feat: event 입금기한

bo-an-bo · May 1, 2024 · c5bc91e · c5bc91e
1 parent de20650
commit c5bc91e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 4 deletions.
diff --git a/src/event/dto/create-event.dto.ts b/src/event/dto/create-event.dto.ts
@@ -25,6 +25,18 @@ export class CreateEventDto {
   })
   endDate: Date;
 
+  @ApiProperty({
+    description: '이벤트 입금 시작일',
+    example: new Date().toISOString(),
+  })
+  transactionStartDate: Date;
+
+  @ApiProperty({
+    description: '이벤트 입금 마감일',
+    example: new Date(),
+  })
+  transactionEndDate: Date;
+
   @ApiProperty({
     description: '이벤트 참가비',
     example: 10000,

diff --git a/src/event/entities/event.entity.ts b/src/event/entities/event.entity.ts
@@ -4,6 +4,8 @@ export class Event {
   description: string;
   startDate: Date;
   endDate: Date;
+  transactionStartDate: Date;
+  transactionEndDate: Date;
   fee: number;
   attendees: string[];
 }
diff --git a/src/event/interfaces/event.interface.ts b/src/event/interfaces/event.interface.ts
@@ -5,6 +5,8 @@ export interface EventInterface extends Document {
   description: string;
   startDate: Date;
   endDate: Date;
+  transactionStartDate: Date;
+  transactionEndDate: Date;
   fee: number;
   attendees: string[];
 }
diff --git a/src/event/schemas/event.schema.ts b/src/event/schemas/event.schema.ts
@@ -5,6 +5,8 @@ export const EventSchema = new Schema({
   description: String,
   startDate: Date,
   endDate: Date,
+  transactionStartDate: Date,
+  transactionEndDate: Date,
   fee: Number,
   attendees: { type: [String], default: [] },
 });
diff --git a/src/group/group.service.ts b/src/group/group.service.ts
@@ -122,8 +122,8 @@ export class GroupService {
     //eventId로 eventTransaction 정보 가져오기
     const event = await this.eventService.getOne(eventId);
     // startTransactionDate, endTransactionDate로 변경 필요
-    const eventStart = event.startDate;
-    const eventEnd = event.endDate;
+    const eventStart = event.transactionStartDate;
+    const eventEnd = event.transactionEndDate;
 
     return this.transactionService.getTransactionsByPeriod(
       groupId,

diff --git a/src/transaction/transaction.repository.ts b/src/transaction/transaction.repository.ts
@@ -28,8 +28,8 @@ export class TransactionRepository {
       .find({
         'metadata.groupId': groupId,
         timestamp: {
-          $gte: new Date(startDate),
-          $lt: new Date(endDate),
+          $gte: new Date(startDate).toISOString(),
+          $lt: new Date(endDate).toISOString(),
         },
       })
       .exec();