Merge pull request #230 from Roger13579/dev

Dev
Roger13579 · Jun 16, 2024 · 34a3dd3 · 34a3dd3
2 parents 8819a2d + d4e7a49
commit 34a3dd3
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 5 deletions.
diff --git a/src/controller/ticketController.ts b/src/controller/ticketController.ts
@@ -46,6 +46,17 @@ export class TicketController extends BaseController {
     );
   };
 
+  public getSharedTickets: TMethod<IGetTicketsReq> = async (req) => {
+    const getTicketsDto = new GetTicketsDto(req);
+    const { page, limit } = getTicketsDto;
+    const info = await this.ticketService.findSharedTickets(getTicketsDto);
+    return this.formatResponse(
+      CustomResponseType.OK_MESSAGE,
+      CustomResponseType.OK,
+      new GetTicketVo(info, page, limit),
+    );
+  };
+
   public getTicketDetail = async (req: IUserReq) => {
     const getTicketsDto = new GetTicketDetailDto(req);
     const ticket = await this.ticketService.getTicketDetail(getTicketsDto);

diff --git a/src/dto/user/userDetailDto.ts b/src/dto/user/userDetailDto.ts
@@ -40,12 +40,12 @@ export class UserDetailDto {
 
   constructor(req: IUpdateUserDetailReq) {
     this._id = (req.user as IUser).id.toString();
-    const { name, birthDate, gender, phone, address, avatarPath } = req.body;
+    const { name, birthDate, gender, phone, address, imgUrl } = req.body;
     this._name = name;
     this._birthDate = birthDate;
     this._gender = gender;
     this._phone = phone;
     this._address = address;
-    this._avatarPath = avatarPath;
+    this._avatarPath = imgUrl;
   }
 }
diff --git a/src/models/ticket.ts b/src/models/ticket.ts
@@ -47,7 +47,10 @@ const schema = new Schema<ITicket>(
       type: Date,
       select: true,
     },
-    writeOffStaffId: userId,
+    writeOffStaffId: {
+      type: Types.ObjectId,
+      select: true,
+    },
     shareCode: { type: String },
   },
   { ...schemaOption, ...virtualSchemaOption },

diff --git a/src/repository/ticketRepository.ts b/src/repository/ticketRepository.ts
@@ -16,7 +16,10 @@ import { EditTicketsDTO } from '../dto/ticket/editTicketsDto';
 import { CreateShareCodeDTO } from '../dto/ticket/createShareCodeDto';
 import { TransferTicketDTO } from '../dto/ticket/transferTicketDto';
 import moment from 'moment';
-import { createGetTicketPipeline } from '../utils/aggregate/ticket/getTickets.pipeline';
+import {
+  createGetSharedTicketPipeline,
+  createGetTicketPipeline,
+} from '../utils/aggregate/ticket/getTickets.pipeline';
 import { GetTicketDetailDto } from '../dto/ticket/getTicketDetailDto';
 import { createGetTicketDetailPipeline } from '../utils/aggregate/ticket/getTicketDetail.pipeline';
 import { SellTicketDto } from '../dto/ticket/sellTicketDto';
@@ -33,6 +36,13 @@ export class TicketRepository {
     const results = await TicketModel.aggregate(pipeline);
     return results[0];
   };
+  public findSharedTickets = async (
+    ticketFilterDto: GetTicketsDto,
+  ): Promise<IGetTicketsRes> => {
+    const pipeline = createGetSharedTicketPipeline(ticketFilterDto);
+    const results = await TicketModel.aggregate(pipeline);
+    return results[0];
+  };
 
   public findTransferableTicketByOrderIdAndProductId = async (
     sellTicketDto: SellTicketDto,

diff --git a/src/routes/ticketRoute.ts b/src/routes/ticketRoute.ts
@@ -173,6 +173,32 @@ export class TicketRoute extends BaseRoute {
       this.responseHandler(this.controller.getTicketDetail),
     );
 
+    this.router.get(
+      '/v1/ticket-shared',
+      /**
+       * #swagger.tags = ['Ticket']
+       * #swagger.summary = '取得票券詳細資料'
+       * #swagger.security=[{"Bearer": []}],
+       */
+      /*
+        #swagger.parameters['id'] = {
+          in: 'path',
+          description: '票券 id',
+          example: 'abcdefg123124',
+        }
+      */
+      /*
+          #swagger.responses[200] = {
+            description:'OK',
+            schema:{
+              $ref: "#/definitions/GetTicketDetailSuccess"
+            }
+          }
+      */
+      UserVerify,
+      this.responseHandler(this.controller.getSharedTickets),
+    );
+
     this.router.patch(
       '/v1/ticket',
       /**

diff --git a/src/service/ticketService.ts b/src/service/ticketService.ts
@@ -34,6 +34,9 @@ export class TicketService {
 
     return await this.ticketRepository.findTickets(ticketFilterDto);
   };
+  public findSharedTickets = async (ticketFilterDto: GetTicketsDto) => {
+    return await this.ticketRepository.findSharedTickets(ticketFilterDto);
+  };
 
   public async createTickets(order: IOrder) {
     const orderProducts = order.products.reduce(

diff --git a/src/types/user.type.ts b/src/types/user.type.ts
@@ -109,6 +109,6 @@ export interface IUpdateUserDetailReq extends IUserReq {
     gender: Gender;
     phone: string;
     address: string;
-    avatarPath: string;
+    imgUrl: string;
   };
 }
diff --git a/src/utils/aggregate/ticket/getTickets.pipeline.ts b/src/utils/aggregate/ticket/getTickets.pipeline.ts
@@ -67,3 +67,87 @@ export const createGetTicketPipeline = ({
     { $unwind: '$metadata' },
   ];
 };
+
+export const createGetSharedTicketPipeline = ({
+  options,
+  sort,
+  limit,
+  page,
+}: GetTicketsDto) => {
+  return [
+    {
+      $match: {
+        isPublished: { $eq: true },
+      },
+    },
+    {
+      $lookup: {
+        localField: 'productId',
+        from: 'products',
+        foreignField: '_id',
+        as: 'product',
+        pipeline: [
+          {
+            $project: options.productSelect,
+          },
+        ],
+      },
+    },
+    { $unwind: '$product' },
+    // Grouping by orderId and productId
+    {
+      $group: {
+        _id: {
+          orderId: '$orderId',
+          productId: '$productId',
+        },
+        tickets: { $push: '$$ROOT' },
+        count: { $sum: 1 },
+      },
+    },
+    {
+      $project: {
+        _id: 0,
+        count: 1,
+        ticket: { $arrayElemAt: ['$tickets', 0] },
+      },
+    },
+    {
+      $replaceRoot: {
+        newRoot: {
+          $mergeObjects: ['$ticket', { count: '$count' }],
+        },
+      },
+    },
+    {
+      $facet: {
+        metadata: [{ $count: 'totalCount' }],
+        tickets: [
+          { $sort: sort },
+          { $skip: (page - 1) * limit },
+          { $limit: limit },
+          {
+            $project: {
+              count: 1,
+              ...options.ticketSelect,
+            },
+          },
+        ],
+      },
+    },
+    {
+      $set: {
+        metadata: [
+          {
+            $cond: {
+              if: { $eq: [{ $size: '$metadata' }, 0] },
+              then: [{ totalCount: 0 }],
+              else: '$metadata',
+            },
+          },
+        ],
+      },
+    },
+    { $unwind: '$metadata' },
+  ];
+};