From 9b8883a415c124de683a44c642248f9495baa4c8 Mon Sep 17 00:00:00 2001 From: Todom2 Date: Sun, 25 Jan 2026 21:08:08 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[Rename]=20#2=20Panalty=20->=20Penalty=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{UserPanaltyLog.java => UserPenaltyLog.java} | 6 +++--- .../ssurentbe/domain/users/enums/PanaltyTypes.java | 6 ------ .../ssurentbe/domain/users/enums/PenaltyTypes.java | 13 +++++++++++++ 3 files changed, 16 insertions(+), 9 deletions(-) rename src/main/java/ssurent/ssurentbe/domain/users/entity/{UserPanaltyLog.java => UserPenaltyLog.java} (85%) delete mode 100644 src/main/java/ssurent/ssurentbe/domain/users/enums/PanaltyTypes.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/enums/PenaltyTypes.java diff --git a/src/main/java/ssurent/ssurentbe/domain/users/entity/UserPanaltyLog.java b/src/main/java/ssurent/ssurentbe/domain/users/entity/UserPenaltyLog.java similarity index 85% rename from src/main/java/ssurent/ssurentbe/domain/users/entity/UserPanaltyLog.java rename to src/main/java/ssurent/ssurentbe/domain/users/entity/UserPenaltyLog.java index f327564..2e784d1 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/entity/UserPanaltyLog.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/entity/UserPenaltyLog.java @@ -5,7 +5,7 @@ import ssurent.ssurentbe.common.base.BaseEntity; import ssurent.ssurentbe.domain.item.entity.Items; import ssurent.ssurentbe.domain.rental.entity.RentalHistory; -import ssurent.ssurentbe.domain.users.enums.PanaltyTypes; +import ssurent.ssurentbe.domain.users.enums.PenaltyTypes; @Entity @Getter @@ -13,7 +13,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor @Table(name = "user_panalty_log") -public class UserPanaltyLog extends BaseEntity { +public class UserPenaltyLog extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -32,6 +32,6 @@ public class UserPanaltyLog extends BaseEntity { @Enumerated(EnumType.STRING) @Column(name = "panalty_type") - private PanaltyTypes panaltyType; + private PenaltyTypes penaltyType; } \ No newline at end of file diff --git a/src/main/java/ssurent/ssurentbe/domain/users/enums/PanaltyTypes.java b/src/main/java/ssurent/ssurentbe/domain/users/enums/PanaltyTypes.java deleted file mode 100644 index c1d4e7b..0000000 --- a/src/main/java/ssurent/ssurentbe/domain/users/enums/PanaltyTypes.java +++ /dev/null @@ -1,6 +0,0 @@ -package ssurent.ssurentbe.domain.users.enums; - -public enum PanaltyTypes { - OVERDUE, - UNAUTHORIZED_USE -} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/enums/PenaltyTypes.java b/src/main/java/ssurent/ssurentbe/domain/users/enums/PenaltyTypes.java new file mode 100644 index 0000000..e0b513e --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/enums/PenaltyTypes.java @@ -0,0 +1,13 @@ +package ssurent.ssurentbe.domain.users.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum PenaltyTypes { + OVERDUE("반납기한 경과"), + UNAUTHORIZED_USE("무단 사용"); + + private final String description; +} From 5295e0ca63607c97f9d3f99f22179e7d45d62267 Mon Sep 17 00:00:00 2001 From: Todom2 Date: Sun, 25 Jan 2026 21:08:50 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[Refactor]=20#2=20Status=20=EC=97=90=20desc?= =?UTF-8?q?ription=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssurent/ssurentbe/domain/item/enums/Status.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java b/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java index 137f5e3..426e86d 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java @@ -1,7 +1,14 @@ package ssurent.ssurentbe.domain.item.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum Status { - ACTIVE, - FIXING, - INACTIVE + ACTIVE("대여 가능"), + FIXING("수리 중"), + INACTIVE("대여 불가"); + + private String description; } From 9ae087c884ffe0dae8ffce5a3198853f85ccb79f Mon Sep 17 00:00:00 2001 From: Todom2 Date: Sun, 25 Jan 2026 21:09:26 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[Refactor]=20#2=20Category=20=EC=97=90=20de?= =?UTF-8?q?scription=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 새로운 컬럼 추가입니다. --- .../java/ssurent/ssurentbe/domain/item/entity/Category.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/ssurent/ssurentbe/domain/item/entity/Category.java b/src/main/java/ssurent/ssurentbe/domain/item/entity/Category.java index ac0180c..5e0c9e1 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/entity/Category.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/entity/Category.java @@ -23,6 +23,9 @@ public class Category extends BaseEntity { @Column(name = "is_deleted") private boolean isDelelted; + @Column(name = "description") + private String description; + @Column(name = "deleted_at") private LocalDateTime deletedAt; } \ No newline at end of file From 66161b7e12d90b6edd4c622602aa03aa046374b1 Mon Sep 17 00:00:00 2001 From: Todom2 Date: Sun, 25 Jan 2026 21:34:02 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[Add]=20#2=20API=20Request/Response=20Dto?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Api No.18 까지, 16번,17번 제외하고 Dto 추가 새로운 컬럼 추가입니다. --- .../item/dto/response/CategoryResponse.java | 15 +++++++++ .../item/dto/response/ItemResponse.java | 21 +++++++++++++ .../dto/request/RentalExtendRequest.java | 9 ++++++ .../dto/request/RentalReportRequest.java | 7 +++++ .../rental/dto/request/RentalRequest.java | 7 +++++ .../dto/request/RentalReturnRequest.java | 8 +++++ .../dto/response/RentalItemResponse.java | 24 ++++++++++++++ .../request/AdminUserRoleUpdateRequest.java | 7 +++++ .../dto/request/UserPhoneNumberRequest.java | 6 ++++ .../dto/response/AdminUserDetailResponse.java | 31 +++++++++++++++++++ .../users/dto/response/AdminUserResponse.java | 6 ++++ .../dto/response/UserPenaltyResponse.java | 25 +++++++++++++++ .../users/dto/response/UserResponse.java | 25 +++++++++++++++ 13 files changed, 191 insertions(+) create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/request/UserPhoneNumberRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java new file mode 100644 index 0000000..322de95 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java @@ -0,0 +1,15 @@ +package ssurent.ssurentbe.domain.item.dto.response; + +import ssurent.ssurentbe.domain.item.entity.Category; + +public record CategoryResponse( + String categoryId, + String categoryName +) { + public static CategoryResponse from(Category category) { + return new CategoryResponse( + category.getId(), + category.getName() + ); + } +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java new file mode 100644 index 0000000..9096297 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java @@ -0,0 +1,21 @@ +package ssurent.ssurentbe.domain.item.dto.response; + +import ssurent.ssurentbe.domain.item.entity.Items; +import ssurent.ssurentbe.domain.item.enums.Status; + +public record ItemResponse( + String itemId, + String itemName, + String itemDescription, + Status status +) { + public static ItemResponse from(Items item) { + String ItemName = item.getName() + "(" + item.getItemNum() + ")"; + return new ItemResponse( + item.getId(), + item.getName(), + ItemName, + item.getStatus() + ); + } +} diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java new file mode 100644 index 0000000..a009a1a --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java @@ -0,0 +1,9 @@ +package ssurent.ssurentbe.domain.rental.dto.request; + +import java.time.LocalDateTime; + +public record RentalExtendRequest( + String rentalId, + LocalDateTime dueDate +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java new file mode 100644 index 0000000..43bc0fa --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java @@ -0,0 +1,7 @@ +package ssurent.ssurentbe.domain.rental.dto.request; + +public record RentalReportRequest( + String rentalId, + String problem +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java new file mode 100644 index 0000000..e18d37a --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java @@ -0,0 +1,7 @@ +package ssurent.ssurentbe.domain.rental.dto.request; + +public record RentalRequest( + String itemId, + String assistName +){ +} diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java new file mode 100644 index 0000000..d4571d7 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java @@ -0,0 +1,8 @@ +package ssurent.ssurentbe.domain.rental.dto.request; + +public record RentalReturnRequest( + String itemId, + String rentalId, + String assistName +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java new file mode 100644 index 0000000..e095f7d --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java @@ -0,0 +1,24 @@ +package ssurent.ssurentbe.domain.rental.dto.response; + +import ssurent.ssurentbe.domain.item.entity.Items; +import ssurent.ssurentbe.domain.rental.entity.RentalHistory; + +import java.time.LocalDateTime; + +public record RentalItemResponse( + String rentalId, + String itemId, + String itemName, + LocalDateTime dueDate +) { + public static RentalItemResponse from(RentalHistory rentalHistory) { + Items items = rentalHistory.getItemId(); + String itemName = items.getName() + "(" + items.getItemNum() + ")"; + return new RentalItemResponse( + rentalHistory.getId(), + rentalHistory.getItemId().getId(), + itemName, + rentalHistory.getDueDate() + ); + } +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java new file mode 100644 index 0000000..e7e96d4 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java @@ -0,0 +1,7 @@ +package ssurent.ssurentbe.domain.users.dto.request; + +public record AdminUserRoleUpdateRequest( + String userId, + String role +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/UserPhoneNumberRequest.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/UserPhoneNumberRequest.java new file mode 100644 index 0000000..d8ecba1 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/UserPhoneNumberRequest.java @@ -0,0 +1,6 @@ +package ssurent.ssurentbe.domain.users.dto.request; + +public record UserPhoneNumberRequest( + String phoneNum +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java new file mode 100644 index 0000000..63e9841 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java @@ -0,0 +1,31 @@ +package ssurent.ssurentbe.domain.users.dto.response; + +import ssurent.ssurentbe.domain.users.entity.Users; + +import java.util.ArrayList; +import java.util.List; + +public record AdminUserDetailResponse( + String userId, + String userName, + String studentNum, + String role, + String status, + String phoneNum, + List penalties +) { + public static AdminUserDetailResponse from(Users user) { + // TODO : 이후 Users 가 Penalty를 관리하게 해서 추가시켜주도록 + List penaltyList = new ArrayList<>(); + + return new AdminUserDetailResponse( + user.getId(), + user.getName(), + user.getStudentNum(), + user.getRole().name(), + user.getStatus().name(), + user.getPhoneNum(), + penaltyList + ); + } +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java new file mode 100644 index 0000000..daacd92 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java @@ -0,0 +1,6 @@ +package ssurent.ssurentbe.domain.users.dto.response; + +public record AdminUserResponse( + +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java new file mode 100644 index 0000000..b80c3ae --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java @@ -0,0 +1,25 @@ +package ssurent.ssurentbe.domain.users.dto.response; + +import ssurent.ssurentbe.domain.item.entity.Items; +import ssurent.ssurentbe.domain.users.entity.UserPenaltyLog; + +import java.time.LocalDateTime; + +public record UserPenaltyResponse( + String userPenaltyId, + LocalDateTime createdAt, + String itemName, + String penaltyType +) { + public static UserPenaltyResponse from(UserPenaltyLog userPenaltyLog) { + Items item = userPenaltyLog.getItemsId(); + String itemInfo = item.getName() + " (" + item.getItemNum() + ")"; + + return new UserPenaltyResponse( + userPenaltyLog.getId(), + userPenaltyLog.getCreatedAt(), + itemInfo, + userPenaltyLog.getPenaltyType().getDescription() + ); + } +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java new file mode 100644 index 0000000..93373ee --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java @@ -0,0 +1,25 @@ +package ssurent.ssurentbe.domain.users.dto.response; + +import ssurent.ssurentbe.domain.users.entity.Users; +import ssurent.ssurentbe.domain.users.enums.Role; +import ssurent.ssurentbe.domain.users.enums.Status; + +public record UserResponse( + String userId, + String studentNum, + String name, + Role role, + Status status, + String phoneNum +) { + public static UserResponse from(Users user) { + return new UserResponse( + user.getId(), + user.getStudentNum(), + user.getName(), + user.getRole(), + user.getStatus(), + user.getPhoneNum() + ); + } +} From 7022b15e470e2b47aad9458b258c1c945faf5a4b Mon Sep 17 00:00:00 2001 From: Todom2 Date: Wed, 4 Feb 2026 21:12:57 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[Add]=20#2=20API=20Request/Response=20Dto?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Api 32번,33번 제외하고 Dto 추가 --- .../dto/request/AdminAssistCreateRequest.java | 6 ++++++ .../dto/response/AdminAssistResponse.java | 7 +++++++ .../dto/request/AdminCategoryCreateRequest.java | 6 ++++++ .../dto/request/AdminItemCreateRequest.java | 7 +++++++ .../dto/request/AdminItemUpdateRequest.java | 13 +++++++++++++ .../response/AdminItemNameSearchResponse.java | 7 +++++++ .../item/dto/response/AdminItemResponse.java | 10 ++++++++++ .../dto/response/AdminItemSearchResponse.java | 10 ++++++++++ .../domain/item/dto/response/ItemResponse.java | 7 +++++-- .../dto/request/AdminRentalUpdateRequest.java | 14 ++++++++++++++ .../response/AdminRentalHistoryResponse.java | 17 +++++++++++++++++ .../response/AdminUserRentalItemResponse.java | 11 +++++++++++ .../request/AdminUserPenaltyCreateRequest.java | 11 +++++++++++ .../request/AdminUserStatusUpdateRequest.java | 6 ++++++ .../dto/response/AdminUserDetailResponse.java | 10 +++++----- .../users/dto/response/AdminUserResponse.java | 7 ++++++- 16 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 src/main/java/ssurent/ssurentbe/domain/assists/dto/request/AdminAssistCreateRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/assists/dto/response/AdminAssistResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminCategoryCreateRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemUpdateRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemNameSearchResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemSearchResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/request/AdminRentalUpdateRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java create mode 100644 src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java diff --git a/src/main/java/ssurent/ssurentbe/domain/assists/dto/request/AdminAssistCreateRequest.java b/src/main/java/ssurent/ssurentbe/domain/assists/dto/request/AdminAssistCreateRequest.java new file mode 100644 index 0000000..3fccee8 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/assists/dto/request/AdminAssistCreateRequest.java @@ -0,0 +1,6 @@ +package ssurent.ssurentbe.domain.assists.dto.request; + +public record AdminAssistCreateRequest( + String assistName +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/assists/dto/response/AdminAssistResponse.java b/src/main/java/ssurent/ssurentbe/domain/assists/dto/response/AdminAssistResponse.java new file mode 100644 index 0000000..c73672a --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/assists/dto/response/AdminAssistResponse.java @@ -0,0 +1,7 @@ +package ssurent.ssurentbe.domain.assists.dto.response; + +public record AdminAssistResponse( + Long assistId, + String assistName +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminCategoryCreateRequest.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminCategoryCreateRequest.java new file mode 100644 index 0000000..d8c5a0a --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminCategoryCreateRequest.java @@ -0,0 +1,6 @@ +package ssurent.ssurentbe.domain.item.dto.request; + +public record AdminCategoryCreateRequest( + String categoryName +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java new file mode 100644 index 0000000..0895de5 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java @@ -0,0 +1,7 @@ +package ssurent.ssurentbe.domain.item.dto.request; + +public record AdminItemCreateRequest( + String categoryName, + Integer itemNum +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemUpdateRequest.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemUpdateRequest.java new file mode 100644 index 0000000..2e4af05 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemUpdateRequest.java @@ -0,0 +1,13 @@ +package ssurent.ssurentbe.domain.item.dto.request; + +import java.util.List; + +public record AdminItemUpdateRequest( + List itemUpdates +) { + public record ItemUpdate( + Long itemId, + String status + ){ + } +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemNameSearchResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemNameSearchResponse.java new file mode 100644 index 0000000..f3f450b --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemNameSearchResponse.java @@ -0,0 +1,7 @@ +package ssurent.ssurentbe.domain.item.dto.response; + +public record AdminItemNameSearchResponse( + Long itemId, + String itemName +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemResponse.java new file mode 100644 index 0000000..f04fea2 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemResponse.java @@ -0,0 +1,10 @@ +package ssurent.ssurentbe.domain.item.dto.response; + +import java.util.List; + +public record AdminItemResponse( + Long categoryId, + String categoryName, + List items +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemSearchResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemSearchResponse.java new file mode 100644 index 0000000..bf0b6cb --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/AdminItemSearchResponse.java @@ -0,0 +1,10 @@ +package ssurent.ssurentbe.domain.item.dto.response; + +import ssurent.ssurentbe.domain.item.enums.Condition; + +public record AdminItemSearchResponse( + Long itemId, + String itemName, + Condition condition +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java index 9096297..206dea7 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java @@ -1,13 +1,15 @@ package ssurent.ssurentbe.domain.item.dto.response; import ssurent.ssurentbe.domain.item.entity.Items; +import ssurent.ssurentbe.domain.item.enums.Condition; import ssurent.ssurentbe.domain.item.enums.Status; public record ItemResponse( String itemId, String itemName, String itemDescription, - Status status + Status status, + Condition condition ) { public static ItemResponse from(Items item) { String ItemName = item.getName() + "(" + item.getItemNum() + ")"; @@ -15,7 +17,8 @@ public static ItemResponse from(Items item) { item.getId(), item.getName(), ItemName, - item.getStatus() + item.getStatus(), + item.getCondition() ); } } diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/AdminRentalUpdateRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/AdminRentalUpdateRequest.java new file mode 100644 index 0000000..305eb25 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/AdminRentalUpdateRequest.java @@ -0,0 +1,14 @@ +package ssurent.ssurentbe.domain.rental.dto.request; + +import java.util.List; + +public record AdminRentalUpdateRequest( + List rentalUpdates +) { + public record RentalUpdate( + Long rentalId, + boolean returned + ){ + + } +} diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java new file mode 100644 index 0000000..eb00fc3 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java @@ -0,0 +1,17 @@ +package ssurent.ssurentbe.domain.rental.dto.response; + +import ssurent.ssurentbe.domain.rental.enums.Status; + +import java.time.LocalDateTime; + +public record AdminRentalHistoryResponse( + LocalDateTime timeStamp, + String name, + String studentNum, + String phNum, + Status status, + String itemName, + String itemNum, + boolean isOverdue +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java new file mode 100644 index 0000000..0a13e74 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java @@ -0,0 +1,11 @@ +package ssurent.ssurentbe.domain.rental.dto.response; + +import java.time.LocalDateTime; + +public record AdminUserRentalItemResponse( + Long RentalId, + LocalDateTime rentalDate, + LocalDateTime returnDate, + String itemName +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java new file mode 100644 index 0000000..c8adec9 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java @@ -0,0 +1,11 @@ +package ssurent.ssurentbe.domain.users.dto.request; + + +import java.time.LocalDateTime; + +public record AdminUserPenaltyCreateRequest ( + LocalDateTime createdAt, + String itemName, + String penaltyType +){ +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java new file mode 100644 index 0000000..ac01def --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java @@ -0,0 +1,6 @@ +package ssurent.ssurentbe.domain.users.dto.request; + +public record AdminUserStatusUpdateRequest( + String status +) { +} diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java index 63e9841..3f61923 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java @@ -1,5 +1,6 @@ package ssurent.ssurentbe.domain.users.dto.response; +import ssurent.ssurentbe.domain.users.entity.UserPenaltyLog; import ssurent.ssurentbe.domain.users.entity.Users; import java.util.ArrayList; @@ -14,10 +15,7 @@ public record AdminUserDetailResponse( String phoneNum, List penalties ) { - public static AdminUserDetailResponse from(Users user) { - // TODO : 이후 Users 가 Penalty를 관리하게 해서 추가시켜주도록 - List penaltyList = new ArrayList<>(); - + public static AdminUserDetailResponse from(Users user, List penalties) { return new AdminUserDetailResponse( user.getId(), user.getName(), @@ -25,7 +23,9 @@ public static AdminUserDetailResponse from(Users user) { user.getRole().name(), user.getStatus().name(), user.getPhoneNum(), - penaltyList + penalties.stream() + .map(UserPenaltyResponse::from) + .toList() ); } } diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java index daacd92..dc136ad 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java @@ -1,6 +1,11 @@ package ssurent.ssurentbe.domain.users.dto.response; -public record AdminUserResponse( +import ssurent.ssurentbe.domain.users.enums.Role; +public record AdminUserResponse( + Long userId, + String userName, + String studentNum, + Role role ) { } From 4d3c0803b48ae494af6293b561144be5a1c7d73d Mon Sep 17 00:00:00 2001 From: Todom2 Date: Wed, 4 Feb 2026 21:15:03 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[Add]=20#2=20Table=20Column=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Items, RentalHistory 에 있는 Status, Condition ENUM을 더 자연스럽게 개선했습니다. --- .../ssurentbe/domain/item/entity/Items.java | 5 +++++ .../ssurentbe/domain/item/enums/Condition.java | 15 +++++++++++++++ .../ssurentbe/domain/item/enums/Status.java | 1 - .../domain/rental/entity/RentalHistory.java | 3 +++ .../ssurentbe/domain/rental/enums/Status.java | 5 ++--- 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/main/java/ssurent/ssurentbe/domain/item/enums/Condition.java diff --git a/src/main/java/ssurent/ssurentbe/domain/item/entity/Items.java b/src/main/java/ssurent/ssurentbe/domain/item/entity/Items.java index 9db6874..b91cc38 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/entity/Items.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/entity/Items.java @@ -3,6 +3,7 @@ import jakarta.persistence.*; import lombok.*; import ssurent.ssurentbe.common.base.BaseEntity; +import ssurent.ssurentbe.domain.item.enums.Condition; import ssurent.ssurentbe.domain.item.enums.Status; import java.time.LocalDateTime; @@ -32,6 +33,10 @@ public class Items extends BaseEntity { @Column(name = "status") private Status status; + @Enumerated(EnumType.STRING) + @Column(name = "condition") + private Condition condition; + @Column(name = "is_deleted") private boolean deleted; diff --git a/src/main/java/ssurent/ssurentbe/domain/item/enums/Condition.java b/src/main/java/ssurent/ssurentbe/domain/item/enums/Condition.java new file mode 100644 index 0000000..60e3104 --- /dev/null +++ b/src/main/java/ssurent/ssurentbe/domain/item/enums/Condition.java @@ -0,0 +1,15 @@ +package ssurent.ssurentbe.domain.item.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + + +@Getter +@AllArgsConstructor +public enum Condition { + RENT("대여 중"), + KEEP("보관 중"), + OVERDUE("연체 중"); + + private String description; +} \ No newline at end of file diff --git a/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java b/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java index 426e86d..2039e53 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java @@ -7,7 +7,6 @@ @AllArgsConstructor public enum Status { ACTIVE("대여 가능"), - FIXING("수리 중"), INACTIVE("대여 불가"); private String description; diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java b/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java index 0a7f237..d646e73 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java @@ -44,4 +44,7 @@ public class RentalHistory extends BaseEntity { @Column(name = "status") private Status status; + + @Column(name = "is_overdue") + private Boolean overdue; } diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/enums/Status.java b/src/main/java/ssurent/ssurentbe/domain/rental/enums/Status.java index bdf07ce..4be92d1 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/enums/Status.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/enums/Status.java @@ -1,7 +1,6 @@ package ssurent.ssurentbe.domain.rental.enums; public enum Status { - ACTIVE, - OVERDUE, - INACTIVE + RENT, + RETURN } From a0f1a4ffbed769e9338ecdd821e408a58dc4f762 Mon Sep 17 00:00:00 2001 From: Todom2 Date: Wed, 4 Feb 2026 21:28:10 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[Docs]=20#2=20.gitignore=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gitignore에 gradle과 .idea를 추가했습니다. --- .gitignore | 2 ++ .gradle/9.2.1/fileHashes/fileHashes.bin | Bin 0 -> 21647 bytes .gradle/9.2.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .idea/compiler.xml | 9 ++++++++- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .gradle/9.2.1/fileHashes/fileHashes.bin create mode 100644 .gradle/9.2.1/fileHashes/fileHashes.lock diff --git a/.gitignore b/.gitignore index ec3d49b..6ad85eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ HELP.md .gradle build/ +gradle +.idea !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ diff --git a/.gradle/9.2.1/fileHashes/fileHashes.bin b/.gradle/9.2.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..3ff371cfb6949eed5592b3f958e67a681b655e6a GIT binary patch literal 21647 zcmeI3do)yCAIFcGLDJ-s!jnr+DW!5R3aK~AopGyB5h_Z#t0+uTNOVC;q>E_f(&LhA zBhDivI5e@s@ zX8wMQ-k}6g0w@8L07?KQfD%9npaf6?C;^lJN&qE*55u?kSBZU3dU2j z!~r)^T!lQ(d`rdmO8<1gjdnnuFCt^-P&nKKxRvubznHJ|q^2hU za6>J~Z~Yo#(EpOSM)X&Kyhx>fP=9%K8sLn^aem>XtapLm7QijtAg?e_*;rs4B@4K* z66BR`d##5TN+n@}z!^G_ zH!b*--tyLc8&P)%^5#XsLO(7P3;}Lh1o>OH%lu2$uWAI`ycP0J*|ZhWnEx5Tjh)7M zQQfjvLIt6KTlhi#QLE#-N95;9V*f`W?=A7|onl_|H{jNrAs=uaOD}KRG6uL274o6` zRZV7_rI!J2d>Zm!Qfg}a6pyojn@K~?!}LhK|XWaD`s}usSaZQq2v6YvON2D2|>jE10kO^oZ40Y z&UGH(mUWOzm~P?;AF+N0xbfgPf02t+ z0&Y?c`Rv-n*d_B~=zv?ifL!Le>+F}SGKg^+3P3KuMyWMS;^iLD-)I!_g*k{JInvpd?~<KJ-QS&!4Ox;Tn_nJZAY1<-<`)d^xjXf-#II zZe7i24mduU`}nIOr?K(tbtR?DMvdr-aso6Aa!(tb5-{Mzn4yjmJ(TBdkv1 zN2j_8ez*Gs1CvbQHiR1mie>m3Ukokia(@5Kb^k3sTICC3wDX&^@I6NM(wa`9yqwQA(hmoIU z%WWL8wma)hJ%76;S}^IuzjmzPFvO!-_c)WX^6e4xS7YcXRFtLjyJYv-;l}w_ipi3A zPrUKi;2V;`ujQ^AS{|vBQL58qTa#MLHdIw!vjvRuh1=+}Yq#QQlm7ZOq3}*@o0kbN zRObVunDrzFsYbuoX{{oI4S}*L%KjrU_wNDYz;j@*xBrc?OfK#}8;y79$tU?oY=aW2 zY))xJ%CKuFCjS8p$|P4iGb=zxE!#RjJZmg9Cm4Ovj_vP#cI?^=10St(k`36&%%cDa!&?@=zk}SIcx!=MBuNa8ZCn%aTT%` zyT&fP?A3GhTS^#nfkFMiZR`qkk)W)4+2XNl)H-Xbwk2T@cjQw=xs5~*&!l7FyeVHS z3wJRO(P)H0oI%Ws+fY#x6{=Fm^b7ck00hVcC;q}rdv20CAv z&S_w*=UqsnYM-O$W+R%zEPlH>F8fn@K4Gw~4py5a-F&}z8G(WL2MY3e4m)xZrAfvl zYl-)P6OXr@`e6Q0`KFfo>X=rxF+OW)ig+E;s4{|Qx##Q^m|MmxHGD`e8=u$s)vl`Y zkv%4ihstf_Eu1O&Zbk1Ms>#c*wt_2RjZeT3Fyc1kBVG?$-s26uN(mi}{Swqd)WFXR ztMNa@H>6QDY-zmYa-%szk7@OOgu$9gc%w}+ z&t32K@f`hj`=6Q>CLQygybFP$$^#6c+xRP~#zl{3g;(~C8eNd@tW|WQmT?;NNmhoj z-7mYPJ=|T(Hq1}<-+t>or$OuIuCY{oSKmG1jSdS!40g#Ji^Z=e)^(+d&l6VTXFVrF z8dc-#YbBbIjz!g>=eF<&<~}40A+~_=<#HPiZeE++y;s>u8g|dFe2`CkeyFm>kGJXg z+Cr`&-(K-bye{;sv2}-Di`Y@T2YXavYyq2Q%55~SJ9TjJnBB8IJ)P=}cf0X%vkiQW zXEi#0)sSnvxzj9mlS&yJEU*oj!qmi99kxMy)=rybMj4g7z3jg;Ez-`6SNmysQx{%;$wmU*_nlq)0?R;)V>$ZH$8HhE z9K0vqX!!4B!?5jzOUE_A{yiTXwpZ$C_~XV|9cyB_;+31^+SNLjcK67JIxw>ES^F3pZ90n$72Xl=F8ysnIfWlAnf>@N+w4Qn&>(YZsRzk_2!u)**^B4rCr7P5B!{1W2$oIB;PDO d*Ty#nB-HrTZ#3acS5?M)OdORYeq~~c{|1c2F&h8? literal 0 HcmV?d00001 diff --git a/.gradle/9.2.1/fileHashes/fileHashes.lock b/.gradle/9.2.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..35fdc5eafd2163972e47e3307dec719046b85fac GIT binary patch literal 17 UcmZSXU$}Mkd@%tV1_+n{05IwVB>(^b literal 0 HcmV?d00001 diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ba9ca2f..e954152 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,9 +7,16 @@ - + + + + \ No newline at end of file From c8b5eb9ea36312d33732a1b965fa674669482251 Mon Sep 17 00:00:00 2001 From: Todom2 Date: Thu, 5 Feb 2026 21:15:46 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[Feat]=20#2=20coderabbit=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0=EC=A0=90=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Id String -> Long 타입 변경 from() 메서드 추가 --- .../item/dto/request/AdminItemCreateRequest.java | 2 +- .../item/dto/response/CategoryResponse.java | 2 +- .../domain/item/dto/response/ItemResponse.java | 2 +- .../rental/dto/request/RentalExtendRequest.java | 2 +- .../rental/dto/request/RentalReportRequest.java | 2 +- .../domain/rental/dto/request/RentalRequest.java | 2 +- .../rental/dto/request/RentalReturnRequest.java | 4 ++-- .../dto/response/AdminRentalHistoryResponse.java | 5 +++++ .../dto/response/AdminUserRentalItemResponse.java | 15 ++++++++++++++- .../rental/dto/response/RentalItemResponse.java | 4 ++-- .../domain/rental/entity/RentalHistory.java | 2 +- .../request/AdminUserPenaltyCreateRequest.java | 1 - .../dto/request/AdminUserRoleUpdateRequest.java | 6 ++++-- .../dto/request/AdminUserStatusUpdateRequest.java | 4 +++- .../dto/response/AdminUserDetailResponse.java | 12 +++++++----- .../users/dto/response/AdminUserResponse.java | 9 +++++++++ .../users/dto/response/UserPenaltyResponse.java | 2 +- .../domain/users/dto/response/UserResponse.java | 2 +- 18 files changed, 55 insertions(+), 23 deletions(-) diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java index 0895de5..6445e6c 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/request/AdminItemCreateRequest.java @@ -2,6 +2,6 @@ public record AdminItemCreateRequest( String categoryName, - Integer itemNum + String itemNum ) { } diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java index 322de95..5aa00c0 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/CategoryResponse.java @@ -3,7 +3,7 @@ import ssurent.ssurentbe.domain.item.entity.Category; public record CategoryResponse( - String categoryId, + Long categoryId, String categoryName ) { public static CategoryResponse from(Category category) { diff --git a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java index 206dea7..4afcc17 100644 --- a/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java @@ -5,7 +5,7 @@ import ssurent.ssurentbe.domain.item.enums.Status; public record ItemResponse( - String itemId, + Long itemId, String itemName, String itemDescription, Status status, diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java index a009a1a..a00075a 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalExtendRequest.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; public record RentalExtendRequest( - String rentalId, + Long rentalId, LocalDateTime dueDate ) { } diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java index 43bc0fa..45ef8ca 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReportRequest.java @@ -1,7 +1,7 @@ package ssurent.ssurentbe.domain.rental.dto.request; public record RentalReportRequest( - String rentalId, + Long rentalId, String problem ) { } diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java index e18d37a..56f0fd9 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalRequest.java @@ -1,7 +1,7 @@ package ssurent.ssurentbe.domain.rental.dto.request; public record RentalRequest( - String itemId, + Long itemId, String assistName ){ } diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java index d4571d7..4bae9ba 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/request/RentalReturnRequest.java @@ -1,8 +1,8 @@ package ssurent.ssurentbe.domain.rental.dto.request; public record RentalReturnRequest( - String itemId, - String rentalId, + Long itemId, + Long rentalId, String assistName ) { } diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java index eb00fc3..ab8e49a 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java @@ -1,10 +1,15 @@ package ssurent.ssurentbe.domain.rental.dto.response; +import ssurent.ssurentbe.domain.rental.entity.RentalHistory; import ssurent.ssurentbe.domain.rental.enums.Status; import java.time.LocalDateTime; +// 서비스 로직 단에서 Status = 에 따라서 List 내부에 구성. +// Status = 대여 -> timeStamp = created_At 인 데이터 1개 제공 +// Status = 반납 -> timeStamp = created_At(대여) , timeStamp = updated_At(반납)인 데이터 2개 제공 public record AdminRentalHistoryResponse( + Long rentalId, LocalDateTime timeStamp, String name, String studentNum, diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java index 0a13e74..7371561 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.java @@ -1,11 +1,24 @@ package ssurent.ssurentbe.domain.rental.dto.response; +import ssurent.ssurentbe.domain.item.entity.Items; +import ssurent.ssurentbe.domain.rental.entity.RentalHistory; + import java.time.LocalDateTime; public record AdminUserRentalItemResponse( - Long RentalId, + Long rentalId, LocalDateTime rentalDate, LocalDateTime returnDate, String itemName ) { + public static AdminUserRentalItemResponse from(RentalHistory rentalHistory) { + Items items = rentalHistory.getItemId(); + String itemName = items.getName() + "(" + items.getItemNum() + ")"; + return new AdminUserRentalItemResponse( + rentalHistory.getId(), + rentalHistory.getRentalDate(), + rentalHistory.getReturnDate(), + itemName + ); + } } diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java index e095f7d..79cafc1 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/dto/response/RentalItemResponse.java @@ -6,8 +6,8 @@ import java.time.LocalDateTime; public record RentalItemResponse( - String rentalId, - String itemId, + Long rentalId, + Long itemId, String itemName, LocalDateTime dueDate ) { diff --git a/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java b/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java index d646e73..cfd4baf 100644 --- a/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java +++ b/src/main/java/ssurent/ssurentbe/domain/rental/entity/RentalHistory.java @@ -46,5 +46,5 @@ public class RentalHistory extends BaseEntity { private Status status; @Column(name = "is_overdue") - private Boolean overdue; + private boolean overdue; } diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java index c8adec9..abdde1a 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java @@ -4,7 +4,6 @@ import java.time.LocalDateTime; public record AdminUserPenaltyCreateRequest ( - LocalDateTime createdAt, String itemName, String penaltyType ){ diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java index e7e96d4..8c400d1 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java @@ -1,7 +1,9 @@ package ssurent.ssurentbe.domain.users.dto.request; +import ssurent.ssurentbe.domain.users.enums.Role; + public record AdminUserRoleUpdateRequest( - String userId, - String role + Long userId, + Role role ) { } diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java index ac01def..6b19b57 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java @@ -1,6 +1,8 @@ package ssurent.ssurentbe.domain.users.dto.request; +import ssurent.ssurentbe.domain.users.enums.Status; + public record AdminUserStatusUpdateRequest( - String status + Status status ) { } diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java index 3f61923..c2d226d 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserDetailResponse.java @@ -2,16 +2,18 @@ import ssurent.ssurentbe.domain.users.entity.UserPenaltyLog; import ssurent.ssurentbe.domain.users.entity.Users; +import ssurent.ssurentbe.domain.users.enums.Role; +import ssurent.ssurentbe.domain.users.enums.Status; import java.util.ArrayList; import java.util.List; public record AdminUserDetailResponse( - String userId, + Long userId, String userName, String studentNum, - String role, - String status, + Role role, + Status status, String phoneNum, List penalties ) { @@ -20,8 +22,8 @@ public static AdminUserDetailResponse from(Users user, List pena user.getId(), user.getName(), user.getStudentNum(), - user.getRole().name(), - user.getStatus().name(), + user.getRole(), + user.getStatus(), user.getPhoneNum(), penalties.stream() .map(UserPenaltyResponse::from) diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java index dc136ad..7838010 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/AdminUserResponse.java @@ -1,5 +1,6 @@ package ssurent.ssurentbe.domain.users.dto.response; +import ssurent.ssurentbe.domain.users.entity.Users; import ssurent.ssurentbe.domain.users.enums.Role; public record AdminUserResponse( @@ -8,4 +9,12 @@ public record AdminUserResponse( String studentNum, Role role ) { + public static AdminUserResponse from(Users user) { + return new AdminUserResponse( + user.getId(), + user.getName(), + user.getStudentNum(), + user.getRole() + ); + } } diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java index b80c3ae..ded7f15 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserPenaltyResponse.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; public record UserPenaltyResponse( - String userPenaltyId, + Long userPenaltyId, LocalDateTime createdAt, String itemName, String penaltyType diff --git a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java index 93373ee..c7d8388 100644 --- a/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java +++ b/src/main/java/ssurent/ssurentbe/domain/users/dto/response/UserResponse.java @@ -5,7 +5,7 @@ import ssurent.ssurentbe.domain.users.enums.Status; public record UserResponse( - String userId, + Long userId, String studentNum, String name, Role role,