Refactor: Clean up Docker, remove Elasticsearch, and fix search functionality.

.dockerignore

@@ -1 +1 @@
-db/
+docker/db/

.gitignore

@@ -37,7 +37,7 @@ out/
 .vscode/
 .idea
 .env
-/db
+/docker/db
 !/resources/db/*.sql
 mongodb
 

build.gradle

@@ -28,8 +28,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
-    implementation 'co.elastic.clients:elasticsearch-java:8.14.0'
     implementation 'jakarta.json:jakarta.json-api:2.1.3'
     implementation 'org.eclipse.parsson:parsson:1.1.5'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
@@ -47,6 +45,7 @@ dependencies {
     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.modelmapper:modelmapper:3.1.1'
 
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
 
@@ -82,15 +81,3 @@ tasks.named('test') {
 clean {
     delete file('src/main/generated')
 }
-
-
-// bootRun 자동 컴파일 설정 (핫 리로딩)
-tasks.named('bootRun') {
-    dependsOn 'classes'
-
-    doFirst {
-        println "starting bootRun with auto-compile..."
-    }
-}
-
-

docker/docker-compose.yml

@@ -0,0 +1,30 @@
+version: "3.8"
+
+services:
+  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
+
+
+volumes:
+  redis-data:

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

@@ -1,16 +1,31 @@
 package org.atdev.artrip.config;
 
+import lombok.RequiredArgsConstructor;
+import org.atdev.artrip.global.resolver.LoginUserIdArgumentResolver;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.List;
+
 @Configuration
+@RequiredArgsConstructor
 public class WebConfig implements WebMvcConfigurer {
+
+    private final LoginUserIdArgumentResolver userIdArgumentResolver;
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 .allowedOrigins("http://localhost:3000", "http://localhost:8080", "https://dev.coffit.today")
                 .allowedMethods("OPTIONS","GET", "POST", "PUT", "PATCH", "DELETE")
                 .allowCredentials(true);
     }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(userIdArgumentResolver);
+    }
+
 }

src/main/java/org/atdev/artrip/controller/AdminExhibitController.java

@@ -17,7 +17,6 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/admin/exhibits")
-@Slf4j
 @Tag(name = "Admin - Exhibit", description = "관리자 전시 관리 API")
 public class AdminExhibitController {
 
@@ -37,7 +36,6 @@ public class AdminExhibitController {
     )
     @GetMapping
     public CommonResponse<PagingResponseDTO<AdminExhibitListResponse>> getExhibitList(Criteria cri) {
-        log.info("Admin getting exhibit list: {}", cri);
 
         PagingResponseDTO<AdminExhibitListResponse> result = adminExhibitService.getExhibitList(cri);
 
@@ -47,7 +45,6 @@ public CommonResponse<PagingResponseDTO<AdminExhibitListResponse>> getExhibitLis
     @Operation(summary = "전시 상세 조회", description = "특정 전시의 상세 정보를 조회합니다.")
     @GetMapping("/{exhibitId}")
     public CommonResponse<AdminExhibitResponse> getExhibit(@PathVariable Long exhibitId) {
-        log.info("Admin getting exhibit : {}", exhibitId);
 
         AdminExhibitResponse result = adminExhibitService.getExhibit(exhibitId);
 
@@ -57,7 +54,6 @@ public CommonResponse<AdminExhibitResponse> getExhibit(@PathVariable Long exhibi
     @Operation(summary = "전시 등록", description = "새로운 전시를 등록합니다.")
     @PostMapping
     public CommonResponse<Long> createExhibit(@RequestBody CreateExhibitRequest request) {
-        log.info("Admin creating exhibit: title = {}", request.getTitle());
 
         Long exhibitId = adminExhibitService.createExhibit(request);
 
@@ -67,7 +63,6 @@ public CommonResponse<Long> createExhibit(@RequestBody CreateExhibitRequest requ
     @Operation(summary = "전시 수정", description = "특정 전시를 수정합니다.")
     @PutMapping("/{exhibitId}")
     public CommonResponse<Long> updateExhibit(@PathVariable Long exhibitId, @RequestBody UpdateExhibitRequest request){
-    log.info("Admin updating exhibit: {}", request.getTitle());
 
     Long updatedId = adminExhibitService.updateExhibit(exhibitId, request);
 
@@ -77,7 +72,6 @@ public CommonResponse<Long> updateExhibit(@PathVariable Long exhibitId, @Request
     @Operation(summary = "전시 삭제", description = "특정 전시를 삭제합니다.")
     @DeleteMapping("/{exhibitId}")
     public CommonResponse<Void> deleteExhibit(@PathVariable Long exhibitId) {
-        log.info("Admin deleting exhibit: {}", exhibitId);
 
         adminExhibitService.deleteExhibit(exhibitId);
         return CommonResponse.onSuccess(null);

src/main/java/org/atdev/artrip/controller/AdminExhibitHallController.java

@@ -17,7 +17,6 @@
 @RestController
 @RequestMapping("/admin/exhibit-halls")
 @RequiredArgsConstructor
-@Slf4j
 @Tag(name = "Admin - ExhibitHall", description = "관리자 전시관 관리 API")
 public class AdminExhibitHallController {
 
@@ -37,7 +36,6 @@ public class AdminExhibitHallController {
     )
     @GetMapping
     public CommonResponse<PagingResponseDTO<ExhibitHallListResponse>> getExhibitHallList(Criteria cri) {
-        log.info("Admin getting exhibit hall : {}" , cri);
 
         PagingResponseDTO<ExhibitHallListResponse> result = adminExhibitHallService.getExhibitHallList(cri);
 
@@ -47,7 +45,6 @@ public CommonResponse<PagingResponseDTO<ExhibitHallListResponse>> getExhibitHall
     @Operation(summary = "전시관 상세 조회", description = "전시관 ID로 전시관 상세 조회")
     @GetMapping("/{exhibitHallId}")
     public CommonResponse<ExhibitHallResponse> getExhibitHall(@PathVariable Long exhibitHallId) {
-        log.info("Admin getting exhibit hall : {}" , exhibitHallId);
 
         ExhibitHallResponse result = adminExhibitHallService.getExhibitHall(exhibitHallId);
 
@@ -57,7 +54,6 @@ public CommonResponse<ExhibitHallResponse> getExhibitHall(@PathVariable Long exh
     @Operation(summary = "전시관 등록" )
     @PostMapping
     public CommonResponse<Long> createExhibitHall(@RequestBody CreateExhibitHallRequest request) {
-        log.info("Admin creating exhibit hall : {}" , request);
 
         Long result = adminExhibitHallService.createExhibitHall(request);
 
@@ -67,7 +63,6 @@ public CommonResponse<Long> createExhibitHall(@RequestBody CreateExhibitHallRequ
     @Operation(summary = "전시관 수정" )
     @PutMapping("/{exhibitHallId}")
     public CommonResponse<Long> updateExhibitHall(@PathVariable Long exhibitHallId, @RequestBody UpdateExhibitHallRequest request) {
-        log.info("Admin updating exhibit hall : {}, {}", exhibitHallId, request);
 
         Long result = adminExhibitHallService.updateExhibitHall(exhibitHallId, request);
 
@@ -77,7 +72,6 @@ public CommonResponse<Long> updateExhibitHall(@PathVariable Long exhibitHallId,
     @Operation(summary = "전시관 삭제" )
     @DeleteMapping("/{exhibitHallId}")
     public CommonResponse<Void> deleteExhibitHall(@PathVariable Long exhibitHallId) {
-        log.info("Admin deleting exhibit hall : {}" , exhibitHallId);
 
         adminExhibitHallService.deleteExhibitHall(exhibitHallId);
 

src/main/java/org/atdev/artrip/controller/AuthController.java

@@ -6,15 +6,14 @@
 import lombok.RequiredArgsConstructor;
 import org.atdev.artrip.controller.dto.request.ReissueRequest;
 import org.atdev.artrip.global.apipayload.code.status.UserErrorCode;
+import org.atdev.artrip.global.resolver.LoginUser;
 import org.atdev.artrip.service.AuthService;
 import org.atdev.artrip.controller.dto.request.SocialLoginRequest;
 import org.atdev.artrip.controller.dto.response.SocialLoginResponse;
 import org.atdev.artrip.global.apipayload.CommonResponse;
 import org.atdev.artrip.global.apipayload.code.status.CommonErrorCode;
 import org.atdev.artrip.global.swagger.ApiErrorResponses;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -110,9 +109,7 @@ public ResponseEntity<CommonResponse<SocialLoginResponse>> socialLogin(@RequestB
     @Operation(summary = "isFirstLogin값 반전 api")
     @PostMapping("/complete")
     public ResponseEntity<String> completeOnboarding(
-            @AuthenticationPrincipal UserDetails userDetails) {
-
-        long userId = Long.parseLong(userDetails.getUsername());
+            @LoginUser Long userId) {
 
         authService.completeOnboarding(userId);