Edit :: error messages

src/main/java/com/keepgoing/keepserver/domain/book/entity/Book.java → src/main/java/com/keepgoing/keepserver/domain/book/domain/entity/Book.java

@@ -1,8 +1,8 @@
-package com.keepgoing.keepserver.domain.book.entity;
+package com.keepgoing.keepserver.domain.book.domain.entity;
 
 
-import com.keepgoing.keepserver.domain.book.consts.BookState;
-import com.keepgoing.keepserver.domain.user.entity.user.User;
+import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
+import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -47,13 +47,14 @@ public class Book {
     /*
         도서 대여 여부
     */
-    @Column(updatable = false, nullable = false)
+    @Column(nullable = false)
     @Enumerated(EnumType.STRING)
     private BookState state;
 
     /*
         책 이미지 url
     */
+    @Column
     private String imageUrl;
 
     /*

src/main/java/com/keepgoing/keepserver/domain/book/consts/BookState.java → src/main/java/com/keepgoing/keepserver/domain/book/domain/entity/enums/BookState.java

@@ -1,4 +1,4 @@
-package com.keepgoing.keepserver.domain.book.consts;
+package com.keepgoing.keepserver.domain.book.domain.entity.enums;
 
 public enum BookState {
     AVAILABLE,

src/main/java/com/keepgoing/keepserver/domain/book/repository/BookRepository.java → src/main/java/com/keepgoing/keepserver/domain/book/domain/repository/BookRepository.java

@@ -1,7 +1,7 @@
-package com.keepgoing.keepserver.domain.book.repository;
+package com.keepgoing.keepserver.domain.book.domain.repository;
 
-import com.keepgoing.keepserver.domain.book.entity.Book;
-import com.keepgoing.keepserver.domain.user.entity.user.User;
+import com.keepgoing.keepserver.domain.book.domain.entity.Book;
+import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -11,7 +11,6 @@
 @Repository
 public interface BookRepository extends JpaRepository<Book, Long> {
     Book findBookByNfcCode(String NfcCode);
-    List<Book> findByBookNameContaining(String bookName);
-    Optional<Book> findByBookName(String bookName);
+    Optional<Book> findBookByNfcCodeContaining(String NfcCode);
     List<Book> findByBorrower(User borrower);
 }

src/main/java/com/keepgoing/keepserver/domain/book/mapper/BookMapper.java

@@ -1,9 +1,9 @@
 package com.keepgoing.keepserver.domain.book.mapper;
 
-import com.keepgoing.keepserver.domain.book.consts.BookState;
-import com.keepgoing.keepserver.domain.book.entity.Book;
-import com.keepgoing.keepserver.domain.book.entity.dto.BookDto;
-import com.keepgoing.keepserver.domain.book.entity.dto.BookResponseDto;
+import com.keepgoing.keepserver.domain.book.domain.entity.Book;
+import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
+import com.keepgoing.keepserver.domain.book.payload.request.BookDto;
+import com.keepgoing.keepserver.domain.book.payload.response.BookResponseDto;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -22,15 +22,15 @@ public BookResponseDto entityToDto(Book entity) {
                 .build();
     }
 
-    public static Book dtoToEntity(BookDto dto) {
+    public Book dtoToEntity(BookDto dto, String nfcCode) {
         return Book.builder()
-                .bookName(dto.getBookName())
-                .imageUrl(dto.getImageUrl())
+                .bookName(dto.bookName())
+                .imageUrl(dto.imageUrl())
                 .registrationDate(LocalDateTime.now())
-                .rentDate(dto.getRentDate())
-                .writer(dto.getWriter())
+                .rentDate(dto.rentDate())
+                .writer(dto.writer())
                 .state(BookState.AVAILABLE)
-                .nfcCode(dto.getNfcCode())
+                .nfcCode(nfcCode)
                 .build();
     }
 

src/main/java/com/keepgoing/keepserver/domain/book/payload/request/BookDto.java

@@ -0,0 +1,19 @@
+package com.keepgoing.keepserver.domain.book.payload.request;
+
+import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
+import lombok.Builder;
+
+import java.time.LocalDateTime;
+
+@Builder
+public record BookDto (
+        Long id,
+        String bookName,
+        String writer,
+        String imageUrl,
+        String nfcCode,
+        LocalDateTime registrationDate,
+        LocalDateTime rentDate,
+        BookState state
+) {
+}

src/main/java/com/keepgoing/keepserver/domain/book/payload/request/BookRequestDto.java

@@ -0,0 +1,13 @@
+package com.keepgoing.keepserver.domain.book.payload.request;
+
+import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
+import lombok.Builder;
+
+@Builder
+public record BookRequestDto (
+        String name,
+        String nfcCode,
+        String imageUrl,
+        BookState state
+){
+}

src/main/java/com/keepgoing/keepserver/domain/book/entity/dto/BookResponseDto.java → src/main/java/com/keepgoing/keepserver/domain/book/payload/response/BookResponseDto.java

@@ -1,6 +1,6 @@
-package com.keepgoing.keepserver.domain.book.entity.dto;
+package com.keepgoing.keepserver.domain.book.payload.response;
 
-import com.keepgoing.keepserver.domain.book.consts.BookState;
+import com.keepgoing.keepserver.domain.book.domain.entity.enums.BookState;
 import lombok.Builder;
 
 import java.time.LocalDateTime;

src/main/java/com/keepgoing/keepserver/domain/book/presentation/BookController.java

@@ -1,7 +1,7 @@
 package com.keepgoing.keepserver.domain.book.presentation;
 
-import com.keepgoing.keepserver.domain.book.entity.dto.BookDto;
-import com.keepgoing.keepserver.domain.book.entity.dto.BookRequestDto;
+import com.keepgoing.keepserver.domain.book.payload.request.BookDto;
+import com.keepgoing.keepserver.domain.book.payload.request.BookRequestDto;
 import com.keepgoing.keepserver.domain.book.service.BookService;
 import com.keepgoing.keepserver.global.common.BaseResponse;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/keepgoing/keepserver/domain/book/service/BookService.java

@@ -1,11 +1,9 @@
 package com.keepgoing.keepserver.domain.book.service;
 
-import com.keepgoing.keepserver.domain.book.entity.dto.BookDto;
-import com.keepgoing.keepserver.domain.book.entity.dto.BookRequestDto;
+import com.keepgoing.keepserver.domain.book.payload.request.BookDto;
+import com.keepgoing.keepserver.domain.book.payload.request.BookRequestDto;
 import com.keepgoing.keepserver.global.common.BaseResponse;
 import org.springframework.security.core.Authentication;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.io.IOException;
 
 public interface BookService {

src/main/java/com/keepgoing/keepserver/domain/book/service/BookServiceImpl.java

@@ -1,20 +1,19 @@
 package com.keepgoing.keepserver.domain.book.service;
 
-import com.keepgoing.keepserver.domain.book.entity.Book;
-import com.keepgoing.keepserver.domain.book.entity.dto.BookDto;
-import com.keepgoing.keepserver.domain.book.entity.dto.BookRequestDto;
+import com.keepgoing.keepserver.domain.book.domain.entity.Book;
+import com.keepgoing.keepserver.domain.book.payload.request.BookDto;
+import com.keepgoing.keepserver.domain.book.payload.request.BookRequestDto;
 import com.keepgoing.keepserver.domain.book.mapper.BookMapper;
-import com.keepgoing.keepserver.domain.book.repository.BookRepository;
-import com.keepgoing.keepserver.domain.user.entity.user.User;
-import com.keepgoing.keepserver.domain.user.repository.user.UserRepository;
+import com.keepgoing.keepserver.domain.book.domain.repository.BookRepository;
+import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
+import com.keepgoing.keepserver.domain.user.domain.repository.user.UserRepository;
 import com.keepgoing.keepserver.global.common.BaseResponse;
 import com.keepgoing.keepserver.global.exception.book.BookException;
 import com.keepgoing.keepserver.global.util.GenerateCertCharacter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Optional;
@@ -30,18 +29,15 @@ public class BookServiceImpl implements BookService {
     @Override
     public BaseResponse bookRegister(BookDto bookDto) {
         String nfcCode = createNfcCode();
-        bookDto.setNfcCode(nfcCode);
-        bookRepository.save(bookMapper.dtoToEntity(bookDto));
+        bookRepository.save(bookMapper.dtoToEntity(bookDto, nfcCode));
         return new BaseResponse(HttpStatus.OK, "책 생성 성공");
     }
 
-    @Transactional(readOnly = true)
     @Override
     public BaseResponse selectAllBook() {
         return new BaseResponse(HttpStatus.OK, "책 불러오기 성공", bookRepository.findAll());
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public BaseResponse deleteBook(String nfcCode, Authentication auth) {
         if (nfcCode == null || nfcCode.isEmpty()) {
@@ -80,15 +76,13 @@ public String createNfcCode() {
         return newNfcCode;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public BaseResponse editBook(String nfcCode, BookRequestDto bookRequest) {
         Book book = bookRepository.findBookByNfcCode(nfcCode);
 
-        if (bookRequest.getState() != null) book.setState(bookRequest.getState());
-        if (bookRequest.getWriter() != null) book.setWriter(bookRequest.getWriter());
-        if (bookRequest.getImageUrl() != null) book.setImageUrl(bookRequest.getImageUrl());
-        if (bookRequest.getName() != null) book.setBookName(bookRequest.getName());
+        if (bookRequest.state() != null) book.setState(bookRequest.state());
+        if (bookRequest.imageUrl() != null) book.setImageUrl(bookRequest.imageUrl());
+        if (bookRequest.name() != null) book.setBookName(bookRequest.name());
         bookRepository.save(book);
         return new BaseResponse(HttpStatus.OK, "책 정보 수정 성공");
     }

src/main/java/com/keepgoing/keepserver/domain/device/entity/Device.java → src/main/java/com/keepgoing/keepserver/domain/device/domain/entity/Device.java

@@ -1,15 +1,13 @@
-package com.keepgoing.keepserver.domain.device.entity;
+package com.keepgoing.keepserver.domain.device.domain.entity;
 
-import com.keepgoing.keepserver.domain.device.enums.DeviceStatus;
-import com.keepgoing.keepserver.domain.user.entity.user.User;
+import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
+import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.time.LocalDateTime;
 
-import static com.keepgoing.keepserver.domain.device.enums.DeviceStatus.AVAILABLE;
-
 @Entity
 @Setter
 @Getter
@@ -39,7 +37,7 @@ public class Device {
     */
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private DeviceStatus status = AVAILABLE;
+    private DeviceStatus status = DeviceStatus.AVAILABLE;
 
     /*
         기기 등록일

src/main/java/com/keepgoing/keepserver/domain/device/enums/DeviceStatus.java → src/main/java/com/keepgoing/keepserver/domain/device/domain/entity/enums/DeviceStatus.java

@@ -1,4 +1,4 @@
-package com.keepgoing.keepserver.domain.device.enums;
+package com.keepgoing.keepserver.domain.device.domain.entity.enums;
 
 public enum DeviceStatus {
     AVAILABLE,

src/main/java/com/keepgoing/keepserver/domain/device/repository/DeviceRepository.java → src/main/java/com/keepgoing/keepserver/domain/device/domain/repository/DeviceRepository.java

@@ -1,7 +1,7 @@
-package com.keepgoing.keepserver.domain.device.repository;
+package com.keepgoing.keepserver.domain.device.domain.repository;
 
-import com.keepgoing.keepserver.domain.device.entity.Device;
-import com.keepgoing.keepserver.domain.user.entity.user.User;
+import com.keepgoing.keepserver.domain.device.domain.entity.Device;
+import com.keepgoing.keepserver.domain.user.domain.entity.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/keepgoing/keepserver/domain/device/mapper/DeviceMapper.java

@@ -1,7 +1,7 @@
 package com.keepgoing.keepserver.domain.device.mapper;
 
-import com.keepgoing.keepserver.domain.device.entity.Device;
-import com.keepgoing.keepserver.domain.device.enums.DeviceStatus;
+import com.keepgoing.keepserver.domain.device.domain.entity.Device;
+import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
 import com.keepgoing.keepserver.domain.device.payload.response.DeviceResponseDto;
 import com.keepgoing.keepserver.domain.device.payload.request.DeviceDto;
 import org.springframework.stereotype.Component;
@@ -12,17 +12,18 @@
 
 @Component
 public class DeviceMapper {
-    public static DeviceResponseDto entityToDto(Device entity) {
+    public DeviceResponseDto entityToDto(Device entity) {
         return DeviceResponseDto.builder()
                 .id(entity.getId())
                 .deviceName(entity.getDeviceName())
                 .imgUrl(entity.getImgUrl())
+                .regDate(entity.getRegDate())
                 .rentDate(entity.getRentDate())
                 .status(entity.getStatus())
                 .build();
     }
 
-    public static Device dtoToEntity(DeviceDto dto) {
+    public Device dtoToEntity(DeviceDto dto) {
         return Device.builder()
                 .deviceName(dto.deviceName())
                 .imgUrl(dto.imgUrl())
@@ -32,9 +33,9 @@ public static Device dtoToEntity(DeviceDto dto) {
                 .build();
     }
 
-    public static List<DeviceResponseDto> convertDevicesToDtos(List<Device> devices) {
+    public List<DeviceResponseDto> convertDevicesToDtos(List<Device> devices) {
         return devices.stream()
-                .map(DeviceMapper::entityToDto)
+                .map(this::entityToDto)
                 .collect(Collectors.toList());
     }
 }

src/main/java/com/keepgoing/keepserver/domain/device/payload/request/DeviceDto.java

@@ -1,6 +1,6 @@
 package com.keepgoing.keepserver.domain.device.payload.request;
 
-import com.keepgoing.keepserver.domain.device.enums.DeviceStatus;
+import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
 
 import java.time.LocalDateTime;
 

src/main/java/com/keepgoing/keepserver/domain/device/payload/request/DeviceEditRequest.java

@@ -0,0 +1,10 @@
+package com.keepgoing.keepserver.domain.device.payload.request;
+
+import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
+
+public record DeviceEditRequest (
+        String deviceName,
+        String imgUrl,
+        DeviceStatus status
+) {
+}

src/main/java/com/keepgoing/keepserver/domain/device/payload/response/DeviceResponseDto.java

@@ -1,6 +1,6 @@
 package com.keepgoing.keepserver.domain.device.payload.response;
 
-import com.keepgoing.keepserver.domain.device.enums.DeviceStatus;
+import com.keepgoing.keepserver.domain.device.domain.entity.enums.DeviceStatus;
 import lombok.Builder;
 
 import java.time.LocalDateTime;