From 3db3a1de9957e8951ff7e30e79d54bfd2afcb0d7 Mon Sep 17 00:00:00 2001
From: mahyargdz <mahyar.goudarzi@outlook.com>
Date: Tue, 4 Mar 2025 14:31:34 +0330
Subject: [PATCH] fix: bug in services list

---
 .../danak-services/providers/danak-services.service.ts       | 5 ++---
 .../danak-services/repositories/danak-services.repository.ts | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/danak-services/providers/danak-services.service.ts b/src/modules/danak-services/providers/danak-services.service.ts
index 2c4e933..5cb5417 100755
--- a/src/modules/danak-services/providers/danak-services.service.ts
+++ b/src/modules/danak-services/providers/danak-services.service.ts
@@ -93,8 +93,7 @@ export class DanakServicesService {
     const { limit, skip } = PaginationUtils(queryDto);
     const queryBuilder = this.danakServicesCategoryRepository
       .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.childrenCount", "category.children");
 
@@ -259,7 +258,7 @@ export class DanakServicesService {
   async getDanakServiceByIdWithSubs(serviceId: string, isAdmin: boolean, userId: string) {
     const serviceQueryBuilder = this.danakServicesRepository
       .createQueryBuilder("service")
-      .where("service.deletedAt = :deletedAt", { deletedAt: IsNull() })
+      .where("service.deletedAt IS NULL")
       .leftJoinAndSelect("service.images", "images")
       .leftJoinAndSelect("service.subscriptionPlans", "subscriptionPlans")
       .leftJoin("service.reviews", "reviews", "reviews.status = :reviewStatus", { reviewStatus: ReviewStatus.APPROVED })
diff --git a/src/modules/danak-services/repositories/danak-services.repository.ts b/src/modules/danak-services/repositories/danak-services.repository.ts
index 2325493..6fcde0f 100755
--- a/src/modules/danak-services/repositories/danak-services.repository.ts
+++ b/src/modules/danak-services/repositories/danak-services.repository.ts
@@ -27,7 +27,7 @@ export class DanakServicesRepository extends Repository<DanakService> {
       .leftJoinAndSelect("service.category", "category")
       .loadRelationCountAndMap("service.subscriptionCount", "service.subscriptionPlans")
       .orderBy("service.createdAt", "DESC")
-      .where("service.deletedAt = :deletedAt", { deletedAt: IsNull() })
+      .where("service.deletedAt IS NULL")
       .skip(skip)
       .take(limit);
 
@@ -69,7 +69,7 @@ export class DanakServicesRepository extends Repository<DanakService> {
       .innerJoin("service.subscriptionPlans", "subscriptionPlans", "subscriptionPlans.isActive = :isActive", { isActive: true })
       .leftJoinAndSelect("service.category", "category")
       .where("service.isActive = :isActive", { isActive: true })
-      .andWhere("service.deletedAt = :deletedAt", { deletedAt: IsNull() })
+      .andWhere("service.deletedAt IS NULL")
       .andWhere("service.isDanakSuggest = :isDanakSuggest", { isDanakSuggest: true })
       .orderBy("service.createdAt", "DESC")
       .skip(skip)