feat: Update findAll methods across services to exclude records marked as 'DELETED'

Author: letnull19A

src/achievement/achievement.service.ts

@@ -38,7 +38,10 @@ export class AchievementService {
   }
 
   async findAll() {
-    return this.db.select().from(achievements);
+    return this.db
+      .select()
+      .from(achievements)
+      .where(ne(achievements.recordStatus, 'DELETED'));
   }
 
   async findOne(id: number) {

src/category/category.service.ts

@@ -35,7 +35,10 @@ export class CategoryService {
   }
 
   async findAll() {
-    return this.db.select().from(categories);
+    return this.db
+      .select()
+      .from(categories)
+      .where(ne(categories.recordStatus, 'DELETED'));
   }
 
   async findOne(id: number) {

src/city/city.service.ts

@@ -40,7 +40,7 @@ export class CityService {
   }
 
   async findAll(regionId?: number) {
-    const baseConditions = [];
+    const baseConditions = [ne(cities.recordStatus, 'DELETED')];
 
     if (regionId) {
       baseConditions.push(eq(cities.regionId, regionId));
@@ -62,8 +62,11 @@ export class CityService {
         updatedAt: cities.updatedAt,
       })
       .from(cities)
-      .leftJoin(regions, eq(cities.regionId, regions.id))
-      .where(baseConditions.length > 0 ? and(...baseConditions) : undefined);
+      .leftJoin(regions, and(
+        eq(cities.regionId, regions.id),
+        ne(regions.recordStatus, 'DELETED')
+      ))
+      .where(and(...baseConditions));
   }
 
   async findOne(id: number) {

src/help-type/help-type.service.ts

@@ -34,7 +34,10 @@ export class HelpTypeService {
   }
 
   async findAll() {
-    return this.db.select().from(helpTypes);
+    return this.db
+      .select()
+      .from(helpTypes)
+      .where(ne(helpTypes.recordStatus, 'DELETED'));
   }
 
   async findOne(id: number) {

src/organization-type/organization-type.service.ts

@@ -34,7 +34,10 @@ export class OrganizationTypeService {
   }
 
   async findAll() {
-    return this.db.select().from(organizationTypes);
+    return this.db
+      .select()
+      .from(organizationTypes)
+      .where(ne(organizationTypes.recordStatus, 'DELETED'));
   }
 
   async findOne(id: number) {

src/quest-update/quest-update.service.ts

@@ -44,14 +44,14 @@ export class QuestUpdateService {
   }
 
   async findAll(questId?: number) {
-    const conditions = [];
+    const conditions = [ne(questUpdates.recordStatus, 'DELETED')];
     if (questId) {
       conditions.push(eq(questUpdates.questId, questId));
     }
     return this.db
       .select()
       .from(questUpdates)
-      .where(conditions.length > 0 ? and(...conditions) : undefined);
+      .where(and(...conditions));
   }
 
   async findOne(id: number) {

src/quest/quest.repository.ts

@@ -258,17 +258,15 @@ export class QuestRepository {
           ne(organizationTypes.recordStatus, 'DELETED')
         ));
 
-      const conditions = [];
+      const conditions = [ne(quests.recordStatus, 'DELETED')];
       if (cityId) {
         conditions.push(eq(quests.cityId, cityId));
       }
       if (categoryId) {
         query = query.innerJoin(questCategories, eq(quests.id, questCategories.questId)) as any;
         conditions.push(eq(questCategories.categoryId, categoryId));
       }
-      if (conditions.length > 0) {
-        query = query.where(and(...conditions)) as any;
-      }
+      query = query.where(and(...conditions)) as any;
 
       return await query as QuestWithRelations[];
     } catch (error: any) {

src/region/region.service.ts

@@ -22,7 +22,10 @@ export class RegionService {
   }
 
   async findAll() {
-    return this.db.select().from(regions);
+    return this.db
+      .select()
+      .from(regions)
+      .where(ne(regions.recordStatus, 'DELETED'));
   }
 
   async findOne(id: number) {