Merge pull request #48 from klerick/fix-inccorect-condition

fix(json-api-nestjs): fix incorrect condition

Author: klerick

libs/json-api-nestjs/src/lib/mixin/service/typeorm/methods/get-all/get-all.spec.ts

@@ -358,7 +358,7 @@ describe('GetAll methode test', () => {
     expect(result.meta.totalItems).toBe(0);
     expect(result.meta.pageSize).toBe(page.size);
 
-    expect(resultJoinSpy).toBeCalledTimes(4);
+    expect(resultJoinSpy).toBeCalledTimes(2);
     expect(resultJoinSpy).toHaveBeenNthCalledWith(
       1,
       `${aliasString}.${include[0]}`,

libs/json-api-nestjs/src/lib/mixin/service/typeorm/methods/get-all/get-all.ts

@@ -173,29 +173,24 @@ export async function getAll<T>(
   const resultBuilder = resultBuilderQuery
     .select([...fieldsSelect])
   const ids = resultIds.map((i) => i[`${countAlias}_${primaryColumn}`]);
+  let result = [];
   if (ids.length > 0) {
     resultBuilder.whereInIds(resultIds.map((i) => i[`${countAlias}_${primaryColumn}`]));
-  }
-
-  for (let i = 0; i < expressionObjectForRelation.length; i++) {
-    const {expression, params, selectInclude} =
-      expressionObjectForRelation[i];
-    if (selectInclude && !(include || []).includes(selectInclude as any)) {
-      resultBuilder.leftJoin(
-        `${preparedResourceName}.${selectInclude}`,
-        selectInclude
-      );
-    }
-    if (i === 0 && ids.length === 0) {
-      resultBuilder.where(expression);
-    } else {
+    for (let i = 0; i < expressionObjectForRelation.length; i++) {
+      const {expression, params, selectInclude} =
+        expressionObjectForRelation[i];
+      if (selectInclude && !(include || []).includes(selectInclude as any)) {
+        resultBuilder.leftJoin(
+          `${preparedResourceName}.${selectInclude}`,
+          selectInclude
+        );
+      }
       resultBuilder.andWhere(expression);
+      resultBuilder.setParameters(params ? {[params.name]: params.val} : {});
     }
-
-    resultBuilder.setParameters(params ? {[params.name]: params.val} : {});
   }
 
-  const result = await resultBuilder.getRawMany();
+  result = await resultBuilder.getRawMany();
 
   const callQuery = Date.now() - startTime;