From 0f1293d3b5ca0fe5057caaad585b9d1c292b672a Mon Sep 17 00:00:00 2001 From: Kim Doo Hyeon Date: Wed, 19 Feb 2025 17:06:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[ALL]=20=EC=9D=B4=EA=B2=83=EC=A0=80?= =?UTF-8?q?=EA=B2=83=20#43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - center @Default 추가 --- src/main/java/young/blaybus/domain/center/Center.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/young/blaybus/domain/center/Center.java b/src/main/java/young/blaybus/domain/center/Center.java index 0e8bb3b..a846095 100644 --- a/src/main/java/young/blaybus/domain/center/Center.java +++ b/src/main/java/young/blaybus/domain/center/Center.java @@ -8,6 +8,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.Builder.Default; import lombok.Getter; import lombok.NoArgsConstructor; import org.hibernate.annotations.Comment; @@ -64,9 +65,11 @@ public class Center { @LastModifiedDate private LocalDateTime updatedTime; + @Default @OneToMany(mappedBy = "center", cascade = CascadeType.ALL, orphanRemoval = true) private List memberList = new ArrayList<>(); + @Default @OneToMany(mappedBy = "center", cascade = CascadeType.ALL, orphanRemoval = true) private List seniorList = new ArrayList<>(); From d19ed2acbeb8919ed176103cee2a958609ac5e02 Mon Sep 17 00:00:00 2001 From: Kim Doo Hyeon Date: Wed, 19 Feb 2025 18:13:05 +0900 Subject: [PATCH 2/3] fixed untracked files --- .gitignore | 2 + src/main/resources/application-dev.yml | 67 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 src/main/resources/application-dev.yml diff --git a/.gitignore b/.gitignore index c2065bc..4457eb4 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ out/ ### VS Code ### .vscode/ + +application-dev.yml diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..669136e --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,67 @@ +spring: + application: + name: blaybus + + servlet: + multipart: + max-file-size: 200MB + max-request-size: 200MB + enabled: true + + jpa: + open-in-view: false + show-sql: true + hibernate: + ddl-auto: update + properties: + hibernate: + format_sql: false + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL_DEV} + username: ${DB_USERNAME_DEV} + password: ${DB_PW_DEV} + + data: + redis: + port: 6379 + host: ${REDIS_HOST} + repositories: + enabled: false + +sk: + app-key: ${SK_APP_KEY} + url: https://apis.openapi.sk.com/tmap + +jwt: + secret: ${JWT} + +# mail: +# host: smtp.naver.com +# port: ${MAIL_PORT} +# username: ${MAIL_USERNAME} +# password: ${MAIL_PW} +# properties: +# mail: +# debug: true +# smtp.auth: true +# smtp.ssl.enable: true +# smtp.ssl.trust: smtp.naver.com + +cloud: + aws: + credentials: + access-key: ${AWS_ACCESS_KEY} + secret-key: ${AWS_SECRET_KEY} + s3: + bucket: ${AWS_S3_BUCKET} + region: + static: ap-northeast-2 + auto: false + stack: + auto: false + +crypto: + private-key: ${CRYPTO_PRIVATE_KEY} + transformation: ${CRYPTO_TRANSFORMATION} From bcb890841fae49895830f5395d89e9dd68c11e2d Mon Sep 17 00:00:00 2001 From: Kim Doo Hyeon Date: Wed, 19 Feb 2025 18:19:39 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[ALL]=20=EC=9D=B4=EA=B2=83=EC=A0=80?= =?UTF-8?q?=EA=B2=83=20#43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - recommend 반환 형식 수정 --- .../controller/response/ListRecommendDto.java | 15 ++++++++++++++- .../domain/senior/service/RecommendService.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/young/blaybus/domain/senior/controller/response/ListRecommendDto.java b/src/main/java/young/blaybus/domain/senior/controller/response/ListRecommendDto.java index f1e3270..72f70c2 100644 --- a/src/main/java/young/blaybus/domain/senior/controller/response/ListRecommendDto.java +++ b/src/main/java/young/blaybus/domain/senior/controller/response/ListRecommendDto.java @@ -2,12 +2,15 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.List; +import java.util.Locale; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import young.blaybus.util.enums.CareStyle; import young.blaybus.util.enums.DayOfWeek; @Builder @@ -37,9 +40,19 @@ public class ListRecommendDto { private LocalTime endTime; @Schema(description = "돌봄 스타일") - private String careStyle; + private CareStyle careStyle; @Schema(description = "적합도 %") private Integer fitness; + public String getStartTime() { + return startTime.format(DateTimeFormatter.ofPattern("a HH:mm").withLocale(Locale.forLanguageTag("ko"))); + } + public String getEndTime() { + return endTime.format(DateTimeFormatter.ofPattern("HH:mm").withLocale(Locale.forLanguageTag("ko"))); + } + public String getCareStyle() { + String emojiRegex = "[\uD83C-\uDBFF\uDC00-\uDFFF\u2600-\u26FF]+"; + return careStyle.getValue().replaceAll(emojiRegex, "").strip(); + } } diff --git a/src/main/java/young/blaybus/domain/senior/service/RecommendService.java b/src/main/java/young/blaybus/domain/senior/service/RecommendService.java index bbb9bc2..1edcf98 100644 --- a/src/main/java/young/blaybus/domain/senior/service/RecommendService.java +++ b/src/main/java/young/blaybus/domain/senior/service/RecommendService.java @@ -63,7 +63,7 @@ public ListRecommendResponse getRecommendList(Long seniorId) { .dayList(jobSearch.getDayList().stream().map(JobSearchDay::getDay).toList()) .startTime(jobSearch.getStartTime()) .endTime(jobSearch.getEndTime()) - .careStyle(member.getCareStyle().getValue()) + .careStyle(member.getCareStyle()) .fitness(calculateFitness(member, senior)) .build() );