Merge pull request #8 from browngraphicslab/server_database_merge

Server database merge

1 files changed, 14 insertions, 1 deletions

diff --git a/src/fields/DocumentReference.ts b/src/fields/DocumentReference.ts
index 983b162a3..9d3c209b4 100644
--- a/src/fields/DocumentReference.ts
+++ b/src/fields/DocumentReference.ts
@@ -1,6 +1,8 @@
-import { Field, Opt, FieldValue } from "./Field";
+import { Field, Opt, FieldValue, FieldId } from "./Field";
 import { Document } from "./Document";
 import { Key } from "./Key";
+import { Types } from "../server/Message";
+import { ObjectID } from "bson";
 
 export class DocumentReference extends Field {
     get Key(): Key {
@@ -15,6 +17,10 @@ export class DocumentReference extends Field {
         super();
     }
 
+    UpdateFromServer() {
+
+    }
+
     Dereference(): FieldValue<Field> {
         return this.document.Get(this.key);
     }
@@ -41,4 +47,11 @@ export class DocumentReference extends Field {
         return "";
     }
 
+    ToJson(): { type: Types, data: FieldId, _id: string } {
+        return {
+            type: Types.DocumentReference,
+            data: this.document.Id,
+            _id: this.Id
+        }
+    }
 }
\ No newline at end of file