Skip to content

Commit 0466798

Browse files
committed
refactor: record 미적용된 클래스 변경, @transactional 누락된 서비스 메서드 보완
1 parent 6892024 commit 0466798

File tree

7 files changed

+13
-46
lines changed

7 files changed

+13
-46
lines changed

src/main/java/com/yourssu/roomescape/member/MemberService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.yourssu.roomescape.member;
22

33
import org.springframework.stereotype.Service;
4+
import org.springframework.transaction.annotation.Transactional;
45

56
@Service
67
public class MemberService {
@@ -10,6 +11,7 @@ public MemberService(MemberRepository memberRepository) {
1011
this.memberRepository = memberRepository;
1112
}
1213

14+
@Transactional
1315
public MemberResponse createMember(MemberRequest request) {
1416
Member member = new Member(request.name(), request.email(), request.password(), "USER");
1517
Member saved = memberRepository.save(member);

src/main/java/com/yourssu/roomescape/reservation/MyReservationResponse.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,8 @@
22

33
import com.yourssu.roomescape.reservation.waiting.Waiting;
44
import com.yourssu.roomescape.reservation.waiting.WaitingWithRank;
5-
import lombok.Getter;
65

7-
@Getter
8-
public class MyReservationResponse {
9-
private final Long reservationId;
10-
private final String theme;
11-
private final String date;
12-
private final String time;
13-
private final String status;
14-
15-
public MyReservationResponse(Long reservationId, String theme, String date, String time, String status) {
16-
this.reservationId = reservationId;
17-
this.theme = theme;
18-
this.date = date;
19-
this.time = time;
20-
this.status = status;
21-
}
6+
public record MyReservationResponse(Long reservationId, String theme, String date, String time, String status) {
227

238
public static MyReservationResponse of(Reservation reservation) {
249
return new MyReservationResponse(
@@ -31,8 +16,8 @@ public static MyReservationResponse of(Reservation reservation) {
3116
}
3217

3318
public static MyReservationResponse fromWaiting(WaitingWithRank waitingWithRank) {
34-
Waiting waiting = waitingWithRank.getWaiting();
35-
String status = waitingWithRank.getRank() + "번째 예약대기";
19+
Waiting waiting = waitingWithRank.waiting();
20+
String status = waitingWithRank.rank() + "번째 예약대기";
3621
return new MyReservationResponse(
3722
waiting.getId(),
3823
waiting.getTheme().getName(),

src/main/java/com/yourssu/roomescape/reservation/ReservationService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public ReservationService(
4242
this.waitingRepository = waitingRepository;
4343
}
4444

45+
@Transactional
4546
public ReservationResponse save(ReservationRequest request, LoginMember loginMember) {
4647
Member member = (request.name() != null && !request.name().isBlank())
4748
? memberRepository.findByName(request.name())
Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package com.yourssu.roomescape.reservation.waiting;
22

3-
import lombok.Getter;
4-
5-
@Getter
6-
public class WaitingWithRank {
7-
8-
private final Waiting waiting;
9-
private final int rank;
10-
11-
public WaitingWithRank(Waiting waiting, int rank) {
12-
this.waiting = waiting;
13-
this.rank = rank;
14-
}
3+
public record WaitingWithRank(Waiting waiting, int rank) {
154

165
}
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
package com.yourssu.roomescape.time;
22

3-
import lombok.Getter;
4-
5-
@Getter
6-
public class AvailableTime {
7-
private Long timeId;
8-
private String time;
9-
private boolean booked;
10-
11-
public AvailableTime(Long timeId, String time, boolean booked) {
12-
this.timeId = timeId;
13-
this.time = time;
14-
this.booked = booked;
15-
}
3+
public record AvailableTime (Long timeId, String time, boolean booked){
164

175
}

src/main/java/com/yourssu/roomescape/time/TimeService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.yourssu.roomescape.reservation.Reservation;
44
import com.yourssu.roomescape.reservation.ReservationRepository;
55
import org.springframework.stereotype.Service;
6+
import org.springframework.transaction.annotation.Transactional;
67

78
import java.util.List;
89

@@ -16,6 +17,7 @@ public TimeService(TimeRepository timeRepository, ReservationRepository reservat
1617
this.reservationRepository = reservationRepository;
1718
}
1819

20+
@Transactional
1921
public List<AvailableTime> getAvailableTime(String date, Long themeId) {
2022
List<Reservation> reservations = reservationRepository.findByDateAndThemeId(date, themeId);
2123
List<Time> times = timeRepository.findByDeletedFalse();

src/test/java/com/yourssu/roomescape/MissionStepTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ private String createToken(String email, String password) {
159159

160160
// 예약 대기 상태 확인
161161
String status = myReservations.stream()
162-
.filter(it -> it.getReservationId().equals(waiting.id()))
163-
.filter(it -> !it.getStatus().equals("예약"))
162+
.filter(it -> it.reservationId().equals(waiting.id()))
163+
.filter(it -> !it.status().equals("예약"))
164164
.findFirst()
165-
.map(it -> it.getStatus())
165+
.map(it -> it.status())
166166
.orElse(null);
167167

168168
assertThat(status).isEqualTo("1번째 예약대기");

0 commit comments

Comments
 (0)