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

fix: bug in services list

Browse Source
This commit is contained in:
mahyargdz
2025-03-04 14:31:34 +03:30
parent ea184c643b
commit 3db3a1de99
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/danak-services/providers/danak-services.service.ts
+2 -3
View File
@@ -93,8 +93,7 @@ export class DanakServicesService {
const { limit, skip } = PaginationUtils(queryDto); const { limit, skip } = PaginationUtils(queryDto);
const queryBuilder = this.danakServicesCategoryRepository const queryBuilder = this.danakServicesCategoryRepository
.createQueryBuilder("category") .createQueryBuilder("category")
.where("service.deletedAt = :deletedAt", { deletedAt: IsNull() }) .where("category.deletedAt IS NULL")
// .where("category.deletedAt IS NULL")
.loadRelationCountAndMap("category.servicesCount", "category.danakServices") .loadRelationCountAndMap("category.servicesCount", "category.danakServices")
.loadRelationCountAndMap("category.childrenCount", "category.children"); .loadRelationCountAndMap("category.childrenCount", "category.children");
@@ -259,7 +258,7 @@ export class DanakServicesService {
async getDanakServiceByIdWithSubs(serviceId: string, isAdmin: boolean, userId: string) { async getDanakServiceByIdWithSubs(serviceId: string, isAdmin: boolean, userId: string) {
const serviceQueryBuilder = this.danakServicesRepository const serviceQueryBuilder = this.danakServicesRepository
.createQueryBuilder("service") .createQueryBuilder("service")
.where("service.deletedAt = :deletedAt", { deletedAt: IsNull() }) .where("service.deletedAt IS NULL")
.leftJoinAndSelect("service.images", "images") .leftJoinAndSelect("service.images", "images")
.leftJoinAndSelect("service.subscriptionPlans", "subscriptionPlans") .leftJoinAndSelect("service.subscriptionPlans", "subscriptionPlans")
.leftJoin("service.reviews", "reviews", "reviews.status = :reviewStatus", { reviewStatus: ReviewStatus.APPROVED }) .leftJoin("service.reviews", "reviews", "reviews.status = :reviewStatus", { reviewStatus: ReviewStatus.APPROVED })
src/modules/danak-services/repositories/danak-services.repository.ts
+2 -2
View File
@@ -27,7 +27,7 @@ export class DanakServicesRepository extends Repository<DanakService> {
.leftJoinAndSelect("service.category", "category") .leftJoinAndSelect("service.category", "category")
.loadRelationCountAndMap("service.subscriptionCount", "service.subscriptionPlans") .loadRelationCountAndMap("service.subscriptionCount", "service.subscriptionPlans")
.orderBy("service.createdAt", "DESC") .orderBy("service.createdAt", "DESC")
.where("service.deletedAt = :deletedAt", { deletedAt: IsNull() }) .where("service.deletedAt IS NULL")
.skip(skip) .skip(skip)
.take(limit); .take(limit);
@@ -69,7 +69,7 @@ export class DanakServicesRepository extends Repository<DanakService> {
.innerJoin("service.subscriptionPlans", "subscriptionPlans", "subscriptionPlans.isActive = :isActive", { isActive: true }) .innerJoin("service.subscriptionPlans", "subscriptionPlans", "subscriptionPlans.isActive = :isActive", { isActive: true })
.leftJoinAndSelect("service.category", "category") .leftJoinAndSelect("service.category", "category")
.where("service.isActive = :isActive", { isActive: true }) .where("service.isActive = :isActive", { isActive: true })
.andWhere("service.deletedAt = :deletedAt", { deletedAt: IsNull() }) .andWhere("service.deletedAt IS NULL")
.andWhere("service.isDanakSuggest = :isDanakSuggest", { isDanakSuggest: true }) .andWhere("service.isDanakSuggest = :isDanakSuggest", { isDanakSuggest: true })
.orderBy("service.createdAt", "DESC") .orderBy("service.createdAt", "DESC")
.skip(skip) .skip(skip)