Merge pull request #271 from Roger13579/TS269

fix: get ticket filter of expiredAt
Roger13579 · Jun 22, 2024 · e491025 · e491025
2 parents ef91941 + 4bfe573
commit e491025
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/src/dto/ticket/getTicketsDto.ts b/src/dto/ticket/getTicketsDto.ts
@@ -73,9 +73,9 @@ export class GetTicketsDto {
       ...(this._userId && { userId: { $eq: this._userId } }),
       ...(this._ids && { _id: { $in: this._ids } }),
       ...((this._expiredAtFrom || this._expiredAtTo) && {
-        startAt: {
-          ...(this._expiredAtFrom && { $lte: this._expiredAtFrom }),
-          ...(this._expiredAtTo && { $gte: this._expiredAtTo }),
+        expiredAt: {
+          ...(this._expiredAtFrom && { $gte: this._expiredAtFrom }),
+          ...(this._expiredAtTo && { $lte: this._expiredAtTo }),
         },
       }),
       ...(this._isPublished && { isPublished: { $eq: this._isPublished } }),

diff --git a/src/service/ticketService.ts b/src/service/ticketService.ts
@@ -2,11 +2,9 @@ import log4js from '../config/log4js';
 import { IOrder, IOrderProduct } from '../models/order';
 import { throwError } from '../utils/errorHandler';
 import { CustomResponseType } from '../types/customResponseType';
-import { areTimesInOrder } from '../utils/common';
 import { TicketRepository } from '../repository/ticketRepository';
 import { CreateTicketDto } from '../dto/ticket/createTicketDto';
 import { GetTicketsDto } from '../dto/ticket/getTicketsDto';
-import { SortOrder } from '../types/common.type';
 import { VerifyTicketsDTO } from '../dto/ticket/verifyTicketsDto';
 import { EditTicketsDTO } from '../dto/ticket/editTicketsDto';
 import { CreateShareCodeDTO } from '../dto/ticket/createShareCodeDto';
@@ -32,20 +30,9 @@ export class TicketService {
   private readonly productRepository: ProductRepository =
     new ProductRepository();
 
-  public findTickets = async (ticketFilterDto: GetTicketsDto) => {
-    const { expiredAtFrom, expiredAtTo } = ticketFilterDto;
+  public findTickets = async (ticketFilterDto: GetTicketsDto) =>
+    await this.ticketRepository.findTickets(ticketFilterDto);
 
-    // 確認時間順序
-    areTimesInOrder(
-      [
-        { name: 'expiredAtFrom', value: expiredAtFrom },
-        { name: 'expiredAtTo', value: expiredAtTo },
-      ],
-      SortOrder.asc,
-    );
-
-    return await this.ticketRepository.findTickets(ticketFilterDto);
-  };
   public findSharedTickets = async (
     getSharedTicketsDto: GetSharedTicketsDto,
   ) => {