Merge pull request #245 from Roger13579/fix/group-request-parameter-c…

…heck Fix/group request parameter check
Roger13579 · Jun 19, 2024 · c0a4371 · c0a4371
2 parents e5eff9d + 39310f0
commit c0a4371
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 28 deletions.
diff --git a/src/controller/groupController.ts b/src/controller/groupController.ts
@@ -45,7 +45,10 @@ export class GroupController extends BaseController {
   };
   public joinGroup: TMethod<TJoinGroupReq> = async (req) => {
     const joinGroupDto = new JoinGroupDto(req);
-    await this.groupService.joinGroup(joinGroupDto);
+    const result = await this.groupService.joinGroup(joinGroupDto);
+    if (result) {
+      return this.formatResponse(result.message, result.code, {});
+    }
     return this.formatResponse(
       CustomResponseType.OK_MESSAGE,
       CustomResponseType.OK,

diff --git a/src/dto/group/groupFilterDto.ts b/src/dto/group/groupFilterDto.ts
@@ -29,7 +29,7 @@ export class GroupFilterDto {
       ...(this._participantCount && {
         amount: { $eq: this._participantCount },
       }),
-      ...(this._haveTicket !== undefined && { haveTicket: this._haveTicket }),
+      ...(this._haveTicket && { haveTicket: this._haveTicket }),
       ...((this._startAt || this._endAt) && {
         time: {
           ...(this._endAt && { $lte: this._endAt }),
@@ -83,8 +83,8 @@ export class GroupFilterDto {
     this._limit = Number(limit);
     this._page = Number(page);
     this._participantCount = Number(participantCount);
-    this._movieTitle = movieTitle?.split(',');
-    this._theater = theater?.split(',');
+    this._movieTitle = movieTitle ? movieTitle.split(',') : undefined;
+    this._theater = theater ? theater.split(',') : undefined;
     this._haveTicket =
       haveTicket === undefined ? undefined : haveTicket === 'true';
     this._startAt = startAt ? moment(startAt).toDate() : undefined;

diff --git a/src/service/groupService.ts b/src/service/groupService.ts
@@ -53,10 +53,10 @@ export class GroupService {
           (userId) => userId.toString() === joinGroupDto.userId.toString(),
         );
       if (matchGroup.length > 0) {
-        throwError(
-          CustomResponseType.GROUP_ALREADY_JOINED_MESSAGE,
-          CustomResponseType.GROUP_ALREADY_JOINED,
-        );
+        return {
+          code: CustomResponseType.GROUP_ALREADY_JOINED,
+          message: CustomResponseType.GROUP_ALREADY_JOINED_MESSAGE,
+        };
       }
       // 檢查人數是否已滿
       const groupSize = group.amount;

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -33,3 +33,5 @@ export const virtualSchemaOption = {
     },
   },
 };
+
+export const nullableOption = { nullable: true, checkFalsy: true };
diff --git a/src/validator/group/getGroup.pipe.ts b/src/validator/group/getGroup.pipe.ts
@@ -8,7 +8,7 @@ import {
 } from '../../types/group.type';
 import { OptionType, TCustomValidator } from '../index.type';
 import { SortOrder } from '../../types/common.type';
-import { booleanStrings } from '../../utils/constants';
+import { booleanStrings, nullableOption } from '../../utils/constants';
 
 export class GetGroupsPipe extends PipeBase {
   private validateStartAt: TCustomValidator = (value, { req }) => {
@@ -30,54 +30,44 @@ export class GetGroupsPipe extends PipeBase {
       query('page'),
       CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'page',
     ),
-    query('title')
-      .optional()
-      .isString()
-      .withMessage(CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'title'),
     query('hasTicket')
-      .optional()
+      .optional(nullableOption)
       .isIn(booleanStrings)
       .withMessage(
         CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'hasTicket',
       ),
-    query('movieTitle')
-      .optional()
-      .isString()
-      .withMessage(
-        CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'movieTitle',
-      ),
     query('status')
-      .optional()
+      .optional(nullableOption)
       .isIn(Object.keys(GroupStatus))
       .withMessage(CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'status'),
     query('participantCount')
-      .optional()
+      .optional(nullableOption)
       .isInt({ min: 1 })
       .withMessage(
         CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'participantCount',
       ),
     query('startAt')
-      .optional()
+      .optional(nullableOption)
       .custom(this.validateDate)
       .custom(this.validateStartAt)
       .withMessage(
         CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'startAtTo',
       ),
     query('endAt')
-      .optional()
+      .optional(nullableOption)
       .custom(this.validateDate)
       .custom(this.validateEndAt)
       .withMessage(
         CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'startAtTo',
       ),
     query('sortField')
-      .optional()
+      .optional(nullableOption)
       .custom(this.validateOption(OptionType.item, GroupSortField))
       .withMessage(
         CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'sortField',
       ),
     query('sortOrder')
-      .optional()
+      .optional(nullableOption)
       .custom(this.validateOption(OptionType.item, SortOrder))
       .withMessage(
         CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'sortOrder',

diff --git a/src/validator/pipe.base.ts b/src/validator/pipe.base.ts
@@ -57,7 +57,7 @@ export abstract class PipeBase {
    */
   protected validateDate = (value: string) => {
     const date = new Date(value);
-    return date instanceof Date && !isNaN(date.getTime());
+    return !isNaN(date.getTime());
   };
 
   protected validationHandler: TMethod<IUserReq, void> = (req, res, next) => {
@@ -155,7 +155,7 @@ export abstract class PipeBase {
 
   /**
    * 驗證：多個屬性不可同時存在
-   * @param propNames - 需要檢查的屬性名稱數組
+   * @param params - 需要檢查的屬性名稱數組
    */
   protected validateExclusiveQuery =
     (params: IValidateExclusiveQueryParams): TCustomValidator<unknown> =>
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,3 +33,5 @@ export const virtualSchemaOption = { @@
         },
       },
     };
+    export const nullableOption = { nullable: true, checkFalsy: true };