Fix update/patch with includes

src/adapter.ts

@@ -226,13 +226,13 @@ export class SequelizeAdapter<
   async _getOrFind (id: NullableId, _params: ServiceParams) {
     const params = _params || {} as ServiceParams;
     if (id === null) {
-      return await this._find({
+      return this._find({
         ...params,
         paginate: false
       });
     }
 
-    return await this._get(id, params);
+    return this._get(id, params);
   }
 
 
@@ -456,7 +456,10 @@ export class SequelizeAdapter<
       .catch(errorHandler);
 
     if (isPresent(sequelize.include)) {
-      return await this._get(id, params);
+      return this._get(id, {
+        ...params,
+        query: { $select: params.query?.$select }
+      });
     }
 
     if (sequelize.raw) {
@@ -507,7 +510,10 @@ export class SequelizeAdapter<
       .catch(errorHandler);
 
     if (isPresent(sequelize.include)) {
-      return await this._get(id, params);
+      return this._get(id, {
+        ...params,
+        query: { $select: params.query?.$select }
+      });
     }
 
     if (isPresent(sequelize.attributes)) {

test/index.test.ts

@@ -275,8 +275,6 @@ describe('Feathers Sequelize Service', () => {
         await people.create({ name });
         const { data } = await people.find({ query: { age: null } }) as Paginated<any>;
 
-        console.log(data);
-
         assert.strictEqual(data.length, 1);
         assert.strictEqual(data[0].name, name);
         assert.strictEqual(data[0].age, null);
@@ -474,6 +472,26 @@ describe('Feathers Sequelize Service', () => {
         expect(result).to.have.property('orders.id');
       });
 
+      it('patch() includes associations and query', async () => {
+        const params = { sequelize: { include: Order } };
+        const data = { name: 'Patched' };
+
+        const current = await people.get(kirsten.id, params);
+
+        const result = await people.patch(kirsten.id, data, {
+          query: { name: current.name },
+          ...params
+        });
+
+        delete current.updatedAt;
+        // @ts-ignore
+        delete result.updatedAt
+
+        console.log(result, { ...current, ...data })
+
+        assert.deepStrictEqual(result, { ...current, ...data });
+      });
+
       it('update() includes associations', async () => {
         const params = { sequelize: { include: Order } };
         const data = { name: 'Updated' };
@@ -483,6 +501,26 @@ describe('Feathers Sequelize Service', () => {
         expect(result).to.have.property('orders.id');
       });
 
+      it('update() includes associations and query', async () => {
+        const params = { sequelize: { include: Order } };
+        const data = { name: 'Updated' };
+
+        const current = await people.get(kirsten.id, params);
+
+        const result = await people.update(kirsten.id, {
+          ...current,
+          ...data
+        }, {
+          query: { name: current.name },
+          ...params
+        });
+
+        delete current.updatedAt;
+        delete result.updatedAt
+
+        assert.deepStrictEqual(result, { ...current, ...data });
+      });
+
       it('remove() includes associations', async () => {
         const params = { sequelize: { include: Order } };