Skip to content

Commit 968e020

Browse files
Boyeon-ShinBoyeon-Shin
authored
refactor: DTO 기본 class 타입에서 record 타입으로 변경 (#21)
 refactor: DTO 기본 class 타입에서 record 타입으로 변r경
1 parent 0aa91fd commit 968e020

21 files changed

Lines changed: 199 additions & 531 deletions

‎src/main/java/iceapple/placeservice/dto/ReservationSlot.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
public record ReservationSlot(
1414
String placeId,
1515
LocalDate date,
16-
List<Integer> times
16+
List<Integer> times,
17+
Integer resCount
1718
) {}

‎src/main/java/iceapple/placeservice/dto/request/AdminPlaceRequest.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package iceapple.placeservice.dto.request;
22

3-
import lombok.Getter;
4-
import lombok.NoArgsConstructor;
5-
import lombok.Setter;
3+
public record AdminPlaceRequest(
4+
String name,
65

7-
@Setter
8-
@Getter
9-
@NoArgsConstructor
10-
public class AdminPlaceRequest {
11-
private String name;
12-
private String description;
13-
private Integer placeCount;
6+
String description,
7+
8+
Integer placeCount
9+
) {
1410
}

‎src/main/java/iceapple/placeservice/dto/request/AdminReservationRequest.java‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,19 @@
33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import java.time.LocalDate;
55
import java.util.List;
6-
import lombok.Getter;
7-
import lombok.Setter;
86

9-
@Getter
10-
@Setter
11-
public class AdminReservationRequest {
12-
private LocalDate date;
7+
public record AdminReservationRequest(
8+
LocalDate date,
139

14-
@JsonProperty("place_id")
15-
private String placeId;
10+
@JsonProperty("place_id")
11+
String placeId,
1612

17-
private List<Integer> times;
13+
List<Integer> times,
1814

19-
@JsonProperty("user_name")
20-
private String userName;
15+
@JsonProperty("user_name")
16+
String userName,
2117

22-
public AdminReservationRequest() {
23-
}
24-
25-
public AdminReservationRequest(LocalDate date, String placeId, List<Integer> times,
26-
String userName) {
27-
this.date = date;
28-
this.placeId = placeId;
29-
this.times = times;
30-
this.userName = userName;
31-
}
18+
@JsonProperty("res_count")
19+
int resCount
20+
) {
3221
}

‎src/main/java/iceapple/placeservice/dto/request/ReservationInfoRequest.java‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
package iceapple.placeservice.dto.request;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import lombok.Getter;
5-
import lombok.Setter;
64

7-
@Getter
8-
@Setter
9-
public class ReservationInfoRequest {
5+
public record ReservationInfoRequest(
6+
@JsonProperty("student_number")
7+
String studentNumber,
108

11-
@JsonProperty("student_number")
12-
private String studentNumber;
13-
private String password;
14-
15-
public ReservationInfoRequest() {
16-
}
17-
18-
public ReservationInfoRequest(String studentNumber, String password) {
19-
this.studentNumber = studentNumber;
20-
this.password = password;
21-
}
9+
String password
10+
) {
2211
}
2312

‎src/main/java/iceapple/placeservice/dto/request/ReservationRequest.java‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,24 @@
33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import java.time.LocalDateTime;
55
import java.util.List;
6-
import lombok.Getter;
7-
import lombok.Setter;
8-
9-
@Getter
10-
@Setter
11-
public class ReservationRequest {
12-
@JsonProperty("student_number")
13-
private String studentNumber;
14-
15-
@JsonProperty("phone_number")
16-
private String phoneNumber;
17-
private String password;
18-
19-
@JsonProperty("place_id")
20-
private String placeId;
21-
private LocalDateTime date;
22-
private List<Integer> times;
23-
24-
public ReservationRequest() {
25-
26-
}
27-
28-
public ReservationRequest(final String studentNumber, final String phoneNumber, final String password,
29-
final String placeId, final LocalDateTime date,
30-
final List<Integer> times) {
31-
this.studentNumber = studentNumber;
32-
this.phoneNumber = phoneNumber;
33-
this.password = password;
34-
this.placeId = placeId;
35-
this.date = date;
36-
this.times = times;
37-
}
6+
7+
public record ReservationRequest(
8+
@JsonProperty("student_number")
9+
String studentNumber,
10+
11+
@JsonProperty("phone_number")
12+
String phoneNumber,
13+
14+
String password,
15+
16+
@JsonProperty("place_id")
17+
String placeId,
18+
19+
LocalDateTime date,
20+
21+
List<Integer> times,
22+
23+
@JsonProperty("res_count")
24+
int resCount
25+
) {
3826
}

‎src/main/java/iceapple/placeservice/dto/response/AdminPlaceResponse.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package iceapple.placeservice.dto.response;
22

3-
import lombok.AllArgsConstructor;
4-
import lombok.Getter;
5-
6-
@Getter
7-
@AllArgsConstructor
8-
public class AdminPlaceResponse {
9-
private String id;
10-
private String name;
11-
private String description;
12-
private int count;
3+
public record AdminPlaceResponse(
4+
String id,
5+
6+
String name,
7+
8+
String description,
9+
10+
int count
11+
) {
1312
}

‎src/main/java/iceapple/placeservice/dto/response/AdminReservationResponse.java‎

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,27 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import java.util.List;
5-
import lombok.Getter;
6-
import lombok.Setter;
7-
8-
@Getter
9-
@Setter
10-
public class AdminReservationResponse {
11-
private String id;
12-
private List<Integer> times;
13-
14-
@JsonProperty("student_number")
15-
private String studentNumber;
16-
17-
@JsonProperty("phone_number")
18-
private String phoneNumber;
19-
20-
private PlaceInfo place;
21-
22-
public AdminReservationResponse(final String id, final List<Integer> times, final String studentNumber,
23-
final String phoneNumber,
24-
final PlaceInfo place) {
25-
this.id = id;
26-
this.times = times;
27-
this.studentNumber = studentNumber;
28-
this.phoneNumber = phoneNumber;
29-
this.place = place;
30-
}
31-
32-
@Getter
33-
@Setter
34-
public static class PlaceInfo {
35-
private String id;
36-
private String name;
37-
private int count;
38-
39-
public PlaceInfo() {
40-
}
41-
42-
public PlaceInfo(final String id, final String name, final int count) {
43-
this.id = id;
44-
this.name = name;
45-
this.count = count;
46-
}
47-
}
48-
}
5+
6+
public record AdminReservationResponse(
7+
String id,
8+
List<Integer> times,
9+
10+
@JsonProperty("student_number")
11+
String studentNumber,
12+
13+
@JsonProperty("phone_number")
14+
String phoneNumber,
15+
16+
PlaceInfo place,
17+
18+
@JsonProperty("res_count")
19+
int resCount
20+
) {
21+
public record PlaceInfo(
22+
String id,
23+
24+
String name,
25+
26+
int count
27+
) {}
28+
}

‎src/main/java/iceapple/placeservice/dto/response/PlaceListResponse.java‎

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

33
import iceapple.placeservice.entity.Place;
44
import java.util.List;
5-
import lombok.AllArgsConstructor;
6-
import lombok.Getter;
7-
import lombok.NoArgsConstructor;
85

9-
@Getter
10-
@NoArgsConstructor
11-
@AllArgsConstructor
12-
public class PlaceListResponse {
13-
private List<Place> places;
6+
public record PlaceListResponse(
7+
List<Place> places
8+
) {
149
}

‎src/main/java/iceapple/placeservice/dto/response/PlaceTimeCountResponse.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package iceapple.placeservice.dto.response;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import lombok.Builder;
5-
import lombok.Getter;
64

7-
@Builder
8-
@Getter
9-
public class PlaceTimeCountResponse {
10-
private String name;
11-
private int[] count;
5+
public record PlaceTimeCountResponse(
6+
String name,
7+
int[] count,
128

13-
@JsonProperty("max_count")
14-
private int maxCount;
9+
@JsonProperty("max_count")
10+
int maxCount
11+
) {
1512
}
1613

1714

‎src/main/java/iceapple/placeservice/dto/response/ReservationPlaceResponse.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
package iceapple.placeservice.dto.response;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
34
import iceapple.placeservice.entity.Place;
45
import java.time.LocalDateTime;
56
import java.util.List;
6-
import lombok.Getter;
7-
import lombok.Setter;
87

9-
@Getter
10-
@Setter
11-
public class ReservationPlaceResponse {
12-
private String id;
13-
private List<Integer> times;
14-
private LocalDateTime date;
15-
private Place place;
16-
17-
public ReservationPlaceResponse(final String id, final List<Integer> times, final LocalDateTime date, final Place place) {
18-
this.id = id;
19-
this.times = times;
20-
this.date = date;
21-
this.place = place;
22-
}
8+
public record ReservationPlaceResponse(String id, List<Integer> times, LocalDateTime date, Place place,
9+
@JsonProperty("res_count") int resCount) {
2310
}

0 commit comments

Comments
 (0)