fix: refactor trigger moduls codes

apps/triggers/src/phases/dto/get.phase.dto.ts

@@ -42,7 +42,6 @@ export class GetPhaseByName {
     example: Phases.PREPAREDNESS,
   })
   @IsEnum(Phases)
-  @IsNotEmpty()
   @IsOptional()
   phase?: Phases;
 

apps/triggers/src/phases/phases.service.ts

@@ -744,7 +744,7 @@ export class PhasesService {
     for (const trigger of phase.Trigger) {
       const { repeatKey } = trigger;
       if (trigger.source === DataSource.MANUAL) {
-        await this.triggerService.create(
+        await this.triggerService.createTrigger(
           appId,
           {
             title: trigger.title,
@@ -756,7 +756,7 @@ export class PhasesService {
           trigger.createdBy,
         );
       } else {
-        await this.triggerService.create(
+        await this.triggerService.createTrigger(
           appId,
           {
             title: trigger.title,

apps/triggers/src/sources-data/data-source-events.listener.ts

@@ -245,7 +245,7 @@ export class DataSourceEventsListener {
       if (meetsThreshold) {
         this.logger.log(`Trigger ${trigger.id} MET threshold`);
         // update trigger
-        await this.triggerService.activateTrigger(trigger.uuid, '', trigger);
+        // await this.triggerService.activateTrigger(trigger.uuid, '', trigger);
       } else {
         this.logger.log(`Trigger ${trigger.id} NOT met`);
       }

apps/triggers/src/trigger/dto/activate-trigger-payload.dto.ts

@@ -0,0 +1,52 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsOptional, IsArray } from 'class-validator';
+
+export class ActivateTriggerPayloadDto {
+  @ApiProperty({
+    description: 'Trigger UUID',
+    required: false,
+  })
+  @IsOptional()
+  @IsString()
+  uuid?: string;
+
+  @ApiProperty({
+    description: 'Trigger repeat key',
+    required: false,
+  })
+  @IsOptional()
+  @IsString()
+  repeatKey?: string;
+
+  @ApiProperty({
+    description: 'Application ID',
+    required: false,
+  })
+  @IsOptional()
+  @IsString()
+  appId?: string;
+
+  @ApiProperty({
+    description: 'Trigger documents',
+    required: false,
+  })
+  @IsOptional()
+  @IsArray()
+  triggerDocuments?: unknown[];
+
+  @ApiProperty({
+    description: 'User information',
+    required: false,
+  })
+  @IsOptional()
+  user?: { name?: string };
+
+  @ApiProperty({
+    description: 'Notes',
+    required: false,
+  })
+  @IsOptional()
+  @IsString()
+  notes?: string;
+}
+

apps/triggers/src/trigger/dto/create-trigger.dto.ts

@@ -139,13 +139,29 @@ export class CreateTriggerDto {
   riverBasin?: string;
 }
 
-export class BulkCreateTriggerDto {
+export class CreateTriggerPayloadDto {
   @ApiProperty({
+    description: 'User information',
+    required: false,
+  })
+  @IsOptional()
+  user?: { name?: string };
+
+  @ApiProperty({
+    description: 'Application ID',
+    example: 'app-123',
+  })
+  @IsString()
+  appId: string;
+
+  @ApiProperty({
+    description: 'Array of triggers for bulk create',
     type: [CreateTriggerDto],
-    description: 'An array of triggers to be created',
+    required: false,
   })
+  @IsOptional()
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => CreateTriggerDto)
-  triggers: CreateTriggerDto[];
+  triggers?: CreateTriggerDto[];
 }

apps/triggers/src/trigger/dto/get-by-location-payload.dto.ts

@@ -0,0 +1,32 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsOptional, IsNumber } from 'class-validator';
+import { Type } from 'class-transformer';
+
+export class GetByLocationPayloadDto {
+  @ApiProperty({
+    description: 'River basin name',
+    required: false,
+  })
+  @IsOptional()
+  @IsString()
+  riverBasin?: string;
+
+  @ApiProperty({
+    description: 'Page number',
+    required: false,
+  })
+  @IsOptional()
+  @Type(() => Number)
+  @IsNumber()
+  page?: number;
+
+  @ApiProperty({
+    description: 'Items per page',
+    required: false,
+  })
+  @IsOptional()
+  @Type(() => Number)
+  @IsNumber()
+  perPage?: number;
+}
+

apps/triggers/src/trigger/dto/get-triggers.dto.ts

@@ -2,7 +2,17 @@ import { PartialType } from '@nestjs/swagger';
 import { PaginationDto } from 'src/common/dto';
 import { ApiProperty } from '@nestjs/swagger';
 import { DataSource } from '@lib/database';
-import { IsEnum, IsOptional, IsString } from 'class-validator';
+import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+
+export class findOneTriggerDto {
+  @ApiProperty({
+    example: 'trigger-id',
+    description: 'The UUID of the trigger to retrieve',
+  })
+  @IsString()
+  @IsNotEmpty()
+  uuid: string;
+}
 
 export class GetTriggersDto extends PartialType(PaginationDto) {
   @ApiProperty({

apps/triggers/src/trigger/dto/index.ts

@@ -1,3 +1,5 @@
 export * from './create-trigger.dto';
 export * from './update-trigger.dto';
 export * from './get-triggers.dto';
+export * from './activate-trigger-payload.dto';
+export * from './get-by-location-payload.dto';

apps/triggers/src/trigger/dto/update-trigger.dto.ts

@@ -1,9 +1,32 @@
-import { PartialType } from '@nestjs/swagger';
+import { ApiProperty, PartialType } from '@nestjs/swagger';
 import { CreateTriggerDto } from './create-trigger.dto';
+import { IsString } from 'class-validator';
 
-export class UpdateTriggerDto extends PartialType(CreateTriggerDto) {}
+export class UpdateTriggerPayloadDto extends PartialType(CreateTriggerDto) {
+  @ApiProperty({
+    description: 'Application ID',
+  })
+  @IsString()
+  appId: string;
+}
 
 export class UpdateTriggerTransactionDto {
+  @ApiProperty({
+    description: 'Trigger UUID',
+  })
+  @IsString()
   uuid: string;
+
+  @ApiProperty({
+    description: 'Transaction Hash',
+  })
   transactionHash: string;
 }
+
+export class RemoveTriggerPayloadDto {
+  @ApiProperty({
+    description: 'Trigger UUID',
+  })
+  @IsString()
+  uuid: string;
+}

apps/triggers/src/trigger/trigger.constants.ts

@@ -0,0 +1,4 @@
+export const TRIGGER_CONSTANTS = {
+  MICROSERVICE_TIMEOUT_SHORT_MS: 3000,
+  MICROSERVICE_TIMEOUT_LONG_MS: 30000,
+} as const;