Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/json-api-nestjs/src/lib/mixin/service/typeorm/methods/get-all/get-all.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]}`,
Expand Down
29 changes: 12 additions & 17 deletions libs/json-api-nestjs/src/lib/mixin/service/typeorm/methods/get-all/get-all.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down