feat: 책 기능을 추가했습니다.

README.md

@@ -60,7 +60,6 @@ compiler(`⌘,` > `Build, Execution, Deployment` > `Compiler` > `Java Compiler`
 ./gradlew asciidoctor
 ```
 
-
 `/build/asciidoc/html5/api-doc.html` 에서 api 문서를 확인할 수 있습니다.
 
 

build.gradle

@@ -66,6 +66,10 @@ dependencies {
     implementation 'org.hibernate:hibernate-core'
     implementation 'org.hibernate:hibernate-entitymanager'
 
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: '2.18.1'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.1'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.18.1'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.18.1'
     //compile group: 'io.springfox', name: 'springfox-swagger2', version: '3.0.0'
     //compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.9.2'
 

src/main/java/org/poolc/api/activity/domain/Session.java

@@ -98,4 +98,4 @@ public int hashCode() {
         return Objects.hash(getId(), getActivity(), getDescription(), getDate(), getSessionNumber());
     }
 
-}
+}

src/main/java/org/poolc/api/badge/service/BadgeService.java

@@ -139,17 +139,16 @@ public Badge getBadgeByBadgeId(Long badgeId){
     }
 
     //뱃지가 존재하고, 해당 뱃지를 받은 적이 없을 경우에만 지급함
+    @Transactional
     public void badgeGiver(Member member, Long badgeId){
         if(duplicateBadgeLogCheck(badgeId, member)&&badgeRepository.findBadgeById(badgeId).isPresent()){
-            if(badgeLogRepository.findBadgeLogByUUID(member.getUUID(),badgeId).isEmpty()) {
-                Badge badge = getBadgeByBadgeId(badgeId);
-                badgeLogRepository.save(BadgeLog.builder()
-                        .member(member)
-                        .date(LocalDate.now())
-                        .badge(badge)
-                        .build());
-                notificationService.createBadgeNotification(member);
-            }
+            Badge badge = getBadgeByBadgeId(badgeId);
+            badgeLogRepository.save(BadgeLog.builder()
+                    .member(member)
+                    .date(LocalDate.now())
+                    .badge(badge)
+                    .build());
+            notificationService.createBadgeNotification(member);
         }
     }
 }

src/main/java/org/poolc/api/book/client/BookClient.java

@@ -0,0 +1,12 @@
+package org.poolc.api.book.client;
+
+import org.poolc.api.book.dto.response.BookApiResponse;
+
+import javax.management.modelmbean.XMLParseException;
+import java.util.List;
+
+public interface BookClient {
+
+    List<BookApiResponse> searchBooks(String query, int page) throws XMLParseException;
+
+}

src/main/java/org/poolc/api/book/client/NaverBookClient.java

@@ -0,0 +1,65 @@
+package org.poolc.api.book.client;
+
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import lombok.RequiredArgsConstructor;
+import org.poolc.api.book.dto.response.BookApiResponse;
+import org.poolc.api.book.dto.response.NaverApiResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import javax.management.modelmbean.XMLParseException;
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class NaverBookClient implements BookClient{
+
+    @Value("${book.api.url}")
+    private String url;
+
+    @Value("${book.api.secret}")
+    private String clientSecret;
+
+    @Value("${book.api.id}")
+    private String clientId;
+
+    private final RestTemplate restTemplate;
+
+    private static final int PAGE_SIZE = 10;
+
+    @Override
+    public List<BookApiResponse> searchBooks(String query, int page) throws XMLParseException {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("X-Naver-Client-Id", clientId);
+        headers.set("X-Naver-Client-Secret", clientSecret);
+
+        HttpEntity<String> entity = new HttpEntity<>(headers);
+
+        String url = new StringBuilder(this.url)
+                .append("?query=").append(query)
+                .append("&display=").append(PAGE_SIZE)
+                .append("&start=").append(page * PAGE_SIZE + 1)
+                .toString();
+
+        String xmlResponse = restTemplate.exchange(url, HttpMethod.GET, entity, String.class).getBody();
+        System.out.println(xmlResponse);
+
+
+        try {
+            NaverApiResponse naverApiResponse = parseBooks(xmlResponse);
+            return naverApiResponse.getChannel().getItems();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new XMLParseException("Failed to parse XML response");
+        }
+    }
+
+    private NaverApiResponse parseBooks(String xmlResponse) throws Exception {
+        XmlMapper xmlMapper = new XmlMapper();
+        return xmlMapper.readValue(xmlResponse, NaverApiResponse.class);
+    }
+}

src/main/java/org/poolc/api/book/controller/BookController.java

@@ -1,70 +1,106 @@
 package org.poolc.api.book.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.poolc.api.book.dto.BookRequest;
-import org.poolc.api.book.dto.BookResponse;
+import org.poolc.api.book.client.BookClient;
+import org.poolc.api.book.dto.request.CreateBookRequest;
+import org.poolc.api.book.dto.request.UpdateBookRequest;
 import org.poolc.api.book.service.BookService;
-import org.poolc.api.book.vo.BookCreateValues;
-import org.poolc.api.book.vo.BookUpdateValues;
 import org.poolc.api.member.domain.Member;
-import org.springframework.http.MediaType;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
-
-import static java.util.stream.Collectors.toList;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
 
 @RestController
-@RequiredArgsConstructor
 @RequestMapping("/book")
+@RequiredArgsConstructor
 public class BookController {
 
+    private final BookClient bookClient;
     private final BookService bookService;
 
-    @GetMapping(value = "/{bookID}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<BookResponse> findOneBookWithBorrower(@PathVariable("bookID") Long id) {
-        return ResponseEntity.ok().body(BookResponse.of(bookService.findOneBook(id)));
+    @GetMapping("/search")
+    public ResponseEntity<?> searchBooks(@RequestParam String query,
+                                         @RequestParam(value = "page", defaultValue = "0") @Min(0) Integer page) {
+        try {
+            return new ResponseEntity<>(bookClient.searchBooks(query, page), HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
-    @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<HashMap<String, List<BookResponse>>> findBooks() {
-        HashMap<String, List<BookResponse>> responseBody = new HashMap<>();
-        responseBody.put("data", bookService.findBooks().stream()
-                .map(BookResponse::of)
-                .collect(toList()));
-        return ResponseEntity.ok().body(responseBody);
+    @GetMapping("/all")
+    public ResponseEntity<?> getAllBooks(@RequestParam(value = "page", defaultValue = "0") @Min(0) Integer page) {
+        try {
+            return new ResponseEntity<>(bookService.getAllBooks(page), HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
-    @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<Void> registerBook(@RequestBody BookRequest requestBody) {
-        bookService.saveBook(new BookCreateValues(requestBody));
-        return ResponseEntity.ok().build();
+    @GetMapping("/{id}")
+    public ResponseEntity<?> getBook(@PathVariable Long id) {
+        try {
+            return new ResponseEntity<>(bookService.getBook(id), HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
-    @DeleteMapping(value = "/{bookID}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<Void> deleteBook(@PathVariable("bookID") Long id) {
-        bookService.deleteBook(id);
-        return ResponseEntity.ok().build();
+    @PostMapping("/new")
+    public ResponseEntity<?> addBook(@AuthenticationPrincipal Member member,
+                                     @Valid @RequestBody CreateBookRequest request) {
+        try {
+            bookService.createBook(member, request);
+            return new ResponseEntity<>(HttpStatus.CREATED);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
-    @PutMapping(value = "/{bookID}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<Void> updateBook(@RequestBody BookRequest requestBody, @PathVariable("bookID") Long id) {
-        bookService.updateBook(id, new BookUpdateValues(requestBody));
-        return ResponseEntity.ok().build();
+    @DeleteMapping("/{id}")
+    public ResponseEntity<?> deleteBook(@AuthenticationPrincipal Member member, @PathVariable Long id) {
+        try {
+            bookService.deleteBook(member, id);
+            return new ResponseEntity<>(HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
-    @PutMapping(value = "/borrow/{bookID}")
-    public ResponseEntity borrowBook(@AuthenticationPrincipal Member member, @PathVariable("bookID") Long id) {
-        bookService.borrowBook(member, id);
-        return ResponseEntity.ok().build();
+    @PutMapping("/{id}")
+    public ResponseEntity<?> updateBook(@AuthenticationPrincipal Member member, @PathVariable Long id,
+                                        @Valid @RequestBody UpdateBookRequest request) {
+        try {
+            bookService.updateBook(member, id, request);
+            return new ResponseEntity<>(HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
-    @PutMapping(value = "/return/{bookID}")
-    public ResponseEntity returnBook(@AuthenticationPrincipal Member member, @PathVariable("bookID") Long id) {
-        bookService.returnBook(member, id);
-        return ResponseEntity.ok().build();
+    @PostMapping("/{id}/borrow")
+    public ResponseEntity<?> borrowBook(@AuthenticationPrincipal Member member, @PathVariable Long id) {
+        try {
+            bookService.borrow(member, id);
+            return new ResponseEntity<>(HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
-}
+
+    @PostMapping("/{id}/return")
+    public ResponseEntity<?> returnBook(@AuthenticationPrincipal Member member, @PathVariable Long id) {
+        try {
+            bookService.returnBook(member, id);
+            return new ResponseEntity<>(HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+
+}

src/main/java/org/poolc/api/book/domain/Book.java

@@ -1,11 +1,15 @@
 package org.poolc.api.book.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import org.poolc.api.book.dto.request.UpdateBookRequest;
 import org.poolc.api.common.domain.TimestampEntity;
 import org.poolc.api.member.domain.Member;
 
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.time.LocalDate;
 
 @Entity
@@ -14,7 +18,9 @@
         name = "BOOK_SEQ_GENERATOR",
         sequenceName = "BOOK_SEQ"
 )
+@AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
+@Builder
 public class Book extends TimestampEntity {
 
     @Id
@@ -26,17 +32,32 @@ public class Book extends TimestampEntity {
     @JoinColumn(name = "borrower", referencedColumnName = "UUID")
     private Member borrower = null;
 
-    @Column(name = "title", nullable = false, length = 1024)
+    @Column(name = "title", nullable = false)
     private String title;
 
-    @Column(name = "author", nullable = false, length = 1024)
-    private String author;
+    @Column(name = "link", columnDefinition = "VARCHAR(600)")
+    private String link;
 
-    @Column(name = "image_url", length = 1024)
+    @Column(name = "image_url", columnDefinition = "VARCHAR(600)")
     private String imageURL;
 
-    @Column(name = "info", length = 1024)
-    private String info;
+    @Column(name = "author", nullable = false)
+    private String author;
+
+    @Column(name = "description", columnDefinition = "TEXT")
+    private String description;
+
+    @Column(name = "discount")
+    private Integer discount;
+
+    @Column(name = "isbn")
+    private String isbn;
+
+    @Column(name = "publisher")
+    private String publisher;
+
+    @Column(name = "published_date")
+    private String publishedDate;
 
     @Column(name = "borrow_date")
     private LocalDate borrowDate;
@@ -48,14 +69,6 @@ public class Book extends TimestampEntity {
     protected Book() {
     }
 
-    public Book(String title, String author, String imageURL, String info, BookStatus status) {
-        this.title = title;
-        this.author = author;
-        this.imageURL = imageURL;
-        this.info = info;
-        this.status = status;
-    }
-
     public void borrowBook(Member member) {
         this.status = BookStatus.UNAVAILABLE;
         this.borrowDate = LocalDate.now();
@@ -68,10 +81,16 @@ public void returnBook() {
         this.borrower = null;
     }
 
-    public void update(String title, String author, String imageURL, String info) {
-        this.title = title;
-        this.author = author;
-        this.imageURL = imageURL;
-        this.info = info;
+    public void update(UpdateBookRequest request) {
+        if (request.getTitle() != null) this.title = request.getTitle();
+        if (request.getLink() != null) this.link = request.getLink();
+        if (request.getImage() != null) this.imageURL = request.getImage();
+        if (request.getAuthor() != null) this.author = request.getAuthor();
+        if (request.getDescription() != null) this.description = request.getDescription();
+        if (request.getDiscount() != null) this.discount = request.getDiscount();
+        if (request.getIsbn() != null) this.isbn = request.getIsbn();
+        if (request.getPublisher() != null) this.publisher = request.getPublisher();
+        if (request.getPubdate() != null) this.publishedDate = request.getPubdate();
     }
+
 }

src/main/java/org/poolc/api/book/domain/BookBorrower.java

@@ -0,0 +1,8 @@
+package org.poolc.api.book.domain;
+
+public class BookBorrower {
+    // maps book with user who borrowed it
+    private Long bookId;
+    private Long userId;
+
+}

src/main/java/org/poolc/api/book/domain/BorrowStatus.java

@@ -0,0 +1,5 @@
+package org.poolc.api.book.domain;
+
+public enum BorrowStatus {
+    BORROWED, RETURNED, EXTENDED, OVERDUE
+}