From fcce50d8933c74a9b50bc4e8cf0a2b11923c3c41 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 10:37:53 +0900
Subject: [PATCH 1/4] =?UTF-8?q?CLAP-107=20Test=20:=20=EC=8A=A4=ED=94=84?=
 =?UTF-8?q?=EB=A7=81=20CI=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=97=90=20?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EC=BB=A8=ED=85=8C=EC=9D=B4=EB=84=88,=20h2=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #60
---
 build.gradle                                  |  4 +++
 .../config/elastic/ElasticsearchConfig.java   |  6 +++-
 src/main/resources/application.yml            |  2 ++
 .../clap/server/TaskflowApplicationTests.java | 31 ++++++++++++++++++-
 src/test/resources/application.yml            | 19 ++++++++++++
 5 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/application.yml

diff --git a/build.gradle b/build.gradle
index f29319ad..55f6b27e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,6 +69,10 @@ dependencies {
 
     // Junit
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.springframework.boot:spring-boot-testcontainers'
+    testImplementation 'org.testcontainers:elasticsearch:1.20.4'
+    testImplementation 'com.redis:testcontainers-redis:2.2.2'
 
     // Json
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.1'
diff --git a/src/main/java/clap/server/config/elastic/ElasticsearchConfig.java b/src/main/java/clap/server/config/elastic/ElasticsearchConfig.java
index 026a142f..32e5193d 100644
--- a/src/main/java/clap/server/config/elastic/ElasticsearchConfig.java
+++ b/src/main/java/clap/server/config/elastic/ElasticsearchConfig.java
@@ -1,6 +1,7 @@
 package clap.server.config.elastic;
 
 import clap.server.adapter.outbound.infrastructure.elastic.repository.TaskElasticRepository;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration;
@@ -10,11 +11,14 @@
 @EnableElasticsearchRepositories(basePackageClasses = {TaskElasticRepository.class})
 public class ElasticsearchConfig extends ElasticsearchConfiguration {
 
+    @Value("${spring.elasticsearch.uris}")
+    private String elasticUrl;
+
     @Override
     public ClientConfiguration clientConfiguration() {
 
         return ClientConfiguration.builder()
-                .connectedTo("127.0.0.1:9200")
+                .connectedTo(elasticUrl)
                 .withConnectTimeout(30000)
                 .withSocketTimeout(30000)
                 .build();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 64c7f036..18de6d00 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,6 +9,8 @@ spring:
       - optional:classpath:env.properties
   application:
     name: taskflow
+  elasticsearch:
+    uris: ${ELASTIC_URI:127.0.0.1:9200}
 
 web.resources.add-mappings: false
 
diff --git a/src/test/java/clap/server/TaskflowApplicationTests.java b/src/test/java/clap/server/TaskflowApplicationTests.java
index 542e3b68..36ecad3a 100644
--- a/src/test/java/clap/server/TaskflowApplicationTests.java
+++ b/src/test/java/clap/server/TaskflowApplicationTests.java
@@ -1,13 +1,42 @@
 package clap.server;
 
+import com.redis.testcontainers.RedisContainer;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+//@DataElasticsearchTest
+@Testcontainers
 @SpringBootTest
 class TaskflowApplicationTests {
 
+    @Container
+//    @ServiceConnection
+    public static ElasticsearchContainer ES_CONTAINER = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.5");
+
+    @Container
+    @ServiceConnection
+    public static RedisContainer REDIS_CONTAINER = new RedisContainer(DockerImageName.parse("redis:6.2.6"));
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        // Elasticsearch 설정
+        registry.add("spring.elasticsearch.uris", ES_CONTAINER::getHttpHostAddress);
+    }
+
     @Test
     void contextLoads() {
+        assertThat(ES_CONTAINER.isRunning()).isTrue();
+        assertThat(REDIS_CONTAINER.isRunning()).isTrue();
+        System.out.println("Redis: " + REDIS_CONTAINER.getHost() + ":" + REDIS_CONTAINER.getMappedPort(6379));
+        System.out.println("Elasticsearch URL: " + ES_CONTAINER.getHttpHostAddress());
     }
-
 }
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
new file mode 100644
index 00000000..5e5c5c04
--- /dev/null
+++ b/src/test/resources/application.yml
@@ -0,0 +1,19 @@
+spring:
+  # H2 Setting Info (H2 Console에 접속하기 위한 설정정보 입력)
+  h2:
+    console:
+      enabled: false  # H2 Console을 사용할지 여부 (H2 Console은 H2 Database를 UI로 제공해주는 기능)
+      path: /h2  # H2 Console의 Path
+  # Database Setting Info (Database를 H2로 사용하기 위해 H2연결 정보 입력)
+  datasource:
+    driver-class-name: org.h2.Driver  # Database를 H2로 사용하겠다.
+    url: jdbc:h2:mem:testdb  # H2 접속 정보
+    username: taskflow  # H2 접속 시 입력할 username 정보 (원하는 것으로 입력)
+    password:  # H2 접속 시 입력할 password 정보 (원하는 것으로 입력)
+  jpa:
+    hibernate:
+      ddl-auto: create
+
+swagger:
+  server:
+    url: http://localhost:8080
\ No newline at end of file

From ca67b5108d0754df4b1c9208dfbcf6ecbcd9bea9 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 10:43:18 +0900
Subject: [PATCH 2/4] =?UTF-8?q?CLAP-107=20Test=20:=20h2=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0=20=EB=90=98=EB=8A=94=EB=8D=B0=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #60
---
 src/test/java/clap/server/TaskflowApplicationTests.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/java/clap/server/TaskflowApplicationTests.java b/src/test/java/clap/server/TaskflowApplicationTests.java
index 36ecad3a..41766b64 100644
--- a/src/test/java/clap/server/TaskflowApplicationTests.java
+++ b/src/test/java/clap/server/TaskflowApplicationTests.java
@@ -1,7 +1,9 @@
 package clap.server;
 
+import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
 import com.redis.testcontainers.RedisContainer;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.test.context.DynamicPropertyRegistry;
@@ -18,6 +20,9 @@
 @SpringBootTest
 class TaskflowApplicationTests {
 
+    @Autowired
+    private MemberRepository memberRepository;
+
     @Container
 //    @ServiceConnection
     public static ElasticsearchContainer ES_CONTAINER = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.5");
@@ -34,6 +39,7 @@ static void configureProperties(DynamicPropertyRegistry registry) {
 
     @Test
     void contextLoads() {
+        assertThat(memberRepository.findAll()).isEmpty();
         assertThat(ES_CONTAINER.isRunning()).isTrue();
         assertThat(REDIS_CONTAINER.isRunning()).isTrue();
         System.out.println("Redis: " + REDIS_CONTAINER.getHost() + ":" + REDIS_CONTAINER.getMappedPort(6379));

From bacda0efdcd5d9b27a1cbbf9d8053bf140bd3a69 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 11:07:56 +0900
Subject: [PATCH 3/4] =?UTF-8?q?CLAP-104=20CI/CD=20:=20=EA=B9=83=ED=97=88?=
 =?UTF-8?q?=EB=B8=8C=EC=95=A1=EC=85=98=20dev=20=ED=99=98=EA=B2=BD=20ci/cd?=
 =?UTF-8?q?=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #55
---
 .github/workflows/dev-cd.yml | 44 +++++++++++++++++++++++++++++++
 .github/workflows/dev-ci.yml | 50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 .github/workflows/dev-cd.yml
 create mode 100644 .github/workflows/dev-ci.yml

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
new file mode 100644
index 00000000..b9116349
--- /dev/null
+++ b/.github/workflows/dev-cd.yml
@@ -0,0 +1,44 @@
+# github repository actions 페이지에 나타날 이름
+name: CD to dev using github actions
+
+# event trigger
+# develop 브랜치에 pull_request가 닫혔을 때 실행
+on:
+  pull_request:
+    types: [ closed ]
+    branches: [ "develop" ]
+
+permissions:
+  contents: read
+
+jobs:
+  DEV-CD:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: build-artifacts
+
+        ## docker build & push to production
+      - name: Docker build & push to prod
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_REPO }} .
+          docker push ${{ secrets.DOCKER_REPO }}
+
+        ## deploy to dev
+      - name: Deploy to prod
+        uses: appleboy/ssh-action@master
+        id: deploy
+        with:
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.DEV_HOST_USERNAME }}
+          key: ${{ secrets.DEV_HOST_KEY }}
+          port: ${{ secrets.DEV_HOST_PORT }}
+          script: |
+            docker rm -f taskflow
+            docker image rm ${{ secrets.DOCKER_REPO }} -f
+            docker pull ${{ secrets.DOCKER_REPO }}
+            docker run --name taskflow --network host -d -p 8080:8080 ${{ secrets.DOCKER_REPO }} --restart on-failure
\ No newline at end of file
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
new file mode 100644
index 00000000..2abf0f3e
--- /dev/null
+++ b/.github/workflows/dev-ci.yml
@@ -0,0 +1,50 @@
+# github repository actions 페이지에 나타날 이름
+name: CI/CD using github actions
+
+# event trigger
+# develop 브랜치에 pull_request가 열렸을 때 실행
+on:
+  pull_request:
+    types: [opened, synchronize, closed]
+    branches: [ "develop" ]
+
+permissions:
+  contents: read
+
+jobs:
+  CI:
+    if: github.event.action == 'opened' || github.event.action == 'synchronize'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: 'Set up jdk'
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin' # https://github.com/actions/setup-java
+
+      - run: touch ./Dockerfile
+      - run: echo "${{ secrets.DEV_DOCKERFILE }}" > ./Dockerfile
+
+      # gradle caching - 빌드 시간 향상
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      ## gradle build
+      - name: Build with Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: build/libs/*.jar
\ No newline at end of file

From 36de783ce6e2a0be0f2f19006676cb709faa71ff Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Thu, 23 Jan 2025 11:25:30 +0900
Subject: [PATCH 4/4] =?UTF-8?q?CLAP-104=20CI/CD=20:=20=EA=B9=83=ED=97=88?=
 =?UTF-8?q?=EB=B8=8C=EC=95=A1=EC=85=98=20dev=20=ED=99=98=EA=B2=BD=20cd=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #55
---
 .github/workflows/dev-cd.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml
index b9116349..aed861b5 100644
--- a/.github/workflows/dev-cd.yml
+++ b/.github/workflows/dev-cd.yml
@@ -40,5 +40,4 @@ jobs:
           script: |
             docker rm -f taskflow
             docker image rm ${{ secrets.DOCKER_REPO }} -f
-            docker pull ${{ secrets.DOCKER_REPO }}
             docker run --name taskflow --network host -d -p 8080:8080 ${{ secrets.DOCKER_REPO }} --restart on-failure
\ No newline at end of file