Skip to content

Commit

Permalink
fix: date range not required (#249)
Browse files Browse the repository at this point in the history
  • Loading branch information
@y0000ga
y0000ga committed Jun 20, 2024
1 parent ceaddd0 commit c7e8188
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 32 deletions.
6 changes: 1 addition & 5 deletions src/dto/group/groupFilterDto.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class GroupFilterDto {
amount: { $eq: this._participantCount },
}),
...(this._haveTicket && { haveTicket: this._haveTicket }),
$or: this._dateRanges,
...(this._dateRanges.length > 0 && { $or: this._dateRanges }),
};
}

Expand All @@ -61,10 +61,6 @@ export class GroupFilterDto {
};
}

get dateRanges() {
return this._dateRanges;
}

constructor(req: IGetGroupsReq) {
const {
title,
Expand Down
16 changes: 8 additions & 8 deletions src/routes/groupRoute.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,29 +260,29 @@ export class GroupRoute extends BaseRoute {
}
#swagger.parameters['startDate'] = {
in: 'query',
required: true,
description: '開始活動日期-起 (一定要遵循以下格式)',
required: false,
description: '開始活動日期-起，一定要遵循以下格式，若要以時段搜尋則 startDate、endDate、startTime、endTime 皆為必填。',
type: 'string',
example: '2024/01/12'
}
#swagger.parameters['endDate'] = {
in: 'query',
required: true,
description: '開始活動日期-迄 (一定要遵循以下格式)',
required: false,
description: '開始活動日期-迄，一定要遵循以下格式，若要以時段搜尋則 startDate、endDate、startTime、endTime 皆為必填。',
type: 'string',
example:'2024/07/12'
}
#swagger.parameters['startTime'] = {
in: 'query',
required: true,
description: '開始活動時間-起 (一定要遵循以下格式)',
required: false,
description: '開始活動時間-起，一定要遵循以下格式，若要以時段搜尋則 startDate、endDate、startTime、endTime 皆為必填。',
type: 'string',
example: '01:00'
}
#swagger.parameters['endTime'] = {
in: 'query',
required: true,
description: '開始活動時間-迄 (一定要遵循以下格式)',
required: false,
description: '開始活動時間-迄，一定要遵循以下格式，若要以時段搜尋則 startDate、endDate、startTime、endTime 皆為必填。',
type: 'string',
example: '23:00'
}
Expand Down
9 changes: 0 additions & 9 deletions src/service/groupService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,6 @@ export class GroupService {
}
}
public async findGroups(groupFilterDto: GroupFilterDto) {
const { dateRanges } = groupFilterDto;

if (dateRanges.length === 0) {
throwError(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + '時間區間有誤',
CustomResponseType.INVALID_GROUP_FILTER,
);
}

return await this.groupRepository.findGroups(groupFilterDto);
}

Expand Down
71 changes: 61 additions & 10 deletions src/validator/group/getGroup.pipe.ts
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,35 @@
import { PipeBase } from '../pipe.base';
import { query } from 'express-validator';
import { CustomResponseType } from '../../types/customResponseType';
import { GroupSortField, GroupStatus } from '../../types/group.type';
import { OptionType } from '../index.type';
import {
GroupSortField,
GroupStatus,
IGetGroupsReq,
} from '../../types/group.type';
import { OptionType, TCustomValidator } from '../index.type';
import { SortOrder } from '../../types/common.type';
import { booleanStrings, nullableOption } from '../../utils/constants';

const timeFormat = /^([01]\d|2[0-3]):([0-5]\d)$/; // HH:mm 格式
const dateFormat = /^\d{4}\/\d{2}\/\d{2}$/; // YYYY/MM/DD 格式

export class GetGroupsPipe extends PipeBase {
private validateTimeRange: TCustomValidator = (value, { req }) => {
const { startTime, endTime, startDate, endDate } = (req as IGetGroupsReq)
.query;

const hasTimeRange = !!startTime && !!endTime && !!startDate && !!endDate;
const hasNoTimeRange = !startTime && !endTime && !startDate && !endDate;

return hasTimeRange || hasNoTimeRange;
};

private validateTimeFormat: TCustomValidator<string> = (value) =>
timeFormat.test(value);

private validateDateFormat: TCustomValidator<string> = (value) =>
dateFormat.test(value);

public transform = () => [
this.limitValidation(
query('limit'),
Expand All @@ -33,21 +56,49 @@ export class GetGroupsPipe extends PipeBase {
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'participantCount',
),
query('startTime')
.exists()
.optional()
.custom(this.validateTimeFormat)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'startTime 格式錯誤',
)
.custom(this.validateTimeRange)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'startTime',
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE +
'使用時間區段搜尋時，startTime、endTime、startDate、endDate 皆為必填',
),
query('endTime')
.exists()
.withMessage(CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'endTime'),
.optional()
.custom(this.validateTimeFormat)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'endTime 格式錯誤',
)
.custom(this.validateTimeRange)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE +
'使用時間區段搜尋時，startTime、endTime、startDate、endDate 皆為必填',
),
query('startDate')
.exists()
.optional()
.custom(this.validateDateFormat)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'startDate 格式錯誤',
)
.custom(this.validateTimeRange)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'startDate',
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE +
'使用時間區段搜尋時，startTime、endTime、startDate、endDate 皆為必填',
),
query('endDate')
.exists()
.withMessage(CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'endDate'),
.optional()
.custom(this.validateDateFormat)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE + 'endDate 格式錯誤',
)
.custom(this.validateTimeRange)
.withMessage(
CustomResponseType.INVALID_GROUP_FILTER_MESSAGE +
'使用時間區段搜尋時，startTime、endTime、startDate、endDate 皆為必填',
),
query('sortField')
.optional(nullableOption)
.custom(this.validateOption(OptionType.item, GroupSortField))
Expand Down

0 comments on commit c7e8188

Please sign in to comment.