danak/dsc-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug in the customer and tikcet for admin panel

Browse Source
This commit is contained in:
mahyargdz
2025-03-03 09:31:23 +03:30
parent 73fb9b915c
commit 0abac00bde
9 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/users/providers/users.service.ts
+21 -20
View File
@@ -26,6 +26,7 @@ import { CreateLegalUserDto } from "../DTO/create-legal-user.dto";
import { CreateRealUserDto } from "../DTO/create-real-user.dto";
import { CreateRoleDto } from "../DTO/create-role.dto";
import { SearchAdminQueryDto } from "../DTO/search-admins-query.dto";
import { SearchCustomersDto } from "../DTO/search-customers.dto";
import { SearchRolesQueryDto } from "../DTO/search-roles.dto";
import { UpdateProfileDto } from "../DTO/update-profile.dto";
import { CreateUserGroupDto } from "../DTO/user-group.dto";
@@ -398,30 +399,30 @@ export class UsersService {
/************************************************************ */
// async findAllCustomers(queryDto: SearchCustomersDto) {
// const { limit, skip } = PaginationUtils(queryDto);
async getCustomers(queryDto: SearchCustomersDto) {
const { limit, skip } = PaginationUtils(queryDto);
// const queryBuilder = this.userRepository
// .createQueryBuilder("user")
// .leftJoin("user.roles", "role")
// .where("role.name = :roleName", { roleName: RoleEnum.USER })
// .leftJoin("user.groups", "groups")
// .addSelect(["groups.id", "groups.name"])
// .loadRelationCountAndMap("user.invoicesCount", "user.invoices")
// .loadRelationCountAndMap("user.subscriptionsCount", "user.subscriptions")
// .loadRelationCountAndMap("user.ticketsCount", "user.tickets");
const queryBuilder = this.userRepository
.createQueryBuilder("user")
.leftJoin("user.roles", "role")
.where("role.name = :roleName", { roleName: RoleEnum.USER })
.leftJoin("user.groups", "groups")
.addSelect(["groups.id", "groups.name"])
.loadRelationCountAndMap("user.invoicesCount", "user.invoices")
.loadRelationCountAndMap("user.subscriptionsCount", "user.subscriptions")
.loadRelationCountAndMap("user.ticketsCount", "user.tickets");
// if (queryDto.q) {
// queryBuilder
// .orWhere("user.firstName ILIKE :search", { search: `%${queryDto.q}%` })
// .orWhere("user.lastName ILIKE :search", { search: `%${queryDto.q}%` })
// .orWhere("user.userName ILIKE :search", { search: `%${queryDto.q}%` });
// }
if (queryDto.q) {
queryBuilder
.orWhere("user.firstName ILIKE :search", { search: `%${queryDto.q}%` })
.orWhere("user.lastName ILIKE :search", { search: `%${queryDto.q}%` })
.orWhere("user.userName ILIKE :search", { search: `%${queryDto.q}%` });
}
// const [customers, count] = await queryBuilder.skip(skip).take(limit).getManyAndCount();
const [customers, count] = await queryBuilder.skip(skip).take(limit).getManyAndCount();
// return { customers, count };
// }
return { customers, count };
}
/************************************************************ */