[BE][Team09][Bat & Pyro] API 를 JDBC 와 연동

backend/.gitignore

@@ -2,6 +2,10 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+build
+.gradle
+.gradle/**/*
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml

backend/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Apr 20 01:45:16 KST 2021
-gradle.version=6.8.3
+#Thu Apr 29 14:48:25 KST 2021
+gradle.version=7.0

backend/README.md

@@ -5,3 +5,13 @@
 ## API 배포 링크
 
 http://3.37.26.82:8080/swagger-ui.html
+
+## 로컬 IntelliJ 로 실행하는 법
+
+Edit Configurations 에서 Active profile 을 "dev" 혹은 "prod" 로 설정하자
+
+## 빌드한 jar 를 실행하는 법
+
+```sh
+java -jar SideDish-0.0.1-SNAPSHOT.jar --spring.profiles.active=dev   
+```

backend/build.gradle

@@ -17,7 +17,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
     runtimeOnly 'mysql:mysql-connector-java'
+    runtimeOnly 'com.h2database:h2'
 
     // swagger
     implementation 'io.springfox:springfox-swagger2:2.9.2'

backend/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

backend/gradlew.bat

@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="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
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

backend/src/main/java/com/codesquad/sidedish/SideDish/SideDishApplication.java

@@ -6,11 +6,7 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 
-// FIXME: DB 연동을 무효화하기 위해서 임시로 exclude 함, 나중에 수정할 예정
-@SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
-        DataSourceTransactionManagerAutoConfiguration.class,
-        HibernateJpaAutoConfiguration.class})
+@SpringBootApplication
 public class SideDishApplication {
 
     public static void main(String[] args) {

backend/src/main/java/com/codesquad/sidedish/SideDish/controller/DishController.java

@@ -7,10 +7,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -53,24 +50,34 @@ public ResponseEntity<QuantityDto> getDetailQuantity(@ApiParam("요리의 식별
         return ResponseEntity.ok().body(quantityDto);
     }
 
+    @PatchMapping("/detail/{detailHash}/{count}")
+    @ApiOperation(value = "주문하기", notes = "주문하기")
+    public ResponseEntity<String> orderDish(@ApiParam("요리의 식별자") @PathVariable("detailHash") String detailHash, @PathVariable("count") int count) {
+        if (dishService.order(detailHash, count)) {
+            return ResponseEntity.ok().body("주문완료");
+        }
+        return ResponseEntity.ok().body("주문불가");
+    }
+
     @GetMapping("/main")
     @ApiOperation(value = "메인 요리", notes = "메인 요리의 목록을 반환합니다.")
     public ResponseEntity<List<DishDto>> getMainList() {
-        List<DishDto> dishes = dishService.getList(1);
+        List<DishDto> dishes = dishService.getList(1L);
+        return ResponseEntity.ok().body(dishes);
+    }
+
+    @GetMapping("/soup")
+    @ApiOperation(value = "국물 요리", notes = "국물 요리의 목록을 반환합니다.")
+    public ResponseEntity<List<DishDto>> getSoupList() {
+        List<DishDto> dishes = dishService.getList(2L);
         return ResponseEntity.ok().body(dishes);
     }
 
     @GetMapping("/side")
     @ApiOperation(value = "반찬 요리", notes = "반찬 요리의 목록을 반환합니다.")
     public ResponseEntity<List<DishDto>> getSideList() {
-        List<DishDto> dishes = dishService.getList(3);
+        List<DishDto> dishes = dishService.getList(3L);
         return ResponseEntity.ok().body(dishes);
     }
 
-    @GetMapping("/soup")
-    @ApiOperation(value = "국물 요리", notes = "국물 요리의 목록을 반환합니다.")
-    public ResponseEntity<List<DishDto>> getSoupList() {
-        List<DishDto> dishes = dishService.getList(2);
-        return ResponseEntity.ok().body(dishes);
-    }
 }

backend/src/main/java/com/codesquad/sidedish/SideDish/domain/Category.java

@@ -1,11 +1,14 @@
 package com.codesquad.sidedish.SideDish.domain;
 
+import org.springframework.data.annotation.Id;
+
 public class Category {
-    private final long id;
+    @Id
+    private final Long id;
     private final String categoryName;
     private final String endPoint;
 
-    public Category(long id, String categoryName, String endPoint) {
+    public Category(Long id, String categoryName, String endPoint) {
         this.id = id;
         this.categoryName = categoryName;
         this.endPoint = endPoint;
@@ -22,4 +25,13 @@ public String getCategoryName() {
     public String getEndPoint() {
         return endPoint;
     }
+
+    @Override
+    public String toString() {
+        return "Category{" +
+                "id=" + id +
+                ", categoryName='" + categoryName + '\'' +
+                ", endPoint='" + endPoint + '\'' +
+                '}';
+    }
 }

backend/src/main/java/com/codesquad/sidedish/SideDish/domain/CategoryRepository.java

@@ -1,7 +1,12 @@
 package com.codesquad.sidedish.SideDish.domain;
 
+import org.springframework.data.jdbc.repository.query.Query;
+import org.springframework.data.repository.CrudRepository;
+
 import java.util.List;
 
-public interface CategoryRepository {
+public interface CategoryRepository extends CrudRepository<Category, Long> {
+    @Override
+    @Query("SELECT * from sidedish.category")
     List<Category> findAll();
 }

backend/src/main/java/com/codesquad/sidedish/SideDish/domain/Delivery.java

@@ -0,0 +1,33 @@
+package com.codesquad.sidedish.SideDish.domain;
+
+import java.util.Objects;
+
+public class Delivery {
+    private String deliveryType;
+
+    public Delivery(String deliveryType) {
+        this.deliveryType = deliveryType;
+    }
+
+    public String getDeliveryType() {
+        return deliveryType;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Delivery delivery = (Delivery) o;
+        return Objects.equals(deliveryType, delivery.deliveryType);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(deliveryType);
+    }
+}