diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..bbc28df --- /dev/null +++ b/HELP.md @@ -0,0 +1,14 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.1.5/gradle-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.1.5/gradle-plugin/reference/html/#build-image) + +### Additional Links +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index 9a1b890..c9dcbbb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ -# Java base repository - -Java 관련하여 스터디한 내용을 올리는 Repository 입니다. +# Spring base repository +Spring 관련하여 스터디한 내용을 올리는 Repository 입니다. diff --git a/build.gradle b/build.gradle index f7beddb..aeb6049 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,34 @@ plugins { - id 'java' + id 'java' + id 'org.springframework.boot' version '3.1.5' + id 'io.spring.dependency-management' version '1.1.3' } -group = 'org.example' -version = '1.0-SNAPSHOT' +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} repositories { - mavenCentral() + mavenCentral() } dependencies { - testImplementation platform('org.junit:junit-bom:5.9.1') - testImplementation 'org.junit.jupiter:junit-jupiter' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.mariadb.jdbc:mariadb-java-client' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' +} + +tasks.named('bootBuildImage') { + builder = 'paketobuildpacks/builder-jammy-base:latest' } -test { - useJUnitPlatform() +tasks.named('test') { + useJUnitPlatform() } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df2827a..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Oct 16 17:13:00 KST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 1b6c787..1aa94a4 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 26a19f0..0a383dd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ -rootProject.name = 'Laboratory' - +rootProject.name = 'demo' diff --git a/src/main/java/CalculatorExample/Calculable.java b/src/main/java/CalculatorExample/Calculable.java deleted file mode 100644 index e7c700d..0000000 --- a/src/main/java/CalculatorExample/Calculable.java +++ /dev/null @@ -1,13 +0,0 @@ -package CalculatorExample; - -public interface Calculable { - int add(int a, int b); - - int sub(int a, int b); - - int mul(int a, int b); - - int div(int a, int b); - - int mod(int a, int b); -} diff --git a/src/main/java/CalculatorExample/Calculator.java b/src/main/java/CalculatorExample/Calculator.java deleted file mode 100644 index 401c25b..0000000 --- a/src/main/java/CalculatorExample/Calculator.java +++ /dev/null @@ -1,28 +0,0 @@ -package CalculatorExample; - -public class Calculator implements Calculable { - @Override - public int add(int a, int b) { - return a + b; - } - - @Override - public int sub(int a, int b) { - return a - b; - } - - @Override - public int mul(int a, int b) { - return a * b; - } - - @Override - public int div(int a, int b) { - return a / b; - } - - @Override - public int mod(int a, int b) { - return 0; - } -} diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..0ca87a3 --- /dev/null +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } +} + + diff --git a/src/main/java/com/example/demo/controller/BookController.java b/src/main/java/com/example/demo/controller/BookController.java new file mode 100644 index 0000000..0152ce5 --- /dev/null +++ b/src/main/java/com/example/demo/controller/BookController.java @@ -0,0 +1,70 @@ +package com.example.demo.controller; + +import com.example.demo.domain.dto.request.BorrowBookDTO; +import com.example.demo.domain.dto.request.RegisterBookDTO; +import com.example.demo.domain.dto.request.ReturnBookDTO; +import com.example.demo.domain.dto.response.BaseResponse; +import com.example.demo.domain.dto.response.BookResponse; +import com.example.demo.domain.dto.response.BooksResponse; +import com.example.demo.domain.dto.response.OrderResponse; +import com.example.demo.domain.entity.BookCategory; +import com.example.demo.service.BookService; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/jp_library") +public class BookController { + + @Autowired + private BookService bookService; + + @PostMapping(value = "/book", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + public BooksResponse registryBook(@RequestBody RegisterBookDTO registerBookDTO) { + return bookService.registryBook(registerBookDTO); + } + + @GetMapping("/books") + public BooksResponse findAll() { + return bookService.findAllBook(); + } + + @GetMapping("/book/{isbn}") + public BooksResponse findByIsbn(@PathVariable String isbn) { + return bookService.findByIsbn(isbn); + } + + @GetMapping("/books/title") + public BooksResponse findAllContainsTitle(@RequestParam("contains") String title) { + return bookService.findAllContainsTitle(title); + } + + @GetMapping("/book/authorName") + public BooksResponse findAllContainsAuthor(@RequestParam("contains") String authorName) { + return bookService.findAllContainsAuthor(authorName); + } + + @GetMapping("/books/category") + public BooksResponse findAllByCategory(@RequestParam("name") String categoryName) { + return bookService.findAllByCategory(BookCategory.valueOf(categoryName)); + } + + @PatchMapping(value = "/book/borrow", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + public OrderResponse borrowBook(@RequestBody BorrowBookDTO borrowBookDTO) { + return bookService.borrowBook(borrowBookDTO); + } + + @PatchMapping(value = "/book/return", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + public OrderResponse returnBook(@RequestBody ReturnBookDTO returnBookDTO) { + return bookService.returnBook(returnBookDTO); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/dto/request/BorrowBookDTO.java b/src/main/java/com/example/demo/domain/dto/request/BorrowBookDTO.java new file mode 100644 index 0000000..e5ed88d --- /dev/null +++ b/src/main/java/com/example/demo/domain/dto/request/BorrowBookDTO.java @@ -0,0 +1,8 @@ +package com.example.demo.domain.dto.request; + +import lombok.Getter; + +@Getter +public class BorrowBookDTO { + String isbn; +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/dto/request/RegisterBookDTO.java b/src/main/java/com/example/demo/domain/dto/request/RegisterBookDTO.java new file mode 100644 index 0000000..b0dfc91 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dto/request/RegisterBookDTO.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.dto.request; + +import com.example.demo.domain.entity.BookCategory; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class RegisterBookDTO { + + String title; + String isbn; + String author; + BookCategory category; +} diff --git a/src/main/java/com/example/demo/domain/dto/request/ReturnBookDTO.java b/src/main/java/com/example/demo/domain/dto/request/ReturnBookDTO.java new file mode 100644 index 0000000..e5cc7b9 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dto/request/ReturnBookDTO.java @@ -0,0 +1,8 @@ +package com.example.demo.domain.dto.request; + +import lombok.Getter; + +@Getter +public class ReturnBookDTO { + String isbn; +} diff --git a/src/main/java/com/example/demo/domain/dto/response/BaseResponse.java b/src/main/java/com/example/demo/domain/dto/response/BaseResponse.java new file mode 100644 index 0000000..319ec59 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dto/response/BaseResponse.java @@ -0,0 +1,11 @@ +package com.example.demo.domain.dto.response; + +import lombok.Builder; +import lombok.Getter; +import lombok.experimental.SuperBuilder; + +@Getter +@SuperBuilder +public class BaseResponse { + String message; +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/dto/response/BookResponse.java b/src/main/java/com/example/demo/domain/dto/response/BookResponse.java new file mode 100644 index 0000000..cd78a3d --- /dev/null +++ b/src/main/java/com/example/demo/domain/dto/response/BookResponse.java @@ -0,0 +1,18 @@ +package com.example.demo.domain.dto.response; + +import com.example.demo.domain.entity.BookCategory; +import com.example.demo.domain.entity.BookStatus; +import lombok.Builder; +import lombok.Getter; +import lombok.experimental.SuperBuilder; + + +@Getter +@Builder +public class BookResponse { + String title; + String isbn; + String author; + BookCategory category; + BookStatus status; +} diff --git a/src/main/java/com/example/demo/domain/dto/response/BooksResponse.java b/src/main/java/com/example/demo/domain/dto/response/BooksResponse.java new file mode 100644 index 0000000..0041207 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dto/response/BooksResponse.java @@ -0,0 +1,13 @@ +package com.example.demo.domain.dto.response; + +import lombok.Builder; +import lombok.Getter; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +@Getter +@SuperBuilder +public class BooksResponse extends BaseResponse { + List books; +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/dto/response/OrderResponse.java b/src/main/java/com/example/demo/domain/dto/response/OrderResponse.java new file mode 100644 index 0000000..24d505b --- /dev/null +++ b/src/main/java/com/example/demo/domain/dto/response/OrderResponse.java @@ -0,0 +1,12 @@ +package com.example.demo.domain.dto.response; + +import com.example.demo.domain.entity.BookStatus; +import lombok.Getter; +import lombok.experimental.SuperBuilder; + +@SuperBuilder +@Getter +public class OrderResponse extends BaseResponse { + String isbn; + BookStatus status; +} diff --git a/src/main/java/com/example/demo/domain/entity/Book.java b/src/main/java/com/example/demo/domain/entity/Book.java new file mode 100644 index 0000000..8a8e076 --- /dev/null +++ b/src/main/java/com/example/demo/domain/entity/Book.java @@ -0,0 +1,34 @@ +package com.example.demo.domain.entity; + +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Getter +@Setter +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class Book { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + Long id; + + String title; + String isbn; + String author; + + @Enumerated(EnumType.STRING) + BookCategory category; + @Enumerated(EnumType.STRING) + BookStatus status; +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/entity/BookCategory.java b/src/main/java/com/example/demo/domain/entity/BookCategory.java new file mode 100644 index 0000000..6cab7d2 --- /dev/null +++ b/src/main/java/com/example/demo/domain/entity/BookCategory.java @@ -0,0 +1,10 @@ +package com.example.demo.domain.entity; + +/* + 인문학, 컴퓨터 과학, 수학 으로 분류한다. +*/ +public enum BookCategory { + HUMAN, + CS, + MATH +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/entity/BookStatus.java b/src/main/java/com/example/demo/domain/entity/BookStatus.java new file mode 100644 index 0000000..e554f99 --- /dev/null +++ b/src/main/java/com/example/demo/domain/entity/BookStatus.java @@ -0,0 +1,14 @@ +package com.example.demo.domain.entity; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +/* + 각각 대출 가능, 대출 중인 상태를 의미한다. +*/ +@Getter +public enum BookStatus { + AVAILABLE, + BORROWING +} diff --git a/src/main/java/com/example/demo/repository/BookRepository.java b/src/main/java/com/example/demo/repository/BookRepository.java new file mode 100644 index 0000000..e5eed0b --- /dev/null +++ b/src/main/java/com/example/demo/repository/BookRepository.java @@ -0,0 +1,21 @@ +package com.example.demo.repository; + +import com.example.demo.domain.entity.Book; +import com.example.demo.domain.entity.BookCategory; +import java.sql.SQLException; +import java.util.List; +import org.springframework.stereotype.Repository; + + +@Repository +public interface BookRepository { + Book save(Book book); + List findAll(); + Book findByISBN(String isbn); + List findByTitle(String title); + List findByAuthor(String author); + List findByCategory(BookCategory category); + Book borrowBook(String isbn); + Book returnBook(String isbn); + boolean existsByIsbn(String isbn); +} diff --git a/src/main/java/com/example/demo/repository/JdbcBookRepository.java b/src/main/java/com/example/demo/repository/JdbcBookRepository.java new file mode 100644 index 0000000..3a00702 --- /dev/null +++ b/src/main/java/com/example/demo/repository/JdbcBookRepository.java @@ -0,0 +1,239 @@ +package com.example.demo.repository; + +import com.example.demo.domain.entity.Book; +import com.example.demo.domain.entity.BookCategory; +import com.example.demo.domain.entity.BookStatus; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Repository; + +@Repository +public class JdbcBookRepository implements BookRepository { + private static final String DATABASE_URL = System.getenv("DATABASE_URL"); + private static Connection connection; + private static Statement statement; + private static PreparedStatement preparedStatement; + private static ResultSet rs; + + public JdbcBookRepository(){ +// try { +// connection = DriverManager.getConnection(DATABASE_URL); +// statement = connection.createStatement(); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } + } + + @Override + public Book save(Book book) { + try { + String sql = "insert into book (title, isbn, author, book_category) VALUES (?, ?, ?, ?)"; + preparedStatement = connection.prepareStatement(sql); + + preparedStatement.setNString(1, book.getTitle()); + preparedStatement.setNString(2, book.getIsbn()); + preparedStatement.setNString(3, book.getAuthor()); + preparedStatement.setNString(4, book.getCategory().name()); + + preparedStatement.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + } + return book; + } + + @Override + public Book findByISBN(String isbn) { + try { + String sql = "select * from book where isbn=?"; + preparedStatement = connection.prepareStatement(sql); + + preparedStatement.setString(1, isbn); + rs = preparedStatement.executeQuery(); + if(rs.next()){ + Book book = new Book(); + book.setTitle(rs.getString("title")); + book.setIsbn(rs.getString("isbn")); + book.setAuthor(rs.getString("author")); + book.setCategory(BookCategory.valueOf(rs.getString("book_category"))); + book.setStatus(BookStatus.valueOf(rs.getString("book_status"))); + return book; + } + }catch(SQLException e){ + e.printStackTrace(); + } + return new Book(); + } + + @Override + public boolean existsByIsbn(String isbn) { + + try { + String sql = "select * from book where isbn=?"; + + preparedStatement = connection.prepareStatement(sql); + preparedStatement.setString(1, isbn); + int count = preparedStatement.executeUpdate(); + + if (count == 1){ + return true; + } + }catch (SQLException e){ + e.printStackTrace(); + } + return false; + } + + @Override + public List findAll(){ + List Books = new ArrayList<>(); + try { + String sql = "select * from book"; + + preparedStatement = connection.prepareStatement(sql); + rs = preparedStatement.executeQuery(); + while(rs.next()){ + Book book = new Book(); + book.setTitle(rs.getString("title")); + book.setIsbn(rs.getString("isbn")); + book.setAuthor(rs.getString("author")); + book.setCategory(BookCategory.valueOf(rs.getString("book_category"))); + book.setStatus(BookStatus.valueOf(rs.getString("book_status"))); + Books.add(book); + } + }catch (SQLException e){ + e.printStackTrace(); + } + return Books; + } + + @Override + public List findByTitle(String title){ + List Books = new ArrayList<>(); + try { + String sql = "select * from book where title=?"; + + preparedStatement = connection.prepareStatement(sql); + + preparedStatement.setString(1, title); + rs = preparedStatement.executeQuery(); + + while(rs.next()){ + Book book = new Book(); + book.setTitle(rs.getString("title")); + book.setIsbn(rs.getString("isbn")); + book.setAuthor(rs.getString("author")); + book.setCategory(BookCategory.valueOf(rs.getString("book_category"))); + book.setStatus(BookStatus.valueOf(rs.getString("book_status"))); + Books.add(book); + } + }catch (SQLException e){ + e.printStackTrace(); + } + return Books; + } + @Override + public List findByAuthor(String author){ + + List Books = new ArrayList<>(); + try { + String sql = "select * from book where author=?"; + + preparedStatement = connection.prepareStatement(sql); + + preparedStatement.setString(1, author); + rs = preparedStatement.executeQuery(); + + while(rs.next()){ + Book book = new Book(); + book.setTitle(rs.getString("title")); + book.setIsbn(rs.getString("isbn")); + book.setAuthor(rs.getString("author")); + book.setCategory(BookCategory.valueOf(rs.getString("book_category"))); + book.setStatus(BookStatus.valueOf(rs.getString("book_status"))); + Books.add(book); + } + }catch (SQLException e){ + e.printStackTrace(); + } + return Books; + } + + @Override + public List findByCategory(BookCategory category){ + List Books = new ArrayList<>(); + try { + String sql = "select * from book where category=?"; + + preparedStatement = connection.prepareStatement(sql); + + preparedStatement.setString(1, String.valueOf(category)); + rs = preparedStatement.executeQuery(); + + while(rs.next()){ + Book book = new Book(); + book.setTitle(rs.getString("title")); + book.setIsbn(rs.getString("isbn")); + book.setAuthor(rs.getString("author")); + book.setCategory(BookCategory.valueOf(rs.getString("book_category"))); + book.setStatus(BookStatus.valueOf(rs.getString("book_status"))); + Books.add(book); + } + }catch (SQLException e){ + e.printStackTrace(); + } + return Books; + } + + @Override + public Book borrowBook(String isbn) { + try { + String sql = "update book set book_status = ? where isbn=? "; + preparedStatement = connection.prepareStatement(sql); + + preparedStatement.setString(1, String.valueOf(BookStatus.BORROWING)); + preparedStatement.setString(2, isbn); + + int row = preparedStatement.executeUpdate(); + + if (row > 0) { + Book book = new Book(); + book.setIsbn(isbn); + book.setStatus(BookStatus.BORROWING); + return book; + } + } catch (SQLException e) { + e.printStackTrace(); + } + return new Book(); + } + + @Override + public Book returnBook(String isbn){ + try { + String sql = "update book set book_status = ? where isbn=? "; + preparedStatement = connection.prepareStatement(sql); + + preparedStatement.setString(1, String.valueOf(BookStatus.AVAILABLE)); + preparedStatement.setString(2, isbn); + + int row = preparedStatement.executeUpdate(); + + if (row > 0) { + Book book = new Book(); + book.setIsbn(isbn); + book.setStatus(BookStatus.BORROWING); + return book; + } + } catch (SQLException e) { + e.printStackTrace(); + } + return new Book(); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/JpaBookRepository.java b/src/main/java/com/example/demo/repository/JpaBookRepository.java new file mode 100644 index 0000000..4ddae96 --- /dev/null +++ b/src/main/java/com/example/demo/repository/JpaBookRepository.java @@ -0,0 +1,15 @@ +package com.example.demo.repository; + +import com.example.demo.domain.entity.Book; +import com.example.demo.domain.entity.BookCategory; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface JpaBookRepository extends JpaRepository { + Book findByIsbn(String isbn); + List findByTitleContains(String title); + List findByAuthorContains(String authorName); + List findAllByCategory(BookCategory category); +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/MemoryBookRepository.java b/src/main/java/com/example/demo/repository/MemoryBookRepository.java new file mode 100644 index 0000000..e18c18f --- /dev/null +++ b/src/main/java/com/example/demo/repository/MemoryBookRepository.java @@ -0,0 +1,85 @@ +package com.example.demo.repository; + +import com.example.demo.domain.entity.Book; +import com.example.demo.domain.entity.BookCategory; +import com.example.demo.domain.entity.BookStatus; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; +import org.springframework.stereotype.Repository; + +@Repository +public class MemoryBookRepository implements BookRepository{ + HashMap memoryDB = new HashMap<>(); + + //도서관에 책을 등록하기 + @Override + public Book save(Book book){ + memoryDB.put(book.getIsbn(), book); + return book; + } + + //도서관이 보유한 전체 도서를 조회하기 + @Override + public List findAll(){ + return new ArrayList<>(memoryDB.values()); + } + + //책의 ISBN으로 도서한권을 조회하기 + @Override + public Book findByISBN(String isbn){ + System.out.println(memoryDB.get(isbn)); + return memoryDB.get(isbn); + } + + //책을 도서명으로 조회하기 + @Override + public List findByTitle(String title){ + return memoryDB.values().stream() + .filter(book -> book.getTitle().equals(title)) + .collect(Collectors.toList()); + } + + //책을 저자명으로 조회하기 + @Override + public List findByAuthor(String author){ + return memoryDB.values().stream() + .filter(book -> book.getAuthor().equals(author)) + .collect(Collectors.toList()); + } + + //책을 분류별로 조회하기 + @Override + public List findByCategory(BookCategory category){ + return memoryDB.values().stream() + .filter(book -> book.getCategory().equals(category)) + .collect(Collectors.toList()); + } + + + // 책 대여하기 + @Override + public Book borrowBook(String isbn){ + Book borrowBk = findByISBN(isbn); + if (borrowBk.getStatus()==BookStatus.AVAILABLE){ + borrowBk.setStatus(BookStatus.BORROWING); + } + return borrowBk; + } + + //책 반납하기 + @Override + public Book returnBook(String isbn){ + Book borrowBk = findByISBN(isbn); + if (borrowBk.getStatus()==BookStatus.BORROWING){ + borrowBk.setStatus(BookStatus.AVAILABLE); + } + return borrowBk; + } + + @Override + public boolean existsByIsbn(String isbn) { + return false; + } +} diff --git a/src/main/java/com/example/demo/service/BookService.java b/src/main/java/com/example/demo/service/BookService.java new file mode 100644 index 0000000..8b40783 --- /dev/null +++ b/src/main/java/com/example/demo/service/BookService.java @@ -0,0 +1,307 @@ +package com.example.demo.service; + +import com.example.demo.domain.dto.request.BorrowBookDTO; +import com.example.demo.domain.dto.request.RegisterBookDTO; +import com.example.demo.domain.dto.request.ReturnBookDTO; +import com.example.demo.domain.dto.response.BookResponse; +import com.example.demo.domain.dto.response.BooksResponse; +import com.example.demo.domain.dto.response.OrderResponse; +import com.example.demo.domain.entity.Book; +import com.example.demo.domain.entity.BookCategory; +import com.example.demo.domain.entity.BookStatus; +import com.example.demo.repository.JpaBookRepository; +import jakarta.transaction.Transactional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class BookService { + + @Autowired + JpaBookRepository bookRepository; + + public BooksResponse registryBook(RegisterBookDTO registerBookDTO) { + BooksResponse response; + + try { + Book newBook = Book + .builder() + .title(registerBookDTO.getTitle()) + .isbn(registerBookDTO.getIsbn()) + .author(registerBookDTO.getAuthor()) + .category(registerBookDTO.getCategory()) + .status(BookStatus.AVAILABLE) + .build(); + + Book savedBook = bookRepository.save(newBook); + List books = new ArrayList<>(); + + books.add( + BookResponse + .builder() + .title(savedBook.getTitle()) + .isbn(savedBook.getIsbn()) + .author(savedBook.getAuthor()) + .category(savedBook.getCategory()) + .status(savedBook.getStatus()) + .build() + ); + + response = BooksResponse + .builder() + .message("Success") + .books(books) + .build(); + + } catch (RuntimeException e) { + response = BooksResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } + + public BooksResponse findByIsbn(String isbn) { + BooksResponse response; + + try { + Book findBook = bookRepository.findByIsbn(isbn); + + List books = new ArrayList<>(); + + books.add( + BookResponse + .builder() + .title(findBook.getTitle()) + .isbn(findBook.getIsbn()) + .author(findBook.getAuthor()) + .category(findBook.getCategory()) + .status(findBook.getStatus()) + .build() + ); + + response = BooksResponse + .builder() + .message("Success") + .books(books) + .build(); + + } catch (RuntimeException e) { + response = BooksResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } + + public BooksResponse findAllBook() { + BooksResponse response; + + try { + List findAllBook = bookRepository.findAll(); + List books = new ArrayList<>(); + + for (Book findBook : findAllBook) { + BookResponse bookResponse = BookResponse + .builder() + .title(findBook.getTitle()) + .isbn(findBook.getIsbn()) + .author(findBook.getAuthor()) + .category(findBook.getCategory()) + .status(findBook.getStatus()) + .build(); + + books.add(bookResponse); + } + + response = BooksResponse + .builder() + .message("Success") + .books(books) + .build(); + + } catch (RuntimeException e) { + response = BooksResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } + + public BooksResponse findAllContainsTitle(String title) { + BooksResponse response; + + try { + List findAllBook = bookRepository.findByTitleContains(title); + List books = new ArrayList<>(); + + for (Book findBook : findAllBook) { + BookResponse bookResponse = BookResponse + .builder() + .title(findBook.getTitle()) + .isbn(findBook.getIsbn()) + .author(findBook.getAuthor()) + .category(findBook.getCategory()) + .status(findBook.getStatus()) + .build(); + + books.add(bookResponse); + } + + response = BooksResponse + .builder() + .message("Success") + .books(books) + .build(); + + } catch (RuntimeException e) { + response = BooksResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } + + public BooksResponse findAllContainsAuthor(String authorName) { + BooksResponse response; + + try { + List findAllBook = bookRepository.findByAuthorContains(authorName); + List books = new ArrayList<>(); + + for (Book findBook : findAllBook) { + BookResponse bookResponse = BookResponse + .builder() + .title(findBook.getTitle()) + .isbn(findBook.getIsbn()) + .author(findBook.getAuthor()) + .category(findBook.getCategory()) + .status(findBook.getStatus()) + .build(); + + books.add(bookResponse); + } + + response = BooksResponse + .builder() + .message("Success") + .books(books) + .build(); + + } catch (RuntimeException e) { + response = BooksResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } + + public BooksResponse findAllByCategory(BookCategory category) { + BooksResponse response; + + try { + List findAllBook = bookRepository.findAllByCategory(category); + List books = new ArrayList<>(); + + for (Book findBook : findAllBook) { + BookResponse bookResponse = BookResponse + .builder() + .title(findBook.getTitle()) + .isbn(findBook.getIsbn()) + .author(findBook.getAuthor()) + .category(findBook.getCategory()) + .status(findBook.getStatus()) + .build(); + + books.add(bookResponse); + } + + response = BooksResponse + .builder() + .message("Success") + .books(books) + .build(); + + } catch (RuntimeException e) { + response = BooksResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } + + @Transactional + public OrderResponse borrowBook(BorrowBookDTO borrowBookDTO) { + OrderResponse response; + + try { + Book book = bookRepository.findByIsbn(borrowBookDTO.getIsbn()); + + if (book.getStatus() == BookStatus.AVAILABLE) { + book.setStatus(BookStatus.BORROWING); + + response = OrderResponse + .builder() + .message("Borrowing book") + .isbn(book.getIsbn()) + .status(book.getStatus()) + .build(); + bookRepository.save(book); + } else { + throw new RuntimeException("Book is not available!"); + } + + } catch (RuntimeException e) { + response = OrderResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } + + @Transactional + public OrderResponse returnBook(ReturnBookDTO returnBookDTO) { + OrderResponse response; + + try { + Book book = bookRepository.findByIsbn(returnBookDTO.getIsbn()); + + if (book.getStatus() == BookStatus.AVAILABLE) { + throw new RuntimeException("Book is available!"); + } else { + book.setStatus(BookStatus.AVAILABLE); + + response = OrderResponse + .builder() + .message("Return book") + .isbn(book.getIsbn()) + .status(book.getStatus()) + .build(); + } + } catch (RuntimeException e) { + response = OrderResponse + .builder() + .message(e.getMessage()) + .build(); + } + + return response; + } +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..f1b01f9 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,6 @@ +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.datasource.url=${DATABASE_URL} +spring.datasource.username=${DATABASE_USERNAME} +spring.datasource.password=${DATABASE_PASSWORD} +spring.jpa.hibernate.ddl-auto:create +spring.jpa.properties.hibernate.show_sql=true \ No newline at end of file diff --git a/src/test/java/CalculatorExample/CaclulatorTest.java b/src/test/java/CalculatorExample/CaclulatorTest.java deleted file mode 100644 index 6381033..0000000 --- a/src/test/java/CalculatorExample/CaclulatorTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package CalculatorExample; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class CaclulatorTest { - public Calculator myCalc = new Calculator(); - - @Test - void addTest() { - Assertions.assertEquals(10, myCalc.add(5, 5)); - } - - @Test - void subTest() { - Assertions.assertEquals(0, myCalc.sub(5, 5)); - } - - @Test - void mulTest() { - Assertions.assertEquals(25, myCalc.mul(5, 5)); - } - - @Test - void divTest() { - Assertions.assertEquals(1, myCalc.div(5, 5)); - } - - @Test - void modTest() { - Assertions.assertEquals(0, myCalc.mod(5, 5)); - } -} diff --git a/src/test/java/com/example/demo/DemoApplicationTests.java b/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +}