updaye

Author: khanh1902

server/src/controllers/flows.controller.ts

@@ -24,8 +24,11 @@ export class FlowController {
     public updateFlow = catchAsync(async (req: RequestWithUser, res) => {
         req.body.userId = req.user?.id;
         const data = await this.flowService.updateFlowById(
-            req.params.id,
-            req.body
+            {
+                fields: req.body,
+                id: req.params.id,
+                userId: req.user.id
+            }
         );
         res.status(StatusCodes.OK).json({
             message: this.localeService.i18n().FLOW.UPDATE_SUCCESS(),
@@ -65,21 +68,6 @@ export class FlowController {
         res.status(StatusCodes.OK).json({ data });
     });
 
-    public addMultipleChannels = catchAsync(
-        async (req: RequestWithUser, res) => {
-            await this.flowService.addMultipleChannels(
-                req.body.channelIds,
-                req.body.flowId,
-                req.user?.id as string
-            );
-            res.status(StatusCodes.OK).json({
-                message: this.localeService
-                    .i18n()
-                    .FLOW.ADD_MULTIPLE_CHANNELS_FLOW__SUCCESS(),
-            });
-        }
-    );
-
     public selectFlowsForChannel = catchAsync(
         async (req: RequestWithUser, res) => {
             const data = await this.flowService.selectFlowsForChannel(

server/src/database/schema.ts

@@ -1,3 +1,4 @@
+import { IFlowSetting, IFlowVariable } from '@/interfaces/flows.interface';
 import { createId } from '@paralleldrive/cuid2';
 import { relations } from 'drizzle-orm';
 import {
@@ -127,15 +128,14 @@ export const flows = pgTable('flows', {
    deleted: boolean('deleted').default(false),
    updatedAt: timestamp('updated_at'),
    createdAt: timestamp('created_at').defaultNow(),
-   edges: json('edges').default([]).$type<any[]>(),
-   nodes: json('nodes').default([]).$type<any[]>(),
-   settings: json('settings').default([]).$type<any[]>(),
-   variables: json('variables').default([]).$type<
-      Array<{
-         name: string;
-         value: string;
-      }>
+   edges: json('edges').default([]).$type<
+      Array<Record<any, any>>
    >(),
+   nodes: json('nodes').default([]).$type<
+      Array<Record<any, any>>
+   >(),
+   settings: json('settings').default([]).$type<Array<IFlowSetting>>(),
+   variables: json('variables').default([]).$type<Array<IFlowVariable>>(),
    flows: json('flows').default([]).$type<any[]>(),
    publishAt: timestamp('publish_at'),
 });

server/src/dtos/flows.dto.ts

@@ -1,4 +1,5 @@
 import { getCurrentLocale } from '@/i18n/get-current';
+import { IFlowSetting, IFlowVariable } from '@/interfaces/flows.interface';
 import { Transform } from 'class-transformer';
 import {
    IsArray,
@@ -16,11 +17,6 @@ export class FlowDTO {
    @Transform(({ value }) => value.trim())
    name: string;
 
-   @IsArray()
-   @IsOptional()
-   @IsObject({ each: true })
-   diagrams: Array<Record<any, any>>;
-
    @IsArray()
    @IsOptional()
    @IsObject({ each: true })
@@ -34,17 +30,22 @@ export class FlowDTO {
    @IsArray()
    @IsOptional()
    @IsObject({ each: true })
-   settings: Array<Record<any, any>>;
+   settings: Array<IFlowSetting>;
 
    @IsArray()
    @IsOptional()
    @IsObject({ each: true })
-   variables: Array<Record<any, any>>;
+   variables: Array<IFlowVariable>;
 
    @IsArray()
    @IsOptional()
    @IsObject({ each: true })
    flows: Array<Record<any, any>>;
+
+   @IsArray()
+   @IsOptional()
+   @IsString({ each: true })
+   channelIds: string[];
 }
 
 export class SelectMultipleChannelDTO {

server/src/interfaces/flows.interface.ts

@@ -2,4 +2,16 @@ export interface FlowExtend {
     id: string;
     name: string;
     publishAt: Date;
+}
+
+export interface IFlowSetting {
+    type: string;
+    label: string;
+    value: any
+    default: any
+}
+
+export interface IFlowVariable {
+    name: string;
+    value: any
 }

server/src/routes/flow.route.ts

@@ -1,6 +1,6 @@
 import { ENDPOINTS } from '@/constants';
 import { FlowController } from '@/controllers/flows.controller';
-import { FlowDTO, SelectMultipleChannelDTO } from '@/dtos/flows.dto';
+import { FlowDTO } from '@/dtos/flows.dto';
 import { PagingDTO } from '@/dtos/paging.dto';
 import { authMiddleware } from '@/middlewares/auth.middleware';
 import { validate } from '@/middlewares/validation.middleware';
@@ -41,6 +41,13 @@ export class FlowRoute implements Routes {
          this.controller.deleteFlow
       );
 
+      //for bot get flow by contactId
+      this.router.get(
+         `${ENDPOINTS.FLOW.INDEX}/:contactId`,
+         authMiddleware,
+         this.controller.getFlowByContactId
+      );
+
       this.router.get(
          `${ENDPOINTS.FLOW.GET_ONE}/:id`,
          authMiddleware,
@@ -54,23 +61,10 @@ export class FlowRoute implements Routes {
          this.controller.getAllFlows
       );
 
-      this.router.post(
-         ENDPOINTS.FLOW.ADD_CHANNELS,
-         validate(SelectMultipleChannelDTO, 'body'),
-         authMiddleware,
-         this.controller.addMultipleChannels
-      );
-
       this.router.get(
          ENDPOINTS.FLOW.SELECT_FLOWS_FOR_CHANNEL,
          authMiddleware,
          this.controller.selectFlowsForChannel
       );
-
-      this.router.get(
-         `${ENDPOINTS.FLOW.INDEX}/:contactId`,
-         authMiddleware,
-         this.controller.getFlowByContactId
-      );
    }
 }

server/src/services/flows.service.ts

@@ -1,14 +1,16 @@
 import { LOCALE_KEY } from '@/constants';
 import { db } from '@/database/db';
 import { channels, flows } from '@/database/schema';
-import { TNewFlow, TUpdateFlow } from '@/database/types';
+import { TNewFlow } from '@/database/types';
+import { FlowDTO } from '@/dtos/flows.dto';
 import { PagingDTO } from '@/dtos/paging.dto';
 import { HttpException } from '@/exceptions/http-exception';
 import { LocaleService } from '@/i18n/ctx';
 import { FlowExtend } from '@/interfaces/flows.interface';
 import { Paging } from '@/interfaces/paging.interface';
 import { and, asc, desc, eq, isNotNull, like, ne, notExists, sql } from 'drizzle-orm';
 import { StatusCodes } from 'http-status-codes';
+import { omit } from 'lodash';
 import { Inject, Service } from 'typedi';
 import { ChannelService } from './channels.service';
 
@@ -47,7 +49,12 @@ export class FlowService {
       return newFlow;
    }
 
-   public async updateFlowById(id: string, fields: TUpdateFlow) {
+   public async updateFlowById({ fields, id, userId }: {
+      userId: string;
+      id: string;
+      fields: FlowDTO
+   }) {
+
       const flowExisted = await db.query.flows.findFirst({
          where: eq(flows.id, id),
       });
@@ -63,7 +70,7 @@ export class FlowService {
          where: and(
             ne(flows.id, id),
             eq(flows.name, fields.name),
-            eq(flows.userId, fields.userId),
+            eq(flows.userId, userId),
             eq(flows.deleted, false)
          ),
       });
@@ -75,11 +82,27 @@ export class FlowService {
          );
       }
 
-      fields.updatedAt = new Date();
+      // handle update flowId for channel
+      const addFlowIdForChannels = await this.chanelService.updateFlowId(
+         fields.channelIds,
+         flowExisted.id
+      );
+
+      if (!addFlowIdForChannels) {
+         throw new HttpException(
+            StatusCodes.BAD_REQUEST,
+            this.localeService.i18n().FLOW.ADD_MULTIPLE_CHANNELS_FLOW__FAILED()
+         );
+      }
+
 
       const [updateFlow] = await db
          .update(flows)
-         .set(fields)
+         .set({
+            ...omit(fields, ['channelIds']),
+            updatedAt: new Date()
+
+         })
          .where(eq(flows.id, id))
          .returning();