FIX #1812 Updates to documents fail with GraphQL replication

Author: pubkey

CHANGELOG.md

@@ -5,6 +5,9 @@
 Other:
   - Added a new example for electron with the remote API. Thanks [@SebastienWae](https://github.com/SebastienWae)
 
+Bugfixes:
+  - Updates to documents fail with GraphQL replication. [#1812](https://github.com/pubkey/rxdb/issues/1812). Thanks [@gautambt](https://github.com/gautambt)
+
 ### 8.7.4 (2 December 2019)
 
 Other:

examples/graphql/client/index.js

@@ -19,6 +19,9 @@ RxDB.plugin(RxDBErrorMessagesModule);
 import RxDBValidateModule from 'rxdb/plugins/validate';
 RxDB.plugin(RxDBValidateModule);
 
+import UpdatePlugin from 'rxdb/plugins/update';
+RxDB.plugin(UpdatePlugin);
+
 import {
     GRAPHQL_PORT,
     GRAPHQL_PATH,
@@ -188,13 +191,14 @@ async function run() {
     }`;
     const ret = wsClient.request({ query });
     ret.subscribe({
-        next(data) {
-            console.log('subscription emitted => trigger run');
+        next: async (data) => {
+            console.log('subscription emitted => trigger run()');
             console.dir(data);
-            replicationState.run();
+            await replicationState.run();
+            console.log('run() done');
         },
         error(error) {
-            console.log('got error:');
+            console.log('run() got error:');
             console.dir(error);
         }
     });

src/plugins/replication-graphql/crawling-checkpoint.ts

@@ -30,7 +30,6 @@ import {
 // things for the push-checkpoint
 //
 
-
 const pushSequenceId = (endpointHash: string) => LOCAL_PREFIX + PLUGIN_IDENT + '-push-checkpoint-' + endpointHash;
 
 /**
@@ -137,8 +136,6 @@ export async function getChangesSinceLastPushSequence(
 }
 
 
-
-
 //
 // things for pull-checkpoint
 //

src/plugins/replication-graphql/index.ts

@@ -354,9 +354,10 @@ export class RxGraphQLReplicationState {
         await this.collection.pouch.bulkDocs(
             [
                 toPouch
-            ], {
-            new_edits: false
-        }
+            ],
+            {
+                new_edits: false
+            }
         );
 
         /**
@@ -366,9 +367,15 @@ export class RxGraphQLReplicationState {
          * so other instances get informed about it
          */
         const originalDoc = flatClone(toPouch);
-        originalDoc._deleted = deletedValue;
+        if (deletedValue) {
+            originalDoc._deleted = deletedValue;
+        } else {
+            delete originalDoc._deleted;
+        }
         delete originalDoc[this.deletedFlag];
+        delete originalDoc._revisions;
         originalDoc._rev = newRevision;
+
         const cE = changeEventfromPouchChange(
             originalDoc,
             this.collection

test/unit/replication-graphql.test.ts

@@ -1763,6 +1763,69 @@ describe('replication-graphql.test.js', () => {
                     return docs.length === (amount + 1);
                 });
 
+                server.close();
+                db.destroy();
+            });
+            it('#1812 updates fail when graphql is enabled', async () => {
+                const db = await RxDB.create({
+                    name: util.randomCouchString(10),
+                    adapter: 'memory',
+                    multiInstance: false,
+                    queryChangeDetection: true,
+                    password: util.randomCouchString(10)
+                });
+                const schema = clone(schemas.humanWithTimestampAllIndex);
+                schema.properties.name.encrypted = true;
+                const collection = await db.collection({
+                    name: 'humans',
+                    schema
+                });
+                const server = await SpawnServer.spawn();
+                assert.strictEqual(server.getDocuments().length, 0);
+
+                const replicationState = collection.syncGraphQL({
+                    url: server.url,
+                    push: {
+                        batchSize,
+                        queryBuilder: pushQueryBuilder
+                    },
+                    pull: {
+                        queryBuilder
+                    },
+                    live: true,
+                    deletedFlag: 'deleted'
+                });
+                await replicationState.awaitInitialReplication();
+
+                // add one doc
+                const testData = getTestData(1).pop();
+                delete testData.deleted;
+                await collection.insert(testData);
+
+                // sync
+                await replicationState.run();
+                assert.strictEqual(server.getDocuments().length, 1);
+
+                // update document
+                const newTime = Math.round(new Date().getTime() / 1000);
+                const doc = await collection.findOne().exec();
+                await doc.atomicSet('updatedAt', newTime);
+
+                // check server
+                await replicationState.run();
+                await AsyncTestUtil.waitUntil(() => {
+                    const notUpdated = server.getDocuments().find((d: any) => d.updatedAt !== newTime);
+                    return !notUpdated;
+                });
+
+                // also delete to ensure nothing broke
+                await doc.remove();
+                await replicationState.run();
+                await AsyncTestUtil.waitUntil(() => {
+                    const d = server.getDocuments().pop();
+                    return d['deleted'];
+                });
+
                 server.close();
                 db.destroy();
             });