From 970599b8064430b2680a480a7d41592c2019b397 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sat, 25 Jan 2025 14:56:10 +0900
Subject: [PATCH 1/6] =?UTF-8?q?CLAP-133=20Config:=20cors=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=93=B1=EB=A1=9D=20=EB=B0=8F=20es=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #98
---
 src/main/resources/application.yml   | 15 ++++++++++-----
 src/main/resources/elasticsearch.yml |  3 +++
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/elasticsearch.yml

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 26f09508..d5fbaff7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,22 +7,27 @@ spring:
       - swagger.yml
       - redis.yml
       - auth.yml
+      - elasticsearch.yml
   application:
     name: taskflow
-  elasticsearch:
-    uris: ${ELASTIC_URI:127.0.0.1:9200}
-
   web.resources.add-mappings: false
 
 
 server:
   port: ${APPLICATION_PORT:8080}
   tomcat:
-    max-connections: 20000
+    max-connections: 10000
     threads:
       max: 600
       min-spare: 100
-
+  domain:
+    local: ${TASKFLOW_LOCAL_SERVER:127.0.0.1:8080}
+    service: ${TASKFLOW_SERVICE_SERVER:127.0.0.1:8080}
+
+web:
+  domain:
+    local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:3O00}
+    service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:3000}
 #logging:
 #  level:
 #    root: INFO
diff --git a/src/main/resources/elasticsearch.yml b/src/main/resources/elasticsearch.yml
new file mode 100644
index 00000000..d77bdeca
--- /dev/null
+++ b/src/main/resources/elasticsearch.yml
@@ -0,0 +1,3 @@
+spring:
+  elasticsearch:
+    uris: ${ELASTIC_URI:127.0.0.1:9200}
\ No newline at end of file

From e7fc065c319d51fec5cff557abaa7a07b2825f34 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sat, 25 Jan 2025 14:57:18 +0900
Subject: [PATCH 2/6] =?UTF-8?q?CLAP-133=20Config:=20=EC=9B=B9/=EC=84=9C?=
 =?UTF-8?q?=EB=B2=84=20=EB=8F=84=EB=A9=94=EC=9D=B8=20properties=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #98
---
 .../properties/PasswordPolicyProperties.java     |  4 ++--
 .../properties/ServerDomainProperties.java       | 13 +++++++++++++
 .../common/properties/WebDomainProperties.java   | 13 +++++++++++++
 .../config/properties/PropertiesConfig.java      | 16 ++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/clap/server/common/properties/ServerDomainProperties.java
 create mode 100644 src/main/java/clap/server/common/properties/WebDomainProperties.java
 create mode 100644 src/main/java/clap/server/config/properties/PropertiesConfig.java

diff --git a/src/main/java/clap/server/common/properties/PasswordPolicyProperties.java b/src/main/java/clap/server/common/properties/PasswordPolicyProperties.java
index f25b5bf8..64c2e7da 100644
--- a/src/main/java/clap/server/common/properties/PasswordPolicyProperties.java
+++ b/src/main/java/clap/server/common/properties/PasswordPolicyProperties.java
@@ -1,13 +1,13 @@
 package clap.server.common.properties;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
 
 @Getter
 @Setter
-@Component
+@RequiredArgsConstructor
 @ConfigurationProperties(prefix = "password.policy")
 public class PasswordPolicyProperties {
     private String characters;
diff --git a/src/main/java/clap/server/common/properties/ServerDomainProperties.java b/src/main/java/clap/server/common/properties/ServerDomainProperties.java
new file mode 100644
index 00000000..6e6f944f
--- /dev/null
+++ b/src/main/java/clap/server/common/properties/ServerDomainProperties.java
@@ -0,0 +1,13 @@
+package clap.server.common.properties;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@RequiredArgsConstructor
+@ConfigurationProperties(prefix = "server.domain")
+public class ServerDomainProperties {
+    private final String local;
+    private final String service;
+}
diff --git a/src/main/java/clap/server/common/properties/WebDomainProperties.java b/src/main/java/clap/server/common/properties/WebDomainProperties.java
new file mode 100644
index 00000000..6e292101
--- /dev/null
+++ b/src/main/java/clap/server/common/properties/WebDomainProperties.java
@@ -0,0 +1,13 @@
+package clap.server.common.properties;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@RequiredArgsConstructor
+@ConfigurationProperties(prefix = "web.domain")
+public class WebDomainProperties {
+    private final String local;
+    private final String service;
+}
diff --git a/src/main/java/clap/server/config/properties/PropertiesConfig.java b/src/main/java/clap/server/config/properties/PropertiesConfig.java
new file mode 100644
index 00000000..b0679dc0
--- /dev/null
+++ b/src/main/java/clap/server/config/properties/PropertiesConfig.java
@@ -0,0 +1,16 @@
+package clap.server.config.properties;
+
+import clap.server.common.properties.PasswordPolicyProperties;
+import clap.server.common.properties.ServerDomainProperties;
+import clap.server.common.properties.WebDomainProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties({
+        ServerDomainProperties.class,
+        WebDomainProperties.class,
+        PasswordPolicyProperties.class
+})
+public class PropertiesConfig {
+}
\ No newline at end of file

From af29a75276a99acc702ce14fd966cc5465e61341 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sat, 25 Jan 2025 14:57:30 +0900
Subject: [PATCH 3/6] =?UTF-8?q?CLAP-133=20Config:=20Cors=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #98
---
 .../server/config/security/CorsConfig.java    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/main/java/clap/server/config/security/CorsConfig.java

diff --git a/src/main/java/clap/server/config/security/CorsConfig.java b/src/main/java/clap/server/config/security/CorsConfig.java
new file mode 100644
index 00000000..a6cd1cc9
--- /dev/null
+++ b/src/main/java/clap/server/config/security/CorsConfig.java
@@ -0,0 +1,40 @@
+package clap.server.config.security;
+
+import clap.server.common.properties.ServerDomainProperties;
+import clap.server.common.properties.WebDomainProperties;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
+import java.util.List;
+
+import static clap.server.common.constants.AuthConstants.SESSION_ID;
+
+@Configuration
+@RequiredArgsConstructor
+public class CorsConfig {
+    private final ServerDomainProperties serverDomainProperties;
+    private final WebDomainProperties webDomainProperties;
+
+    @Bean
+    public CorsConfigurationSource corsConfigurationSource() {
+        CorsConfiguration configuration = new CorsConfiguration();
+        configuration.setAllowedOrigins(
+                List.of(serverDomainProperties.getLocal(), serverDomainProperties.getService(),
+                        webDomainProperties.getLocal(), webDomainProperties.getService()));
+        configuration.setAllowedMethods(List.of("GET", "POST", "OPTIONS", "PUT", "PATCH", "DELETE"));
+        configuration.setAllowedHeaders(List.of("*"));
+        configuration.setExposedHeaders(List.of(HttpHeaders.AUTHORIZATION, SESSION_ID.getValue()));
+        configuration.setAllowCredentials(true);
+        configuration.setMaxAge(3600L);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", configuration);
+        return source;
+    }
+
+}

From efdd7f90d62d4bd63b367630a341f4a112bde50a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sat, 25 Jan 2025 15:03:09 +0900
Subject: [PATCH 4/6] =?UTF-8?q?CLAP-133=20Config:=20test=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #98
---
 src/test/resources/application.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index ba283b05..683f2af6 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -17,6 +17,15 @@ spring:
   testcontainers:
     beans:
       startup: parallel
+server:
+  domain:
+    local: 127.0.0.1:8080
+    service: 127.0.0.1:8080
+
+web:
+  domain:
+    local: 127.0.0.1:3O00
+    service: 127.0.0.1:3000
 
 swagger:
   server:
@@ -35,5 +44,6 @@ jwt:
 password:
   policy:
     length: 12
-    characters: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+"
+    characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+
+
 

From 0feb54c58df7116604f8828cb9fa453bb0476756 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sat, 25 Jan 2025 17:33:51 +0900
Subject: [PATCH 5/6] =?UTF-8?q?CLAP-133=20Refactor:=20properties=20class?=
 =?UTF-8?q?=20=EB=B0=A9=EC=8B=9D=EC=97=90=EC=84=9C=20@value=EB=A5=BC=20?=
 =?UTF-8?q?=ED=86=B5=ED=95=B4=20=EA=B0=92=20=EC=A3=BC=EC=9E=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #98
---
 .../properties/PasswordPolicyProperties.java  | 15 -------------
 .../properties/ServerDomainProperties.java    | 13 ------------
 .../properties/WebDomainProperties.java       | 13 ------------
 .../utils/InitialPasswordGenerator.java       | 13 +++++-------
 .../config/properties/PropertiesConfig.java   | 16 --------------
 .../server/config/security/CorsConfig.java    | 21 ++++++++++++-------
 6 files changed, 18 insertions(+), 73 deletions(-)
 delete mode 100644 src/main/java/clap/server/common/properties/PasswordPolicyProperties.java
 delete mode 100644 src/main/java/clap/server/common/properties/ServerDomainProperties.java
 delete mode 100644 src/main/java/clap/server/common/properties/WebDomainProperties.java
 delete mode 100644 src/main/java/clap/server/config/properties/PropertiesConfig.java

diff --git a/src/main/java/clap/server/common/properties/PasswordPolicyProperties.java b/src/main/java/clap/server/common/properties/PasswordPolicyProperties.java
deleted file mode 100644
index 64c2e7da..00000000
--- a/src/main/java/clap/server/common/properties/PasswordPolicyProperties.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package clap.server.common.properties;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@Getter
-@Setter
-@RequiredArgsConstructor
-@ConfigurationProperties(prefix = "password.policy")
-public class PasswordPolicyProperties {
-    private String characters;
-    private int length;
-}
diff --git a/src/main/java/clap/server/common/properties/ServerDomainProperties.java b/src/main/java/clap/server/common/properties/ServerDomainProperties.java
deleted file mode 100644
index 6e6f944f..00000000
--- a/src/main/java/clap/server/common/properties/ServerDomainProperties.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.common.properties;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@Getter
-@RequiredArgsConstructor
-@ConfigurationProperties(prefix = "server.domain")
-public class ServerDomainProperties {
-    private final String local;
-    private final String service;
-}
diff --git a/src/main/java/clap/server/common/properties/WebDomainProperties.java b/src/main/java/clap/server/common/properties/WebDomainProperties.java
deleted file mode 100644
index 6e292101..00000000
--- a/src/main/java/clap/server/common/properties/WebDomainProperties.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package clap.server.common.properties;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@Getter
-@RequiredArgsConstructor
-@ConfigurationProperties(prefix = "web.domain")
-public class WebDomainProperties {
-    private final String local;
-    private final String service;
-}
diff --git a/src/main/java/clap/server/common/utils/InitialPasswordGenerator.java b/src/main/java/clap/server/common/utils/InitialPasswordGenerator.java
index 97808e62..175e5984 100644
--- a/src/main/java/clap/server/common/utils/InitialPasswordGenerator.java
+++ b/src/main/java/clap/server/common/utils/InitialPasswordGenerator.java
@@ -1,16 +1,15 @@
 package clap.server.common.utils;
 
-import clap.server.common.properties.PasswordPolicyProperties;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 
 import java.security.SecureRandom;
 
-@RequiredArgsConstructor
 public class InitialPasswordGenerator {
 
-    private final PasswordPolicyProperties properties;
+    @Value("${password.policy.characters}")
+    private String characters;
+
+    private static final int PASSWORD_LENGTH = 8;
 
     private InitialPasswordGenerator() {
         throw new IllegalStateException("Utility class");
@@ -24,10 +23,8 @@ public String generateRandomPassword(int length) {
         SecureRandom secureRandom = new SecureRandom();
         StringBuilder password = new StringBuilder(length);
 
-        String characters = properties.getCharacters();
-
         for (int i = 0; i < length; i++) {
-            int randomIndex = secureRandom.nextInt(properties.getLength());
+            int randomIndex = secureRandom.nextInt(PASSWORD_LENGTH);
             password.append(characters.charAt(randomIndex));
         }
 
diff --git a/src/main/java/clap/server/config/properties/PropertiesConfig.java b/src/main/java/clap/server/config/properties/PropertiesConfig.java
deleted file mode 100644
index b0679dc0..00000000
--- a/src/main/java/clap/server/config/properties/PropertiesConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package clap.server.config.properties;
-
-import clap.server.common.properties.PasswordPolicyProperties;
-import clap.server.common.properties.ServerDomainProperties;
-import clap.server.common.properties.WebDomainProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@EnableConfigurationProperties({
-        ServerDomainProperties.class,
-        WebDomainProperties.class,
-        PasswordPolicyProperties.class
-})
-public class PropertiesConfig {
-}
\ No newline at end of file
diff --git a/src/main/java/clap/server/config/security/CorsConfig.java b/src/main/java/clap/server/config/security/CorsConfig.java
index a6cd1cc9..fd1042ea 100644
--- a/src/main/java/clap/server/config/security/CorsConfig.java
+++ b/src/main/java/clap/server/config/security/CorsConfig.java
@@ -1,8 +1,6 @@
 package clap.server.config.security;
 
-import clap.server.common.properties.ServerDomainProperties;
-import clap.server.common.properties.WebDomainProperties;
-import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
@@ -15,17 +13,24 @@
 import static clap.server.common.constants.AuthConstants.SESSION_ID;
 
 @Configuration
-@RequiredArgsConstructor
 public class CorsConfig {
-    private final ServerDomainProperties serverDomainProperties;
-    private final WebDomainProperties webDomainProperties;
+    @Value("${server.domain.local}")
+    private String localServerDomain;
+
+    @Value("${server.domain.service}")
+    private String serviceServerDomain;
+
+    @Value("${web.domain.local}")
+    private String localWebDomain;
+
+    @Value("${web.domain.service}")
+    private String serviceWebDomain;
 
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
         configuration.setAllowedOrigins(
-                List.of(serverDomainProperties.getLocal(), serverDomainProperties.getService(),
-                        webDomainProperties.getLocal(), webDomainProperties.getService()));
+                List.of(localServerDomain, localWebDomain, serviceServerDomain, serviceWebDomain));
         configuration.setAllowedMethods(List.of("GET", "POST", "OPTIONS", "PUT", "PATCH", "DELETE"));
         configuration.setAllowedHeaders(List.of("*"));
         configuration.setExposedHeaders(List.of(HttpHeaders.AUTHORIZATION, SESSION_ID.getValue()));

From dc0aed64a9495e87d96e13280caea32c198d69ba Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Sun, 26 Jan 2025 11:30:49 +0900
Subject: [PATCH 6/6] =?UTF-8?q?CLAP-133=20Chore:=20=ED=99=98=EA=B2=BD?=
 =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=A0=81=EC=9A=A9=20=EB=8B=A8=EA=B3=84=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #98
---
 .github/workflows/dev-cd.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index ae3495c3..ababe2a1 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -62,4 +62,7 @@ jobs:
           script: |
             docker rm -f taskflow
             docker image rm ${{ secrets.DOCKER_REPO }} -f
-            docker run --name taskflow -d -p 9090:9090 ${{ secrets.DOCKER_REPO }} --restart on-failure
+            docker run --name taskflow -d -p 9090:9090 \
+              --env-file /home/ubuntu/.env \
+              ${{ secrets.DOCKER_REPO }} \
+              --restart on-failure