ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-07-17 03:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated listing

Browse Source
This commit is contained in:
hannathkadher
2025-01-12 13:40:48 +04:00
parent 4ee4097246
commit 65b7cf1f64
3 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/common/src/models/typeOrmCustom.model.ts
View File

@ -98,14 +98,17 @@ export function TypeORMCustomModel(repository: Repository<any>) {
if (customQueryBuilder) {
const qb = customQueryBuilder.skip(skip).take(size);
if (order) {
Object.keys(order).forEach((key) => {
qb.addOrderBy(key, order[key]);
});
}
if (whereClause) {
qb.where(whereClause);
qb.andWhere(whereClause); // Use .andWhere instead of .where to avoid overwriting conditions
}
if (select) {
const selectColumns = Array.isArray(select)
? select
@ -114,6 +117,7 @@ export function TypeORMCustomModel(repository: Repository<any>) {
);
qb.select(selectColumns as string[]);
}
[data, count] = await qb.getManyAndCount();
} else {
[data, count] = await repository.findAndCount({