From 57f3911aa0b8240c1b4583c38b134b3759a7be1c Mon Sep 17 00:00:00 2001 From: Kyu <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 19 Apr 2021 19:04:45 +1200 Subject: [PATCH 01/64] Update README.md --- README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/README.md b/README.md index c04306379..dbbad7392 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,34 @@ # sidedish 그룹프로젝트 #2 + +--- + +## 커밋 메시지 규칙 + +- feat : 새로운 기능 추가 +- fix : 버그 수정 +- docs : 문서의 수정 +- style : (코드의 수정 없이) 스타일(style)만 변경(들여쓰기 같은 포맷이나 세미콜론을 빼먹은 경우) +- refactor : 코드를 리펙토링 +- test : Test 관련한 코드의 추가, 수정 +- chore : (코드의 수정 없이) 설정을 변경 + +커밋은 기본적으로 한글로, 말머리만 영어로 + +--- + +## 브랜치 규칙 + +upstream - dev - FE, BE - 각 브랜치 + +--- + +## 프로젝트 관리 + +![2021-04-19_18-19-57](https://user-images.githubusercontent.com/59721293/115190268-e27e4300-a13b-11eb-962a-ecadd06bae82.jpg) + +--- + +![2021-04-19_18-21-48](https://user-images.githubusercontent.com/59721293/115190453-24a78480-a13c-11eb-9210-8b836843248e.jpg) + + From 97d1844b2b84c2f67a30d3c5f6a11260ba47831d Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 19 Apr 2021 19:36:59 +1200 Subject: [PATCH 02/64] =?UTF-8?q?chore=20:=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/build.gradle | 23 +++++++++++++++++++ .../baminchan/SidedishApplication.java | 13 +++++++++++ .../src/main/resources/application.properties | 6 +++++ .../baminchan/SidedishApplicationTests.java | 13 +++++++++++ 4 files changed, 55 insertions(+) create mode 100644 backend/build.gradle create mode 100644 backend/src/main/java/develop/baminchan/SidedishApplication.java create mode 100644 backend/src/main/resources/application.properties create mode 100644 backend/src/test/java/develop/baminchan/SidedishApplicationTests.java diff --git a/backend/build.gradle b/backend/build.gradle new file mode 100644 index 000000000..50c6f98e6 --- /dev/null +++ b/backend/build.gradle @@ -0,0 +1,23 @@ +plugins { + id 'org.springframework.boot' version '2.4.5' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'develop.baminchan' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + runtimeOnly 'mysql:mysql-connector-java' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +test { + useJUnitPlatform() +} diff --git a/backend/src/main/java/develop/baminchan/SidedishApplication.java b/backend/src/main/java/develop/baminchan/SidedishApplication.java new file mode 100644 index 000000000..ba5345ed8 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/SidedishApplication.java @@ -0,0 +1,13 @@ +package develop.baminchan; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SidedishApplication { + + public static void main(String[] args) { + SpringApplication.run(SidedishApplication.class, args); + } + +} diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties new file mode 100644 index 000000000..910f29813 --- /dev/null +++ b/backend/src/main/resources/application.properties @@ -0,0 +1,6 @@ +logging.level.sql=DEBUG + +spring.datasource.url=jdbc:mysql://localhost:3306/sidedish?autoReconnect=true&useUnicode=true&characterEncoding=UTF8 +spring.datasource.username=root +spring.datasource.password= +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java new file mode 100644 index 000000000..2ca4a84df --- /dev/null +++ b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java @@ -0,0 +1,13 @@ +package develop.baminchan; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SidedishApplicationTests { + + @Test + void contextLoads() { + } + +} From f7377ec9b78cf5c01348d460843b238a81104849 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 19 Apr 2021 20:38:39 +1200 Subject: [PATCH 03/64] =?UTF-8?q?add=20:=20=EC=97=94=ED=8B=B0=ED=8B=B0=20B?= =?UTF-8?q?anchan,=20Category=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/entity/Banchan.java | 67 +++++++++++++++++++ .../develop/baminchan/entity/Category.java | 28 ++++++++ 2 files changed, 95 insertions(+) create mode 100644 backend/src/main/java/develop/baminchan/entity/Banchan.java create mode 100644 backend/src/main/java/develop/baminchan/entity/Category.java diff --git a/backend/src/main/java/develop/baminchan/entity/Banchan.java b/backend/src/main/java/develop/baminchan/entity/Banchan.java new file mode 100644 index 000000000..98968effe --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/Banchan.java @@ -0,0 +1,67 @@ +package develop.baminchan.entity; + +public class Banchan { + private Long id; + private String detailHash; + private String image; + private String alt; + private String[] deliveryType; + private String title; + private String description; + private String nPrice; + private String sPrice; + private String[] badge; + + public Banchan(Long id, String detailHash, String image, String alt, String[] deliveryType, String title, String description, String nPrice, String sPrice, String[] badge) { + this.id = id; + this.detailHash = detailHash; + this.image = image; + this.alt = alt; + this.deliveryType = deliveryType; + this.title = title; + this.description = description; + this.nPrice = nPrice; + this.sPrice = sPrice; + this.badge = badge; + } + + public Long getId() { + return id; + } + + public String getDetailHash() { + return detailHash; + } + + public String getImage() { + return image; + } + + public String getAlt() { + return alt; + } + + public String[] getDeliveryType() { + return deliveryType; + } + + public String getTitle() { + return title; + } + + public String getDescription() { + return description; + } + + public String getnPrice() { + return nPrice; + } + + public String getsPrice() { + return sPrice; + } + + public String[] getBadge() { + return badge; + } +} diff --git a/backend/src/main/java/develop/baminchan/entity/Category.java b/backend/src/main/java/develop/baminchan/entity/Category.java new file mode 100644 index 000000000..bde30cffd --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/Category.java @@ -0,0 +1,28 @@ +package develop.baminchan.entity; + +import java.util.ArrayList; +import java.util.List; + +public class Category { + private String categoryId; + private String name; + private List banchans = new ArrayList<>(); + + public Category(String categoryId, String name, List banchans) { + this.categoryId = categoryId; + this.name = name; + this.banchans = banchans; + } + + public String getCategoryId() { + return categoryId; + } + + public String getName() { + return name; + } + + public List getBanchans() { + return banchans; + } +} From fb62ccbdb0b3f631dd60455637d3a2a5caf672b6 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 08:30:16 +1200 Subject: [PATCH 04/64] =?UTF-8?q?add=20:=20Entity=20User=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/develop/baminchan/entity/User.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 backend/src/main/java/develop/baminchan/entity/User.java diff --git a/backend/src/main/java/develop/baminchan/entity/User.java b/backend/src/main/java/develop/baminchan/entity/User.java new file mode 100644 index 000000000..fc342c165 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/User.java @@ -0,0 +1,37 @@ +package develop.baminchan.entity; + +public class User { + private Long id; + private String username; + private String password; + private String name; + private String email; + + public User(Long id, String username, String password, String name, String email) { + this.id = id; + this.username = username; + this.password = password; + this.name = name; + this.email = email; + } + + public Long getId() { + return id; + } + + public String getUsername() { + return username; + } + + public String getPassword() { + return password; + } + + public String getName() { + return name; + } + + public String getEmail() { + return email; + } +} From 8c62da3ceb09fb359b3eff8acf7e93200b9886ad Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 08:45:13 +1200 Subject: [PATCH 05/64] =?UTF-8?q?delete=20:=20=ED=81=B4=EB=9E=98=EC=8A=A4?= =?UTF-8?q?=20User=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Github Oauth 연동 --- .../java/develop/baminchan/entity/User.java | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 backend/src/main/java/develop/baminchan/entity/User.java diff --git a/backend/src/main/java/develop/baminchan/entity/User.java b/backend/src/main/java/develop/baminchan/entity/User.java deleted file mode 100644 index fc342c165..000000000 --- a/backend/src/main/java/develop/baminchan/entity/User.java +++ /dev/null @@ -1,37 +0,0 @@ -package develop.baminchan.entity; - -public class User { - private Long id; - private String username; - private String password; - private String name; - private String email; - - public User(Long id, String username, String password, String name, String email) { - this.id = id; - this.username = username; - this.password = password; - this.name = name; - this.email = email; - } - - public Long getId() { - return id; - } - - public String getUsername() { - return username; - } - - public String getPassword() { - return password; - } - - public String getName() { - return name; - } - - public String getEmail() { - return email; - } -} From 5cc5704a4c463d4345203ce56fb5d65182ea4eb9 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 11:47:41 +1200 Subject: [PATCH 06/64] =?UTF-8?q?fix=20:=20=ED=81=B4=EB=9E=98=EC=8A=A4=20B?= =?UTF-8?q?anchan=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - detail_hash를 id로 설정 --- .../develop/baminchan/entity/Banchan.java | 60 +++++++++++-------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/entity/Banchan.java b/backend/src/main/java/develop/baminchan/entity/Banchan.java index 98968effe..ff67a7ce4 100644 --- a/backend/src/main/java/develop/baminchan/entity/Banchan.java +++ b/backend/src/main/java/develop/baminchan/entity/Banchan.java @@ -1,36 +1,35 @@ package develop.baminchan.entity; +import org.springframework.data.annotation.Id; + +import java.util.HashMap; + public class Banchan { - private Long id; - private String detailHash; + @Id + private String detail_hash; private String image; private String alt; - private String[] deliveryType; + private DeliveryType delivery_type; private String title; private String description; - private String nPrice; - private String sPrice; - private String[] badge; + private String n_price; + private String s_price; + private Badge badge; - public Banchan(Long id, String detailHash, String image, String alt, String[] deliveryType, String title, String description, String nPrice, String sPrice, String[] badge) { - this.id = id; - this.detailHash = detailHash; + public Banchan(String detail_hash, String image, String alt, DeliveryType delivery_type, String title, String description, String n_price, String s_price, Badge badge) { + this.detail_hash = detail_hash; this.image = image; this.alt = alt; - this.deliveryType = deliveryType; + this.delivery_type = delivery_type; this.title = title; this.description = description; - this.nPrice = nPrice; - this.sPrice = sPrice; + this.n_price = n_price; + this.s_price = s_price; this.badge = badge; } - public Long getId() { - return id; - } - - public String getDetailHash() { - return detailHash; + public String getDetail_hash() { + return detail_hash; } public String getImage() { @@ -41,8 +40,8 @@ public String getAlt() { return alt; } - public String[] getDeliveryType() { - return deliveryType; + public DeliveryType getDelivery_type() { + return delivery_type; } public String getTitle() { @@ -53,15 +52,26 @@ public String getDescription() { return description; } - public String getnPrice() { - return nPrice; + public String getN_price() { + return n_price; } - public String getsPrice() { - return sPrice; + public String getS_price() { + return s_price; } - public String[] getBadge() { + public Badge getBadge() { return badge; } + + public enum DeliveryType { + 새벽배송, + 전국택배 + } + + public enum Badge { + 이벤트특가, + 론칭특가, + 베스트 + } } From c036d5b69a540a4fefbb38d88c825ce307825958 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 11:48:52 +1200 Subject: [PATCH 07/64] =?UTF-8?q?add=20:=20Repo=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/repository/BanchanRepository.java | 9 +++++++++ .../develop/baminchan/repository/CategoryRepository.java | 8 ++++++++ 2 files changed, 17 insertions(+) create mode 100644 backend/src/main/java/develop/baminchan/repository/BanchanRepository.java create mode 100644 backend/src/main/java/develop/baminchan/repository/CategoryRepository.java diff --git a/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java new file mode 100644 index 000000000..9488dd076 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java @@ -0,0 +1,9 @@ +package develop.baminchan.repository; + +import develop.baminchan.entity.Banchan; +import org.springframework.data.jdbc.repository.query.Query; +import org.springframework.data.repository.CrudRepository; + +public interface BanchanRepository extends CrudRepository { + +} diff --git a/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java b/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java new file mode 100644 index 000000000..b95312f97 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java @@ -0,0 +1,8 @@ +package develop.baminchan.repository; + +import develop.baminchan.entity.Category; +import org.springframework.data.repository.CrudRepository; + +public interface CategoryRepository extends CrudRepository { // categoryId 스트링값으로 가져온다? + +} From 793442241b71ef5d64c920ed79e6bd516a67c88a Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 11:55:00 +1200 Subject: [PATCH 08/64] =?UTF-8?q?chore=20:=20spring-data-jdbc=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/build.gradle b/backend/build.gradle index 50c6f98e6..cf9519cda 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -13,6 +13,7 @@ repositories { } dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' implementation 'org.springframework.boot:spring-boot-starter-web' runtimeOnly 'mysql:mysql-connector-java' testImplementation 'org.springframework.boot:spring-boot-starter-test' From cd6efd9c7988e170c9972a75d6d5e83a2d09d010 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 21:56:25 +1200 Subject: [PATCH 09/64] =?UTF-8?q?refactor=20:=20Banchan=EC=9D=98=20Deliver?= =?UTF-8?q?yType=EA=B3=BC=20Badge=EB=A5=BC=20=EA=B0=9D=EC=B2=B4=EB=A1=9C?= =?UTF-8?q?=20=EB=B0=9B=EB=8A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/entity/Banchan.java | 32 +++++++++---------- .../baminchan/entity/banchan/Badge.java | 4 +++ .../entity/banchan/BanchanDetail.java | 4 +++ .../entity/banchan/DeliveryType.java | 4 +++ 4 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/Badge.java create mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java create mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java diff --git a/backend/src/main/java/develop/baminchan/entity/Banchan.java b/backend/src/main/java/develop/baminchan/entity/Banchan.java index ff67a7ce4..be9615ab6 100644 --- a/backend/src/main/java/develop/baminchan/entity/Banchan.java +++ b/backend/src/main/java/develop/baminchan/entity/Banchan.java @@ -1,22 +1,27 @@ package develop.baminchan.entity; +import develop.baminchan.entity.banchan.Badge; +import develop.baminchan.entity.banchan.DeliveryType; import org.springframework.data.annotation.Id; -import java.util.HashMap; +import java.util.Set; public class Banchan { @Id + private Long id; + private String detail_hash; private String image; private String alt; - private DeliveryType delivery_type; + private Set delivery_type; private String title; private String description; private String n_price; private String s_price; - private Badge badge; + private Set badge; - public Banchan(String detail_hash, String image, String alt, DeliveryType delivery_type, String title, String description, String n_price, String s_price, Badge badge) { + public Banchan(Long id, String detail_hash, String image, String alt, Set delivery_type, String title, String description, String n_price, String s_price, Set badge) { + this.id = id; this.detail_hash = detail_hash; this.image = image; this.alt = alt; @@ -28,6 +33,10 @@ public Banchan(String detail_hash, String image, String alt, DeliveryType delive this.badge = badge; } + public Long getId() { + return id; + } + public String getDetail_hash() { return detail_hash; } @@ -40,7 +49,7 @@ public String getAlt() { return alt; } - public DeliveryType getDelivery_type() { + public Set getDelivery_type() { return delivery_type; } @@ -60,18 +69,7 @@ public String getS_price() { return s_price; } - public Badge getBadge() { + public Set getBadge() { return badge; } - - public enum DeliveryType { - 새벽배송, - 전국택배 - } - - public enum Badge { - 이벤트특가, - 론칭특가, - 베스트 - } } diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/Badge.java b/backend/src/main/java/develop/baminchan/entity/banchan/Badge.java new file mode 100644 index 000000000..41d36130b --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/banchan/Badge.java @@ -0,0 +1,4 @@ +package develop.baminchan.entity.banchan; + +public class Badge { +} diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java new file mode 100644 index 000000000..4254f3487 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java @@ -0,0 +1,4 @@ +package develop.baminchan.entity.banchan; + +public class BanchanDetail { +} diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java b/backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java new file mode 100644 index 000000000..2d0d54f5d --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java @@ -0,0 +1,4 @@ +package develop.baminchan.entity.banchan; + +public class DeliveryType { +} From e3247f935ab201d876150815044e912c1c3c71cf Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 21:57:47 +1200 Subject: [PATCH 10/64] =?UTF-8?q?add=20:=20detail=5Fhash=EC=97=90=20?= =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EB=B0=98=EC=B0=AC=20=EC=B0=BE?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/develop/baminchan/repository/BanchanRepository.java | 5 +++-- .../develop/baminchan/repository/CategoryRepository.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java index 9488dd076..e066cf509 100644 --- a/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java +++ b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java @@ -4,6 +4,7 @@ import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; -public interface BanchanRepository extends CrudRepository { - +public interface BanchanRepository extends CrudRepository { + @Query("select * from banchan where detail_hash = :detail_hash") + Banchan findBanchanByDetail_hash(String detail_hash); } diff --git a/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java b/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java index b95312f97..c42290be9 100644 --- a/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java +++ b/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java @@ -3,6 +3,6 @@ import develop.baminchan.entity.Category; import org.springframework.data.repository.CrudRepository; -public interface CategoryRepository extends CrudRepository { // categoryId 스트링값으로 가져온다? +public interface CategoryRepository extends CrudRepository { } From 1e367d5d1bc1d0bda7054bd6c50b074dc2d71c7c Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 21:58:38 +1200 Subject: [PATCH 11/64] =?UTF-8?q?fix:=20Category=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/entity/Category.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/entity/Category.java b/backend/src/main/java/develop/baminchan/entity/Category.java index bde30cffd..b2bc6da3d 100644 --- a/backend/src/main/java/develop/baminchan/entity/Category.java +++ b/backend/src/main/java/develop/baminchan/entity/Category.java @@ -1,28 +1,38 @@ package develop.baminchan.entity; +import org.springframework.data.annotation.Id; + import java.util.ArrayList; import java.util.List; public class Category { - private String categoryId; + @Id + private int id; + + private int category_id; private String name; - private List banchans = new ArrayList<>(); + private List items = new ArrayList<>(); - public Category(String categoryId, String name, List banchans) { - this.categoryId = categoryId; + public Category(int id, int category_id, String name, List items) { + this.id = id; + this.category_id = category_id; this.name = name; - this.banchans = banchans; + this.items = items; + } + + public int getId() { + return id; } - public String getCategoryId() { - return categoryId; + public int getCategory_id() { + return category_id; } public String getName() { return name; } - public List getBanchans() { - return banchans; + public List getItems() { + return items; } } From 4cf5b7de7f3fa671ed55586a61304f779dc3194e Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 21:59:08 +1200 Subject: [PATCH 12/64] =?UTF-8?q?add=20:=20=EA=B8=B0=EB=B3=B8=EC=A0=81?= =?UTF-8?q?=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4,=20=EC=BB=A8=ED=8A=B8?= =?UTF-8?q?=EB=A1=A4=EB=9F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BanchanController.java | 42 +++++++++++++++++ .../controller/CategoryController.java | 46 +++++++++++++++++++ .../baminchan/service/BanchanService.java | 28 +++++++++++ .../baminchan/service/CategoryService.java | 41 +++++++++++++++++ 4 files changed, 157 insertions(+) create mode 100644 backend/src/main/java/develop/baminchan/controller/BanchanController.java create mode 100644 backend/src/main/java/develop/baminchan/controller/CategoryController.java create mode 100644 backend/src/main/java/develop/baminchan/service/BanchanService.java create mode 100644 backend/src/main/java/develop/baminchan/service/CategoryService.java diff --git a/backend/src/main/java/develop/baminchan/controller/BanchanController.java b/backend/src/main/java/develop/baminchan/controller/BanchanController.java new file mode 100644 index 000000000..aaff85e2a --- /dev/null +++ b/backend/src/main/java/develop/baminchan/controller/BanchanController.java @@ -0,0 +1,42 @@ +package develop.baminchan.controller; + +import develop.baminchan.entity.Banchan; +import develop.baminchan.repository.BanchanRepository; +import develop.baminchan.service.BanchanService; +import org.springframework.web.bind.annotation.*; + +import java.util.Optional; + +@RestController +public class BanchanController { + + private BanchanService banchanService; + + public BanchanController(BanchanService banchanService) { + this.banchanService = banchanService; + } + + @GetMapping("/main/{detail_hash}") + public Banchan readOneMain(@PathVariable String detail_hash) { + Banchan banchan = banchanService.findBanchanByDetailHash(detail_hash); + return banchan; + } + +// @GetMapping("/soup/{detail_hash}") +// public Optional readOneSoup(@PathVariable String detail_hash) { +// Optional banchan = banchanService.findBanchanByDetailHash(detail_hash); +// return banchan; +// } +// +// @GetMapping("/side/{detail_hash") +// public Optional readOneSide(@PathVariable String detail_hash) { +// Optional banchan = banchanService.findBanchanByDetailHash(detail_hash); +// return banchan; +// } + + @PostMapping("/create") + public String create(@RequestBody Banchan banchan) { + banchanService.createBanchan(banchan); + return "success"; + } +} diff --git a/backend/src/main/java/develop/baminchan/controller/CategoryController.java b/backend/src/main/java/develop/baminchan/controller/CategoryController.java new file mode 100644 index 000000000..3a1a3e206 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/controller/CategoryController.java @@ -0,0 +1,46 @@ +package develop.baminchan.controller; + +import develop.baminchan.entity.Banchan; +import develop.baminchan.entity.Category; +import develop.baminchan.service.CategoryService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Optional; + +@RestController +public class CategoryController { + + private CategoryService categoryService; + + public CategoryController(CategoryService categoryService) { + this.categoryService = categoryService; + } + + @GetMapping("/best") + public List> findAllBestCategories() { + return categoryService.findAllBestCategories(); + } + +// @GetMapping("/best/{category_id}") +// public List findBestBanchans(@PathVariable Long category_id) { +// return categoryService.findBestBanchans(category_id); +// } +// +// @GetMapping("/main") +// public List findMainBanchans() { +// return categoryService.findMainBanchans(); +// } +// +// @GetMapping("/soup") +// public List findSoupBanchans() { +// return categoryService.findSoupBanchans(); +// } +// +// @GetMapping("/side") +// public List findSideBanchans() { +// return categoryService.findSideBanchans(); +// } +} diff --git a/backend/src/main/java/develop/baminchan/service/BanchanService.java b/backend/src/main/java/develop/baminchan/service/BanchanService.java new file mode 100644 index 000000000..ebcd7df9c --- /dev/null +++ b/backend/src/main/java/develop/baminchan/service/BanchanService.java @@ -0,0 +1,28 @@ +package develop.baminchan.service; + +import develop.baminchan.entity.Banchan; +import develop.baminchan.repository.BanchanRepository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Service +public class BanchanService { + + private BanchanRepository banchanRepository; + + public BanchanService(BanchanRepository banchanRepository) { + this.banchanRepository = banchanRepository; + } + + public Banchan findBanchanByDetailHash(String detail_hash) { + Banchan banchan = banchanRepository.findBanchanByDetail_hash(detail_hash); + return banchan; + } + + @Transactional + public void createBanchan(Banchan banchan) { + banchanRepository.save(banchan); + } +} diff --git a/backend/src/main/java/develop/baminchan/service/CategoryService.java b/backend/src/main/java/develop/baminchan/service/CategoryService.java new file mode 100644 index 000000000..e3713712f --- /dev/null +++ b/backend/src/main/java/develop/baminchan/service/CategoryService.java @@ -0,0 +1,41 @@ +package develop.baminchan.service; + +import develop.baminchan.entity.Banchan; +import develop.baminchan.entity.Category; +import develop.baminchan.repository.CategoryRepository; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +@Service +public class CategoryService { + private CategoryRepository categoryRepository; + + public CategoryService(CategoryRepository categoryRepository) { + this.categoryRepository = categoryRepository; + } + + public List> findAllBestCategories() { + List> allBestCategories = new ArrayList<>(); + allBestCategories.add(categoryRepository.findById(17011200L)); + allBestCategories.add(categoryRepository.findById(17011000L)); + allBestCategories.add(categoryRepository.findById(17010200L)); + allBestCategories.add(categoryRepository.findById(17010300L)); + allBestCategories.add(categoryRepository.findById(17011400L)); + return allBestCategories; + } + +// public List findBestBanchans(Long category_id) { +// } +// +// public List findMainBanchans() { +// } +// +// public List findSoupBanchans() { +// } +// +// public List findSideBanchans() { +// } +} From 328ad5bc9e30f2405d05534c6197f49a6afe8be3 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 20 Apr 2021 21:59:29 +1200 Subject: [PATCH 13/64] =?UTF-8?q?test=20:=20=EA=B8=B0=EB=B3=B8=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baminchan/SidedishApplicationTests.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java index 2ca4a84df..d3f1e8e52 100644 --- a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java +++ b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java @@ -1,13 +1,38 @@ package develop.baminchan; +import develop.baminchan.entity.Banchan; +import develop.baminchan.repository.BanchanRepository; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; +import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; + +@Transactional @SpringBootTest class SidedishApplicationTests { + + private Logger logger = LoggerFactory.getLogger(SidedishApplicationTests.class); + @Autowired + private ApplicationContext ctx; + @Autowired + private BanchanRepository banchanRepository; + @Test + @DisplayName("IoC컨테이너 정상 동작 확인") void contextLoads() { + assertThat(logger).isNotNull(); + assertThat(ctx).isNotNull(); } + @Test + @DisplayName("Banchan에 있는 Badge랑 DeliveryType 잘가져오는지 확인") + void getBanchan() { + } } From 5f188a2bdd5b02b29415b3142475e5403708e558 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 09:53:53 +1200 Subject: [PATCH 14/64] =?UTF-8?q?chore=20:=20=EB=94=94=EB=B9=84=20?= =?UTF-8?q?=EB=B9=84=EB=B2=88=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 910f29813..8db293f31 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -2,5 +2,5 @@ logging.level.sql=DEBUG spring.datasource.url=jdbc:mysql://localhost:3306/sidedish?autoReconnect=true&useUnicode=true&characterEncoding=UTF8 spring.datasource.username=root -spring.datasource.password= +spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver From d48ca5f2c184d03cdc590e7b8e4d68881db18653 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 09:54:32 +1200 Subject: [PATCH 15/64] =?UTF-8?q?delete=20:=20=ED=81=B4=EB=9E=98=EC=8A=A4?= =?UTF-8?q?=20Badge,=20DeliveryType=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 구조 변경으로 필요없음 --- .../src/main/java/develop/baminchan/entity/banchan/Badge.java | 4 ---- .../java/develop/baminchan/entity/banchan/DeliveryType.java | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/Badge.java delete mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/Badge.java b/backend/src/main/java/develop/baminchan/entity/banchan/Badge.java deleted file mode 100644 index 41d36130b..000000000 --- a/backend/src/main/java/develop/baminchan/entity/banchan/Badge.java +++ /dev/null @@ -1,4 +0,0 @@ -package develop.baminchan.entity.banchan; - -public class Badge { -} diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java b/backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java deleted file mode 100644 index 2d0d54f5d..000000000 --- a/backend/src/main/java/develop/baminchan/entity/banchan/DeliveryType.java +++ /dev/null @@ -1,4 +0,0 @@ -package develop.baminchan.entity.banchan; - -public class DeliveryType { -} From 5bb829c22a9290f3fe1cddbd878df78814fe2cc1 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 09:55:38 +1200 Subject: [PATCH 16/64] =?UTF-8?q?fix=20:=20delivery=5Ftype=20&=20badge=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20String=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/develop/baminchan/entity/Banchan.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/entity/Banchan.java b/backend/src/main/java/develop/baminchan/entity/Banchan.java index be9615ab6..712a74ee3 100644 --- a/backend/src/main/java/develop/baminchan/entity/Banchan.java +++ b/backend/src/main/java/develop/baminchan/entity/Banchan.java @@ -1,7 +1,5 @@ package develop.baminchan.entity; -import develop.baminchan.entity.banchan.Badge; -import develop.baminchan.entity.banchan.DeliveryType; import org.springframework.data.annotation.Id; import java.util.Set; @@ -13,14 +11,14 @@ public class Banchan { private String detail_hash; private String image; private String alt; - private Set delivery_type; + private String delivery_type; private String title; private String description; private String n_price; private String s_price; - private Set badge; + private String badge; - public Banchan(Long id, String detail_hash, String image, String alt, Set delivery_type, String title, String description, String n_price, String s_price, Set badge) { + public Banchan(Long id, String detail_hash, String image, String alt, String delivery_type, String title, String description, String n_price, String s_price, String badge) { this.id = id; this.detail_hash = detail_hash; this.image = image; @@ -49,7 +47,7 @@ public String getAlt() { return alt; } - public Set getDelivery_type() { + public String getDelivery_type() { return delivery_type; } @@ -69,7 +67,7 @@ public String getS_price() { return s_price; } - public Set getBadge() { + public String getBadge() { return badge; } } From c81ab8ff47afd1c0f2d20b7092c89d6143cf989e Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 09:59:38 +1200 Subject: [PATCH 17/64] =?UTF-8?q?add=20:=20BanchanDto=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 배열 반환을 위해 Entity는 디비와 1:1매칭이 된다. 배열 반환을 위해서 타입을 배열로 주면 MySQL에서 데이터타입으로 배열로 설정할수 없기때문에 데이터를 집어넣을수없다. 2. 디비는 Entity로, 나머지는 DTO로 데이터를 통신. --- .../develop/baminchan/dto/BanchanDto.java | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 backend/src/main/java/develop/baminchan/dto/BanchanDto.java diff --git a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java new file mode 100644 index 000000000..ca1db84bc --- /dev/null +++ b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java @@ -0,0 +1,77 @@ +package develop.baminchan.dto; + +import develop.baminchan.entity.Banchan; + +public class BanchanDto { + private String detail_hash; + private String image; + private String alt; + private String[] delivery_type; + private String title; + private String description; + private String n_price; + private String s_price; + private String[] badge; + + protected BanchanDto() { + + } + + private BanchanDto(Banchan banchan) { + this.detail_hash = banchan.getDetail_hash(); + this.image = banchan.getImage(); + this.alt = banchan.getAlt(); + this.delivery_type = convertStringToArray(banchan.getDelivery_type()); + this.title = banchan.getTitle(); + this.description = banchan.getDescription(); + this.n_price = banchan.getN_price(); + this.s_price = banchan.getS_price(); + this.badge = convertStringToArray(banchan.getBadge()); + } + + private String[] convertStringToArray(String str) { + String[] arr = str.split(","); + return arr; + } + + // Entity -> DTO + public static BanchanDto of(Banchan banchan) { + return new BanchanDto(banchan); + } + + public String getDetail_hash() { + return detail_hash; + } + + public String getImage() { + return image; + } + + public String getAlt() { + return alt; + } + + public String[] getDelivery_type() { + return delivery_type; + } + + public String getTitle() { + return title; + } + + public String getDescription() { + return description; + } + + public String getN_price() { + return n_price; + } + + public String getS_price() { + return s_price; + } + + public String[] getBadge() { + return badge; + } +} From d40364e15f52bc2992e6b38ab4f2f3bbeb8b4cf0 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 10:01:13 +1200 Subject: [PATCH 18/64] =?UTF-8?q?fix=20:=20Controller,=20Service=EC=97=90?= =?UTF-8?q?=EC=84=9C=20Entity=EA=B0=80=20=EC=95=84=EB=8B=88=EB=9D=BC=20DTO?= =?UTF-8?q?=EB=A5=BC=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/controller/BanchanController.java | 7 ++++--- .../java/develop/baminchan/service/BanchanService.java | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/controller/BanchanController.java b/backend/src/main/java/develop/baminchan/controller/BanchanController.java index aaff85e2a..ec6f35e60 100644 --- a/backend/src/main/java/develop/baminchan/controller/BanchanController.java +++ b/backend/src/main/java/develop/baminchan/controller/BanchanController.java @@ -1,5 +1,6 @@ package develop.baminchan.controller; +import develop.baminchan.dto.BanchanDto; import develop.baminchan.entity.Banchan; import develop.baminchan.repository.BanchanRepository; import develop.baminchan.service.BanchanService; @@ -17,9 +18,9 @@ public BanchanController(BanchanService banchanService) { } @GetMapping("/main/{detail_hash}") - public Banchan readOneMain(@PathVariable String detail_hash) { - Banchan banchan = banchanService.findBanchanByDetailHash(detail_hash); - return banchan; + public BanchanDto findOneMain(@PathVariable String detail_hash) { + BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash); + return banchanDto; } // @GetMapping("/soup/{detail_hash}") diff --git a/backend/src/main/java/develop/baminchan/service/BanchanService.java b/backend/src/main/java/develop/baminchan/service/BanchanService.java index ebcd7df9c..92ebf9751 100644 --- a/backend/src/main/java/develop/baminchan/service/BanchanService.java +++ b/backend/src/main/java/develop/baminchan/service/BanchanService.java @@ -1,5 +1,6 @@ package develop.baminchan.service; +import develop.baminchan.dto.BanchanDto; import develop.baminchan.entity.Banchan; import develop.baminchan.repository.BanchanRepository; import org.springframework.stereotype.Service; @@ -16,9 +17,10 @@ public BanchanService(BanchanRepository banchanRepository) { this.banchanRepository = banchanRepository; } - public Banchan findBanchanByDetailHash(String detail_hash) { + public BanchanDto findBanchanByDetailHash(String detail_hash) { Banchan banchan = banchanRepository.findBanchanByDetail_hash(detail_hash); - return banchan; + BanchanDto banchanDto = BanchanDto.of(banchan); + return banchanDto; } @Transactional From c9949d16b792801b95d07f86cfbad8b989892ccd Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 10:02:03 +1200 Subject: [PATCH 19/64] fix : BanchanDetail directory --- .../src/main/java/develop/baminchan/entity/BanchanDetail.java | 4 ++++ .../java/develop/baminchan/entity/banchan/BanchanDetail.java | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/entity/BanchanDetail.java delete mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java diff --git a/backend/src/main/java/develop/baminchan/entity/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/BanchanDetail.java new file mode 100644 index 000000000..65a9c8f72 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/BanchanDetail.java @@ -0,0 +1,4 @@ +package develop.baminchan.entity; + +public class BanchanDetail { +} diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java deleted file mode 100644 index 4254f3487..000000000 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java +++ /dev/null @@ -1,4 +0,0 @@ -package develop.baminchan.entity.banchan; - -public class BanchanDetail { -} From cfc49fdeecf9c9be34712afa12a6659997cf3255 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 22:22:26 +1200 Subject: [PATCH 20/64] =?UTF-8?q?set=20:=20Null=EA=B0=92=EC=9D=B4=EB=A9=B4?= =?UTF-8?q?=20JSON=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=96=B4?= =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/develop/baminchan/dto/BanchanDto.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java index ca1db84bc..67af7d264 100644 --- a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java +++ b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java @@ -1,7 +1,9 @@ package develop.baminchan.dto; +import com.fasterxml.jackson.annotation.JsonInclude; import develop.baminchan.entity.Banchan; +@JsonInclude(JsonInclude.Include.NON_NULL) public class BanchanDto { private String detail_hash; private String image; From ef29e094f96fa812bb25b8c0ea56a59c8fc3e811 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 22:26:26 +1200 Subject: [PATCH 21/64] =?UTF-8?q?feat=20:=20String=EC=9D=84=20=EB=B0=B0?= =?UTF-8?q?=EC=97=B4=EB=A1=9C=20=EB=B3=80=ED=99=98=ED=95=B4=EC=A4=84?= =?UTF-8?q?=EB=95=8C=20String=EC=9D=B4=20Null=EC=9D=B4=EB=A9=B4=20Null?= =?UTF-8?q?=EB=A1=9C=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 컬럼이 Null일 경우 데이터 대처 --- backend/src/main/java/develop/baminchan/dto/BanchanDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java index 67af7d264..8e2986401 100644 --- a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java +++ b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java @@ -33,7 +33,7 @@ private BanchanDto(Banchan banchan) { private String[] convertStringToArray(String str) { String[] arr = str.split(","); - return arr; + return (str == null) ? null : arr; } // Entity -> DTO From d91be65f31d18fa4e6674dcb109b82c05b0c34c5 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 22:27:39 +1200 Subject: [PATCH 22/64] =?UTF-8?q?add=20:=20=ED=95=84=EB=93=9C=20tag,=20Ban?= =?UTF-8?q?chanDetail=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/entity/Banchan.java | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/entity/Banchan.java b/backend/src/main/java/develop/baminchan/entity/Banchan.java index 712a74ee3..8fa7e2ce5 100644 --- a/backend/src/main/java/develop/baminchan/entity/Banchan.java +++ b/backend/src/main/java/develop/baminchan/entity/Banchan.java @@ -1,8 +1,8 @@ package develop.baminchan.entity; +import develop.baminchan.entity.banchan.BanchanDetail; import org.springframework.data.annotation.Id; - -import java.util.Set; +import org.springframework.data.relational.core.mapping.Embedded; public class Banchan { @Id @@ -18,7 +18,12 @@ public class Banchan { private String s_price; private String badge; - public Banchan(Long id, String detail_hash, String image, String alt, String delivery_type, String title, String description, String n_price, String s_price, String badge) { + private String tag; + + @Embedded.Nullable + private BanchanDetail banchanDetail; + + public Banchan(Long id, String detail_hash, String image, String alt, String delivery_type, String title, String description, String n_price, String s_price, String badge, String tag, BanchanDetail banchanDetail) { this.id = id; this.detail_hash = detail_hash; this.image = image; @@ -29,6 +34,8 @@ public Banchan(Long id, String detail_hash, String image, String alt, String del this.n_price = n_price; this.s_price = s_price; this.badge = badge; + this.tag = tag; + this.banchanDetail = banchanDetail; } public Long getId() { @@ -70,4 +77,32 @@ public String getS_price() { public String getBadge() { return badge; } + + public String getTag() { + return tag; + } + + public BanchanDetail getBanchanDetail() { + return banchanDetail; + } + + + + @Override + public String toString() { + return "Banchan{" + + "id=" + id + + ", detail_hash='" + detail_hash + '\'' + + ", image='" + image + '\'' + + ", alt='" + alt + '\'' + + ", delivery_type='" + delivery_type + '\'' + + ", title='" + title + '\'' + + ", description='" + description + '\'' + + ", n_price='" + n_price + '\'' + + ", s_price='" + s_price + '\'' + + ", badge='" + badge + '\'' + + ", tag='" + tag + '\'' + + ", banchanDetail=" + banchanDetail + + '}'; + } } From d953f3e51f73e3ba939821de3542493b5db1b814 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 22:29:06 +1200 Subject: [PATCH 23/64] add : BanchanDetail, BanchanDetailDto --- .../dto/banchan/BanchanDetailDto.java | 28 +++++++++++++++++++ .../baminchan/entity/BanchanDetail.java | 4 --- .../entity/banchan/BanchanDetail.java | 13 +++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java delete mode 100644 backend/src/main/java/develop/baminchan/entity/BanchanDetail.java create mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java new file mode 100644 index 000000000..62fed9ed7 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -0,0 +1,28 @@ +package develop.baminchan.dto.banchan; + +import develop.baminchan.entity.banchan.BanchanDetail; + +public class BanchanDetailDto { + private String test; + + public BanchanDetailDto(String test) { + this.test = test; + } + + public BanchanDetailDto(BanchanDetail banchanDetail) { + this.test = banchanDetail.getTest(); + } + + public String getTest() { + return test; + } + + @Override + public String toString() { + return "BanchanDetailDto{" + + "test='" + test + '\'' + + '}'; + } + +} + diff --git a/backend/src/main/java/develop/baminchan/entity/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/BanchanDetail.java deleted file mode 100644 index 65a9c8f72..000000000 --- a/backend/src/main/java/develop/baminchan/entity/BanchanDetail.java +++ /dev/null @@ -1,4 +0,0 @@ -package develop.baminchan.entity; - -public class BanchanDetail { -} diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java new file mode 100644 index 000000000..23d363f13 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java @@ -0,0 +1,13 @@ +package develop.baminchan.entity.banchan; + +public class BanchanDetail { + private String test; + + public BanchanDetail(String test) { + this.test = test; + } + + public String getTest() { + return test; + } +} From 4a3a18ff5cfbc20ff2480899cce3d4cafdf2b5db Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Wed, 21 Apr 2021 22:29:54 +1200 Subject: [PATCH 24/64] =?UTF-8?q?feat=20:=20=EB=B0=98=EC=B0=AC=20detail=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20api=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BanchanController.java | 21 +++++++------------ .../baminchan/service/BanchanService.java | 10 +++++++-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/controller/BanchanController.java b/backend/src/main/java/develop/baminchan/controller/BanchanController.java index ec6f35e60..61abc3c03 100644 --- a/backend/src/main/java/develop/baminchan/controller/BanchanController.java +++ b/backend/src/main/java/develop/baminchan/controller/BanchanController.java @@ -1,13 +1,11 @@ package develop.baminchan.controller; import develop.baminchan.dto.BanchanDto; +import develop.baminchan.dto.banchan.BanchanDetailDto; import develop.baminchan.entity.Banchan; -import develop.baminchan.repository.BanchanRepository; import develop.baminchan.service.BanchanService; import org.springframework.web.bind.annotation.*; -import java.util.Optional; - @RestController public class BanchanController { @@ -23,17 +21,12 @@ public BanchanDto findOneMain(@PathVariable String detail_hash) { return banchanDto; } -// @GetMapping("/soup/{detail_hash}") -// public Optional readOneSoup(@PathVariable String detail_hash) { -// Optional banchan = banchanService.findBanchanByDetailHash(detail_hash); -// return banchan; -// } -// -// @GetMapping("/side/{detail_hash") -// public Optional readOneSide(@PathVariable String detail_hash) { -// Optional banchan = banchanService.findBanchanByDetailHash(detail_hash); -// return banchan; -// } + @GetMapping("/detail/{detail_hash}") + public BanchanDetailDto findOneDetail(@PathVariable String detail_hash) { + BanchanDetailDto banchanDetailDto = banchanService.findBanchanDetailByDetailHash(detail_hash); + System.out.println(banchanDetailDto); + return banchanDetailDto; + } @PostMapping("/create") public String create(@RequestBody Banchan banchan) { diff --git a/backend/src/main/java/develop/baminchan/service/BanchanService.java b/backend/src/main/java/develop/baminchan/service/BanchanService.java index 92ebf9751..6650e3318 100644 --- a/backend/src/main/java/develop/baminchan/service/BanchanService.java +++ b/backend/src/main/java/develop/baminchan/service/BanchanService.java @@ -1,13 +1,12 @@ package develop.baminchan.service; import develop.baminchan.dto.BanchanDto; +import develop.baminchan.dto.banchan.BanchanDetailDto; import develop.baminchan.entity.Banchan; import develop.baminchan.repository.BanchanRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - @Service public class BanchanService { @@ -27,4 +26,11 @@ public BanchanDto findBanchanByDetailHash(String detail_hash) { public void createBanchan(Banchan banchan) { banchanRepository.save(banchan); } + + public BanchanDetailDto findBanchanDetailByDetailHash(String detail_hash) { + Banchan banchan = banchanRepository.findBanchanByDetail_hash(detail_hash); + System.out.println(banchan); + BanchanDetailDto banchanDetailDto = new BanchanDetailDto(banchan.getBanchanDetail()); + return banchanDetailDto; + } } From 47edb0fe5f9d47bf15afacb3efb721d8fee6ac0c Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 14:12:14 +1200 Subject: [PATCH 25/64] =?UTF-8?q?fix=20:=20=ED=95=84=EB=93=9C=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baminchan/dto/banchan/BanchanDetailDto.java | 14 +++++++------- .../baminchan/entity/banchan/BanchanDetail.java | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index 62fed9ed7..1ddc6b2c0 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -3,24 +3,24 @@ import develop.baminchan.entity.banchan.BanchanDetail; public class BanchanDetailDto { - private String test; + private String hash; - public BanchanDetailDto(String test) { - this.test = test; + public BanchanDetailDto(String hash) { + this.hash = hash; } public BanchanDetailDto(BanchanDetail banchanDetail) { - this.test = banchanDetail.getTest(); + this.hash = banchanDetail.getHash(); } - public String getTest() { - return test; + public String getHash() { + return hash; } @Override public String toString() { return "BanchanDetailDto{" + - "test='" + test + '\'' + + "hash='" + hash + '\'' + '}'; } diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java index 23d363f13..3c1be63e2 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java @@ -1,13 +1,13 @@ package develop.baminchan.entity.banchan; public class BanchanDetail { - private String test; + private String hash; - public BanchanDetail(String test) { - this.test = test; + public BanchanDetail(String hash) { + this.hash = hash; } - public String getTest() { - return test; + public String getHash() { + return hash; } } From 853c8a9d15d585623e21a5295919ee26ecbce955 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 15:16:22 +1200 Subject: [PATCH 26/64] =?UTF-8?q?feat=20:=20=EC=83=81=EC=84=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/banchan/BanchanDetailDto.java | 21 +++++++++---------- .../entity/banchan/BanchanDetail.java | 13 +++++++++++- .../baminchan/entity/banchan/Data.java | 20 ++++++++++++++++++ 3 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/entity/banchan/Data.java diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index 1ddc6b2c0..300db18f4 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -1,28 +1,27 @@ package develop.baminchan.dto.banchan; +import develop.baminchan.entity.banchan.Data; import develop.baminchan.entity.banchan.BanchanDetail; public class BanchanDetailDto { private String hash; - - public BanchanDetailDto(String hash) { - this.hash = hash; - } + private Data data; public BanchanDetailDto(BanchanDetail banchanDetail) { this.hash = banchanDetail.getHash(); + this.data = banchanDetail.getData(); + } + + public BanchanDetailDto(String hash, Data data) { + this.hash = hash; + this.data = data; } public String getHash() { return hash; } - @Override - public String toString() { - return "BanchanDetailDto{" + - "hash='" + hash + '\'' + - '}'; + public Data getData() { + return data; } - } - diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java index 3c1be63e2..9157324ad 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java @@ -1,13 +1,24 @@ package develop.baminchan.entity.banchan; +import org.springframework.data.relational.core.mapping.Embedded; + public class BanchanDetail { private String hash; - public BanchanDetail(String hash) { + @Embedded.Nullable + private Data data; + + public BanchanDetail(String hash, Data data) { this.hash = hash; + this.data = data; } public String getHash() { return hash; } + + public Data getData() { + return data; + } } + diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/Data.java b/backend/src/main/java/develop/baminchan/entity/banchan/Data.java new file mode 100644 index 000000000..ccd76868a --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/banchan/Data.java @@ -0,0 +1,20 @@ +package develop.baminchan.entity.banchan; + +public class Data { + + private String top_image; + private String thumb_images; + + public Data(String top_image, String thumb_images) { + this.top_image = top_image; + this.thumb_images = thumb_images; + } + + public String getTop_image() { + return top_image; + } + + public String getThumb_images() { + return thumb_images; + } +} From 51307e4d1c3026da0c8f5a0a3ac36610eae6b631 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 15:35:41 +1200 Subject: [PATCH 27/64] =?UTF-8?q?add=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=9A=A9=20toString()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/dto/banchan/BanchanDetailDto.java | 8 ++++++++ .../src/main/java/develop/baminchan/entity/Banchan.java | 2 -- .../develop/baminchan/entity/banchan/BanchanDetail.java | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index 300db18f4..8bd503c97 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -24,4 +24,12 @@ public String getHash() { public Data getData() { return data; } + + @Override + public String toString() { + return "BanchanDetailDto{" + + "hash='" + hash + '\'' + + ", data=" + data + + '}'; + } } diff --git a/backend/src/main/java/develop/baminchan/entity/Banchan.java b/backend/src/main/java/develop/baminchan/entity/Banchan.java index 8fa7e2ce5..0fc806bf1 100644 --- a/backend/src/main/java/develop/baminchan/entity/Banchan.java +++ b/backend/src/main/java/develop/baminchan/entity/Banchan.java @@ -86,8 +86,6 @@ public BanchanDetail getBanchanDetail() { return banchanDetail; } - - @Override public String toString() { return "Banchan{" + diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java index 9157324ad..b6dd02f3f 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java @@ -20,5 +20,13 @@ public String getHash() { public Data getData() { return data; } + + @Override + public String toString() { + return "BanchanDetail{" + + "hash='" + hash + '\'' + + ", data=" + data + + '}'; + } } From a4449d4d44175f9d14eac45c24be946104627739 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 15:36:14 +1200 Subject: [PATCH 28/64] =?UTF-8?q?add=20:=20Reponse=EC=8B=9C=20Null?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/develop/baminchan/entity/banchan/Data.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/Data.java b/backend/src/main/java/develop/baminchan/entity/banchan/Data.java index ccd76868a..79792622d 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/Data.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/Data.java @@ -1,5 +1,8 @@ package develop.baminchan.entity.banchan; +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_NULL) public class Data { private String top_image; @@ -17,4 +20,12 @@ public String getTop_image() { public String getThumb_images() { return thumb_images; } + + @Override + public String toString() { + return "Data{" + + "top_image='" + top_image + '\'' + + ", thumb_images='" + thumb_images + '\'' + + '}'; + } } From d69ee68c16b7dcfa75f4a498c47ac37e922ff5dd Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 17:57:17 +1200 Subject: [PATCH 29/64] =?UTF-8?q?fix=20:=20String[]=EC=9D=84=20Set?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - JSON 포맷에 아무 영향이 없음 --- .../develop/baminchan/dto/BanchanDto.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java index 8e2986401..757d201a2 100644 --- a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java +++ b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java @@ -3,17 +3,21 @@ import com.fasterxml.jackson.annotation.JsonInclude; import develop.baminchan.entity.Banchan; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + @JsonInclude(JsonInclude.Include.NON_NULL) public class BanchanDto { private String detail_hash; private String image; private String alt; - private String[] delivery_type; + private Set delivery_type; private String title; private String description; private String n_price; private String s_price; - private String[] badge; + private Set badge; protected BanchanDto() { @@ -23,17 +27,22 @@ private BanchanDto(Banchan banchan) { this.detail_hash = banchan.getDetail_hash(); this.image = banchan.getImage(); this.alt = banchan.getAlt(); - this.delivery_type = convertStringToArray(banchan.getDelivery_type()); + this.delivery_type = convertStringToSet(banchan.getDelivery_type()); this.title = banchan.getTitle(); this.description = banchan.getDescription(); this.n_price = banchan.getN_price(); this.s_price = banchan.getS_price(); - this.badge = convertStringToArray(banchan.getBadge()); + this.badge = convertStringToSet(banchan.getBadge()); } - private String[] convertStringToArray(String str) { - String[] arr = str.split(","); - return (str == null) ? null : arr; + private Set convertStringToSet(String column) { + if (column == null) { + return null; + } + Set set = new HashSet<>(); + String[] arr = column.split(","); + set.addAll(Arrays.asList(arr)); + return set; } // Entity -> DTO @@ -53,7 +62,7 @@ public String getAlt() { return alt; } - public String[] getDelivery_type() { + public Set getDelivery_type() { return delivery_type; } @@ -73,7 +82,7 @@ public String getS_price() { return s_price; } - public String[] getBadge() { + public Set getBadge() { return badge; } } From c50871a6085b39964040cffb216d5c1df17a5efb Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 18:43:36 +1200 Subject: [PATCH 30/64] =?UTF-8?q?feat=20:=20DataDto=20=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=B4=EC=84=9C=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EB=93=A4=20=EB=B0=B0=EC=97=B4=EB=A1=9C=20=EB=B0=9B=EC=9D=84=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/banchan/BanchanDetailDto.java | 25 ++++++--- .../baminchan/dto/banchan/DataDto.java | 54 +++++++++++++++++++ 2 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/dto/banchan/DataDto.java diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index 8bd503c97..a75d4a646 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -1,27 +1,40 @@ package develop.baminchan.dto.banchan; +import com.fasterxml.jackson.annotation.JsonInclude; import develop.baminchan.entity.banchan.Data; import develop.baminchan.entity.banchan.BanchanDetail; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + public class BanchanDetailDto { private String hash; - private Data data; + private DataDto data; public BanchanDetailDto(BanchanDetail banchanDetail) { this.hash = banchanDetail.getHash(); - this.data = banchanDetail.getData(); + data = new DataDto.DataDtoBuilder() + .setTop_image(banchanDetail.getData().getTop_image()) + .setThumb_images(convertStringToSet(banchanDetail.getData().getThumb_images())) + .build(); } - public BanchanDetailDto(String hash, Data data) { - this.hash = hash; - this.data = data; + private Set convertStringToSet(String column) { + if (column == null) { + return null; + } + Set set = new HashSet<>(); + String[] arr = column.split(","); + set.addAll(Arrays.asList(arr)); + return set; } public String getHash() { return hash; } - public Data getData() { + public DataDto getData() { return data; } diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/DataDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/DataDto.java new file mode 100644 index 000000000..5f11dede7 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/dto/banchan/DataDto.java @@ -0,0 +1,54 @@ +package develop.baminchan.dto.banchan; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import java.util.Set; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class DataDto { + + private String top_image; + private Set thumb_images; + + public DataDto(String top_image, Set thumb_images) { + this.top_image = top_image; + this.thumb_images = thumb_images; + } + + public DataDto(DataDtoBuilder dataDtoBuilder) { + this.top_image = dataDtoBuilder.top_image; + this.thumb_images = dataDtoBuilder.thumb_images; + } + + public String getTop_image() { + return top_image; + } + + public Set getThumb_images() { + return thumb_images; + } + + public static class DataDtoBuilder { + + private String top_image; + private Set thumb_images; + + DataDtoBuilder() { + + } + + public DataDtoBuilder setTop_image(String top_image) { + this.top_image = top_image; + return this; + } + + public DataDtoBuilder setThumb_images(Set thumb_images) { + this.thumb_images = thumb_images; + return this; + } + + public DataDto build() { + return new DataDto(this); + } + } +} From cedac8cd663e0b2f80a4730512d773b040c65863 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 18:56:57 +1200 Subject: [PATCH 31/64] =?UTF-8?q?refactor=20:=20String=20=EC=97=90?= =?UTF-8?q?=EC=84=9C=20Set=EC=9C=BC=EB=A1=9C=20=EB=B0=94=EA=BE=B8=EB=8A=94?= =?UTF-8?q?=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=A4=91=EB=B3=B5=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A4=84=EC=9D=B4=EA=B8=B0=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/dto/BanchanDto.java | 18 ++++------------- .../dto/banchan/BanchanDetailDto.java | 18 ++--------------- .../baminchan/dto/util/StringConvertor.java | 20 +++++++++++++++++++ 3 files changed, 26 insertions(+), 30 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java diff --git a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java index 757d201a2..0e477ef8e 100644 --- a/backend/src/main/java/develop/baminchan/dto/BanchanDto.java +++ b/backend/src/main/java/develop/baminchan/dto/BanchanDto.java @@ -3,10 +3,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import develop.baminchan.entity.Banchan; -import java.util.Arrays; -import java.util.HashSet; import java.util.Set; +import static develop.baminchan.dto.util.StringConvertor.convertToSet; + @JsonInclude(JsonInclude.Include.NON_NULL) public class BanchanDto { private String detail_hash; @@ -27,22 +27,12 @@ private BanchanDto(Banchan banchan) { this.detail_hash = banchan.getDetail_hash(); this.image = banchan.getImage(); this.alt = banchan.getAlt(); - this.delivery_type = convertStringToSet(banchan.getDelivery_type()); + this.delivery_type = convertToSet(banchan.getDelivery_type()); this.title = banchan.getTitle(); this.description = banchan.getDescription(); this.n_price = banchan.getN_price(); this.s_price = banchan.getS_price(); - this.badge = convertStringToSet(banchan.getBadge()); - } - - private Set convertStringToSet(String column) { - if (column == null) { - return null; - } - Set set = new HashSet<>(); - String[] arr = column.split(","); - set.addAll(Arrays.asList(arr)); - return set; + this.badge = convertToSet(banchan.getBadge()); } // Entity -> DTO diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index a75d4a646..2bcd05dbe 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -1,12 +1,8 @@ package develop.baminchan.dto.banchan; -import com.fasterxml.jackson.annotation.JsonInclude; -import develop.baminchan.entity.banchan.Data; import develop.baminchan.entity.banchan.BanchanDetail; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import static develop.baminchan.dto.util.StringConvertor.convertToSet; public class BanchanDetailDto { private String hash; @@ -16,20 +12,10 @@ public BanchanDetailDto(BanchanDetail banchanDetail) { this.hash = banchanDetail.getHash(); data = new DataDto.DataDtoBuilder() .setTop_image(banchanDetail.getData().getTop_image()) - .setThumb_images(convertStringToSet(banchanDetail.getData().getThumb_images())) + .setThumb_images(convertToSet(banchanDetail.getData().getThumb_images())) .build(); } - private Set convertStringToSet(String column) { - if (column == null) { - return null; - } - Set set = new HashSet<>(); - String[] arr = column.split(","); - set.addAll(Arrays.asList(arr)); - return set; - } - public String getHash() { return hash; } diff --git a/backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java b/backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java new file mode 100644 index 000000000..bf89dbb2f --- /dev/null +++ b/backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java @@ -0,0 +1,20 @@ +package develop.baminchan.dto.util; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +public class StringConvertor { + private StringConvertor() { + } + + public static Set convertToSet(String column) { + if (column == null) { + return null; + } + Set set = new HashSet<>(); + String[] arr = column.split(","); + set.addAll(Arrays.asList(arr)); + return set; + } +} From 2c6ffd492fbb69390c7ba0fc3fe472ef8d729b6d Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 19:19:34 +1200 Subject: [PATCH 32/64] =?UTF-8?q?rename=20:=20=ED=81=B4=EB=9E=98=EC=8A=A4?= =?UTF-8?q?=20Data=EB=A5=BC=20=EB=AA=85=ED=99=95=ED=95=98=EA=B2=8C=20?= =?UTF-8?q?=ED=91=9C=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{DataDto.java => BanchanDetailDataDto.java} | 10 +++++----- .../baminchan/dto/banchan/BanchanDetailDto.java | 6 +++--- .../baminchan/entity/banchan/BanchanDetail.java | 12 ++++++------ .../banchan/{Data.java => BanchanDetailData.java} | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) rename backend/src/main/java/develop/baminchan/dto/banchan/{DataDto.java => BanchanDetailDataDto.java} (79%) rename backend/src/main/java/develop/baminchan/entity/banchan/{Data.java => BanchanDetailData.java} (86%) diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/DataDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java similarity index 79% rename from backend/src/main/java/develop/baminchan/dto/banchan/DataDto.java rename to backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java index 5f11dede7..63b45d6d4 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/DataDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java @@ -5,17 +5,17 @@ import java.util.Set; @JsonInclude(JsonInclude.Include.NON_NULL) -public class DataDto { +public class BanchanDetailDataDto { private String top_image; private Set thumb_images; - public DataDto(String top_image, Set thumb_images) { + public BanchanDetailDataDto(String top_image, Set thumb_images) { this.top_image = top_image; this.thumb_images = thumb_images; } - public DataDto(DataDtoBuilder dataDtoBuilder) { + public BanchanDetailDataDto(DataDtoBuilder dataDtoBuilder) { this.top_image = dataDtoBuilder.top_image; this.thumb_images = dataDtoBuilder.thumb_images; } @@ -47,8 +47,8 @@ public DataDtoBuilder setThumb_images(Set thumb_images) { return this; } - public DataDto build() { - return new DataDto(this); + public BanchanDetailDataDto build() { + return new BanchanDetailDataDto(this); } } } diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index 2bcd05dbe..3db2a9443 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -6,11 +6,11 @@ public class BanchanDetailDto { private String hash; - private DataDto data; + private BanchanDetailDataDto data; public BanchanDetailDto(BanchanDetail banchanDetail) { this.hash = banchanDetail.getHash(); - data = new DataDto.DataDtoBuilder() + data = new BanchanDetailDataDto.DataDtoBuilder() .setTop_image(banchanDetail.getData().getTop_image()) .setThumb_images(convertToSet(banchanDetail.getData().getThumb_images())) .build(); @@ -20,7 +20,7 @@ public String getHash() { return hash; } - public DataDto getData() { + public BanchanDetailDataDto getData() { return data; } diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java index b6dd02f3f..5775362bd 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java @@ -6,26 +6,26 @@ public class BanchanDetail { private String hash; @Embedded.Nullable - private Data data; + private BanchanDetailData banchanDetailData; - public BanchanDetail(String hash, Data data) { + public BanchanDetail(String hash, BanchanDetailData banchanDetailData) { this.hash = hash; - this.data = data; + this.banchanDetailData = banchanDetailData; } public String getHash() { return hash; } - public Data getData() { - return data; + public BanchanDetailData getData() { + return banchanDetailData; } @Override public String toString() { return "BanchanDetail{" + "hash='" + hash + '\'' + - ", data=" + data + + ", data=" + banchanDetailData + '}'; } } diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/Data.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java similarity index 86% rename from backend/src/main/java/develop/baminchan/entity/banchan/Data.java rename to backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java index 79792622d..4bc36f8bd 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/Data.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java @@ -3,12 +3,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_NULL) -public class Data { +public class BanchanDetailData { private String top_image; private String thumb_images; - public Data(String top_image, String thumb_images) { + public BanchanDetailData(String top_image, String thumb_images) { this.top_image = top_image; this.thumb_images = thumb_images; } From cd5545cd9148c9d06006b050ca8000cfbd8582b9 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 22 Apr 2021 19:33:57 +1200 Subject: [PATCH 33/64] =?UTF-8?q?remove=20:=20=ED=95=84=EC=9A=94=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/dto/banchan/BanchanDetailDataDto.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java index 63b45d6d4..2c092c0a5 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java @@ -10,11 +10,6 @@ public class BanchanDetailDataDto { private String top_image; private Set thumb_images; - public BanchanDetailDataDto(String top_image, Set thumb_images) { - this.top_image = top_image; - this.thumb_images = thumb_images; - } - public BanchanDetailDataDto(DataDtoBuilder dataDtoBuilder) { this.top_image = dataDtoBuilder.top_image; this.thumb_images = dataDtoBuilder.thumb_images; From bce16ccd8402a6ad85a4c633049d1d27188f214d Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 23 Apr 2021 10:27:38 +1200 Subject: [PATCH 34/64] =?UTF-8?q?add=20:=20=EA=B0=9C=EB=B3=84=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EB=B0=98=EC=B0=AC=20=EC=9D=B4=EC=99=B8=EC=97=90=20?= =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=EA=B0=9C=EB=B3=84=20=EB=B0=98=EC=B0=AC=20?= =?UTF-8?q?API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baminchan/controller/BanchanController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/develop/baminchan/controller/BanchanController.java b/backend/src/main/java/develop/baminchan/controller/BanchanController.java index 61abc3c03..b69255160 100644 --- a/backend/src/main/java/develop/baminchan/controller/BanchanController.java +++ b/backend/src/main/java/develop/baminchan/controller/BanchanController.java @@ -17,10 +17,23 @@ public BanchanController(BanchanService banchanService) { @GetMapping("/main/{detail_hash}") public BanchanDto findOneMain(@PathVariable String detail_hash) { - BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash); + BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash); return banchanDto; } + @GetMapping("/soup/{detail_hash}") + public BanchanDto findOneSoup(@PathVariable String detail_hash) { + BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash); + return banchanDto; + } + + @GetMapping("/side/{detail_hash}") + public BanchanDto findOneSide(@PathVariable String detail_hash) { + BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash); + return banchanDto; + } + + @GetMapping("/detail/{detail_hash}") public BanchanDetailDto findOneDetail(@PathVariable String detail_hash) { BanchanDetailDto banchanDetailDto = banchanService.findBanchanDetailByDetailHash(detail_hash); From c2ae6927a283ab2f0a13195164931cac448f18a4 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 23 Apr 2021 10:29:03 +1200 Subject: [PATCH 35/64] =?UTF-8?q?add=20:=20Banchan=EC=97=90=20category=5Fi?= =?UTF-8?q?d=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/baminchan/entity/Banchan.java | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/entity/Banchan.java b/backend/src/main/java/develop/baminchan/entity/Banchan.java index 0fc806bf1..985a71c70 100644 --- a/backend/src/main/java/develop/baminchan/entity/Banchan.java +++ b/backend/src/main/java/develop/baminchan/entity/Banchan.java @@ -19,11 +19,12 @@ public class Banchan { private String badge; private String tag; + private String category_id; @Embedded.Nullable private BanchanDetail banchanDetail; - public Banchan(Long id, String detail_hash, String image, String alt, String delivery_type, String title, String description, String n_price, String s_price, String badge, String tag, BanchanDetail banchanDetail) { + public Banchan(Long id, String detail_hash, String image, String alt, String delivery_type, String title, String description, String n_price, String s_price, String badge, String tag, String category_id, BanchanDetail banchanDetail) { this.id = id; this.detail_hash = detail_hash; this.image = image; @@ -35,6 +36,7 @@ public Banchan(Long id, String detail_hash, String image, String alt, String del this.s_price = s_price; this.badge = badge; this.tag = tag; + this.category_id = category_id; this.banchanDetail = banchanDetail; } @@ -82,25 +84,11 @@ public String getTag() { return tag; } - public BanchanDetail getBanchanDetail() { - return banchanDetail; + public String getCategory_id() { + return category_id; } - @Override - public String toString() { - return "Banchan{" + - "id=" + id + - ", detail_hash='" + detail_hash + '\'' + - ", image='" + image + '\'' + - ", alt='" + alt + '\'' + - ", delivery_type='" + delivery_type + '\'' + - ", title='" + title + '\'' + - ", description='" + description + '\'' + - ", n_price='" + n_price + '\'' + - ", s_price='" + s_price + '\'' + - ", badge='" + badge + '\'' + - ", tag='" + tag + '\'' + - ", banchanDetail=" + banchanDetail + - '}'; + public BanchanDetail getBanchanDetail() { + return banchanDetail; } } From a5a7b56e0954aa631184832deead771a21157677 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 23 Apr 2021 10:29:49 +1200 Subject: [PATCH 36/64] =?UTF-8?q?add=20:=20CategoryDto=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 38 ++++++------------- .../develop/baminchan/dto/CategoryDto.java | 35 +++++++++++++++++ .../develop/baminchan/entity/Category.java | 20 ++-------- .../repository/CategoryRepository.java | 4 +- .../baminchan/service/CategoryService.java | 29 +++----------- 5 files changed, 57 insertions(+), 69 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/dto/CategoryDto.java diff --git a/backend/src/main/java/develop/baminchan/controller/CategoryController.java b/backend/src/main/java/develop/baminchan/controller/CategoryController.java index 3a1a3e206..5a762033b 100644 --- a/backend/src/main/java/develop/baminchan/controller/CategoryController.java +++ b/backend/src/main/java/develop/baminchan/controller/CategoryController.java @@ -1,15 +1,11 @@ package develop.baminchan.controller; -import develop.baminchan.entity.Banchan; -import develop.baminchan.entity.Category; +import develop.baminchan.dto.CategoryDto; import develop.baminchan.service.CategoryService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import java.util.Optional; - @RestController public class CategoryController { @@ -19,28 +15,16 @@ public CategoryController(CategoryService categoryService) { this.categoryService = categoryService; } - @GetMapping("/best") - public List> findAllBestCategories() { - return categoryService.findAllBestCategories(); + // TODO : +// @GetMapping("/best") +// public List> findAllBestCategories() { +// return categoryService.findAllBestCategories(); +// } + + @GetMapping("/best/{category_id}") + public CategoryDto findBestBanchans(@PathVariable String category_id) { + CategoryDto categoryDto = categoryService.findBestBanchansByCategory(category_id); + return categoryDto; } -// @GetMapping("/best/{category_id}") -// public List findBestBanchans(@PathVariable Long category_id) { -// return categoryService.findBestBanchans(category_id); -// } -// -// @GetMapping("/main") -// public List findMainBanchans() { -// return categoryService.findMainBanchans(); -// } -// -// @GetMapping("/soup") -// public List findSoupBanchans() { -// return categoryService.findSoupBanchans(); -// } -// -// @GetMapping("/side") -// public List findSideBanchans() { -// return categoryService.findSideBanchans(); -// } } diff --git a/backend/src/main/java/develop/baminchan/dto/CategoryDto.java b/backend/src/main/java/develop/baminchan/dto/CategoryDto.java new file mode 100644 index 000000000..160c2a720 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/dto/CategoryDto.java @@ -0,0 +1,35 @@ +package develop.baminchan.dto; + +import develop.baminchan.entity.Category; +import org.springframework.data.annotation.Id; + +public class CategoryDto { + @Id + private int id; + + private String category_id; + private String name; + + public CategoryDto(String category_id, String name) { + this.category_id = category_id; + this.name = name; + } + + public CategoryDto(Category category) { + this.category_id = category.getCategory_id(); + this.name = category.getName(); + } + + // Entity -> DTO + public static CategoryDto of(Category category) { + return new CategoryDto(category); + } + + public String getCategory_id() { + return category_id; + } + + public String getName() { + return name; + } +} diff --git a/backend/src/main/java/develop/baminchan/entity/Category.java b/backend/src/main/java/develop/baminchan/entity/Category.java index b2bc6da3d..151f94c0f 100644 --- a/backend/src/main/java/develop/baminchan/entity/Category.java +++ b/backend/src/main/java/develop/baminchan/entity/Category.java @@ -2,37 +2,23 @@ import org.springframework.data.annotation.Id; -import java.util.ArrayList; -import java.util.List; - public class Category { @Id private int id; - private int category_id; + private String category_id; private String name; - private List items = new ArrayList<>(); - public Category(int id, int category_id, String name, List items) { - this.id = id; + public Category(String category_id, String name) { this.category_id = category_id; this.name = name; - this.items = items; - } - - public int getId() { - return id; } - public int getCategory_id() { + public String getCategory_id() { return category_id; } public String getName() { return name; } - - public List getItems() { - return items; - } } diff --git a/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java b/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java index c42290be9..3df51aae9 100644 --- a/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java +++ b/backend/src/main/java/develop/baminchan/repository/CategoryRepository.java @@ -1,8 +1,10 @@ package develop.baminchan.repository; import develop.baminchan.entity.Category; +import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; public interface CategoryRepository extends CrudRepository { - + @Query("select * from category where category_id = :category_id") + Category findCategoryByCategory_id(String category_id); } diff --git a/backend/src/main/java/develop/baminchan/service/CategoryService.java b/backend/src/main/java/develop/baminchan/service/CategoryService.java index e3713712f..457ca9a93 100644 --- a/backend/src/main/java/develop/baminchan/service/CategoryService.java +++ b/backend/src/main/java/develop/baminchan/service/CategoryService.java @@ -1,14 +1,10 @@ package develop.baminchan.service; -import develop.baminchan.entity.Banchan; +import develop.baminchan.dto.CategoryDto; import develop.baminchan.entity.Category; import develop.baminchan.repository.CategoryRepository; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - @Service public class CategoryService { private CategoryRepository categoryRepository; @@ -17,25 +13,10 @@ public CategoryService(CategoryRepository categoryRepository) { this.categoryRepository = categoryRepository; } - public List> findAllBestCategories() { - List> allBestCategories = new ArrayList<>(); - allBestCategories.add(categoryRepository.findById(17011200L)); - allBestCategories.add(categoryRepository.findById(17011000L)); - allBestCategories.add(categoryRepository.findById(17010200L)); - allBestCategories.add(categoryRepository.findById(17010300L)); - allBestCategories.add(categoryRepository.findById(17011400L)); - return allBestCategories; + public CategoryDto findBestBanchansByCategory(String category_id) { + Category category = categoryRepository.findCategoryByCategory_id(category_id); + CategoryDto categoryDto = CategoryDto.of(category); + return categoryDto; } -// public List findBestBanchans(Long category_id) { -// } -// -// public List findMainBanchans() { -// } -// -// public List findSoupBanchans() { -// } -// -// public List findSideBanchans() { -// } } From a4719d5d4e6eac2d5ab6a51500bdc065f6f928a6 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 23 Apr 2021 11:40:34 +1200 Subject: [PATCH 37/64] =?UTF-8?q?feat=20:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=B0=98=EC=B0=AC?= =?UTF-8?q?=EB=93=A4=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 카테고리 서비스단에서 카테고리에 따른 반찬리스트를 담아서 Category를 CategoryDto로 변환하면서 그 반찬리스트를 CategoryDto로 같이 넘겨줌 --- .../develop/baminchan/dto/CategoryDto.java | 16 +++++++++++--- .../repository/BanchanRepository.java | 5 +++++ .../baminchan/service/CategoryService.java | 22 +++++++++++++++++-- .../baminchan/SidedishApplicationTests.java | 8 +++++-- 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/CategoryDto.java b/backend/src/main/java/develop/baminchan/dto/CategoryDto.java index 160c2a720..dea0f1437 100644 --- a/backend/src/main/java/develop/baminchan/dto/CategoryDto.java +++ b/backend/src/main/java/develop/baminchan/dto/CategoryDto.java @@ -3,6 +3,9 @@ import develop.baminchan.entity.Category; import org.springframework.data.annotation.Id; +import java.util.ArrayList; +import java.util.List; + public class CategoryDto { @Id private int id; @@ -10,19 +13,22 @@ public class CategoryDto { private String category_id; private String name; + private List items = new ArrayList<>(); + public CategoryDto(String category_id, String name) { this.category_id = category_id; this.name = name; } - public CategoryDto(Category category) { + public CategoryDto(Category category, List banchanDtoList) { this.category_id = category.getCategory_id(); this.name = category.getName(); + this.items = banchanDtoList; } // Entity -> DTO - public static CategoryDto of(Category category) { - return new CategoryDto(category); + public static CategoryDto of(Category category, List banchanDtoList) { + return new CategoryDto(category, banchanDtoList); } public String getCategory_id() { @@ -32,4 +38,8 @@ public String getCategory_id() { public String getName() { return name; } + + public List getItems() { + return items; + } } diff --git a/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java index e066cf509..0885765fe 100644 --- a/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java +++ b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java @@ -4,7 +4,12 @@ import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; +import java.util.List; + public interface BanchanRepository extends CrudRepository { @Query("select * from banchan where detail_hash = :detail_hash") Banchan findBanchanByDetail_hash(String detail_hash); + + @Query("select * from banchan where category_id = :category_id") + List findBanchansByCategory_id(String category_id); } diff --git a/backend/src/main/java/develop/baminchan/service/CategoryService.java b/backend/src/main/java/develop/baminchan/service/CategoryService.java index 457ca9a93..683491181 100644 --- a/backend/src/main/java/develop/baminchan/service/CategoryService.java +++ b/backend/src/main/java/develop/baminchan/service/CategoryService.java @@ -1,22 +1,40 @@ package develop.baminchan.service; +import develop.baminchan.dto.BanchanDto; import develop.baminchan.dto.CategoryDto; +import develop.baminchan.entity.Banchan; import develop.baminchan.entity.Category; +import develop.baminchan.repository.BanchanRepository; import develop.baminchan.repository.CategoryRepository; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + @Service public class CategoryService { private CategoryRepository categoryRepository; + private BanchanRepository banchanRepository; - public CategoryService(CategoryRepository categoryRepository) { + public CategoryService(CategoryRepository categoryRepository, BanchanRepository banchanRepository) { this.categoryRepository = categoryRepository; + this.banchanRepository = banchanRepository; } public CategoryDto findBestBanchansByCategory(String category_id) { Category category = categoryRepository.findCategoryByCategory_id(category_id); - CategoryDto categoryDto = CategoryDto.of(category); + CategoryDto categoryDto = CategoryDto.of(category, getBanchanListByCategoryId(category_id)); return categoryDto; } + private List getBanchanListByCategoryId(String catrgory_id) { + List banchanDtoList = new ArrayList<>(); + List banchanList = new ArrayList<>(); + + banchanList = banchanRepository.findBanchansByCategory_id(catrgory_id); + for (int i = 0; i < banchanList.size(); i++) { + banchanDtoList.add(BanchanDto.of(banchanList.get(i))); + } + return banchanDtoList; + } } diff --git a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java index d3f1e8e52..4b8bfdfcb 100644 --- a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java +++ b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java @@ -11,6 +11,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + import static org.assertj.core.api.Assertions.assertThat; @Transactional @@ -32,7 +34,9 @@ void contextLoads() { } @Test - @DisplayName("Banchan에 있는 Badge랑 DeliveryType 잘가져오는지 확인") - void getBanchan() { + @DisplayName("반찬레포에서 카테고리에 따라서 잘 가져오는지 확인") + void getBanchanList() { + List banchanList = banchanRepository.findBanchansByCategory_id("17011200"); + assertThat(banchanList).isNull(); } } From 43556f5cccb02cb13e80b22440a8ad685448e7d3 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 23 Apr 2021 13:28:12 +1200 Subject: [PATCH 38/64] rename : method --- .../main/java/develop/baminchan/service/CategoryService.java | 4 ++-- .../test/java/develop/baminchan/SidedishApplicationTests.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/service/CategoryService.java b/backend/src/main/java/develop/baminchan/service/CategoryService.java index 683491181..563f0db04 100644 --- a/backend/src/main/java/develop/baminchan/service/CategoryService.java +++ b/backend/src/main/java/develop/baminchan/service/CategoryService.java @@ -23,11 +23,11 @@ public CategoryService(CategoryRepository categoryRepository, BanchanRepository public CategoryDto findBestBanchansByCategory(String category_id) { Category category = categoryRepository.findCategoryByCategory_id(category_id); - CategoryDto categoryDto = CategoryDto.of(category, getBanchanListByCategoryId(category_id)); + CategoryDto categoryDto = CategoryDto.of(category, findBanchanListByCategoryId(category_id)); return categoryDto; } - private List getBanchanListByCategoryId(String catrgory_id) { + private List findBanchanListByCategoryId(String catrgory_id) { List banchanDtoList = new ArrayList<>(); List banchanList = new ArrayList<>(); diff --git a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java index 4b8bfdfcb..4b605a538 100644 --- a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java +++ b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java @@ -37,6 +37,6 @@ void contextLoads() { @DisplayName("반찬레포에서 카테고리에 따라서 잘 가져오는지 확인") void getBanchanList() { List banchanList = banchanRepository.findBanchansByCategory_id("17011200"); - assertThat(banchanList).isNull(); + assertThat(banchanList).isNotNull(); } } From da543ae3e6c29e5add673998b5b8fd3225e59bb3 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 23 Apr 2021 18:54:42 +1200 Subject: [PATCH 39/64] =?UTF-8?q?feat=20:=20=EB=B2=A0=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=B0=98=EC=B0=AC=EB=93=A4=20API=20=EA=B5=AC=ED=98=84=20Http?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=99=80=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=93=A4=EC=9D=84=20=EC=9D=91=EB=8B=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 15 ++++++++---- .../develop/baminchan/controller/Message.java | 24 +++++++++++++++++++ .../baminchan/service/CategoryService.java | 17 +++++++++++++ 3 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 backend/src/main/java/develop/baminchan/controller/Message.java diff --git a/backend/src/main/java/develop/baminchan/controller/CategoryController.java b/backend/src/main/java/develop/baminchan/controller/CategoryController.java index 5a762033b..ee35de381 100644 --- a/backend/src/main/java/develop/baminchan/controller/CategoryController.java +++ b/backend/src/main/java/develop/baminchan/controller/CategoryController.java @@ -2,10 +2,14 @@ import develop.baminchan.dto.CategoryDto; import develop.baminchan.service.CategoryService; +import org.springframework.http.HttpStatus; +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.RestController; +import java.util.List; + @RestController public class CategoryController { @@ -15,11 +19,12 @@ public CategoryController(CategoryService categoryService) { this.categoryService = categoryService; } - // TODO : -// @GetMapping("/best") -// public List> findAllBestCategories() { -// return categoryService.findAllBestCategories(); -// } + @GetMapping(value = "/best", produces = "application/json") + public ResponseEntity getBest() { + List categoryDtoList = categoryService.findAllBestBanchansByCategory(); + Message message = new Message(Message.OK, categoryDtoList); + return new ResponseEntity(message, HttpStatus.OK); + } @GetMapping("/best/{category_id}") public CategoryDto findBestBanchans(@PathVariable String category_id) { diff --git a/backend/src/main/java/develop/baminchan/controller/Message.java b/backend/src/main/java/develop/baminchan/controller/Message.java new file mode 100644 index 000000000..cd1608ae5 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/controller/Message.java @@ -0,0 +1,24 @@ +package develop.baminchan.controller; + +public class Message { + public static final int OK = 200; + public static final int BAD_REQUEST = 400; + public static final int NOT_FOUND = 404; + public static final int INTERNAL_SERVER_ERROR = 500; + + private int status; + private Object data; + + public Message(int statusEnum, Object data) { + this.status = statusEnum; + this.data = data; + } + + public int getStatus() { + return status; + } + + public Object getData() { + return data; + } +} diff --git a/backend/src/main/java/develop/baminchan/service/CategoryService.java b/backend/src/main/java/develop/baminchan/service/CategoryService.java index 563f0db04..abfb55dbd 100644 --- a/backend/src/main/java/develop/baminchan/service/CategoryService.java +++ b/backend/src/main/java/develop/baminchan/service/CategoryService.java @@ -9,7 +9,9 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Service public class CategoryService { @@ -21,6 +23,21 @@ public CategoryService(CategoryRepository categoryRepository, BanchanRepository this.banchanRepository = banchanRepository; } + public List findAllBestBanchansByCategory() { + Iterable categoryList = categoryRepository.findAll(); + Set setCategoryId = new HashSet<>(); + for (Category category : categoryList) { + setCategoryId.add(category.getCategory_id()); + } + System.out.println(setCategoryId); //테스트 // null도 들어가나? + + List categoryDtoList = new ArrayList<>(); + for (String category_id: setCategoryId) { + categoryDtoList.add(findBestBanchansByCategory(category_id)); + } + return categoryDtoList; + } + public CategoryDto findBestBanchansByCategory(String category_id) { Category category = categoryRepository.findCategoryByCategory_id(category_id); CategoryDto categoryDto = CategoryDto.of(category, findBanchanListByCategoryId(category_id)); From 1dcc49a029a9c57a4130499ef426d857658f86c8 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Sat, 24 Apr 2021 18:04:56 +1200 Subject: [PATCH 40/64] rename : method and variable --- .../baminchan/controller/CategoryController.java | 2 +- .../develop/baminchan/service/CategoryService.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/controller/CategoryController.java b/backend/src/main/java/develop/baminchan/controller/CategoryController.java index ee35de381..03bfed304 100644 --- a/backend/src/main/java/develop/baminchan/controller/CategoryController.java +++ b/backend/src/main/java/develop/baminchan/controller/CategoryController.java @@ -21,7 +21,7 @@ public CategoryController(CategoryService categoryService) { @GetMapping(value = "/best", produces = "application/json") public ResponseEntity getBest() { - List categoryDtoList = categoryService.findAllBestBanchansByCategory(); + List categoryDtoList = categoryService.findAllBestBanchansByCategories(); Message message = new Message(Message.OK, categoryDtoList); return new ResponseEntity(message, HttpStatus.OK); } diff --git a/backend/src/main/java/develop/baminchan/service/CategoryService.java b/backend/src/main/java/develop/baminchan/service/CategoryService.java index abfb55dbd..db404596a 100644 --- a/backend/src/main/java/develop/baminchan/service/CategoryService.java +++ b/backend/src/main/java/develop/baminchan/service/CategoryService.java @@ -23,16 +23,16 @@ public CategoryService(CategoryRepository categoryRepository, BanchanRepository this.banchanRepository = banchanRepository; } - public List findAllBestBanchansByCategory() { + public List findAllBestBanchansByCategories() { Iterable categoryList = categoryRepository.findAll(); - Set setCategoryId = new HashSet<>(); + Set setOfCategoryIds = new HashSet<>(); for (Category category : categoryList) { - setCategoryId.add(category.getCategory_id()); + setOfCategoryIds.add(category.getCategory_id()); } - System.out.println(setCategoryId); //테스트 // null도 들어가나? + System.out.println(setOfCategoryIds); //테스트 // null도 들어가나? List categoryDtoList = new ArrayList<>(); - for (String category_id: setCategoryId) { + for (String category_id : setOfCategoryIds) { categoryDtoList.add(findBestBanchansByCategory(category_id)); } return categoryDtoList; From f2003b1e832bc95eff788a90e7e57163ce326204 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Sat, 24 Apr 2021 18:10:37 +1200 Subject: [PATCH 41/64] =?UTF-8?q?delete=20:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=AA=85=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/develop/baminchan/controller/CategoryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/develop/baminchan/controller/CategoryController.java b/backend/src/main/java/develop/baminchan/controller/CategoryController.java index 03bfed304..bd0f63e26 100644 --- a/backend/src/main/java/develop/baminchan/controller/CategoryController.java +++ b/backend/src/main/java/develop/baminchan/controller/CategoryController.java @@ -19,7 +19,7 @@ public CategoryController(CategoryService categoryService) { this.categoryService = categoryService; } - @GetMapping(value = "/best", produces = "application/json") + @GetMapping("/best") public ResponseEntity getBest() { List categoryDtoList = categoryService.findAllBestBanchansByCategories(); Message message = new Message(Message.OK, categoryDtoList); From 426f6ad5f46f735b490a9da98ac449ef537ee3f5 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Sat, 24 Apr 2021 18:28:07 +1200 Subject: [PATCH 42/64] rename : typo --- .../src/main/java/develop/baminchan/controller/Message.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/controller/Message.java b/backend/src/main/java/develop/baminchan/controller/Message.java index cd1608ae5..6c1da6739 100644 --- a/backend/src/main/java/develop/baminchan/controller/Message.java +++ b/backend/src/main/java/develop/baminchan/controller/Message.java @@ -9,8 +9,8 @@ public class Message { private int status; private Object data; - public Message(int statusEnum, Object data) { - this.status = statusEnum; + public Message(int status, Object data) { + this.status = status; this.data = data; } From 39b0af50fdd2fbc12e3aa2259a234a278927c47c Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 26 Apr 2021 15:41:27 +1200 Subject: [PATCH 43/64] =?UTF-8?q?add=20:=20=EB=B0=98=EC=B0=AC=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EC=A0=95=EB=B3=B4=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/banchan/BanchanDetailDataDto.java | 72 +++++++++++++++++++ .../dto/banchan/BanchanDetailDto.java | 6 ++ .../entity/banchan/BanchanDetailData.java | 46 +++++++++++- 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java index 2c092c0a5..861364c0f 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java @@ -9,10 +9,22 @@ public class BanchanDetailDataDto { private String top_image; private Set thumb_images; + private String product_description; + private String point; + private String delivery_info; + private String delivery_fee; + private Set prices; + private Set detail_section; public BanchanDetailDataDto(DataDtoBuilder dataDtoBuilder) { this.top_image = dataDtoBuilder.top_image; this.thumb_images = dataDtoBuilder.thumb_images; + this.product_description = dataDtoBuilder.product_description; + this.point = dataDtoBuilder.point; + this.delivery_info = dataDtoBuilder.delivery_info; + this.delivery_fee = dataDtoBuilder.delivery_fee; + this.prices = dataDtoBuilder.prices; + this.detail_section = dataDtoBuilder.detail_section; } public String getTop_image() { @@ -23,10 +35,40 @@ public Set getThumb_images() { return thumb_images; } + public String getProduct_description() { + return product_description; + } + + public String getPoint() { + return point; + } + + public String getDelivery_info() { + return delivery_info; + } + + public String getDelivery_fee() { + return delivery_fee; + } + + public Set getPrices() { + return prices; + } + + public Set getDetail_section() { + return detail_section; + } + public static class DataDtoBuilder { private String top_image; private Set thumb_images; + private String product_description; + private String point; + private String delivery_info; + private String delivery_fee; + private Set prices; + private Set detail_section; DataDtoBuilder() { @@ -42,6 +84,36 @@ public DataDtoBuilder setThumb_images(Set thumb_images) { return this; } + public DataDtoBuilder setProduct_description(String product_description) { + this.product_description = product_description; + return this; + } + + public DataDtoBuilder setPoint(String point) { + this.point = point; + return this; + } + + public DataDtoBuilder setDelivery_info(String delivery_info) { + this.delivery_info = delivery_info; + return this; + } + + public DataDtoBuilder setDelivery_fee(String delivery_fee) { + this.delivery_fee = delivery_fee; + return this; + } + + public DataDtoBuilder setPrices(Set prices) { + this.prices = prices; + return this; + } + + public DataDtoBuilder setDetail_section(Set detail_section) { + this.detail_section = detail_section; + return this; + } + public BanchanDetailDataDto build() { return new BanchanDetailDataDto(this); } diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index 3db2a9443..deb4e08a2 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -13,6 +13,12 @@ public BanchanDetailDto(BanchanDetail banchanDetail) { data = new BanchanDetailDataDto.DataDtoBuilder() .setTop_image(banchanDetail.getData().getTop_image()) .setThumb_images(convertToSet(banchanDetail.getData().getThumb_images())) + .setProduct_description(banchanDetail.getData().getProduct_description()) + .setPoint(banchanDetail.getData().getPoint()) + .setDelivery_info(banchanDetail.getData().getDelivery_info()) + .setDelivery_fee(banchanDetail.getData().getDelivery_fee()) + .setPrices(convertToSet(banchanDetail.getData().getPrices())) + .setDetail_section(convertToSet(banchanDetail.getData().getDetail_section())) .build(); } diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java index 4bc36f8bd..7bdaf8562 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java @@ -7,10 +7,22 @@ public class BanchanDetailData { private String top_image; private String thumb_images; + private String product_description; + private String point; + private String delivery_info; + private String delivery_fee; + private String prices; + private String detail_section; - public BanchanDetailData(String top_image, String thumb_images) { + public BanchanDetailData(String top_image, String thumb_images, String product_description, String point, String delivery_info, String delivery_fee, String prices, String detail_section) { this.top_image = top_image; this.thumb_images = thumb_images; + this.product_description = product_description; + this.point = point; + this.delivery_info = delivery_info; + this.delivery_fee = delivery_fee; + this.prices = prices; + this.detail_section = detail_section; } public String getTop_image() { @@ -21,11 +33,41 @@ public String getThumb_images() { return thumb_images; } + public String getProduct_description() { + return product_description; + } + + public String getPoint() { + return point; + } + + public String getDelivery_info() { + return delivery_info; + } + + public String getDelivery_fee() { + return delivery_fee; + } + + public String getPrices() { + return prices; + } + + public String getDetail_section() { + return detail_section; + } + @Override public String toString() { - return "Data{" + + return "BanchanDetailData{" + "top_image='" + top_image + '\'' + ", thumb_images='" + thumb_images + '\'' + + ", product_description='" + product_description + '\'' + + ", point='" + point + '\'' + + ", delivery_info='" + delivery_info + '\'' + + ", delivery_fee='" + delivery_fee + '\'' + + ", prices='" + prices + '\'' + + ", detail_section='" + detail_section + '\'' + '}'; } } From 14eb6d807bdd6fd2061cb3c4bb8c5895f16c92b7 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 26 Apr 2021 18:01:44 +1200 Subject: [PATCH 44/64] =?UTF-8?q?delete=20:=20detail=5Fsection=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 필요 없었음 --- .../baminchan/dto/banchan/BanchanDetailDataDto.java | 12 ------------ .../baminchan/dto/banchan/BanchanDetailDto.java | 1 - .../baminchan/entity/banchan/BanchanDetailData.java | 9 +-------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java index 861364c0f..42ffdd40e 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDataDto.java @@ -14,7 +14,6 @@ public class BanchanDetailDataDto { private String delivery_info; private String delivery_fee; private Set prices; - private Set detail_section; public BanchanDetailDataDto(DataDtoBuilder dataDtoBuilder) { this.top_image = dataDtoBuilder.top_image; @@ -24,7 +23,6 @@ public BanchanDetailDataDto(DataDtoBuilder dataDtoBuilder) { this.delivery_info = dataDtoBuilder.delivery_info; this.delivery_fee = dataDtoBuilder.delivery_fee; this.prices = dataDtoBuilder.prices; - this.detail_section = dataDtoBuilder.detail_section; } public String getTop_image() { @@ -55,10 +53,6 @@ public Set getPrices() { return prices; } - public Set getDetail_section() { - return detail_section; - } - public static class DataDtoBuilder { private String top_image; @@ -68,7 +62,6 @@ public static class DataDtoBuilder { private String delivery_info; private String delivery_fee; private Set prices; - private Set detail_section; DataDtoBuilder() { @@ -109,11 +102,6 @@ public DataDtoBuilder setPrices(Set prices) { return this; } - public DataDtoBuilder setDetail_section(Set detail_section) { - this.detail_section = detail_section; - return this; - } - public BanchanDetailDataDto build() { return new BanchanDetailDataDto(this); } diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index deb4e08a2..9daab4ed7 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -18,7 +18,6 @@ public BanchanDetailDto(BanchanDetail banchanDetail) { .setDelivery_info(banchanDetail.getData().getDelivery_info()) .setDelivery_fee(banchanDetail.getData().getDelivery_fee()) .setPrices(convertToSet(banchanDetail.getData().getPrices())) - .setDetail_section(convertToSet(banchanDetail.getData().getDetail_section())) .build(); } diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java index 7bdaf8562..fe01605aa 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetailData.java @@ -12,9 +12,8 @@ public class BanchanDetailData { private String delivery_info; private String delivery_fee; private String prices; - private String detail_section; - public BanchanDetailData(String top_image, String thumb_images, String product_description, String point, String delivery_info, String delivery_fee, String prices, String detail_section) { + public BanchanDetailData(String top_image, String thumb_images, String product_description, String point, String delivery_info, String delivery_fee, String prices) { this.top_image = top_image; this.thumb_images = thumb_images; this.product_description = product_description; @@ -22,7 +21,6 @@ public BanchanDetailData(String top_image, String thumb_images, String product_d this.delivery_info = delivery_info; this.delivery_fee = delivery_fee; this.prices = prices; - this.detail_section = detail_section; } public String getTop_image() { @@ -53,10 +51,6 @@ public String getPrices() { return prices; } - public String getDetail_section() { - return detail_section; - } - @Override public String toString() { return "BanchanDetailData{" + @@ -67,7 +61,6 @@ public String toString() { ", delivery_info='" + delivery_info + '\'' + ", delivery_fee='" + delivery_fee + '\'' + ", prices='" + prices + '\'' + - ", detail_section='" + detail_section + '\'' + '}'; } } From ea53b25c55a9eafcb336023ed87f02660afef37a Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 26 Apr 2021 18:02:42 +1200 Subject: [PATCH 45/64] rename : Message --- .../develop/baminchan/controller/Message.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/controller/Message.java b/backend/src/main/java/develop/baminchan/controller/Message.java index 6c1da6739..a62c0a4d5 100644 --- a/backend/src/main/java/develop/baminchan/controller/Message.java +++ b/backend/src/main/java/develop/baminchan/controller/Message.java @@ -6,19 +6,19 @@ public class Message { public static final int NOT_FOUND = 404; public static final int INTERNAL_SERVER_ERROR = 500; - private int status; - private Object data; + private int statusCode; + private Object body; - public Message(int status, Object data) { - this.status = status; - this.data = data; + public Message(int statusCode, Object body) { + this.statusCode = statusCode; + this.body = body; } - public int getStatus() { - return status; + public int getStatusCode() { + return statusCode; } - public Object getData() { - return data; + public Object getBody() { + return body; } } From a9f97ec3ca95034fdb1f9d6fba462d9f54519348 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 26 Apr 2021 18:11:26 +1200 Subject: [PATCH 46/64] =?UTF-8?q?add=20:=20Tag=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EB=B0=98=EC=B0=AC=EB=93=A4=20=EB=B6=80=EB=A5=B4?= =?UTF-8?q?=EB=8A=94=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BanchanController.java | 25 +++++++++++++++++++ .../repository/BanchanRepository.java | 3 +++ .../baminchan/service/BanchanService.java | 13 ++++++++++ 3 files changed, 41 insertions(+) diff --git a/backend/src/main/java/develop/baminchan/controller/BanchanController.java b/backend/src/main/java/develop/baminchan/controller/BanchanController.java index b69255160..591a41ba6 100644 --- a/backend/src/main/java/develop/baminchan/controller/BanchanController.java +++ b/backend/src/main/java/develop/baminchan/controller/BanchanController.java @@ -1,11 +1,16 @@ package develop.baminchan.controller; import develop.baminchan.dto.BanchanDto; +import develop.baminchan.dto.CategoryDto; import develop.baminchan.dto.banchan.BanchanDetailDto; import develop.baminchan.entity.Banchan; import develop.baminchan.service.BanchanService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController public class BanchanController { @@ -15,6 +20,26 @@ public BanchanController(BanchanService banchanService) { this.banchanService = banchanService; } + @GetMapping("/main") + public ResponseEntity findMain() { + List banchanDtoList = banchanService.findBanchansByTag("main"); + Message message = new Message(Message.OK, banchanDtoList); + return new ResponseEntity(message, HttpStatus.OK); + } + + @GetMapping("/soup") + public ResponseEntity findSoup() { + List banchanDtoList = banchanService.findBanchansByTag("soup"); + Message message = new Message(Message.OK, banchanDtoList); + return new ResponseEntity(message, HttpStatus.OK); + } + + @GetMapping("/side") + public ResponseEntity findSide() { + List banchanDtoList = banchanService.findBanchansByTag("side"); + Message message = new Message(Message.OK, banchanDtoList); + return new ResponseEntity(message, HttpStatus.OK); + } @GetMapping("/main/{detail_hash}") public BanchanDto findOneMain(@PathVariable String detail_hash) { BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash); diff --git a/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java index 0885765fe..25fb56e8a 100644 --- a/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java +++ b/backend/src/main/java/develop/baminchan/repository/BanchanRepository.java @@ -12,4 +12,7 @@ public interface BanchanRepository extends CrudRepository { @Query("select * from banchan where category_id = :category_id") List findBanchansByCategory_id(String category_id); + + @Query("select * from banchan where tag = :tag") + List findBanchansbyTag(String tag); } diff --git a/backend/src/main/java/develop/baminchan/service/BanchanService.java b/backend/src/main/java/develop/baminchan/service/BanchanService.java index 6650e3318..773f0c43b 100644 --- a/backend/src/main/java/develop/baminchan/service/BanchanService.java +++ b/backend/src/main/java/develop/baminchan/service/BanchanService.java @@ -7,6 +7,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; + @Service public class BanchanService { @@ -33,4 +36,14 @@ public BanchanDetailDto findBanchanDetailByDetailHash(String detail_hash) { BanchanDetailDto banchanDetailDto = new BanchanDetailDto(banchan.getBanchanDetail()); return banchanDetailDto; } + + public List findBanchansByTag(String tag) { + List banchanList = banchanRepository.findBanchansbyTag(tag); + + List banchanDtoList = new ArrayList<>(); + for (int i = 0; i < banchanList.size(); i++) { + banchanDtoList.add(BanchanDto.of(banchanList.get(i))); + } + return banchanDtoList; + } } From 3f268a7290bdb09cb5953b811be368238b4a051c Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Mon, 26 Apr 2021 19:12:48 +1200 Subject: [PATCH 47/64] =?UTF-8?q?fix=20:=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EB=B2=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/develop/baminchan/dto/util/StringConvertor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java b/backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java index bf89dbb2f..48e7bc4d7 100644 --- a/backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java +++ b/backend/src/main/java/develop/baminchan/dto/util/StringConvertor.java @@ -13,7 +13,7 @@ public static Set convertToSet(String column) { return null; } Set set = new HashSet<>(); - String[] arr = column.split(","); + String[] arr = column.split(", "); set.addAll(Arrays.asList(arr)); return set; } From 9a62860af3d50db42b7112060207b8e42daae5a0 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 09:27:53 +1200 Subject: [PATCH 48/64] =?UTF-8?q?fix=20:=20BanchanDetail=20=EB=82=B4?= =?UTF-8?q?=EC=97=90=20hash=EB=A5=BC=20detail=5Fhash=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 테이블에 중복되는 hash 컬럼 삭제 --- .../dto/banchan/BanchanDetailDto.java | 2 +- .../entity/banchan/BanchanDetail.java | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java index 9daab4ed7..8450471a5 100644 --- a/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java +++ b/backend/src/main/java/develop/baminchan/dto/banchan/BanchanDetailDto.java @@ -9,7 +9,7 @@ public class BanchanDetailDto { private BanchanDetailDataDto data; public BanchanDetailDto(BanchanDetail banchanDetail) { - this.hash = banchanDetail.getHash(); + this.hash = banchanDetail.getDetail_hash(); data = new BanchanDetailDataDto.DataDtoBuilder() .setTop_image(banchanDetail.getData().getTop_image()) .setThumb_images(convertToSet(banchanDetail.getData().getThumb_images())) diff --git a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java index 5775362bd..8a6f11202 100644 --- a/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java +++ b/backend/src/main/java/develop/baminchan/entity/banchan/BanchanDetail.java @@ -3,18 +3,22 @@ import org.springframework.data.relational.core.mapping.Embedded; public class BanchanDetail { - private String hash; + private String detail_hash; @Embedded.Nullable private BanchanDetailData banchanDetailData; - public BanchanDetail(String hash, BanchanDetailData banchanDetailData) { - this.hash = hash; + public BanchanDetail(String detail_hash, BanchanDetailData banchanDetailData) { + this.detail_hash = detail_hash; this.banchanDetailData = banchanDetailData; } - public String getHash() { - return hash; + public String getDetail_hash() { + return detail_hash; + } + + public BanchanDetailData getBanchanDetailData() { + return banchanDetailData; } public BanchanDetailData getData() { @@ -24,8 +28,8 @@ public BanchanDetailData getData() { @Override public String toString() { return "BanchanDetail{" + - "hash='" + hash + '\'' + - ", data=" + banchanDetailData + + "detail_hash='" + detail_hash + '\'' + + ", banchanDetailData=" + banchanDetailData + '}'; } } From 837bab155ab75f5c9f1a42f278f25c1f5d6a36c2 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 17:42:20 +1200 Subject: [PATCH 49/64] =?UTF-8?q?feat=20:=20Order=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 주문하기 추가 --- .../baminchan/controller/OrderController.java | 23 ++++++++++++ .../java/develop/baminchan/entity/Order.java | 35 +++++++++++++++++++ .../baminchan/repository/OrderRepository.java | 7 ++++ .../baminchan/service/OrderService.java | 19 ++++++++++ 4 files changed, 84 insertions(+) create mode 100644 backend/src/main/java/develop/baminchan/controller/OrderController.java create mode 100644 backend/src/main/java/develop/baminchan/entity/Order.java create mode 100644 backend/src/main/java/develop/baminchan/repository/OrderRepository.java create mode 100644 backend/src/main/java/develop/baminchan/service/OrderService.java diff --git a/backend/src/main/java/develop/baminchan/controller/OrderController.java b/backend/src/main/java/develop/baminchan/controller/OrderController.java new file mode 100644 index 000000000..58b30954e --- /dev/null +++ b/backend/src/main/java/develop/baminchan/controller/OrderController.java @@ -0,0 +1,23 @@ +package develop.baminchan.controller; + +import develop.baminchan.entity.Order; +import develop.baminchan.service.OrderService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class OrderController { + + private OrderService orderService; + + public OrderController(OrderService orderService) { + this.orderService = orderService; + } + + @PostMapping("/order") + public String createOrder(@RequestBody Order order) { + orderService.createOrder(order); + return "success"; + } +} diff --git a/backend/src/main/java/develop/baminchan/entity/Order.java b/backend/src/main/java/develop/baminchan/entity/Order.java new file mode 100644 index 000000000..f17e8d789 --- /dev/null +++ b/backend/src/main/java/develop/baminchan/entity/Order.java @@ -0,0 +1,35 @@ +package develop.baminchan.entity; + +import org.springframework.data.annotation.Id; + +public class Order { + @Id + private Long Id; + + private String github_id; + private String detail_hash; + private int qty; + + public Order(Long id, String github_id, String detail_hash, int qty) { + Id = id; + this.github_id = github_id; + this.detail_hash = detail_hash; + this.qty = qty; + } + + public Long getId() { + return Id; + } + + public String getGithub_id() { + return github_id; + } + + public String getDetail_hash() { + return detail_hash; + } + + public int getQty() { + return qty; + } +} diff --git a/backend/src/main/java/develop/baminchan/repository/OrderRepository.java b/backend/src/main/java/develop/baminchan/repository/OrderRepository.java new file mode 100644 index 000000000..3431f6d2b --- /dev/null +++ b/backend/src/main/java/develop/baminchan/repository/OrderRepository.java @@ -0,0 +1,7 @@ +package develop.baminchan.repository; + +import develop.baminchan.entity.Order; +import org.springframework.data.repository.CrudRepository; + +public interface OrderRepository extends CrudRepository { +} diff --git a/backend/src/main/java/develop/baminchan/service/OrderService.java b/backend/src/main/java/develop/baminchan/service/OrderService.java new file mode 100644 index 000000000..bc6cbaf6e --- /dev/null +++ b/backend/src/main/java/develop/baminchan/service/OrderService.java @@ -0,0 +1,19 @@ +package develop.baminchan.service; + +import develop.baminchan.entity.Order; +import develop.baminchan.repository.OrderRepository; +import org.springframework.stereotype.Service; + +@Service +public class OrderService { + + private OrderRepository orderRepository; + + public OrderService(OrderRepository orderRepository) { + this.orderRepository = orderRepository; + } + + public void createOrder(Order order) { + orderRepository.save(order); + } +} From 124062a852d332dc3b39501f4e43c5f9591d1988 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 17:48:46 +1200 Subject: [PATCH 50/64] =?UTF-8?q?add=20:=20get=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 주문한 정보 읽어오기 --- .../baminchan/controller/OrderController.java | 12 +++++++++--- .../java/develop/baminchan/service/OrderService.java | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/controller/OrderController.java b/backend/src/main/java/develop/baminchan/controller/OrderController.java index 58b30954e..02b1ea7bb 100644 --- a/backend/src/main/java/develop/baminchan/controller/OrderController.java +++ b/backend/src/main/java/develop/baminchan/controller/OrderController.java @@ -2,9 +2,9 @@ import develop.baminchan.entity.Order; import develop.baminchan.service.OrderService; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.Optional; @RestController public class OrderController { @@ -15,6 +15,12 @@ public OrderController(OrderService orderService) { this.orderService = orderService; } + @GetMapping("/order/{id}") + public Optional findOrder(@PathVariable Long id) { + Optional order = orderService.findById(id); + return order; + } + @PostMapping("/order") public String createOrder(@RequestBody Order order) { orderService.createOrder(order); diff --git a/backend/src/main/java/develop/baminchan/service/OrderService.java b/backend/src/main/java/develop/baminchan/service/OrderService.java index bc6cbaf6e..1ff8c0840 100644 --- a/backend/src/main/java/develop/baminchan/service/OrderService.java +++ b/backend/src/main/java/develop/baminchan/service/OrderService.java @@ -4,6 +4,8 @@ import develop.baminchan.repository.OrderRepository; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service public class OrderService { @@ -16,4 +18,9 @@ public OrderService(OrderRepository orderRepository) { public void createOrder(Order order) { orderRepository.save(order); } + + public Optional findById(Long id) { + Optional order = orderRepository.findById(id); + return order; + } } From 1ce5fc07b204d326bf7634d913079628bec39b00 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 19:42:12 +1200 Subject: [PATCH 51/64] =?UTF-8?q?chore=20:=20spring-security=20&=20spring-?= =?UTF-8?q?oauth2.0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/build.gradle b/backend/build.gradle index cf9519cda..9a73ef5f4 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -13,6 +13,8 @@ repositories { } dependencies { + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-client', version: '2.1.0.RELEASE' implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' implementation 'org.springframework.boot:spring-boot-starter-web' runtimeOnly 'mysql:mysql-connector-java' From 52fbcf82f3ef22055c2877f7fc74108ca10e4155 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 19:44:07 +1200 Subject: [PATCH 52/64] =?UTF-8?q?add=20:=20Oauth=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 바로 깃헙 인증 창으로 넘어가지 않도록 --- .../baminchan/SidedishApplication.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/develop/baminchan/SidedishApplication.java b/backend/src/main/java/develop/baminchan/SidedishApplication.java index ba5345ed8..ac68e5138 100644 --- a/backend/src/main/java/develop/baminchan/SidedishApplication.java +++ b/backend/src/main/java/develop/baminchan/SidedishApplication.java @@ -2,12 +2,30 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.http.HttpStatus; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.authentication.HttpStatusEntryPoint; @SpringBootApplication -public class SidedishApplication { +public class SidedishApplication extends WebSecurityConfigurerAdapter { public static void main(String[] args) { SpringApplication.run(SidedishApplication.class, args); } + @Override + protected void configure(HttpSecurity http) throws Exception { + // @formatter:off + http + .authorizeRequests(a -> a + .antMatchers("/", "/error").permitAll() + .anyRequest().authenticated() + ) + .exceptionHandling(e -> e + .authenticationEntryPoint(new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED)) + ) + .oauth2Login(); + // @formatter:on + } } From 2954b19fee2401a93049e5d30d13c281f77a8097 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 19:45:27 +1200 Subject: [PATCH 53/64] =?UTF-8?q?chore=20:=20Github=20Oauth=20=EC=97=B0?= =?UTF-8?q?=EB=8F=99=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 8db293f31..18bc01511 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -4,3 +4,6 @@ spring.datasource.url=jdbc:mysql://localhost:3306/sidedish?autoReconnect=true&us spring.datasource.username=root spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.security.oauth2.client.registration.github.clientId= +spring.security.oauth2.client.registration.github.clientSecret= From 6d3d3237e6228582689aae2febcbda0b7efb5d77 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 19:45:49 +1200 Subject: [PATCH 54/64] fix : typo --- backend/src/main/java/develop/baminchan/entity/Order.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/entity/Order.java b/backend/src/main/java/develop/baminchan/entity/Order.java index f17e8d789..2f8b57ff5 100644 --- a/backend/src/main/java/develop/baminchan/entity/Order.java +++ b/backend/src/main/java/develop/baminchan/entity/Order.java @@ -4,21 +4,21 @@ public class Order { @Id - private Long Id; + private Long id; private String github_id; private String detail_hash; private int qty; public Order(Long id, String github_id, String detail_hash, int qty) { - Id = id; + this.id = id; this.github_id = github_id; this.detail_hash = detail_hash; this.qty = qty; } public Long getId() { - return Id; + return id; } public String getGithub_id() { From e0049aeeada0efbe27410c475b967343e602284a Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 21:00:12 +1200 Subject: [PATCH 55/64] chore : gradlew --- backend/gradlew | 185 ++++++++++++++++++++++++++++++++++++++++++++ backend/gradlew.bat | 89 +++++++++++++++++++++ 2 files changed, 274 insertions(+) create mode 100755 backend/gradlew create mode 100644 backend/gradlew.bat diff --git a/backend/gradlew b/backend/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /dev/null +++ b/backend/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/backend/gradlew.bat b/backend/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/backend/gradlew.bat @@ -0,0 +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 From 7fb1f3772a072245023350cb217099f4adc01fb0 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 21:10:49 +1200 Subject: [PATCH 56/64] chore : gradle --- backend/.idea/gradle.xml | 16 ++++++++++++++++ backend/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 +++++ 3 files changed, 21 insertions(+) create mode 100644 backend/.idea/gradle.xml create mode 100644 backend/gradle/wrapper/gradle-wrapper.jar create mode 100644 backend/gradle/wrapper/gradle-wrapper.properties diff --git a/backend/.idea/gradle.xml b/backend/.idea/gradle.xml new file mode 100644 index 000000000..ba1ec5c7e --- /dev/null +++ b/backend/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/backend/gradle/wrapper/gradle-wrapper.jar b/backend/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/backend/gradle/wrapper/gradle-wrapper.properties b/backend/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..be52383ef --- /dev/null +++ b/backend/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From ad3eca9c3b62f9300a17870ba957b5c4260af186 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Tue, 27 Apr 2021 21:17:01 +1200 Subject: [PATCH 57/64] chore : application.properties --- backend/src/main/resources/application.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 18bc01511..af76342ea 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -1,9 +1,9 @@ logging.level.sql=DEBUG -spring.datasource.url=jdbc:mysql://localhost:3306/sidedish?autoReconnect=true&useUnicode=true&characterEncoding=UTF8 +spring.datasource.url=jdbc:mysql://ec2-3-34-195-6.ap-northeast-2.compute.amazonaws.com/sidedish?autoReconnect=true&useUnicode=true&characterEncoding=UTF8 spring.datasource.username=root spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.security.oauth2.client.registration.github.clientId= -spring.security.oauth2.client.registration.github.clientSecret= +spring.security.oauth2.client.registration.github.clientId=2e9379902a5f277c3d7 +spring.security.oauth2.client.registration.github.clientSecret=d46e458737f0c64ccb59f6dcb7c7b31daf3ad48f From 2517662cd6494fdbbbcd44f74e8eb73a6d237670 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Thu, 29 Apr 2021 20:38:11 +1200 Subject: [PATCH 58/64] =?UTF-8?q?add=20:=20Mapping=20=EA=B7=9C=EC=B9=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - "/api" 추가 --- .../java/develop/baminchan/controller/BanchanController.java | 1 + .../java/develop/baminchan/controller/CategoryController.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/backend/src/main/java/develop/baminchan/controller/BanchanController.java b/backend/src/main/java/develop/baminchan/controller/BanchanController.java index 591a41ba6..d5caeb3aa 100644 --- a/backend/src/main/java/develop/baminchan/controller/BanchanController.java +++ b/backend/src/main/java/develop/baminchan/controller/BanchanController.java @@ -12,6 +12,7 @@ import java.util.List; @RestController +@RequestMapping("/api") public class BanchanController { private BanchanService banchanService; diff --git a/backend/src/main/java/develop/baminchan/controller/CategoryController.java b/backend/src/main/java/develop/baminchan/controller/CategoryController.java index bd0f63e26..7f7934524 100644 --- a/backend/src/main/java/develop/baminchan/controller/CategoryController.java +++ b/backend/src/main/java/develop/baminchan/controller/CategoryController.java @@ -6,11 +6,13 @@ 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.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController +@RequestMapping("/api") public class CategoryController { private CategoryService categoryService; From 85db84e56bb53dec954898954df34ae48292d698 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 30 Apr 2021 13:44:04 +1200 Subject: [PATCH 59/64] add : gradle related --- backend/.idea/gradle.xml | 17 ++ backend/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + backend/gradlew | 185 ++++++++++++++++++ backend/gradlew.bat | 89 +++++++++ .../baminchan/SidedishApplicationTests.java | 35 ---- 6 files changed, 296 insertions(+), 35 deletions(-) create mode 100644 backend/.idea/gradle.xml create mode 100644 backend/gradle/wrapper/gradle-wrapper.jar create mode 100644 backend/gradle/wrapper/gradle-wrapper.properties create mode 100755 backend/gradlew create mode 100644 backend/gradlew.bat diff --git a/backend/.idea/gradle.xml b/backend/.idea/gradle.xml new file mode 100644 index 000000000..611e7c8ad --- /dev/null +++ b/backend/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/backend/gradle/wrapper/gradle-wrapper.jar b/backend/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/backend/gradle/wrapper/gradle-wrapper.properties b/backend/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..be52383ef --- /dev/null +++ b/backend/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/backend/gradlew b/backend/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /dev/null +++ b/backend/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/backend/gradlew.bat b/backend/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/backend/gradlew.bat @@ -0,0 +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 diff --git a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java index 4b605a538..6657655ac 100644 --- a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java +++ b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java @@ -1,42 +1,7 @@ package develop.baminchan; -import develop.baminchan.entity.Banchan; -import develop.baminchan.repository.BanchanRepository; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -@Transactional @SpringBootTest class SidedishApplicationTests { - - - private Logger logger = LoggerFactory.getLogger(SidedishApplicationTests.class); - @Autowired - private ApplicationContext ctx; - @Autowired - private BanchanRepository banchanRepository; - - @Test - @DisplayName("IoC컨테이너 정상 동작 확인") - void contextLoads() { - assertThat(logger).isNotNull(); - assertThat(ctx).isNotNull(); - } - - @Test - @DisplayName("반찬레포에서 카테고리에 따라서 잘 가져오는지 확인") - void getBanchanList() { - List banchanList = banchanRepository.findBanchansByCategory_id("17011200"); - assertThat(banchanList).isNotNull(); - } } From 3b2644c1ade98db5e0c6985fdee64c4bd6083640 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 30 Apr 2021 13:50:14 +1200 Subject: [PATCH 60/64] remove : test --- .../baminchan/SidedishApplicationTests.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java index 4b605a538..6657655ac 100644 --- a/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java +++ b/backend/src/test/java/develop/baminchan/SidedishApplicationTests.java @@ -1,42 +1,7 @@ package develop.baminchan; -import develop.baminchan.entity.Banchan; -import develop.baminchan.repository.BanchanRepository; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -@Transactional @SpringBootTest class SidedishApplicationTests { - - - private Logger logger = LoggerFactory.getLogger(SidedishApplicationTests.class); - @Autowired - private ApplicationContext ctx; - @Autowired - private BanchanRepository banchanRepository; - - @Test - @DisplayName("IoC컨테이너 정상 동작 확인") - void contextLoads() { - assertThat(logger).isNotNull(); - assertThat(ctx).isNotNull(); - } - - @Test - @DisplayName("반찬레포에서 카테고리에 따라서 잘 가져오는지 확인") - void getBanchanList() { - List banchanList = banchanRepository.findBanchansByCategory_id("17011200"); - assertThat(banchanList).isNotNull(); - } } From 96f05e8506f21abaa262c03d24be58e445137d08 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 30 Apr 2021 13:51:23 +1200 Subject: [PATCH 61/64] resolve : problem about merging with gradle.xml --- backend/.idea/gradle.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/.idea/gradle.xml b/backend/.idea/gradle.xml index ba1ec5c7e..1debe0edf 100644 --- a/backend/.idea/gradle.xml +++ b/backend/.idea/gradle.xml @@ -1,5 +1,6 @@ + - \ No newline at end of file + From 44aee23f8b0ecdeedb93155b03c69de047fb8c6b Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 30 Apr 2021 14:48:03 +1200 Subject: [PATCH 62/64] remove : Oauth related --- backend/build.gradle | 2 -- .../baminchan/SidedishApplication.java | 21 +------------------ .../src/main/resources/application.properties | 5 +---- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 9a73ef5f4..cf9519cda 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -13,8 +13,6 @@ repositories { } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-client', version: '2.1.0.RELEASE' implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' implementation 'org.springframework.boot:spring-boot-starter-web' runtimeOnly 'mysql:mysql-connector-java' diff --git a/backend/src/main/java/develop/baminchan/SidedishApplication.java b/backend/src/main/java/develop/baminchan/SidedishApplication.java index ac68e5138..e9379a0c9 100644 --- a/backend/src/main/java/develop/baminchan/SidedishApplication.java +++ b/backend/src/main/java/develop/baminchan/SidedishApplication.java @@ -2,30 +2,11 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.http.HttpStatus; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.web.authentication.HttpStatusEntryPoint; @SpringBootApplication -public class SidedishApplication extends WebSecurityConfigurerAdapter { +public class SidedishApplication { public static void main(String[] args) { SpringApplication.run(SidedishApplication.class, args); } - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - http - .authorizeRequests(a -> a - .antMatchers("/", "/error").permitAll() - .anyRequest().authenticated() - ) - .exceptionHandling(e -> e - .authenticationEntryPoint(new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED)) - ) - .oauth2Login(); - // @formatter:on - } } diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index af76342ea..8db293f31 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -1,9 +1,6 @@ logging.level.sql=DEBUG -spring.datasource.url=jdbc:mysql://ec2-3-34-195-6.ap-northeast-2.compute.amazonaws.com/sidedish?autoReconnect=true&useUnicode=true&characterEncoding=UTF8 +spring.datasource.url=jdbc:mysql://localhost:3306/sidedish?autoReconnect=true&useUnicode=true&characterEncoding=UTF8 spring.datasource.username=root spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -spring.security.oauth2.client.registration.github.clientId=2e9379902a5f277c3d7 -spring.security.oauth2.client.registration.github.clientSecret=d46e458737f0c64ccb59f6dcb7c7b31daf3ad48f From 5f610447d68a0d4b413a1ba6a5323250fed1da90 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 30 Apr 2021 17:21:45 +1200 Subject: [PATCH 63/64] =?UTF-8?q?add=20:=20=EC=A3=BC=EB=AC=B8=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baminchan/controller/OrderController.java | 8 +++++--- .../java/develop/baminchan/entity/Order.java | 18 +++++++++--------- .../baminchan/service/OrderService.java | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/backend/src/main/java/develop/baminchan/controller/OrderController.java b/backend/src/main/java/develop/baminchan/controller/OrderController.java index 02b1ea7bb..633327ec4 100644 --- a/backend/src/main/java/develop/baminchan/controller/OrderController.java +++ b/backend/src/main/java/develop/baminchan/controller/OrderController.java @@ -2,6 +2,8 @@ import develop.baminchan.entity.Order; import develop.baminchan.service.OrderService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.Optional; @@ -22,8 +24,8 @@ public Optional findOrder(@PathVariable Long id) { } @PostMapping("/order") - public String createOrder(@RequestBody Order order) { - orderService.createOrder(order); - return "success"; + public ResponseEntity createOrder(@RequestBody Order order) { + orderService.createOrder(order); + return new ResponseEntity("success", HttpStatus.OK); } } diff --git a/backend/src/main/java/develop/baminchan/entity/Order.java b/backend/src/main/java/develop/baminchan/entity/Order.java index 2f8b57ff5..667366172 100644 --- a/backend/src/main/java/develop/baminchan/entity/Order.java +++ b/backend/src/main/java/develop/baminchan/entity/Order.java @@ -6,30 +6,30 @@ public class Order { @Id private Long id; - private String github_id; + private String client_id; private String detail_hash; - private int qty; + private int quantity; - public Order(Long id, String github_id, String detail_hash, int qty) { + public Order(Long id, String client_id, String detail_hash, int quantity) { this.id = id; - this.github_id = github_id; + this.client_id = client_id; this.detail_hash = detail_hash; - this.qty = qty; + this.quantity = quantity; } public Long getId() { return id; } - public String getGithub_id() { - return github_id; + public String getClient_id() { + return client_id; } public String getDetail_hash() { return detail_hash; } - public int getQty() { - return qty; + public int getQuantity() { + return quantity; } } diff --git a/backend/src/main/java/develop/baminchan/service/OrderService.java b/backend/src/main/java/develop/baminchan/service/OrderService.java index 1ff8c0840..ac339b7d6 100644 --- a/backend/src/main/java/develop/baminchan/service/OrderService.java +++ b/backend/src/main/java/develop/baminchan/service/OrderService.java @@ -15,8 +15,8 @@ public OrderService(OrderRepository orderRepository) { this.orderRepository = orderRepository; } - public void createOrder(Order order) { - orderRepository.save(order); + public Order createOrder(Order order) { + return orderRepository.save(order); } public Optional findById(Long id) { From 7ff3ea16bbf15247f591a6b35f0f60a0fb12b925 Mon Sep 17 00:00:00 2001 From: kyu-kim-kr <59721293+kyu-kim-kr@users.noreply.github.com> Date: Fri, 30 Apr 2021 17:34:19 +1200 Subject: [PATCH 64/64] =?UTF-8?q?fix=20:=20=EB=A7=A4=ED=95=91=EC=A0=95?= =?UTF-8?q?=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/develop/baminchan/controller/OrderController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/develop/baminchan/controller/OrderController.java b/backend/src/main/java/develop/baminchan/controller/OrderController.java index 633327ec4..53ebe8a17 100644 --- a/backend/src/main/java/develop/baminchan/controller/OrderController.java +++ b/backend/src/main/java/develop/baminchan/controller/OrderController.java @@ -9,6 +9,7 @@ import java.util.Optional; @RestController +@RequestMapping("/api") public class OrderController { private OrderService orderService;