Added support for Graph Upsert

Author: NotAmaan

src/index.js

@@ -64,6 +64,8 @@ class Service {
     this.eagerFilters = options.eagerFilters
     this.allowedInsert = options.allowedInsert
     this.insertGraphOptions = options.insertGraphOptions
+    this.allowedUpsert = options.allowedUpsert
+    this.upsertGraphOptions = options.upsertGraphOptions
   }
 
   extend (obj) {
@@ -408,28 +410,32 @@ class Service {
           }
         }
 
-        // NOTE (EK): Delete id field so we don't update it
-        if (Array.isArray(this.id)) {
-          for (const idKey of this.id) {
-            delete newObject[idKey]
+        if (!this.allowedUpsert) {
+          // NOTE (EK): Delete id field so we don't update it
+          if (Array.isArray(this.id)) {
+            for (const idKey of this.id) {
+              delete newObject[idKey]
+            }
+          } else {
+            delete newObject[this.id]
           }
+          return this._createQuery(params)
+            .where(this.getIdsQuery(id))
+            .update(newObject)
+            .then(() => {
+              // NOTE (EK): Restore the id field so we can return it to the client
+              if (Array.isArray(this.id)) {
+                newObject = Object.assign({}, newObject, this.getIdsQuery(id))
+              } else {
+                newObject[this.id] = id
+              }
+
+              return newObject
+            })
         } else {
-          delete newObject[this.id]
+          return this._createQuery(params)
+            .upsertGraphAndFetch(newObject, this.upsertGraphOptions)
         }
-
-        return this._createQuery(params)
-          .where(this.getIdsQuery(id))
-          .update(newObject)
-          .then(() => {
-            // NOTE (EK): Restore the id field so we can return it to the client
-            if (Array.isArray(this.id)) {
-              newObject = Object.assign({}, newObject, this.getIdsQuery(id))
-            } else {
-              newObject[this.id] = id
-            }
-
-            return newObject
-          })
       })
       .catch(errorHandler)
   }

test/index.test.js

@@ -83,7 +83,8 @@ const app = feathers()
           }
         }
       ],
-      allowedInsert: 'clients'
+      allowedInsert: 'clients',
+      allowedUpsert: 'clients'
     })
   )
   .use(
@@ -506,6 +507,45 @@ describe('Feathers Objection Service', () => {
     })
   })
 
+  describe('Graph Upsert Queries', () => {
+    before(async () => {
+      await companies.remove(null)
+      const [google] = await companies
+        .create([
+          {
+            name: 'Google',
+            clients: [
+              {
+                name: 'Dan Davis'
+              }
+            ]
+          },
+          {
+            name: 'Apple'
+          }
+        ], { query: { $eager: 'clients' } })
+
+      const newClients = (google.clients) ? google.clients.concat([{
+        name: 'Ken Patrick'
+      }]) : []
+
+      await companies
+        .update(google.id, {
+          id: google.id,
+          name: 'Alphabet',
+          clients: newClients
+        }, { query: { $eager: 'clients' } })
+    })
+
+    it('allows upsertGraph queries on update', () => {
+      return companies.find({ query: { $eager: 'clients' } }).then(data => {
+        expect(data[0].name).equal('Alphabet')
+        expect(data[0].clients).to.be.an('array')
+        expect(data[0].clients).to.have.lengthOf(2)
+      })
+    })
+  })
+
   describe('$like method', () => {
     beforeEach(async () => {
       await people