fix(api): update workflow fetching logic to include updatedBy flag and adjust boolean parameters

Author: djabarovgeorge

apps/api/src/app/bridge/bridge.controller.ts

@@ -169,7 +169,7 @@ export class BridgeController {
       user.environmentId,
       workflowId,
       undefined,
-      true
+      false
     );
     if (!workflowExist) {
       throw new NotFoundException('Workflow not found');

apps/api/src/app/events/usecases/parse-event-request/parse-event-request.usecase.ts

@@ -404,7 +404,7 @@ export class ParseEventRequest {
       command.environmentId,
       command.triggerIdentifier,
       undefined,
-      true
+      false
     );
   }
 

apps/api/src/app/workflows-v1/usecases/get-workflow-with-preferences/get-workflow-with-preferences.usecase.ts

@@ -26,6 +26,7 @@ export class GetWorkflowWithPreferencesUseCase {
       organizationId: command.organizationId,
       userId: command.userId,
       session: command.session,
+      includeUpdatedBy: true,
     });
 
     const workflowPreferences = await this.getWorkflowPreferences(command, workflowEntity);

apps/api/src/app/workflows-v2/usecases/sync-to-environment/sync-to-environment.usecase.ts

@@ -217,6 +217,7 @@ export class SyncToEnvironmentUseCase {
       tags: sourceWorkflow.tags,
       description: sourceWorkflow.description,
       __source: WorkflowCreationSourceEnum.DASHBOARD,
+      severity: sourceWorkflow.severity,
       steps: await this.mapStepsToCreateOrUpdateDto(sourceWorkflow.steps),
       preferences: this.mapPreferences(preferences),
     };
@@ -237,6 +238,7 @@ export class SyncToEnvironmentUseCase {
       active: sourceWorkflow.active,
       tags: sourceWorkflow.tags,
       description: sourceWorkflow.description,
+      severity: sourceWorkflow.severity,
       steps: await this.mapStepsToCreateOrUpdateDto(sourceWorkflow.steps, existingTargetEnvWorkflow?.steps),
       preferences: this.mapPreferences(preferencesToClone),
     };

libs/application-generic/src/usecases/workflow/get-workflow-by-ids/get-workflow-by-ids.command.ts

@@ -12,6 +12,9 @@ export class GetWorkflowByIdsCommand extends EnvironmentCommand {
   @IsString()
   userId?: string;
 
+  @IsOptional()
+  includeUpdatedBy?: boolean;
+
   @IsOptional()
   @Exclude()
   session?: ClientSession | null;

libs/application-generic/src/usecases/workflow/get-workflow-by-ids/get-workflow-by-ids.usecase.ts

@@ -16,14 +16,15 @@ export class GetWorkflowByIdsUseCase {
       workflowEntity = await this.notificationTemplateRepository.findById(
         command.workflowIdOrInternalId,
         command.environmentId,
-        command.session
+        command.session,
+        command.includeUpdatedBy || false
       );
     } else {
       workflowEntity = await this.notificationTemplateRepository.findByTriggerIdentifier(
         command.environmentId,
         command.workflowIdOrInternalId,
         command.session,
-        true
+        command.includeUpdatedBy || false
       );
     }
 

libs/dal/src/repositories/notification-template/notification-template.repository.ts

@@ -80,7 +80,7 @@ export class NotificationTemplateRepository extends BaseRepository<
     environmentId: string,
     identifier: string,
     session?: ClientSession | null,
-    skipUpdatedBy: boolean = false
+    includeUpdatedBy: boolean = true
   ) {
     const requestQuery: NotificationTemplateQuery = {
       _environmentId: environmentId,
@@ -89,7 +89,7 @@ export class NotificationTemplateRepository extends BaseRepository<
 
     const query = this.MongooseModel.findOne(requestQuery, undefined, { session }).populate('steps.template');
 
-    if (!skipUpdatedBy) {
+    if (includeUpdatedBy) {
       query.populate('updatedBy');
     }
 
@@ -113,7 +113,7 @@ export class NotificationTemplateRepository extends BaseRepository<
     return this.mapEntities(query);
   }
 
-  async findById(id: string, environmentId: string, session?: ClientSession | null) {
+  async findById(id: string, environmentId: string, session?: ClientSession | null, includeUpdatedBy: boolean = true) {
     const query = this.MongooseModel.findOne(
       {
         _id: id,
@@ -124,110 +124,129 @@ export class NotificationTemplateRepository extends BaseRepository<
     )
       .populate('steps.template')
       .populate('steps.variants.template')
-      .populate('updatedBy');
 
-    const item = await query;
+    if (includeUpdatedBy) { 
+      query.populate('updatedBy');
+    }
 
-    return this.mapEntity(item);
-  }
+      const item = await query;
 
-  async findByTriggerIdentifierAndUpdate(environmentId: string, triggerIdentifier: string, lastTriggeredAt: Date) {
-    const requestQuery: NotificationTemplateQuery = {
-      _environmentId: environmentId,
-      'triggers.identifier': triggerIdentifier,
-    };
+      return this.mapEntity(item);
+    }
 
-    const item = await this.MongooseModel.findOneAndUpdate(
-      requestQuery,
-      {
-        $set: {
-          lastTriggeredAt,
+    async;
+    findByTriggerIdentifierAndUpdate(environmentId: string, triggerIdentifier: string, lastTriggeredAt: Date)
+    {
+      const requestQuery: NotificationTemplateQuery = {
+        _environmentId: environmentId,
+        'triggers.identifier': triggerIdentifier,
+      };
+
+      const item = await this.MongooseModel.findOneAndUpdate(
+        requestQuery,
+        {
+          $set: {
+            lastTriggeredAt,
+          },
         },
-      },
-      {
-        timestamps: false,
-      }
-    ).populate('steps.template');
-
-    return this.mapEntity(item);
-  }
+        {
+          timestamps: false,
+        }
+      ).populate('steps.template');
 
-  async updatePublishFields(workflowId: string, environmentId: string, userId: string, session?: ClientSession | null) {
-    const requestQuery: NotificationTemplateQuery = {
-      _id: workflowId,
-      _environmentId: environmentId,
-    };
+      return this.mapEntity(item);
+    }
 
-    const item = await this.MongooseModel.findOneAndUpdate(
-      requestQuery,
-      {
-        $set: {
-          lastPublishedAt: new Date(),
-          _lastPublishedBy: userId,
+    async;
+    updatePublishFields(workflowId: string, environmentId: string, userId: string, session?: ClientSession | null)
+    {
+      const requestQuery: NotificationTemplateQuery = {
+        _id: workflowId,
+        _environmentId: environmentId,
+      };
+
+      const item = await this.MongooseModel.findOneAndUpdate(
+        requestQuery,
+        {
+          $set: {
+            lastPublishedAt: new Date(),
+            _lastPublishedBy: userId,
+          },
         },
-      },
-      { session, new: true }
-    );
+        { session, new: true }
+      );
 
-    return this.mapEntity(item);
-  }
+      return this.mapEntity(item);
+    }
 
-  async findBlueprintById(id: string) {
-    if (!this.blueprintOrganizationId) throw new DalException('Blueprint environment id was not found');
+    async;
+    findBlueprintById(id: string)
+    {
+      if (!this.blueprintOrganizationId) throw new DalException('Blueprint environment id was not found');
 
-    const requestQuery: NotificationTemplateQuery = {
-      isBlueprint: true,
-      _organizationId: this.blueprintOrganizationId,
-      _id: id,
-    };
+      const requestQuery: NotificationTemplateQuery = {
+        isBlueprint: true,
+        _organizationId: this.blueprintOrganizationId,
+        _id: id,
+      };
 
-    const item = await this.MongooseModel.findOne(requestQuery)
-      .populate('steps.template')
-      .populate('notificationGroup')
-      .lean();
+      const item = await this.MongooseModel.findOne(requestQuery)
+        .populate('steps.template')
+        .populate('notificationGroup')
+        .lean();
 
-    return this.mapEntity(item);
-  }
+      return this.mapEntity(item);
+    }
 
-  async findBlueprintByTriggerIdentifier(identifier: string) {
-    if (!this.blueprintOrganizationId) throw new DalException('Blueprint environment id was not found');
+    async;
+    findBlueprintByTriggerIdentifier(identifier: string)
+    {
+      if (!this.blueprintOrganizationId) throw new DalException('Blueprint environment id was not found');
 
-    const requestQuery: NotificationTemplateQuery = {
-      isBlueprint: true,
-      _organizationId: this.blueprintOrganizationId,
-      triggers: { $elemMatch: { identifier } },
-    };
+      const requestQuery: NotificationTemplateQuery = {
+        isBlueprint: true,
+        _organizationId: this.blueprintOrganizationId,
+        triggers: { $elemMatch: { identifier } },
+      };
 
-    const item = await this.MongooseModel.findOne(requestQuery)
-      .populate('steps.template')
-      .populate('notificationGroup')
-      .lean();
+      const item = await this.MongooseModel.findOne(requestQuery)
+        .populate('steps.template')
+        .populate('notificationGroup')
+        .lean();
 
-    return this.mapEntity(item);
-  }
+      return this.mapEntity(item);
+    }
 
-  async findBlueprintTemplates(organizationId: string, environmentId: string): Promise<NotificationTemplateEntity[]> {
-    const _organizationId = organizationId;
+    async;
+    findBlueprintTemplates(organizationId: string, environmentId: string)
+    : Promise<NotificationTemplateEntity[]>
+    {
+      const _organizationId = organizationId;
 
-    if (!_organizationId) throw new DalException('Blueprint environment id was not found');
+      if (!_organizationId) throw new DalException('Blueprint environment id was not found');
 
-    const templates = await this.MongooseModel.find({
-      isBlueprint: true,
-      _environmentId: environmentId,
-      _organizationId,
-    })
-      .populate('steps.template')
-      .populate('notificationGroup')
-      .lean();
+      const templates = await this.MongooseModel.find({
+        isBlueprint: true,
+        _environmentId: environmentId,
+        _organizationId,
+      })
+        .populate('steps.template')
+        .populate('notificationGroup')
+        .lean();
 
-    if (!templates) {
-      return [];
-    }
+      if (!templates) {
+        return [];
+      }
 
-    return this.mapEntities(templates);
-  }
+      return this.mapEntities(templates);
+    }
 
-  async findAllGroupedByCategory(): Promise<{ name: string; blueprints: NotificationTemplateEntity[] }[]> {
+    async;
+    findAllGroupedByCategory();
+    : Promise<
+    name: string;
+    blueprints: NotificationTemplateEntity[]
+    []> {
     const organizationId = this.blueprintOrganizationId;
 
     if (!organizationId) {