From eb588326d5215f41620b0c2fd2bd6d2659c2f2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Sun, 22 Sep 2024 20:46:59 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[GTB-76]=20refactor:=20=EC=9D=B8=EC=9B=90?= =?UTF-8?q?=EC=88=98=20->=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=A2=85?= =?UTF-8?q?=EB=A5=98=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20BASIC(1~5),=20PARTY(5?= =?UTF-8?q?~8)=EB=A1=9C=20=EA=B5=AC=EB=B6=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/seating/domain/Seating.java | 11 +++++++++-- .../gachontablebe/domain/shared/Table.java | 13 +++++++++++++ .../domain/waiting/domain/Waiting.java | 12 +++++++----- 3 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java diff --git a/src/main/java/site/gachontable/gachontablebe/domain/seating/domain/Seating.java b/src/main/java/site/gachontable/gachontablebe/domain/seating/domain/Seating.java index 6bca4241..3bb2bc10 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/seating/domain/Seating.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/seating/domain/Seating.java @@ -9,6 +9,7 @@ import site.gachontable.gachontablebe.domain.pub.domain.Pub; import site.gachontable.gachontablebe.domain.user.domain.User; import site.gachontable.gachontablebe.domain.waiting.domain.Waiting; +import site.gachontable.gachontablebe.domain.shared.Table; import java.time.LocalDateTime; @@ -24,6 +25,10 @@ public class Seating { @Column(nullable = false) private Integer seatingNum; + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Table tableType; + @Column(nullable = false) private LocalDateTime exitTime; @@ -39,9 +44,10 @@ public class Seating { @JoinColumn(name = "user_id") private User user; - public static Seating create(Integer seatingNum, LocalDateTime exitTime, Pub pub, Waiting waiting, User user) { + public static Seating create(Integer seatingNum, Table tableType, LocalDateTime exitTime, Pub pub, Waiting waiting, User user) { return Seating.builder() .seatingNum(seatingNum) + .tableType(tableType) .exitTime(exitTime) .pub(pub) .waiting(waiting) @@ -50,8 +56,9 @@ public static Seating create(Integer seatingNum, LocalDateTime exitTime, Pub pub } @Builder - public Seating(Integer seatingNum, LocalDateTime exitTime, Pub pub, Waiting waiting, User user) { + public Seating(Integer seatingNum, Table tableType, LocalDateTime exitTime, Pub pub, Waiting waiting, User user) { this.seatingNum = seatingNum; + this.tableType = tableType; this.exitTime = exitTime; this.pub = pub; this.waiting = waiting; diff --git a/src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java b/src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java new file mode 100644 index 00000000..e6f131ed --- /dev/null +++ b/src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java @@ -0,0 +1,13 @@ +package site.gachontable.gachontablebe.domain.shared; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum Table { + BASIC("4인 테이블 (1~5인)"), + PARTY("8인 테이블 (5~8인)"),; + + private final String nameKo; +} diff --git a/src/main/java/site/gachontable/gachontablebe/domain/waiting/domain/Waiting.java b/src/main/java/site/gachontable/gachontablebe/domain/waiting/domain/Waiting.java index 06c1ef34..192a0598 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/waiting/domain/Waiting.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/waiting/domain/Waiting.java @@ -8,6 +8,7 @@ import site.gachontable.gachontablebe.domain.user.domain.User; import site.gachontable.gachontablebe.domain.waiting.type.Position; import site.gachontable.gachontablebe.domain.waiting.type.Status; +import site.gachontable.gachontablebe.domain.shared.Table; import java.util.Objects; import java.util.UUID; @@ -26,8 +27,9 @@ public class Waiting extends BaseTimeEntity { @Column(nullable = false) private Position waitingType; + @Enumerated(EnumType.STRING) @Column(nullable = false) - private Integer headCount; + private Table tableType; @Enumerated(EnumType.STRING) @Column @@ -48,10 +50,10 @@ public boolean matchesUser(User user) { return Objects.equals(this.user, user); } - public static Waiting create(Position waitingType, Integer headCount, Status waitingStatus, String tel, User user, Pub pub) { + public static Waiting create(Position waitingType, Table tableType, Status waitingStatus, String tel, User user, Pub pub) { return Waiting.builder() .waitingType(waitingType) - .headCount(headCount) + .tableType(tableType) .waitingStatus(waitingStatus) .tel(tel) .user(user) @@ -60,9 +62,9 @@ public static Waiting create(Position waitingType, Integer headCount, Status wai } @Builder - public Waiting(Position waitingType, Integer headCount, Status waitingStatus, String tel, User user, Pub pub) { + public Waiting(Position waitingType, Table tableType, Status waitingStatus, String tel, User user, Pub pub) { this.waitingType = waitingType; - this.headCount = headCount; + this.tableType = tableType; this.waitingStatus = waitingStatus; this.tel = tel; this.user = user; From 05fcf89cb8ed82a4cb951da6c19ae461b0e49ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Sun, 22 Sep 2024 21:03:05 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[GTB-76]=20refactor:=20=EC=9D=B8=EC=9B=90?= =?UTF-8?q?=EC=88=98=20=EC=84=A4=EC=A0=95=20=EC=84=9C=EB=B9=84=EC=8A=A4=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD=20=EC=9D=B8=EC=9B=90?= =?UTF-8?q?=EC=88=98=20->=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=A2=85?= =?UTF-8?q?=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gachontablebe/domain/admin/usecase/EnterUser.java | 1 + .../domain/waiting/usecase/CreateWaitingImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/EnterUser.java b/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/EnterUser.java index a15c121e..98f5f8e1 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/EnterUser.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/EnterUser.java @@ -59,6 +59,7 @@ private void createSeating(Pub pub, Waiting waiting, Integer seatingNum) { Seating seating = Seating.create( seatingNum, + waiting.getTableType(), LocalDateTime.now().plusHours(pub.getHours()), pub, waiting, diff --git a/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/CreateWaitingImpl.java b/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/CreateWaitingImpl.java index 4b6a9c54..474a06cf 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/CreateWaitingImpl.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/CreateWaitingImpl.java @@ -49,11 +49,11 @@ public WaitingResponse execute(AuthDetails authDetails, RemoteWaitingRequest req checkPreConditions(pub, user); Waiting waiting = waitingRepository.save( - Waiting.create(Position.REMOTE, request.headCount(), Status.WAITING, user.getUserTel(), user, pub)); + Waiting.create(Position.REMOTE, request.tableType(), Status.WAITING, user.getUserTel(), user, pub)); pub.increaseWaitingCount(); - sendBiztalk.execute(TEMPLATE_CODE, user.getUserTel(), createVariables(user.getUsername(), pub, waiting, request.headCount())); + sendBiztalk.execute(TEMPLATE_CODE, user.getUserTel(), createVariables(user.getUsername(), pub, waiting, request.tableType().getNameKo())); return new WaitingResponse(true, SuccessCode.REMOTE_WAITING_SUCCESS.getMessage()); } @@ -103,7 +103,7 @@ private void checkDuplicatePubWaiting(Pub pub, User user) { }); } - private HashMap createVariables(String username, Pub pub, Waiting waiting, Integer headCount) { + private HashMap createVariables(String username, Pub pub, Waiting waiting, String tableType) { List waitings = waitingRepository .findAllByPubAndWaitingStatusOrWaitingStatusOrderByCreatedAtAsc(pub, Status.WAITING, Status.AVAILABLE); @@ -113,7 +113,7 @@ private HashMap createVariables(String username, Pub pub, Waitin HashMap variables = new HashMap<>(); variables.put("#{username}", username); variables.put("#{pub}", pub.getPubName()); - variables.put("#{headCount}", String.valueOf(headCount)); + variables.put("#{headCount}", tableType); variables.put("#{order}", order); variables.put("#{callNumber}", callNumber); variables.put("#{waitingId}", String.valueOf(waiting.getWaitingId())); From 6c018d9eda3ddf37afd4d27dab0406955beba689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Sun, 22 Sep 2024 21:03:12 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[GTB-76]=20refactor:=20=EC=9D=B8=EC=9B=90?= =?UTF-8?q?=EC=88=98=20=EC=84=A4=EC=A0=95=20DTO=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EC=9D=B8=EC=9B=90=EC=88=98=20->=20=ED=85=8C=EC=9D=B4=EB=B8=94?= =?UTF-8?q?=20=EC=A2=85=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/presentation/dto/response/SeatingsResponse.java | 4 +++- .../presentation/dto/response/WaitingInfosResponse.java | 5 +++-- .../presentation/dto/request/RemoteWaitingRequest.java | 4 +++- .../waiting/presentation/dto/response/StatusResponse.java | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java index 0f3b85a0..1bd1df75 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java @@ -2,6 +2,7 @@ import lombok.Builder; import site.gachontable.gachontablebe.domain.seating.domain.Seating; +import site.gachontable.gachontablebe.domain.shared.Table; import java.util.List; import java.util.UUID; @@ -11,12 +12,13 @@ public record SeatingsResponse(List seatings) { @Builder - public record SeatingResponse(Integer tableId, Integer tableNum, String exitTime, UUID waitingId) { + public record SeatingResponse(Integer tableId, Integer tableNum, Table tableType, String exitTime, UUID waitingId) { public static SeatingResponse from(Seating seating) { return SeatingResponse.builder() .tableId(seating.getSeatingId()) .tableNum(seating.getSeatingNum()) + .tableType(seating.getTableType()) .exitTime(seating.getExitTime().format(WITH_WEEKDAY)) .waitingId(seating.getWaiting().getWaitingId()) .build(); diff --git a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/WaitingInfosResponse.java b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/WaitingInfosResponse.java index 78670f25..82654bab 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/WaitingInfosResponse.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/WaitingInfosResponse.java @@ -1,6 +1,7 @@ package site.gachontable.gachontablebe.domain.admin.presentation.dto.response; import lombok.Builder; +import site.gachontable.gachontablebe.domain.shared.Table; import site.gachontable.gachontablebe.domain.waiting.domain.Waiting; import site.gachontable.gachontablebe.domain.waiting.type.Status; @@ -11,12 +12,12 @@ public record WaitingInfosResponse(Integer count, List waitingInfos) { @Builder - public record WaitingInfo(String username, LocalDateTime time, Integer headCount, String tel, UUID waitingId, Status waitingStatus) { + public record WaitingInfo(String username, LocalDateTime time, Table tableType, String tel, UUID waitingId, Status waitingStatus) { public static WaitingInfo of(String userName, Waiting waiting) { return WaitingInfo.builder() .username(userName) .time(waiting.getCreatedAt()) - .headCount(waiting.getHeadCount()) + .tableType(waiting.getTableType()) .tel(waiting.getTel()) .waitingId(waiting.getWaitingId()) .waitingStatus(waiting.getWaitingStatus()) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/request/RemoteWaitingRequest.java b/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/request/RemoteWaitingRequest.java index 6d47781b..bb61cb92 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/request/RemoteWaitingRequest.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/request/RemoteWaitingRequest.java @@ -1,5 +1,7 @@ package site.gachontable.gachontablebe.domain.waiting.presentation.dto.request; +import site.gachontable.gachontablebe.domain.shared.Table; + public record RemoteWaitingRequest(Integer pubId, - Integer headCount) { + Table tableType) { } diff --git a/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/StatusResponse.java b/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/StatusResponse.java index 9383a856..9d350f18 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/StatusResponse.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/StatusResponse.java @@ -2,6 +2,7 @@ import lombok.Builder; import site.gachontable.gachontablebe.domain.pub.domain.Pub; +import site.gachontable.gachontablebe.domain.shared.Table; import site.gachontable.gachontablebe.domain.waiting.domain.Waiting; import java.util.UUID; @@ -14,7 +15,7 @@ public record StatusResponse(UUID waitingId, String orderStatus, Integer order, String createdAt, - Integer headCount) { + Table tableType) { public static StatusResponse of(Waiting waiting, Pub pub, Integer order) { return StatusResponse.builder() @@ -23,7 +24,7 @@ public static StatusResponse of(Waiting waiting, Pub pub, Integer order) { .orderStatus(waiting.getWaitingStatus().getStatusKo()) .order(order) .createdAt(waiting.getCreatedAt().format(WITH_WEEKDAY)) - .headCount(waiting.getHeadCount()) + .tableType(waiting.getTableType()) .build(); } From 370de060c428e383460c927ff8ce971f1a54d342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Tue, 24 Sep 2024 16:49:05 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[GTB-76]=20feat:=20=EC=B5=9C=EB=8C=80=20?= =?UTF-8?q?=EC=9B=A8=EC=9D=B4=ED=8C=85=20=EB=8C=80=EA=B8=B0=EC=97=B4=20?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gachontable/gachontablebe/domain/pub/domain/Pub.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/pub/domain/Pub.java b/src/main/java/site/gachontable/gachontablebe/domain/pub/domain/Pub.java index 8b1eb55f..3e0dd3b5 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/pub/domain/Pub.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/pub/domain/Pub.java @@ -14,6 +14,7 @@ @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Pub { + private static final Integer MAX_WAITING_COUNT = 30; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -114,6 +115,13 @@ public Pub(String pubName, public void increaseWaitingCount() { this.waitingCount += 1; + checkMaxWaitingCount(); + } + + private void checkMaxWaitingCount() { + if (this.waitingCount >= MAX_WAITING_COUNT) { + this.waitingStatus = false; + } } public void decreaseWaitingCount() { From fb8f178ac249981d5ab5e6609c6624ba9d1bf4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Tue, 24 Sep 2024 17:31:58 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[GTB-76]=20fix:=20=EC=B7=A8=EC=86=8C?= =?UTF-8?q?=EB=90=9C=20=EC=9B=A8=EC=9D=B4=ED=8C=85=EC=9D=98=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/WaitingHistoryResponse.java | 2 +- .../domain/waiting/usecase/GetWaitingHistory.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/WaitingHistoryResponse.java b/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/WaitingHistoryResponse.java index 1070d476..2d65c5cc 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/WaitingHistoryResponse.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/waiting/presentation/dto/response/WaitingHistoryResponse.java @@ -24,7 +24,7 @@ public static WaitingHistoryResponse of(Waiting waiting, Seating seating) { .pubName(waiting.getPub().getPubName()) .status(waiting.getWaitingStatus()) .enteredTime(waiting.getUpdatedAt().format(WITH_WEEKDAY)) - .exitTime(seating.getExitTime().format(WITH_WEEKDAY)) + .exitTime(seating != null ? seating.getExitTime().format(WITH_WEEKDAY) : null) .build(); } } diff --git a/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/GetWaitingHistory.java b/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/GetWaitingHistory.java index f917ce68..ca3b8744 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/GetWaitingHistory.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/GetWaitingHistory.java @@ -32,9 +32,12 @@ public List execute(AuthDetails authDetails) { return waitings.stream() .map(waiting -> { - Seating seating = seatingRepository.findByWaiting(waiting) - .orElseThrow(SeatingNotFoundException::new); - return WaitingHistoryResponse.of(waiting, seating); + if (waiting.getWaitingStatus() == Status.ENTERED) { + Seating seating = seatingRepository.findByWaiting(waiting) + .orElseThrow(SeatingNotFoundException::new); + return WaitingHistoryResponse.of(waiting, seating); + } + return WaitingHistoryResponse.of(waiting, null); }) .toList(); } From e08da8742e8d0b42630ec8abcedc5814b27d2d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Tue, 24 Sep 2024 20:12:40 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[GTB-76]=20fix:=20=EC=98=A4=ED=83=88?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../site/gachontable/gachontablebe/domain/shared/Table.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java b/src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java index e6f131ed..579d4e64 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/shared/Table.java @@ -7,7 +7,7 @@ @AllArgsConstructor public enum Table { BASIC("4인 테이블 (1~5인)"), - PARTY("8인 테이블 (5~8인)"),; + PARTY("8인 테이블 (5~8인)"); private final String nameKo; } From 8cb2cae34784fcef0252cc0588bf599e9c46dd55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Tue, 24 Sep 2024 22:57:36 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[GTB-76]=20fix:=20=EC=98=A4=ED=83=88?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95=20tableId=20->=20seatingId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/presentation/dto/response/SeatingsResponse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java index 1bd1df75..740d04bf 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java @@ -12,11 +12,11 @@ public record SeatingsResponse(List seatings) { @Builder - public record SeatingResponse(Integer tableId, Integer tableNum, Table tableType, String exitTime, UUID waitingId) { + public record SeatingResponse(Integer seatingId, Integer tableNum, Table tableType, String exitTime, UUID waitingId) { public static SeatingResponse from(Seating seating) { return SeatingResponse.builder() - .tableId(seating.getSeatingId()) + .seatingId(seating.getSeatingId()) .tableNum(seating.getSeatingNum()) .tableType(seating.getTableType()) .exitTime(seating.getExitTime().format(WITH_WEEKDAY)) From 9f37385ae186c3aba495012f0419f0eee0be2170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=85=B8=EC=A0=95=EC=99=84?= Date: Tue, 24 Sep 2024 22:59:21 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[GTB-76]=20fix:=20=EC=98=A4=ED=83=88?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95=20tableNum=20->=20seatingNum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/presentation/dto/response/SeatingsResponse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java index 740d04bf..1e7fff62 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/dto/response/SeatingsResponse.java @@ -12,12 +12,12 @@ public record SeatingsResponse(List seatings) { @Builder - public record SeatingResponse(Integer seatingId, Integer tableNum, Table tableType, String exitTime, UUID waitingId) { + public record SeatingResponse(Integer seatingId, Integer seatingNum, Table tableType, String exitTime, UUID waitingId) { public static SeatingResponse from(Seating seating) { return SeatingResponse.builder() .seatingId(seating.getSeatingId()) - .tableNum(seating.getSeatingNum()) + .seatingNum(seating.getSeatingNum()) .tableType(seating.getTableType()) .exitTime(seating.getExitTime().format(WITH_WEEKDAY)) .waitingId(seating.getWaiting().getWaitingId())