[Feat] DTO 추가, 엔티티 변경

.gitignore

@@ -1,6 +1,8 @@
 HELP.md
 .gradle
 build/
+gradle
+.idea
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/

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
+) {
+}

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
+) {
+}

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
+) {
+}

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,
+        String itemNum
+) {
+}

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<ItemUpdate> itemUpdates
+) {
+    public record ItemUpdate(
+            Long itemId,
+            String status
+    ){
+    }
+}

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
+) {
+}

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<ItemResponse> items
+) {
+}

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
+) {
+}

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(
+        Long categoryId,
+        String categoryName
+) {
+    public static CategoryResponse from(Category category) {
+        return new CategoryResponse(
+                category.getId(),
+                category.getName()
+        );
+    }
+}

src/main/java/ssurent/ssurentbe/domain/item/dto/response/ItemResponse.java

@@ -0,0 +1,24 @@
+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(
+        Long itemId,
+        String itemName,
+        String itemDescription,
+        Status status,
+        Condition condition
+) {
+    public static ItemResponse from(Items item) {
+        String ItemName = item.getName() + "(" + item.getItemNum() + ")";
+        return new ItemResponse(
+                item.getId(),
+                item.getName(),
+                ItemName,
+                item.getStatus(),
+                item.getCondition()
+        );
+    }
+}

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;
 }

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;
 

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;
+}

src/main/java/ssurent/ssurentbe/domain/item/enums/Status.java

@@ -1,7 +1,13 @@
 package ssurent.ssurentbe.domain.item.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
 public enum Status {
-    ACTIVE,
-    FIXING,
-    INACTIVE
+    ACTIVE("대여 가능"),
+    INACTIVE("대여 불가");
+
+    private String description;
 }

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<RentalUpdate> rentalUpdates
+) {
+    public record RentalUpdate(
+            Long rentalId,
+            boolean returned
+    ){
+
+    }
+}

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(
+        Long rentalId,
+        LocalDateTime dueDate
+) {
+}

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(
+        Long rentalId,
+        String problem
+) {
+}

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(
+        Long itemId,
+        String assistName
+){
+}

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(
+        Long itemId,
+        Long rentalId,
+        String assistName
+) {
+}

src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminRentalHistoryResponse.java

@@ -0,0 +1,22 @@
+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,
+        String phNum,
+        Status status,
+        String itemName,
+        String itemNum,
+        boolean isOverdue
+) {
+}

src/main/java/ssurent/ssurentbe/domain/rental/dto/response/AdminUserRentalItemResponse.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 AdminUserRentalItemResponse(
+        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
+        );
+    }
+}

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(
+        Long rentalId,
+        Long 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()
+        );
+    }
+}

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;
 }

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
 }

src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserPenaltyCreateRequest.java

@@ -0,0 +1,10 @@
+package ssurent.ssurentbe.domain.users.dto.request;
+
+
+import java.time.LocalDateTime;
+
+public record AdminUserPenaltyCreateRequest (
+        String itemName,
+        String penaltyType
+){
+}

src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserRoleUpdateRequest.java

@@ -0,0 +1,9 @@
+package ssurent.ssurentbe.domain.users.dto.request;
+
+import ssurent.ssurentbe.domain.users.enums.Role;
+
+public record AdminUserRoleUpdateRequest(
+        Long userId,
+        Role role
+) {
+}

src/main/java/ssurent/ssurentbe/domain/users/dto/request/AdminUserStatusUpdateRequest.java

@@ -0,0 +1,8 @@
+package ssurent.ssurentbe.domain.users.dto.request;
+
+import ssurent.ssurentbe.domain.users.enums.Status;
+
+public record AdminUserStatusUpdateRequest(
+        Status status
+) {
+}

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
+) {
+}