Skip to content

Commit 44551cf

Browse files
authored
Merge pull request #525 from woowacourse-teams/dev
main v1.0.1 배포한다.
2 parents 35c08dd + f56a31f commit 44551cf

File tree

72 files changed

+859
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+859
-185
lines changed

backend/src/main/java/com/woowacourse/zzimkkong/ZzimkkongApplication.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,16 @@
33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55

6+
import javax.annotation.PostConstruct;
7+
import java.util.TimeZone;
8+
69
@SpringBootApplication
710
public class ZzimkkongApplication {
11+
@PostConstruct
12+
private void setTimeZone(){
13+
TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
14+
}
15+
816
public static void main(String[] args) {
917
SpringApplication.run(ZzimkkongApplication.class, args);
1018
}

backend/src/main/java/com/woowacourse/zzimkkong/AuthenticationPrincipalConfig.java renamed to backend/src/main/java/com/woowacourse/zzimkkong/config/AuthenticationPrincipalConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woowacourse.zzimkkong;
1+
package com.woowacourse.zzimkkong.config;
22

33
import com.woowacourse.zzimkkong.infrastructure.AuthenticationPrincipalArgumentResolver;
44
import com.woowacourse.zzimkkong.infrastructure.LoginInterceptor;

backend/src/main/java/com/woowacourse/zzimkkong/SecurityConfig.java renamed to backend/src/main/java/com/woowacourse/zzimkkong/config/SecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woowacourse.zzimkkong;
1+
package com.woowacourse.zzimkkong.config;
22

33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;

backend/src/main/java/com/woowacourse/zzimkkong/SlackConfig.java renamed to backend/src/main/java/com/woowacourse/zzimkkong/config/SlackConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woowacourse.zzimkkong;
1+
package com.woowacourse.zzimkkong.config;
22

33
import com.woowacourse.zzimkkong.domain.SlackUrl;
44
import org.springframework.beans.factory.annotation.Value;

backend/src/main/java/com/woowacourse/zzimkkong/StorageConfig.java renamed to backend/src/main/java/com/woowacourse/zzimkkong/config/StorageConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woowacourse.zzimkkong;
1+
package com.woowacourse.zzimkkong.config;
22

33
import com.amazonaws.auth.AWSStaticCredentialsProvider;
44
import com.amazonaws.auth.BasicAWSCredentials;
@@ -15,7 +15,7 @@
1515
@PropertySource("classpath:config/awsS3.properties")
1616
public class StorageConfig {
1717
@Bean
18-
@Profile("prod")
18+
@Profile({"prod", "dev"})
1919
public AmazonS3 amazonS3() {
2020
return AmazonS3ClientBuilder
2121
.standard()
@@ -24,7 +24,7 @@ public AmazonS3 amazonS3() {
2424
}
2525

2626
@Bean(name = "amazonS3")
27-
@Profile("!prod")
27+
@Profile({"local", "test"})
2828
public AmazonS3 amazonS3Local(
2929
@Value("${aws.access-key}") String accessKey,
3030
@Value("${aws.secret-key}") String secretKey) {

backend/src/main/java/com/woowacourse/zzimkkong/WebConfig.java renamed to backend/src/main/java/com/woowacourse/zzimkkong/config/WebConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woowacourse.zzimkkong;
1+
package com.woowacourse.zzimkkong.config;
22

33
import org.apache.http.HttpHeaders;
44
import org.springframework.beans.factory.annotation.Value;

backend/src/main/java/com/woowacourse/zzimkkong/controller/MemberController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class MemberController {
2727
public MemberController(final MemberService memberService, final PresetService presetService) {
2828
this.memberService = memberService;
2929
this.presetService = presetService;
30-
3130
}
3231

3332
@PostMapping

backend/src/main/java/com/woowacourse/zzimkkong/dto/ValidatorMessage.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ private ValidatorMessage() {
1010
public static final String RESERVATION_PW_MESSAGE = "비밀번호는 숫자 4자리만 입력 가능합니다.";
1111
public static final String ORGANIZATION_MESSAGE = "조직명은 특수문자 없이 20자 이내로 작성 가능합니다.";
1212
public static final String NAME_MESSAGE = "이름은 특수문자(-_!?.,)를 포함하여 20자 이내로 작성 가능합니다.";
13+
public static final String PRESET_NAME_MESSAGE = "프리셋 이름은 공백과 특수문자(-_!?.,)를 포함하여 20자 이내로 작성 가능합니다.";
1314
public static final String DESCRIPTION_MESSAGE = "예약 내용은 100자 이내로 작성 가능합니다.";
1415
public static final String FORMAT_MESSAGE = "날짜 및 시간 데이터 형식이 올바르지 않습니다.";
1516
public static final String DAY_OF_WEEK_MESSAGE = "올바른 요일 형식이 아닙니다.";
@@ -23,4 +24,6 @@ private ValidatorMessage() {
2324
public static final String RESERVATION_PW_FORMAT = "^[0-9]{4}$";
2425
public static final String ORGANIZATION_FORMAT = "^[ a-zA-Z0-9ㄱ-힣]{1,20}$";
2526
public static final String NAMING_FORMAT = "^[-_!?.,a-zA-Z0-9ㄱ-힣]{1,20}$";
27+
public static final String PRESET_NAME_FORMAT = "^[-_!?., a-zA-Z0-9ㄱ-힣]{1,20}$";
28+
2629
}

backend/src/main/java/com/woowacourse/zzimkkong/dto/member/PresetCreateRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@NoArgsConstructor
1515
public class PresetCreateRequest {
1616
@NotNull(message = EMPTY_MESSAGE)
17-
@Pattern(regexp = NAMING_FORMAT, message = NAME_MESSAGE)
17+
@Pattern(regexp = PRESET_NAME_FORMAT, message = PRESET_NAME_MESSAGE)
1818
private String name;
1919

2020
@Valid

backend/src/main/java/com/woowacourse/zzimkkong/dto/member/PresetFindResponse.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
@Getter
1212
@NoArgsConstructor
1313
public class PresetFindResponse extends SettingResponse {
14+
private Long id;
1415
private String name;
1516

1617
private PresetFindResponse(
18+
final Long id,
1719
final LocalTime availableStartTime,
1820
final LocalTime availableEndTime,
1921
final Integer reservationTimeUnit,
@@ -23,13 +25,15 @@ private PresetFindResponse(
2325
final String enabledDayOfWeek,
2426
final String name) {
2527
super(availableStartTime, availableEndTime, reservationTimeUnit, reservationMinimumTimeUnit, reservationMaximumTimeUnit, reservationEnable, enabledDayOfWeek);
28+
this.id = id;
2629
this.name = name;
2730
}
2831

2932
public static PresetFindResponse from(final Preset preset) {
3033
Setting setting = preset.getSetting();
3134

3235
return new PresetFindResponse(
36+
preset.getId(),
3337
setting.getAvailableStartTime(),
3438
setting.getAvailableEndTime(),
3539
setting.getReservationTimeUnit(),

0 commit comments

Comments
 (0)