From 37b48f564e987cd8b6ec347e032e408bc7a91e08 Mon Sep 17 00:00:00 2001 From: yejin Date: Sat, 10 May 2025 14:29:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Feat:=20=EB=8C=80=EB=8F=99=EC=A0=9C=20?= =?UTF-8?q?=EC=A3=BC=EC=A0=90=20=ED=95=84=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/koyeon/entity/FreePub.java | 17 ++++++++++++++ .../domain/koyeon/entity/PubImage.java | 23 +++++++++++++++++++ .../teamcback/domain/koyeon/entity/Type.java | 5 ++++ 3 files changed, 45 insertions(+) create mode 100644 src/main/java/devkor/com/teamcback/domain/koyeon/entity/PubImage.java create mode 100644 src/main/java/devkor/com/teamcback/domain/koyeon/entity/Type.java diff --git a/src/main/java/devkor/com/teamcback/domain/koyeon/entity/FreePub.java b/src/main/java/devkor/com/teamcback/domain/koyeon/entity/FreePub.java index 1b31ec28..b6ee322e 100644 --- a/src/main/java/devkor/com/teamcback/domain/koyeon/entity/FreePub.java +++ b/src/main/java/devkor/com/teamcback/domain/koyeon/entity/FreePub.java @@ -5,6 +5,10 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + @Entity @Getter @Table(name = "tb_free_pub") @@ -38,4 +42,17 @@ public class FreePub { @Column(nullable = false) private Double longitude; + + @Column + private Date operatingDate; + + @Column(length = 1500) + private String content; + + @Column(nullable = false) + @Enumerated(EnumType.STRING) + private Type type; + + @OneToMany(mappedBy = "freePub", cascade = CascadeType.ALL, orphanRemoval = true) + private List images = new ArrayList<>(); } diff --git a/src/main/java/devkor/com/teamcback/domain/koyeon/entity/PubImage.java b/src/main/java/devkor/com/teamcback/domain/koyeon/entity/PubImage.java new file mode 100644 index 00000000..67b578ee --- /dev/null +++ b/src/main/java/devkor/com/teamcback/domain/koyeon/entity/PubImage.java @@ -0,0 +1,23 @@ +package devkor.com.teamcback.domain.koyeon.entity; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Table(name = "tb_pub_image") +@NoArgsConstructor +public class PubImage { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String imageUrl; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "freePub_id") + private FreePub freePub; + +} diff --git a/src/main/java/devkor/com/teamcback/domain/koyeon/entity/Type.java b/src/main/java/devkor/com/teamcback/domain/koyeon/entity/Type.java new file mode 100644 index 00000000..8ab2e766 --- /dev/null +++ b/src/main/java/devkor/com/teamcback/domain/koyeon/entity/Type.java @@ -0,0 +1,5 @@ +package devkor.com.teamcback.domain.koyeon.entity; + +public enum Type { + PUB, BOOTH; +} From 740f24b5d73c6cabe161b16d5d7824a4bcc29537 Mon Sep 17 00:00:00 2001 From: yejin Date: Sat, 10 May 2025 14:32:03 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Feat:=20=EC=9E=A5=EC=95=A0=EC=9D=B8?= =?UTF-8?q?=EC=A3=BC=EC=B0=A8=EC=9E=A5=20=EC=9E=A5=EC=86=8C=20=EC=A2=85?= =?UTF-8?q?=EB=A5=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devkor/com/teamcback/domain/place/entity/PlaceType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/devkor/com/teamcback/domain/place/entity/PlaceType.java b/src/main/java/devkor/com/teamcback/domain/place/entity/PlaceType.java index a3219246..71038c51 100644 --- a/src/main/java/devkor/com/teamcback/domain/place/entity/PlaceType.java +++ b/src/main/java/devkor/com/teamcback/domain/place/entity/PlaceType.java @@ -34,7 +34,8 @@ public enum PlaceType { BOOK_RETURN_MACHINE("도서반납기", new String[]{"책반납기계", "도서반납기계"}), TUMBLER_WASHER("텀블러세척기", new String[]{}), ONESTOP_AUTO_MACHINE("원스탑무인발급기", new String[]{"원스톱무인발급기", "증명서", "ONE-STOP", "ONESTOP"}), - HEALTH_OFFICE("건강센터", new String[]{"약받는곳", "보건실", "양호실", "응급약", "약받을수있는", "다쳤을때"}); + HEALTH_OFFICE("건강센터", new String[]{"약받는곳", "보건실", "양호실", "응급약", "약받을수있는", "다쳤을때"}), + DISABLED_PARKING("장애인주차장", new String[] {"장애인주차장", "베리어프리", "휠체어주차장"}); private final String name; private final String[] nickname; From 3eb8e4701e77459913ac16df95a394fe2d9b0207 Mon Sep 17 00:00:00 2001 From: Yeoeun Yang Date: Sat, 10 May 2025 16:09:42 +0900 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=ED=86=B5=ED=95=A9=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=ED=83=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teamcback/domain/search/service/SearchService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/devkor/com/teamcback/domain/search/service/SearchService.java b/src/main/java/devkor/com/teamcback/domain/search/service/SearchService.java index 31a84616..772ec045 100644 --- a/src/main/java/devkor/com/teamcback/domain/search/service/SearchService.java +++ b/src/main/java/devkor/com/teamcback/domain/search/service/SearchService.java @@ -79,7 +79,7 @@ public class SearchService { private final List outerTagTypes = Arrays.asList(PlaceType.CAFE, PlaceType.CAFETERIA, PlaceType.CONVENIENCE_STORE, PlaceType.READING_ROOM, PlaceType.STUDY_ROOM, PlaceType.BOOK_RETURN_MACHINE, PlaceType.LOUNGE, PlaceType.WATER_PURIFIER, PlaceType.VENDING_MACHINE, PlaceType.PRINTER, PlaceType.TUMBLER_WASHER, PlaceType.ONESTOP_AUTO_MACHINE, PlaceType.BANK, - PlaceType.SMOKING_BOOTH, PlaceType.SHOWER_ROOM, PlaceType.GYM, PlaceType.SLEEPING_ROOM, PlaceType.HEALTH_OFFICE); + PlaceType.SMOKING_BOOTH, PlaceType.SHOWER_ROOM, PlaceType.GYM, PlaceType.SLEEPING_ROOM, PlaceType.HEALTH_OFFICE, PlaceType.DISABLED_PARKING); /** * 통합 검색 From 8d65f3c19d6b9e2de501bd5464e21e81b6b74c9f Mon Sep 17 00:00:00 2001 From: Yeoeun Yang Date: Sat, 10 May 2025 16:11:28 +0900 Subject: [PATCH 4/4] =?UTF-8?q?docs:=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=20ignore=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 986c5f89..1da9fd01 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,6 @@ out/ ### VS Code ### .vscode/ + +### 환경 변수 ### +.env