From c9f86d3a30af59b32156b2140b958ade345a6335 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 17:27:10 +0900 Subject: [PATCH 01/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2de001f..59fe747 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ๐Ÿ“š Reading Log +# ๐Ÿ“š Reading Log (๋ฆฌ๋”ฉ๋กœ๊ทธ) - `ํ”„๋กœ์ ํŠธ ์†Œ๊ฐœ:` ๋‚ด๊ฐ€ ์ฝ์€ ์ฑ…๋“ค์„ ๊ธฐ๋กํ•˜๋Š” ๋…์„œ ๊ธฐ๋ก ์„œ๋น„์Šค - `๊ฐœ๋ฐœ ๊ธฐ๊ฐ„:` 2024.03.03. ~ ___ From 17561220e02a1f2264bd31ebfe13956659df64fb Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 18:01:15 +0900 Subject: [PATCH 02/14] =?UTF-8?q?Docs:=20application.yml=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ddl-auto๋Š” ๊ฐ ํ”„๋กœํ•„์—์„œ ๊ด€๋ฆฌํ•˜๋„๋ก ์ˆ˜์ • --- src/main/resources/application.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d7547d5..b7b4311 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,8 +3,6 @@ spring: active: dev jpa: - hibernate: - ddl-auto: create show-sql: true properties: hibernate: From b6bd5484c2a42a89e5c9b3a92d3a0ed39014f034 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 18:15:35 +0900 Subject: [PATCH 03/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59fe747..e9b9d29 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ๐Ÿ“š Reading Log (๋ฆฌ๋”ฉ๋กœ๊ทธ) -- `ํ”„๋กœ์ ํŠธ ์†Œ๊ฐœ:` ๋‚ด๊ฐ€ ์ฝ์€ ์ฑ…๋“ค์„ ๊ธฐ๋กํ•˜๋Š” ๋…์„œ ๊ธฐ๋ก ์„œ๋น„์Šค +- `ํ”„๋กœ์ ํŠธ ์†Œ๊ฐœ:` ๋‚ด๊ฐ€ ์ฝ์€ ์ฑ…๋“ค์„ ๊ธฐ๋กํ•˜๋Š” ๋…์„œ ๊ธฐ๋ก ์„œ๋น„์Šค. - `๊ฐœ๋ฐœ ๊ธฐ๊ฐ„:` 2024.03.03. ~ ___ From 8fd514134158c40d343bb2bf7d739666e7e9835a Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 18:22:09 +0900 Subject: [PATCH 04/14] Docs: Update work.yml --- .github/workflows/work.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/work.yml b/.github/workflows/work.yml index e6654c4..03d8bd3 100644 --- a/.github/workflows/work.yml +++ b/.github/workflows/work.yml @@ -31,7 +31,7 @@ jobs: env: ACTIONS_STEP_DEBUG: true APPLICATION_PROD: ${{ secrets.APPLICATION_PROD_YML }} - run: echo "$APPLICATION_PROD" > src/main/resources/application-prod.yml + run: echo "${{ secrets.APPLICATION_PROD_YML }}" > src/main/resources/application-prod.yml - name: jdk 17 ์„ค์น˜ uses: actions/setup-java@v3 with: From 131c87b4d8f82cace4c45096550a8a052c3c136a Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 18:39:21 +0900 Subject: [PATCH 05/14] =?UTF-8?q?Docs:=20application.yml=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - defer-datasource-initialization: true, sql.init.mode: always application-dev.yml๋กœ ์ด๋™ --- src/main/resources/application.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b7b4311..130c319 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,16 +7,11 @@ spring: properties: hibernate: format_sql: true - defer-datasource-initialization: true h2: console: enabled: true - sql: - init: - mode: always - logging: level: root: info From 791b45d3ba8d48c704549eca60365dbc21960a77 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 18:44:33 +0900 Subject: [PATCH 06/14] =?UTF-8?q?Chore:=20h2=20database=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3ae12ae..69dcda8 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' /* Database */ - runtimeOnly 'com.h2database:h2' + //runtimeOnly 'com.h2database:h2' runtimeOnly 'com.mysql:mysql-connector-j' /* Testing */ From 91d4e85d0adbd90fb8d4c681a27bc1ee8b14058f Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 18:48:38 +0900 Subject: [PATCH 07/14] =?UTF-8?q?Remove:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadinglogApplicationTests.java | 2 +- .../readinglog/domain/entity/MemberTest.java | 31 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 src/test/java/com/api/readinglog/domain/entity/MemberTest.java diff --git a/src/test/java/com/api/readinglog/ReadinglogApplicationTests.java b/src/test/java/com/api/readinglog/ReadinglogApplicationTests.java index a90c76d..3c28887 100644 --- a/src/test/java/com/api/readinglog/ReadinglogApplicationTests.java +++ b/src/test/java/com/api/readinglog/ReadinglogApplicationTests.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest +//@SpringBootTest class ReadinglogApplicationTests { @Test diff --git a/src/test/java/com/api/readinglog/domain/entity/MemberTest.java b/src/test/java/com/api/readinglog/domain/entity/MemberTest.java deleted file mode 100644 index 605a15d..0000000 --- a/src/test/java/com/api/readinglog/domain/entity/MemberTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.api.readinglog.domain.entity; - -import com.api.readinglog.domain.member.entity.Member; -import com.api.readinglog.domain.member.entity.MemberRole; -import com.api.readinglog.domain.member.repository.MemberRepository; -import java.util.List; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; -import org.springframework.transaction.annotation.Transactional; - -@SpringBootTest -class MemberTest { - - @Autowired - private MemberRepository repository; - - @Rollback(value = false) - @Test - @Transactional - public void test() { - Member member = Member.of("test@test.com", "test", "test", MemberRole.MEMBER_NORMAL); - - Member saveMember = repository.save(member); - repository.delete(saveMember); - - List members = repository.findAll(); - System.out.println("size: " + members.size()); - } -} \ No newline at end of file From 35fee68f3c68354f6556a9a04232b68a9f0ff19b Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 19:06:28 +0900 Subject: [PATCH 08/14] =?UTF-8?q?Docs:=20work.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/work.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/work.yml b/.github/workflows/work.yml index 03d8bd3..e6654c4 100644 --- a/.github/workflows/work.yml +++ b/.github/workflows/work.yml @@ -31,7 +31,7 @@ jobs: env: ACTIONS_STEP_DEBUG: true APPLICATION_PROD: ${{ secrets.APPLICATION_PROD_YML }} - run: echo "${{ secrets.APPLICATION_PROD_YML }}" > src/main/resources/application-prod.yml + run: echo "$APPLICATION_PROD" > src/main/resources/application-prod.yml - name: jdk 17 ์„ค์น˜ uses: actions/setup-java@v3 with: From 64c38bf2406cef2f5c2aeab50a3f6a48bd06171a Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 19:15:29 +0900 Subject: [PATCH 09/14] =?UTF-8?q?Docs:=20work.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - name ๋ณ€๊ฒฝ --- .github/workflows/work.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/work.yml b/.github/workflows/work.yml index e6654c4..1887aed 100644 --- a/.github/workflows/work.yml +++ b/.github/workflows/work.yml @@ -1,4 +1,4 @@ -name: 'work' +name: 'readinglog-ci/cd' on: push: From d4883821d97df83f5f1692f664241758d2d65682 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 19:40:25 +0900 Subject: [PATCH 10/14] =?UTF-8?q?Docs:=20work.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - docker build ๋ช…๋ น์–ด ์ˆ˜์ • --- .github/workflows/work.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/work.yml b/.github/workflows/work.yml index 1887aed..51031ce 100644 --- a/.github/workflows/work.yml +++ b/.github/workflows/work.yml @@ -51,8 +51,8 @@ jobs: - name: ๋„์ปค ์ด๋ฏธ์ง€ ๋นŒ๋“œ ๋ฐ ํ‘ธ์‹œ run: | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }} - docker build -t ${{ secrets.DOCKER_REPO }} . - docker push ${{ secrets.DOCKER_REPO }} + docker build -t ${{ secrets.DOCKER_REPO }}/readinglog . + docker push ${{ secrets.DOCKER_REPO }}/readinglog deploy: name: ์›๊ฒฉ ์„œ๋ฒ„์— ๋ฐฐํฌ runs-on: ubuntu-latest @@ -67,6 +67,6 @@ jobs: port: ${{ secrets.SSH_PORT }} script: | sudo docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }} - sudo docker pull ${{ secrets.DOCKER_REPO }} + sudo docker pull ${{ secrets.DOCKER_REPO }}/readinglog sudo docker run --name=readinglog_app --restart unless-stopped \ - -p 8080:8080 -e TZ=Asia/Seoul -d ${{ secrets.DOCKER_REPO }} + -p 8080:8080 -e TZ=Asia/Seoul -d ${{ secrets.DOCKER_REPO }}/readinglog From d1c568af86cf6208f10512fd604909429fc704a2 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 19:48:12 +0900 Subject: [PATCH 11/14] =?UTF-8?q?Docs:=20work.yml=20=EC=9E=AC=EC=9E=AC?= =?UTF-8?q?=EC=9E=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - docker ๋ช…๋ น์–ด ์ˆ˜์ •.. --- .github/workflows/work.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/work.yml b/.github/workflows/work.yml index 51031ce..1887aed 100644 --- a/.github/workflows/work.yml +++ b/.github/workflows/work.yml @@ -51,8 +51,8 @@ jobs: - name: ๋„์ปค ์ด๋ฏธ์ง€ ๋นŒ๋“œ ๋ฐ ํ‘ธ์‹œ run: | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }} - docker build -t ${{ secrets.DOCKER_REPO }}/readinglog . - docker push ${{ secrets.DOCKER_REPO }}/readinglog + docker build -t ${{ secrets.DOCKER_REPO }} . + docker push ${{ secrets.DOCKER_REPO }} deploy: name: ์›๊ฒฉ ์„œ๋ฒ„์— ๋ฐฐํฌ runs-on: ubuntu-latest @@ -67,6 +67,6 @@ jobs: port: ${{ secrets.SSH_PORT }} script: | sudo docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }} - sudo docker pull ${{ secrets.DOCKER_REPO }}/readinglog + sudo docker pull ${{ secrets.DOCKER_REPO }} sudo docker run --name=readinglog_app --restart unless-stopped \ - -p 8080:8080 -e TZ=Asia/Seoul -d ${{ secrets.DOCKER_REPO }}/readinglog + -p 8080:8080 -e TZ=Asia/Seoul -d ${{ secrets.DOCKER_REPO }} From 91ed0c08bc97a519f9d92d29b707703daa9e1210 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 22:15:45 +0900 Subject: [PATCH 12/14] =?UTF-8?q?Chore:=20swagger-ui=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 69dcda8..df75ad5 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,8 @@ dependencies { implementation 'io.jsonwebtoken:jjwt-api:0.11.5' implementation 'io.jsonwebtoken:jjwt-impl:0.11.5' implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' } tasks.named('bootBuildImage') { From fd0550bdf2129d45dfacd342f0304b95cb2fa177 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 22:16:05 +0900 Subject: [PATCH 13/14] =?UTF-8?q?Feat:=20WebConfig=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - cors ์„ค์ • ์ถ”๊ฐ€ --- .../api/readinglog/common/web/WebConfig.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/com/api/readinglog/common/web/WebConfig.java diff --git a/src/main/java/com/api/readinglog/common/web/WebConfig.java b/src/main/java/com/api/readinglog/common/web/WebConfig.java new file mode 100644 index 0000000..24ba1b1 --- /dev/null +++ b/src/main/java/com/api/readinglog/common/web/WebConfig.java @@ -0,0 +1,21 @@ +package com.api.readinglog.common.web; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + // TODO: cors ์„ค์ • ์ข€ ๋” ๋‹ค๋“ฌ๊ธฐ + registry.addMapping("/**") + .allowedOriginPatterns("*") + .allowedHeaders("*") + .allowedMethods("*") + .exposedHeaders("*") + .allowCredentials(true) + .maxAge(3600); // ์บ์‹ฑ + } +} From 6ec56dc035d953ad524ad1dc191453e6edf2e6f3 Mon Sep 17 00:00:00 2001 From: Dongmin Kim Date: Fri, 22 Mar 2024 22:26:16 +0900 Subject: [PATCH 14/14] =?UTF-8?q?Docs:=20work.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ๋„์ปค ์ด๋ฏธ์ง€ ์ถฉ๋Œ ๋ฐฉ์ง€ ์Šคํฌ๋ฆฝํŠธ ์ถ”๊ฐ€ --- .github/workflows/work.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/work.yml b/.github/workflows/work.yml index 1887aed..dc20402 100644 --- a/.github/workflows/work.yml +++ b/.github/workflows/work.yml @@ -68,5 +68,8 @@ jobs: script: | sudo docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }} sudo docker pull ${{ secrets.DOCKER_REPO }} + sudo docker stop readinglog_app || true + sudo docker rm readinglog_app || true sudo docker run --name=readinglog_app --restart unless-stopped \ -p 8080:8080 -e TZ=Asia/Seoul -d ${{ secrets.DOCKER_REPO }} + sudo docker image prune -f