-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #559 from woowacourse-teams/dev
feat: main v1.1.0 배포한다.
- Loading branch information
Showing
231 changed files
with
8,129 additions
and
4,358 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,7 +39,9 @@ public void run(String... args) { | |
| String meetingRoomColor = "#FFE3AC"; | ||
|
|
||
| Member pobi = members.save( | ||
| new Member("[email protected]", "test1234", "woowacourse") | ||
| new Member("[email protected]", | ||
| "$2a$10$c3BysogWR4hnexYx60/r/e3lEUIbSs4zhW6kuX4UW733MW5/NmbW.", // test1234 입니다. | ||
| "woowacourse") | ||
| ); | ||
|
|
||
| Map luther = maps.save( | ||
|
|
@@ -51,13 +53,13 @@ public void run(String... args) { | |
| ); | ||
|
|
||
| Setting defaultSetting = Setting.builder() | ||
| .availableStartTime(LocalTime.of(0, 0)) | ||
| .availableEndTime(LocalTime.of(23, 59)) | ||
| .availableStartTime(LocalTime.of(9, 0)) | ||
| .availableEndTime(LocalTime.of(22, 00)) | ||
| .reservationTimeUnit(10) | ||
| .reservationMinimumTimeUnit(10) | ||
| .reservationMaximumTimeUnit(1440) | ||
| .reservationMaximumTimeUnit(700) | ||
| .reservationEnable(true) | ||
| .enabledDayOfWeek(null) | ||
| .enabledDayOfWeek("monday,tuesday,wednesday,thursday,friday,saturday,sunday") | ||
| .build(); | ||
|
|
||
| Space be = Space.builder() | ||
|
|
@@ -175,6 +177,7 @@ public void run(String... args) { | |
| Reservation reservationBackEndTargetDate0To1 = Reservation.builder() | ||
| .startTime(targetDate.atStartOfDay()) | ||
| .endTime(targetDate.atTime(1, 0, 0)) | ||
| .date(targetDate) | ||
| .description("찜꽁 1차 회의") | ||
| .userName("찜꽁") | ||
| .password("1234") | ||
|
|
@@ -184,6 +187,7 @@ public void run(String... args) { | |
| Reservation reservationBackEndTargetDate13To14 = Reservation.builder() | ||
| .startTime(targetDate.atTime(13, 0, 0)) | ||
| .endTime(targetDate.atTime(14, 0, 0)) | ||
| .date(targetDate) | ||
| .description("찜꽁 2차 회의") | ||
| .userName("찜꽁") | ||
| .password("1234") | ||
|
|
@@ -193,6 +197,7 @@ public void run(String... args) { | |
| Reservation reservationBackEndTargetDate18To23 = Reservation.builder() | ||
| .startTime(targetDate.atTime(18, 0, 0)) | ||
| .endTime(targetDate.atTime(23, 59, 59)) | ||
| .date(targetDate) | ||
| .description("찜꽁 3차 회의") | ||
| .userName("찜꽁") | ||
| .password("6789") | ||
|
|
@@ -202,6 +207,7 @@ public void run(String... args) { | |
| Reservation reservationBackEndTheDayAfterTargetDate = Reservation.builder() | ||
| .startTime(targetDate.plusDays(1L).atStartOfDay()) | ||
| .endTime(targetDate.plusDays(1L).atTime(1, 0, 0)) | ||
| .date(targetDate) | ||
| .description("찜꽁 4차 회의") | ||
| .userName("찜꽁") | ||
| .password("1234") | ||
|
|
@@ -211,6 +217,7 @@ public void run(String... args) { | |
| Reservation reservationFrontEnd1TargetDate0to1 = Reservation.builder() | ||
| .startTime(targetDate.atStartOfDay()) | ||
| .endTime(targetDate.atTime(1, 0, 0)) | ||
| .date(targetDate) | ||
| .description("찜꽁 5차 회의") | ||
| .userName("찜꽁") | ||
| .password("1234") | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
backend/src/main/java/com/woowacourse/zzimkkong/config/OauthConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.woowacourse.zzimkkong.config; | ||
|
|
||
| import com.woowacourse.zzimkkong.infrastructure.oauth.StringToOauthProviderConverter; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.format.FormatterRegistry; | ||
| import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; | ||
|
|
||
| @Configuration | ||
| public class OauthConfig implements WebMvcConfigurer { | ||
| @Override | ||
| public void addFormatters(FormatterRegistry registry) { | ||
| registry.addConverter(new StringToOauthProviderConverter()); | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
backend/src/main/java/com/woowacourse/zzimkkong/config/OauthGithubConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package com.woowacourse.zzimkkong.config; | ||
|
|
||
| import com.woowacourse.zzimkkong.infrastructure.oauth.GithubRequester; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.context.annotation.Profile; | ||
| import org.springframework.context.annotation.PropertySource; | ||
|
|
||
| @Configuration | ||
| @PropertySource("classpath:config/oauth.properties") | ||
| public class OauthGithubConfig { | ||
| @Bean(name = "githubRequester") | ||
| @Profile({"prod"}) | ||
| public GithubRequester githubRequesterProd( | ||
| @Value("${github.client-id.prod}") final String clientId, | ||
| @Value("${github.secret-id.prod}") final String secretId, | ||
| @Value("${github.url.oauth-login}") final String githubOauthUrl, | ||
| @Value("${github.url.open-api}") final String githubOpenApiUrl) { | ||
| return new GithubRequester(clientId, secretId, githubOauthUrl, githubOpenApiUrl); | ||
| } | ||
|
|
||
| @Bean(name = "githubRequester") | ||
| @Profile({"dev"}) | ||
| public GithubRequester githubRequesterDev( | ||
| @Value("${github.client-id.dev}") final String clientId, | ||
| @Value("${github.secret-id.dev}") final String secretId, | ||
| @Value("${github.url.oauth-login}") final String githubOauthUrl, | ||
| @Value("${github.url.open-api}") final String githubOpenApiUrl) { | ||
| return new GithubRequester(clientId, secretId, githubOauthUrl, githubOpenApiUrl); | ||
| } | ||
|
|
||
| @Bean(name = "githubRequester") | ||
| @Profile({"local", "test"}) | ||
| public GithubRequester githubRequesterLocalTest( | ||
| @Value("${github.client-id.local}") final String clientId, | ||
| @Value("${github.secret-id.local}") final String secretId, | ||
| @Value("${github.url.oauth-login}") final String githubOauthUrl, | ||
| @Value("${github.url.open-api}") final String githubOpenApiUrl) { | ||
| return new GithubRequester(clientId, secretId, githubOauthUrl, githubOpenApiUrl); | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
backend/src/main/java/com/woowacourse/zzimkkong/config/datasource/CircularList.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package com.woowacourse.zzimkkong.config.datasource; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class CircularList<T> { | ||
| private final List<T> list; | ||
| private Integer counter = 0; | ||
|
|
||
| public CircularList(List<T> list) { | ||
| this.list = list; | ||
| } | ||
|
|
||
| public T getOne() { | ||
| if (counter + 1 >= list.size()) { | ||
| counter = -1; | ||
| } | ||
| return list.get(++counter); | ||
| } | ||
| } |
Oops, something went wrong.