refactor: Integrating Configuration Files and Docker-Compose

.env.example

@@ -0,0 +1,41 @@
+# Database Configuration
+DB_HOST=
+DB_PORT=
+DB_NAME=
+DB_USERNAME=
+DB_PASSWORD=
+
+# Spring Profile
+SPRING_PROFILES_ACTIVE=
+
+# OAuth - Kakao
+KAKAO_CLIENT_ID=
+KAKAO_CLIENT_SECRET=
+KAKAO_REDIRECT_URI=
+KAKAO_NATIVE_CLIENT_ID=
+
+# OAuth - Google
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+GOOGLE_REDIRECT_URI=
+GOOGLE_AOD_CLIENT_ID=
+
+# JWT
+JWT_ISSUER=
+JWT_SECRET=
+JWT_ACCESS_EXPIRATION=
+JWT_REFRESH_EXPIRATION=
+
+# AWS S3 Configuration
+AWS_S3_BUCKET_NAME=
+AWS_S3_REGION=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_CLOUDFRONT_DOMAIN=
+RESIZE_SECRET_KEY=
+
+# Public Data Service Key
+K_CULTURAL_INFO_CENTER_KEY=
+
+# FCM
+FIREBASE_CONFIG_PATH=

.gitignore

@@ -40,18 +40,10 @@ out/
 /db
 !/resources/db/*.sql
 mongodb
-/src/main/resources/application.yml
-/src/main/resources/application-dev.yml
-/src/main/resources/application-stage.yml
-/src/main/resources/application-prod.yml
+
 .DS_Store
 elasticsearch/
 .cursorrules
-application-stageing.yml
-application-stage.yml
-application-production.yml
-application-prod.yml
-application-local.yml
 !/docker/elasticsearch
 /src/main/resources/firebase/
 

build.gradle

@@ -49,6 +49,7 @@ dependencies {
     implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0'
     implementation 'io.github.resilience4j:resilience4j-reactor:2.2.0'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
+    implementation 'io.github.cdimascio:java-dotenv:5.2.2'
 
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
 

docker-compose.yml

@@ -1,7 +1,50 @@
 version: "3.8"
 
 services:
-  app:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
+  db:
+    image: mysql:8.4
+    container_name: db
+    platform: linux/amd64
+    environment:
+      MYSQL_USER: artrip
+      MYSQL_ROOT_PASSWORD: artrip1!
+      MYSQL_DATABASE: artrip
+      MYSQL_PASSWORD: artrip1!
+    ports:
+      - "33069:3306"
+    volumes:
+      - ./db/data:/var/lib/mysql
+      - ./db/conf:/etc/mysql/conf.d
+
+  redis:
+    image: redis:7.2
+    container_name: redis
+    restart: always
+    ports:
+      - "63799:6379"
+    volumes:
+      - redis-data:/data
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
+    container_name: elastic
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - xpack.security.http.ssl.enabled=false
+      - ES_JAVA_OPTS=-Xms1g -Xmx1g
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    volumes:
+      - ./elasticsearch/data:/usr/share/elasticsearch/data
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:9200/_cluster/health" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+
+
+volumes:
+  redis-data:

src/main/java/org/atdev/artrip/config/ElasticsearchConfig.java

@@ -16,12 +16,9 @@
 @Configuration
 public class ElasticsearchConfig {
 
-    @Value("${spring.elasticsearch.uris}")
-    private String elasticsearchUris;
-
     @Bean
     public RestClient restClient() {
-        return RestClient.builder(HttpHost.create(elasticsearchUris)).build();
+        return RestClient.builder(new HttpHost("localhost", 9200)).build();
     }
 
     @Bean

src/main/java/org/atdev/artrip/config/SecurityConfig.java

@@ -4,9 +4,9 @@
 import lombok.RequiredArgsConstructor;
 import org.atdev.artrip.service.CustomOAuth2UserService;
 import org.atdev.artrip.security.OAuth2LoginSuccessHandler;
-import org.atdev.artrip.jwt.jwt.JwtAuthenticationFilter;
-import org.atdev.artrip.jwt.jwt.JwtProvider;
-import org.atdev.artrip.jwt.jwt.exception.JwtExceptionFilter;
+import org.atdev.artrip.jwt.JwtAuthenticationFilter;
+import org.atdev.artrip.jwt.JwtProvider;
+import org.atdev.artrip.jwt.exception.JwtExceptionFilter;
 import org.atdev.artrip.global.apipayload.exception.handler.JwtAccessDeniedHandler;
 import org.atdev.artrip.global.apipayload.exception.handler.JwtAuthenticationEntryPoint;
 import org.springframework.context.annotation.Bean;

src/main/java/org/atdev/artrip/domain/curation/Curation.java

@@ -31,9 +31,11 @@ public class Curation {
         @Column(name = "curation_type", nullable = false)
         private CurationType curationType;
 
+        @Builder.Default
         @Column(name = "is_active")
         private boolean isActive = true;
 
+        @Builder.Default
         @ManyToMany
         @JoinTable(
                 name = "curation_exhibit",

src/main/java/org/atdev/artrip/elastic/service/ExhibitIndexService.java

@@ -96,7 +96,7 @@ public void createAndApplyIndex() {
                                             )
                                             .analyzer("ngram_nori_analyzer", an -> an
                                                     .custom(ca -> ca
-                                                            .tokenizer("nori_tokenizer")
+                                                            .tokenizer("standard")
                                                             .filter("lowercase", "ngram_filter")
                                                     )
                                             )

src/main/java/org/atdev/artrip/jwt/JwtGenerator.java

@@ -2,8 +2,8 @@
 
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import org.atdev.artrip.domain.Enum.Role;
-import org.atdev.artrip.domain.auth.data.User;
+import org.atdev.artrip.constants.Role;
+import org.atdev.artrip.domain.auth.User;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

src/main/java/org/atdev/artrip/repository/ExhibitRepositoryImpl.java

@@ -10,12 +10,12 @@
 import org.atdev.artrip.constants.SortType;
 import org.atdev.artrip.constants.Status;
 import org.atdev.artrip.domain.exhibit.Exhibit;
-import org.atdev.artrip.domain.exhibit.data.QExhibit;
+import org.atdev.artrip.domain.exhibit.QExhibit;
 import org.atdev.artrip.controller.dto.request.ExhibitFilterRequest;
-import org.atdev.artrip.domain.exhibitHall.data.QExhibitHall;
+import org.atdev.artrip.domain.exhibitHall.QExhibitHall;
 import org.atdev.artrip.controller.dto.response.HomeListResponse;
 import org.atdev.artrip.controller.dto.request.RandomExhibitRequest;
-import org.atdev.artrip.domain.keyword.data.QKeyword;
+import org.atdev.artrip.domain.keyword.QKeyword;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Repository;