mass confirm fixes

SAY-DAO · Jul 22, 2024 · 225c23a · 225c23a
1 parent c4bdc59
commit 225c23a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/src/features/need/need.controller.ts b/src/features/need/need.controller.ts
@@ -360,18 +360,16 @@ export class NeedController {
 
         const validatedNeed = await validateNeed(fetchedNeed, superAdmin);
         let ticket: TicketEntity;
-
+        let needTickets = await this.ticketService.getTicketsByNeed(
+          validatedNeed.needId,
+        );
+        const ticketError = needTickets.find(
+          (t) =>
+            t.lastAnnouncement === AnnouncementEnum.ERROR ||
+            t.color === Colors.RED,
+        );
         // 0-  ticket if not a valid need and not ticketed yet
         if (!validatedNeed.isValidNeed) {
-          let needTickets = await this.ticketService.getTicketsByNeed(
-            validatedNeed.needId,
-          );
-          const ticketError = needTickets.find(
-            (t) =>
-              t.lastAnnouncement === AnnouncementEnum.ERROR ||
-              t.color === Colors.RED,
-          );
-
           // create ticket if already has not
           if (!ticketError) {
             console.log('\x1b[36m%s\x1b[0m', 'Creating Ticket Content ...\n');
@@ -422,6 +420,18 @@ export class NeedController {
           continue;
         }
         /// -------------------------------- If Valid Need --------------------------------------------///
+        if (ticketError) {
+          // since it is a valid need with an old ticket, we need to update the ticket
+          await this.ticketService.updateTicketAnnouncement(
+            ticketError.id,
+            AnnouncementEnum.NONE,
+          );
+
+          await this.ticketService.updateTicketColor(
+            ticketError.id,
+            Colors.BLUE,
+          );
+        }
         // 1- get duplicates for the child / same name-translations.en
         const duplicates = await this.needService.getDuplicateNeeds(
           need.child_id,

diff --git a/src/features/schedule/schedule.service.ts b/src/features/schedule/schedule.service.ts
@@ -160,8 +160,8 @@ export class ScheduleService {
     }
   }
 
-  @Cron('50 12 * * Sat', {
-    name: 'Reminders to announce arrivals At 12:50 on Sat.',
+  @Cron('50 9 * * Wed', {
+    name: 'Reminders to announce arrivals At 9:50 on Wednesday.',
     timeZone: 'Asia/Tehran',
   })
   async handleAnnounceArrivalCron() {

diff --git a/src/features/ticket/ticket.service.ts b/src/features/ticket/ticket.service.ts
@@ -189,7 +189,7 @@ export class TicketService {
     }
   }
 
-  createTicketContent(
+  async createTicketContent(
     contentDetails: CreateTicketContentParams,
     ticket: TicketEntity,
   ): Promise<TicketContentEntity> {