Add server support for objectid

hola · May 8, 2020 · e0103e5 · e0103e5
1 parent 00bc1c1
commit e0103e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/Collection.ts b/lib/Collection.ts
@@ -31,7 +31,7 @@ export class Collection {
 
   async findOne(document: string) {
     const obj = await this._collection.findOne({
-      _id: new MongoDb.ObjectId(document)
+      _id: JsonEncoder.fromObjectId(document)
     })
     return JsonEncoder.encode(obj);
   }
@@ -55,15 +55,15 @@ export class Collection {
     // TODO: For now it makes it impossible to remove fields from object with a projection
     const update = partial ? { '$set':newValue } : JsonEncoder.decode(newValue);
     await this._collection.replaceOne({
-      _id: new MongoDb.ObjectId(document)
+      _id: JsonEncoder.fromObjectId(document)
     }, update);
 
     return JsonEncoder.encode(newValue);
   }
 
   async removeOne(document: string) {
     await this._collection.deleteOne({
-      _id: new MongoDb.ObjectId(document)
+      _id: JsonEncoder.fromObjectId(document)
     });
   }
 

diff --git a/lib/JsonEncoder.ts b/lib/JsonEncoder.ts
@@ -1,6 +1,13 @@
 import * as MongoDb from 'mongodb';
 
+const objid_re = new RegExp(/ObjectId\('?([0-9a-fA-F]{24})'?\)/);
 export default class JsonEncoder {
+  static fromObjectId(obj: string) {
+    const match = objid_re.exec(obj);
+    if (match && match[1])
+      return new MongoDb.ObjectId(match[1]);
+    return obj;
+  }
   static encode(obj: any) {
     if (obj instanceof MongoDb.ObjectID) {
       return {