Merge pull request #40 from reading-log/main

main 변경점 develop 브랜치에 병합

.github/workflows/work.yml

@@ -1,4 +1,4 @@
-name: 'work'
+name: 'readinglog-ci/cd'
 
 on:
   push:
@@ -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

README.md

@@ -1,5 +1,5 @@
-# 📚 Reading Log
-- `프로젝트 소개:`  내가 읽은 책들을 기록하는 독서 기록 서비스
+# 📚 Reading Log (리딩로그)
+- `프로젝트 소개:`  내가 읽은 책들을 기록하는 독서 기록 서비스.
 - `개발 기간:`  2024.03.03. ~
 ___
 

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 */
@@ -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') {

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); // 캐싱
+    }
+}

src/main/resources/application.yml

@@ -3,22 +3,15 @@ spring:
     active: dev
 
   jpa:
-    hibernate:
-      ddl-auto: create
     show-sql: true
     properties:
       hibernate:
         format_sql: true
-    defer-datasource-initialization: true
 
   h2:
     console:
       enabled: true
 
-  sql:
-    init:
-      mode: always
-
 logging:
   level:
     root: info

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