Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ out/

### VS Code ###
.vscode/

application-dev.yml
3 changes: 3 additions & 0 deletions src/main/java/young/blaybus/domain/center/Center.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -64,9 +65,11 @@ public class Center {
@LastModifiedDate
private LocalDateTime updatedTime;

@Default
@OneToMany(mappedBy = "center", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Member> memberList = new ArrayList<>();

@Default
@OneToMany(mappedBy = "center", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Senior> seniorList = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down
67 changes: 67 additions & 0 deletions src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
@@ -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}