feat: 支持会员卡设置

packages/server/src/user/user.service.ts

@@ -2,7 +2,6 @@ import { Injectable, NotFoundException } from '@nestjs/common'
 import { MembershipStatus, BookingStatus, UserRole, CardTypeCategory } from '@mp-pilates/shared'
 import type { PaginatedData, UserProfileResponse, UserStatsResponse } from '@mp-pilates/shared'
 import { PrismaService } from '../prisma/prisma.service'
-import { Membership, CardType, Prisma } from '@prisma/client'
 import { UpdateUserMembershipDto } from './dto/update-user-membership.dto'
 
 const VALID_CARD_TYPES = new Set<string>(Object.values(CardTypeCategory))
@@ -236,7 +235,7 @@ export class UserService {
       where: { userId },
       include: { cardType: true },
     })
-    return membership ? { ...membership, cardType: { ...membership.cardType } } : null
+    return { membership }
   }
 
   async updateUserMembership(userId: string, dto: UpdateUserMembershipDto) {
@@ -252,38 +251,28 @@ export class UserService {
       status = MembershipStatus.USED_UP
     }
 
-    const existing = await this.prisma.membership.findFirst({ where: { userId } })
-
-    let membership: Membership & { cardType: CardType }
-    if (existing) {
-      const updated = await this.prisma.membership.update({
-        where: { id: existing.id },
-        data: {
-          cardTypeId: dto.cardTypeId,
-          remainingTimes: dto.remainingTimes ?? null,
-          startDate: new Date(dto.startDate),
-          expireDate: new Date(dto.expireDate),
-          status,
-        },
-        include: { cardType: true },
-      })
-      membership = { ...updated, cardType: { ...updated.cardType } }
-    } else {
-      const created = await this.prisma.membership.create({
-        data: {
-          userId,
-          cardTypeId: dto.cardTypeId,
-          remainingTimes: dto.remainingTimes ?? null,
-          startDate: new Date(dto.startDate),
-          expireDate: new Date(dto.expireDate),
-          status,
-        },
-        include: { cardType: true },
-      })
-      membership = { ...created, cardType: { ...created.cardType } }
+    const data = {
+      cardTypeId: dto.cardTypeId,
+      remainingTimes: dto.remainingTimes ?? null,
+      startDate: new Date(dto.startDate),
+      expireDate: new Date(dto.expireDate),
+      status,
     }
 
-    return membership
+    const existing = await this.prisma.membership.findFirst({ where: { userId } })
+
+    if (existing) {
+      return this.prisma.membership.update({
+        where: { id: existing.id },
+        data,
+        include: { cardType: true },
+      })
+    }
+
+    return this.prisma.membership.create({
+      data: { userId, ...data },
+      include: { cardType: true },
+    })
   }
 
   async deleteUserMembership(userId: string): Promise<void> {