feat: use findFirst in get if id and query.id is provided

ps73 · Feb 16, 2022 · 563162d · 563162d
1 parent 331b066
commit 563162d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/dist/service.js b/dist/service.js
@@ -81,10 +81,16 @@ class PrismaService extends adapter_commons_1.AdapterService {
             try {
                 const { query, filters } = this.filterQuery(params);
                 const { whitelist } = this.options;
-                (0, utils_1.checkIdInQuery)({ id, query, idField: this.options.id });
                 const { where, select, include } = (0, utils_1.buildPrismaQueryParams)({
                     id, query, filters, whitelist,
                 }, this.options.id);
+                if (typeof query.id === 'object') {
+                    const result = yield this.Model.findFirst(Object.assign({ where: Object.assign(Object.assign({}, where), { id: Object.assign(Object.assign({}, where.id), { equals: id }) }) }, (0, utils_1.buildSelectOrInclude)({ select, include })));
+                    if (!result)
+                        throw new errors.NotFound(`No record found for id '${id}' and query`);
+                    return result;
+                }
+                (0, utils_1.checkIdInQuery)({ id, query, idField: this.options.id });
                 const result = yield this.Model.findUnique(Object.assign({ where }, (0, utils_1.buildSelectOrInclude)({ select, include })));
                 if (!result)
                     throw new errors.NotFound(`No record found for id '${id}'`);

diff --git a/prisma/tests.db b/prisma/tests.db
diff --git a/src/service.ts b/src/service.ts
@@ -81,10 +81,24 @@ export class PrismaService<ModelData = Record<string, any>> extends AdapterServi
     try {
       const { query, filters } = this.filterQuery(params);
       const { whitelist } = this.options;
-      checkIdInQuery({ id, query, idField: this.options.id });
       const { where, select, include } = buildPrismaQueryParams({
         id, query, filters, whitelist,
       }, this.options.id);
+      if (typeof query.id === 'object') {
+        const result: Partial<ModelData> = await this.Model.findFirst({
+          where: {
+            ...where,
+            id: {
+              ...where.id,
+              equals: id,
+            },
+          },
+          ...buildSelectOrInclude({ select, include }),
+        });
+        if (!result) throw new errors.NotFound(`No record found for id '${id}' and query`);
+        return result;
+      }
+      checkIdInQuery({ id, query, idField: this.options.id });
       const result: Partial<ModelData> = await this.Model.findUnique({
         where,
         ...buildSelectOrInclude({ select, include }),

diff --git a/test/index.test.js b/test/index.test.js
@@ -351,6 +351,27 @@ describe('Feathers Prisma Service', () => {
 
         expect(result).to.have.lengthOf(1);
       });
+
+      it('.get + multiple id queries + NotFound', async () => {
+        try {
+          await todosService.create([
+            { title: 'Todo2', prio: 2, userId: data.id },
+            { title: 'Todo3', prio: 4, done: true, userId: data.id },
+          ]);
+          const results = await todosService.find();
+          const inIds = [results[1].id, results[2].id];
+
+          await todosService.get(results[0].id, {
+            query: {
+              id: {
+                $in: inIds,
+              }
+            },
+          });
+        } catch (e) {
+          expect(e.code).to.be.equal(404);
+        }
+      });
     });
   });