Merge pull request #9 from Dialogue-Bot/DIAL-11-Add-DB-channeltype-channel

DIAL-11-Add-DB-channeltype-channel

Author: khanh1902

server/.vscode/settings.json

@@ -5,5 +5,8 @@
     },
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSaveMode": "file"
+    "editor.formatOnSaveMode": "file",
+    "[typescript]": {
+        "editor.defaultFormatter": "vscode.typescript-language-features"
+    }
 }

server/package.json

@@ -50,6 +50,7 @@
       "lodash": "^4.17.21",
       "mime": "^4.0.1",
       "mime-types": "^2.1.35",
+      "moment": "^2.30.1",
       "morgan": "^1.10.0",
       "multer": "1.4.5-lts.1",
       "nodemailer": "^6.9.8",

server/src/constants/index.ts

@@ -25,6 +25,11 @@ export const ENDPOINTS = {
       SINGLE: '/upload/single',
       MULTIPLE: '/upload/multiple',
    },
+   CHANNEL: {
+      INDEX: '/channel',
+      DELETE: '/channel/delete',
+      DELETES: '/channel/deletes',
+   }
 };
 
 export const LOCALE_KEY = 'lang';

server/src/controllers/channels.controller.ts

@@ -0,0 +1,50 @@
+import { LOCALE_KEY } from "@/constants";
+import { PagingDTO } from "@/dtos/paging.dto";
+import { LocaleService } from "@/i18n/ctx";
+import { ChannelService } from "@/services/channels.service";
+import { catchAsync } from "@/utils/catch-async";
+import { plainToClass } from "class-transformer";
+import { validateOrReject } from "class-validator";
+import { StatusCodes } from "http-status-codes";
+import Container from "typedi";
+
+export class ChannelController {
+    public channelService = Container.get(ChannelService);
+    public localeService = Container.get<LocaleService>(LOCALE_KEY);
+
+    public createChannel = catchAsync(async (req, res) => {
+        await this.channelService.create(req.body);
+        res.status(StatusCodes.OK).json({
+            message: this.localeService.i18n().CHANNEL.CREATE_SUCCESS(),
+        });
+    });
+
+    public updateChannel = catchAsync(async (req, res) => {
+        await this.channelService.updateById(req.params.id, req.body);
+        res.status(StatusCodes.OK).json({
+            message: this.localeService.i18n().CHANNEL.UPDATE_SUCCESS(),
+        });
+    })
+
+    public deleteChannel = catchAsync(async (req, res) => {
+        await this.channelService.deleteById(req.params.id);
+        res.status(StatusCodes.OK).json({
+            message: this.localeService.i18n().CHANNEL.DELETE_CHANNEL_SUCCESS(),
+        });
+    })
+
+    public deleteMultipleChannel = catchAsync(async (req, res) => {
+        await this.channelService.deleteByIds(req.body.id);
+        res.status(StatusCodes.OK).json({
+            message: this.localeService.i18n().CHANNEL.DELETE_MULTIPLE_CHANNELS_SUCCESS(),
+        });
+    })
+
+    public getChannelsPaging = catchAsync(async (req, res) => {
+        const paging = plainToClass(PagingDTO, req.query);
+        await validateOrReject(paging);
+
+        const result = await this.channelService.getChannelsPaging(paging);
+        res.status(StatusCodes.OK).json({ result });
+    })
+}

server/src/database/migrations/meta/_journal.json

@@ -1,21 +1,15 @@
+import { createId } from '@paralleldrive/cuid2';
+import { relations } from 'drizzle-orm';
 import {
-   integer,
+   boolean,
    pgEnum,
    pgTable,
    text,
    timestamp,
-   varchar,
-   doublePrecision,
-   index,
    uniqueIndex,
-   primaryKey,
-   json,
-   boolean,
-   serial,
+   varchar
 } from 'drizzle-orm/pg-core';
-import { createId } from '@paralleldrive/cuid2';
 import { MAX_ID_LENGTH } from '../constants';
-import { relations } from 'drizzle-orm';
 
 export const roles = pgEnum('roles', ['ADMIN', 'USER']);
 
@@ -43,27 +37,35 @@ export const users = pgTable(
 );
 
 export const channelTypes = pgTable(
-   'channel_types', // cho nay minh theo conversation channel_types nha 
+   'channel_types',
    {
-      id: serial('id')
-         .primaryKey(),
+      id: varchar('id', {
+         length: MAX_ID_LENGTH,
+      })
+         .primaryKey()
+         .$defaultFn(() => createId()),
       name: text('name').unique().notNull(),
       description: text('description').unique().notNull(),
+      deleted: boolean('deleted').default(false),
    }
 )
 
 export const channels = pgTable(
    'channels',
    {
-      id: serial('id')
-         .primaryKey(),
+      id: varchar('id', {
+         length: MAX_ID_LENGTH,
+      })
+         .primaryKey()
+         .$defaultFn(() => createId()),
       contactId: text('contact_id').unique().notNull(),
       contactName: text('contact_name').notNull(),
-      credentials: json('credentials'),
-      active: boolean('active').default(true),
-      channelTypeId: integer('channel_type_id').notNull(),
+      credentials: text('credentials'),
+      active: boolean('active'),
+      deleted: boolean('deleted').default(false),
+      channelTypeId: text('channel_type_id').notNull(),
       createdAt: timestamp('created_at').defaultNow(),
-      updatedAt: timestamp('update_at').defaultNow(),
+      updatedAt: timestamp('updated_at'),
    }
 )
 

server/src/database/schema.ts

@@ -1,5 +1,6 @@
+import * as bcrypt from 'bcrypt';
 import { db } from "./db";
-import { channelTypes } from "./schema";
+import { channelTypes, users } from "./schema";
 
 async function seedChannelTypes() {
     try {
@@ -15,4 +16,14 @@ async function seedChannelTypes() {
     }
 }
 
-seedChannelTypes();
+async function seedDefaultAccount() {
+    try {
+        const hashedPassword = await bcrypt.hash("Hello@123", 10);
+        await db.insert(users).values({email: "[email protected]", password: hashedPassword, name: "admin",});
+    } catch (error) {
+        console.error(`Can't create default account`);
+    }
+}
+
+seedChannelTypes();
+seedDefaultAccount();

server/src/database/seed.ts

@@ -40,3 +40,7 @@ export const ROLES = z.enum(schema.roles.enumValues);
 export type TNewUser = typeof schema.users.$inferInsert;
 
 export type TUpdateUser = Partial<TNewUser>;
+
+export type TNewChannel = typeof schema.channels.$inferInsert;
+
+export type TUpdateChannel = Partial<TNewChannel>;

server/src/database/types.ts

@@ -0,0 +1,37 @@
+import { getCurrentLocale } from '@/i18n/get-current';
+import { Transform } from "class-transformer";
+import { IsArray, IsBoolean, IsNotEmpty, IsString } from "class-validator";
+
+export class ChannelDTO {
+    @IsString()
+    @IsNotEmpty({
+        message: () => getCurrentLocale().VALIDATE.REQUIRED({ field: 'ContactId' }),
+    })
+    @Transform(({ value }) => value.trim())
+    contactId: string;
+
+    @IsString()
+    @IsNotEmpty({
+        message: () => getCurrentLocale().VALIDATE.REQUIRED({ field: 'Contact name' }),
+    })
+    @Transform(({ value }) => value.trim())
+    contactName: string;
+
+    @IsString()
+    @IsNotEmpty({
+        message: () => getCurrentLocale().VALIDATE.REQUIRED({ field: 'Channel type' }),
+    })
+    channelTypeId: string;
+
+    @IsString()
+    credentials: string;
+
+    @IsBoolean()
+    active: boolean | false;
+}
+
+export class DeleteChannelDTO {
+    @IsArray()
+    @Transform(({ value }) => value ?? [])
+    id: string[];
+}

server/src/dtos/channels.dto.ts

@@ -0,0 +1,29 @@
+import { Transform, Type } from "class-transformer";
+import { IsNumber, IsOptional, IsString } from "class-validator";
+
+export class PagingDTO {
+    @IsNumber()
+    @Type(() => Number)
+    @Transform(({ value }) => parseInt(value) ?? 1)
+    @IsOptional()
+    page: number | 0;
+
+    @IsNumber()
+    @Type(() => Number)
+    @Transform(({ value }) => parseInt(value) ?? 20)
+    @IsOptional()
+    limit: number | 20;
+
+    @IsString()
+    @IsOptional()
+    orderBy: string;
+
+    @IsString()
+    @Transform(({ value }) => value ?? 'asc')
+    @IsOptional()
+    sortType: 'asc' | 'desc';
+
+    @IsString()
+    @IsOptional()
+    q: string;
+}