Merge pull request #19 from Roger13579/dev

Dev

Dockerfile

@@ -1,8 +1,11 @@
 FROM node:latest
+ENV TZ=Asia/Taipei
+RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezone
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
 RUN npm run build
+RUN npm run swagger
 EXPOSE 3000
 CMD ["npm","start"]

src/app.ts

@@ -8,7 +8,7 @@ import { router } from './routes/router';
 import connection from './config/dbConnection';
 import { globalMiddleware } from './middleware/globalMiddleware';
 import swaggerUi from 'swagger-ui-express';
-import swaggerFile from './swagger-output.json';
+import swaggerFile from './dist/swagger-output.json';
 import passport from 'passport';
 import { AppError } from './utils/errorHandler';
 import { DefaultException } from './utils/defaultException';

src/controller/baseController.ts

@@ -1,5 +1,7 @@
 import { CustomResponseType } from '../types/customResponseType';
 import { ResponseObject } from '../utils/responseObject';
+import { Request } from 'express';
+import { validationResult } from 'express-validator';
 
 export abstract class BaseController {
   public formatResponse(
@@ -12,7 +14,15 @@ export abstract class BaseController {
       message: message,
       data: data,
     };
-
     return new ResponseObject(options);
   }
+  public paramVerify(req: Request): ResponseObject | void {
+    const result = validationResult(req);
+    if (!result.isEmpty()) {
+      return this.formatResponse(
+        result.array()[0].msg,
+        CustomResponseType.FORMAT_ERROR,
+      );
+    }
+  }
 }

src/controller/groupController.ts

@@ -0,0 +1,26 @@
+import { Request } from 'express';
+import { BaseController } from './baseController';
+import { CustomResponseType } from '../types/customResponseType';
+import { ResponseObject } from '../utils/responseObject';
+import { CreateGroupDto } from '../dto/createGroupDto';
+import { GroupService } from '../service/groupService';
+import { IGroup } from '../models/group';
+
+export class GroupController extends BaseController {
+  private readonly groupService = new GroupService();
+
+  public createGroup = async (req: Request): Promise<ResponseObject> => {
+    this.paramVerify(req);
+    const createGroupDto = new CreateGroupDto(req);
+    const group = (await this.groupService.createGroup(
+      createGroupDto,
+    )) as IGroup;
+    return this.formatResponse(
+      CustomResponseType.OK_MESSAGE,
+      CustomResponseType.OK,
+      {
+        groupId: group.id,
+      },
+    );
+  };
+}

src/controller/indexController.ts

@@ -2,7 +2,6 @@ import { NextFunction, Request, Response } from 'express';
 import { BaseController } from './baseController';
 import { ResponseObject } from '../utils/responseObject';
 import { CustomResponseType } from '../types/customResponseType';
-import { validationResult } from 'express-validator';
 import bcrypt from 'bcrypt';
 import { LoginVo } from '../vo/loginVo';
 import { UserService } from '../service/userService';
@@ -106,16 +105,6 @@ class IndexController extends BaseController {
       );
     }
   };
-
-  private paramVerify(req: Request) {
-    const result = validationResult(req);
-    if (!result.isEmpty()) {
-      return this.formatResponse(
-        result.array()[0].msg,
-        CustomResponseType.FORMAT_ERROR,
-      );
-    }
-  }
 }
 
 export default IndexController;

src/controller/userController.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from 'express';
+import { Request } from 'express';
 import { BaseController } from './baseController';
 import { CustomResponseType } from '../types/customResponseType';
 import { ResponseObject } from '../utils/responseObject';

src/dto/createGroupDto.ts

@@ -0,0 +1,27 @@
+import { parseDate } from '../utils/common';
+import { Types } from 'mongoose';
+import { GroupStatus, TCreateGroupReq } from '../types/group.type';
+
+export class CreateGroupDto {
+  private readonly userId: Types.ObjectId;
+  private readonly title: string;
+  private readonly theater: string;
+  private readonly movieTitle: string;
+  private readonly time: Date;
+  private readonly amount: number;
+  private readonly haveTicket: boolean;
+  private readonly content?: string;
+  private readonly status: string;
+
+  constructor(req: TCreateGroupReq) {
+    this.userId = new Types.ObjectId((req.user as any).id as string);
+    this.title = req.body.title;
+    this.theater = req.body.theater;
+    this.movieTitle = req.body.movieTitle;
+    this.time = parseDate('time', req.body.time.toString()) as Date;
+    this.amount = req.body.amount;
+    this.haveTicket = req.body.haveTicket;
+    this.content = req.body.content;
+    this.status = GroupStatus.ongoing;
+  }
+}

src/models/baseModel.ts

@@ -0,0 +1,5 @@
+import { Schema } from 'mongoose';
+
+export interface BaseModel extends Document {
+  id: Schema.Types.ObjectId;
+}

src/models/group.ts

@@ -2,8 +2,9 @@ import { Schema, model } from 'mongoose';
 import { ITimestamp } from '../types/common.type';
 import { schemaOption } from '../utils/constants';
 import { GroupStatus } from '../types/group.type';
+import { BaseModel } from './baseModel';
 
-interface IGroup extends Document, ITimestamp {
+export interface IGroup extends Document, ITimestamp, BaseModel {
   userId: Schema.Types.ObjectId;
   title: string;
   theater: string;
@@ -69,6 +70,4 @@ const schema = new Schema<IGroup>(
   schemaOption,
 );
 
-const GroupModel = model<IGroup>('Group', schema);
-
-export default GroupModel;
+export const GroupModel = model<IGroup>('Group', schema);

src/repository/groupRepository.ts

@@ -0,0 +1,8 @@
+import { CreateGroupDto } from '../dto/createGroupDto';
+import { GroupModel, IGroup } from '../models/group';
+
+export class GroupRepository {
+  public async createGroup(createGroupDto: CreateGroupDto): Promise<IGroup> {
+    return GroupModel.create(new GroupModel(createGroupDto));
+  }
+}

src/routes/baseRoute.ts

@@ -3,6 +3,7 @@ import { ResponseObject } from '../utils/responseObject';
 import { BaseController } from '../controller/baseController';
 import { HttpStatus } from '../types/responseType';
 import log4js from '../config/log4js';
+import { PipeBase } from '../validator/pipe.base';
 const logger = log4js.getLogger(`BaseRoute`);
 
 export abstract class BaseRoute {
@@ -23,6 +24,11 @@ export abstract class BaseRoute {
     return this.prefix;
   }
 
+  protected usePipe(prototype: any): any[] {
+    const pipe = new prototype();
+    return (pipe as PipeBase).transform();
+  }
+
   protected responseHandler(
     method: (
       req: Request,

src/routes/groupRoute.ts

@@ -0,0 +1,47 @@
+import { BaseRoute } from './baseRoute';
+import { GroupController } from '../controller/groupController';
+import { UserVerify } from '../middleware/userVerify';
+import { CreateGroupPipe } from '../validator/createGroup.pipe';
+
+export class GroupRoute extends BaseRoute {
+  protected controller!: GroupController;
+
+  constructor() {
+    super();
+    this.initial();
+  }
+
+  protected initial(): void {
+    this.controller = new GroupController();
+    this.setRouters();
+  }
+
+  protected setRouters(): void {
+    this.router.post(
+      '/v1/group',
+      /**
+       * #swagger.tags = ['Group']
+       * #swagger.summary = '建立揪團'
+       */
+      /*
+          #swagger.parameters['obj'] ={
+            in:'body',
+            description:'欲建立的揪團資料',
+            schema:{
+              $ref:"#/definitions/CustomCreateGroupObj"
+            }
+       }
+       */
+      /**
+       #swagger.responses[200] = {
+       description: 'OK',
+       schema: {
+       $ref: '#/definitions/CreateGroupSuccess' }
+       }
+       */
+      UserVerify,
+      this.usePipe(CreateGroupPipe),
+      this.responseHandler(this.controller.createGroup),
+    );
+  }
+}

src/routes/router.ts

@@ -2,9 +2,11 @@ import { IndexRoute } from './indexRoute';
 import { UserRoute } from './userRoute';
 import { BaseRoute } from './baseRoute';
 import { ProductRoute } from './productRoute';
+import { GroupRoute } from './groupRoute';
 
 export const router: Array<BaseRoute> = [
   new IndexRoute(),
   new UserRoute(),
   new ProductRoute(),
+  new GroupRoute(),
 ];

src/service/groupService.ts

@@ -0,0 +1,23 @@
+import { CustomResponseType } from '../types/customResponseType';
+import { throwError } from '../utils/errorHandler';
+import log4js from '../config/log4js';
+import { CreateGroupDto } from '../dto/createGroupDto';
+import { GroupRepository } from '../repository/groupRepository';
+import { IGroup } from '../models/group';
+const logger = log4js.getLogger(`GroupService`);
+
+export class GroupService {
+  private readonly groupRepository: GroupRepository = new GroupRepository();
+
+  public async createGroup(
+    createGroupDto: CreateGroupDto,
+  ): Promise<IGroup | void> {
+    return this.groupRepository.createGroup(createGroupDto).catch((err) => {
+      logger.error('create user error', err);
+      throwError(
+        CustomResponseType.INSERT_ERROR_MESSAGE,
+        CustomResponseType.INSERT_ERROR,
+      );
+    });
+  }
+}