Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/gorae/backend/entity/Student.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public Ticket addFirstTicket() {
.student(this)
.startTime(now)
.endTime(endTime)
.lessonRatio(5)
.lessonRatio(7)
.status(TicketStatus.ACTIVE)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand All @@ -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());
}

Expand Down
16 changes: 8 additions & 8 deletions src/main/resources/init/04-course-data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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);
8900002, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 7, 'UPCOMING', false);
28 changes: 0 additions & 28 deletions src/main/resources/init/05-other-data.sql

This file was deleted.

30 changes: 0 additions & 30 deletions src/main/resources/init/06-instructor-data.sql

This file was deleted.

Loading