From af45204f9f97cf1bb7520a2f850a42d71c5a5378 Mon Sep 17 00:00:00 2001 From: minbros Date: Thu, 25 Sep 2025 20:17:37 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20DB=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/init/04-course-data.sql | 16 +++++----- src/main/resources/init/05-other-data.sql | 28 ----------------- .../resources/init/06-instructor-data.sql | 30 ------------------- 3 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 src/main/resources/init/05-other-data.sql delete mode 100644 src/main/resources/init/06-instructor-data.sql diff --git a/src/main/resources/init/04-course-data.sql b/src/main/resources/init/04-course-data.sql index 0d5b2ca..7dd5f43 100644 --- a/src/main/resources/init/04-course-data.sql +++ b/src/main/resources/init/04-course-data.sql @@ -4,25 +4,25 @@ INSERT INTO course (public_id, start_time, end_time, instructor_id, textbook_id, status, is_real) VALUES (gen_random_uuid(), date_trunc('hour', NOW()) + interval '1 hour', date_trunc('hour', NOW()) + interval '2 hour', - 8900001, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 4, 'UPCOMING', true), + 8900001, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', true), (gen_random_uuid(), date_trunc('hour', NOW()) + interval '2 hour', date_trunc('hour', NOW()) + interval '3 hour', - 8900001, 3, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 4, 'UPCOMING', true), + 8900001, 3, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', true), (gen_random_uuid(), date_trunc('hour', NOW()) + interval '1 hour', date_trunc('hour', NOW()) + interval '2 hour', - 8900002, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 4, 'UPCOMING', true), + 8900002, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', true), (gen_random_uuid(), date_trunc('hour', NOW()) + interval '2 hour', date_trunc('hour', NOW()) + interval '3 hour', - 8900002, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 2, 'UPCOMING', true), + 8900002, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', true), (gen_random_uuid(), date_trunc('hour', NOW()) + interval '3 hour', date_trunc('hour', NOW()) + interval '4 hour', - 8900002, 4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 2, 'UPCOMING', true), + 8900002, 4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', true), (gen_random_uuid(), date_trunc('hour', NOW()) + interval '1 hour', date_trunc('hour', NOW()) + interval '2 hour', - 8900002, 3, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 4, 'UPCOMING', false), + 8900002, 3, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', false), (gen_random_uuid(), date_trunc('hour', NOW()) + interval '2 hour', date_trunc('hour', NOW()) + interval '3 hour', - 8900002, 4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 2, 'UPCOMING', false), + 8900002, 4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', false), (gen_random_uuid(), date_trunc('hour', NOW()) + interval '3 hour', date_trunc('hour', NOW()) + interval '4 hour', - 8900002, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 2, 'UPCOMING', false); \ No newline at end of file + 8900002, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', false); \ No newline at end of file diff --git a/src/main/resources/init/05-other-data.sql b/src/main/resources/init/05-other-data.sql deleted file mode 100644 index e938cd0..0000000 --- a/src/main/resources/init/05-other-data.sql +++ /dev/null @@ -1,28 +0,0 @@ --- Ticket 테이블 -INSERT INTO ticket (public_id, student_id, start_time, end_time, status, created_at, updated_at, lesson_ratio) -VALUES --- 지난 달 티켓 (USED) -( gen_random_uuid(), 8900003, date_trunc('month', NOW() - interval '1 month') -, date_trunc('month', NOW()) - interval '1 second', 'USED' -, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7), -( gen_random_uuid(), 8900003, date_trunc('month', NOW() - interval '1 month') -, date_trunc('month', NOW()) - interval '1 second', 'USED' -, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7), - --- -- 이번 달 티켓 (ACTIVE) -( gen_random_uuid(), 8900003, date_trunc('month', NOW()) -, date_trunc('month', NOW() + interval '1 month') - interval '1 second', 'ACTIVE' -, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7), -( gen_random_uuid(), 8900003, date_trunc('month', NOW()) -, date_trunc('month', NOW() + interval '1 month') - interval '1 second', 'ACTIVE' -, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7), -( gen_random_uuid(), 8900003, date_trunc('month', NOW()) -, date_trunc('month', NOW() + interval '1 month') - interval '1 second', 'ACTIVE' -, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7), -( gen_random_uuid(), 8900003, date_trunc('month', NOW()) -, date_trunc('month', NOW() + interval '1 month') - interval '1 second', 'ACTIVE' -, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7); - -INSERT INTO enrollment (public_id, student_id, course_id, ticket_id, enrolled_at, status) -VALUES (gen_random_uuid(), 8900003, 1, 1, NOW() - interval '7 day', 'ENROLLED'), - (gen_random_uuid(), 8900003, 2, 2, NOW() - interval '7 day', 'ENROLLED'); \ No newline at end of file diff --git a/src/main/resources/init/06-instructor-data.sql b/src/main/resources/init/06-instructor-data.sql deleted file mode 100644 index 0b4cbd4..0000000 --- a/src/main/resources/init/06-instructor-data.sql +++ /dev/null @@ -1,30 +0,0 @@ --- 강사의 정기적 가능 시간 샘플 데이터 -INSERT INTO instructor_availability -(public_id, created_at, updated_at, instructor_id, day_of_week, start_time, end_time, is_active) -VALUES --- 강사1의 가능 시간 -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900001, 'MONDAY', '09:00:00', '12:00:00', true), -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900001, 'MONDAY', '19:00:00', '23:00:00', true), -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900001, 'WEDNESDAY', '10:00:00', '16:00:00', true), -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900001, 'FRIDAY', '13:00:00', '19:00:00', true), - --- 강사2의 가능 시간 -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900002, 'TUESDAY', '10:00:00', '15:00:00', true), -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900002, 'THURSDAY', '13:00:00', '18:00:00', true), -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900002, 'SATURDAY', '09:00:00', '13:00:00', true); - --- 강사의 불가능 날짜 샘플 데이터 -INSERT INTO instructor_unavailable_date -(public_id, created_at, updated_at, instructor_id, start_date, end_date, reason) -VALUES --- 강사1의 불가능 날짜 -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900001, - '2025-06-01', '2025-06-09', '여름 휴가'), -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900001, - '2025-05-25', '2025-05-25', '개인 일정'), - --- 강사2의 불가능 날짜 -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900002, - '2025-05-30', '2025-06-02', '가족 여행'), -(gen_random_uuid(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 8900002, - '2025-05-28', '2025-05-28', '병원 예약'); \ No newline at end of file From 2da172055eb587f0e17aa9e503586a42f954a28a Mon Sep 17 00:00:00 2001 From: minbros Date: Thu, 25 Sep 2025 20:37:18 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Fix:=20First=20Class=20=ED=8B=B0=EC=BC=93?= =?UTF-8?q?=EC=9D=B4=20=EB=91=90=20=EB=B2=88=20=EC=A0=80=EC=9E=A5=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/checkout/CheckoutCompletionService.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/gorae/backend/service/checkout/CheckoutCompletionService.java b/src/main/java/gorae/backend/service/checkout/CheckoutCompletionService.java index ddf75b0..ea28fa7 100644 --- a/src/main/java/gorae/backend/service/checkout/CheckoutCompletionService.java +++ b/src/main/java/gorae/backend/service/checkout/CheckoutCompletionService.java @@ -7,8 +7,6 @@ import gorae.backend.entity.Student; import gorae.backend.entity.Ticket; import gorae.backend.repository.CheckoutOrderRepository; -import gorae.backend.repository.StudentRepository; -import gorae.backend.repository.TicketRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,8 +21,6 @@ @Service public class CheckoutCompletionService { private final CheckoutOrderRepository checkoutOrderRepository; - private final StudentRepository studentRepository; - private final TicketRepository ticketRepository; @Transactional public void handleCompletedOrder(CheckoutOrder order) { @@ -33,16 +29,12 @@ public void handleCompletedOrder(CheckoutOrder order) { if (product.getName() == ProductName.FIRST_CLASS) { Student student = order.getStudent(); Ticket firstTicket = student.addFirstTicket(); - tickets = new ArrayList<>(Collections.singletonList(firstTicket)); - studentRepository.save(student); } else { tickets = order.getStudent().addMonthlyTickets(product); - ticketRepository.saveAll(tickets); } order.completeOrder(tickets); - checkoutOrderRepository.save(order); log.info("[Service] Order {} completed in Paypal, syncing locally", order.getOrderId()); } From dbea8391dd0b429465521fc6cafc09fbee5b8c09 Mon Sep 17 00:00:00 2001 From: minbros Date: Thu, 25 Sep 2025 20:47:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Fix:=20First=20Class=20=ED=8B=B0=EC=BC=93?= =?UTF-8?q?=20ratio=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/gorae/backend/entity/Student.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gorae/backend/entity/Student.java b/src/main/java/gorae/backend/entity/Student.java index 4fb0336..410f825 100644 --- a/src/main/java/gorae/backend/entity/Student.java +++ b/src/main/java/gorae/backend/entity/Student.java @@ -51,7 +51,7 @@ public Ticket addFirstTicket() { .student(this) .startTime(now) .endTime(endTime) - .lessonRatio(5) + .lessonRatio(7) .status(TicketStatus.ACTIVE) .build();