chore: 충돌 해결

Author: seongjae6751

build.gradle

@@ -7,6 +7,10 @@ plugins {
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 
+java {
+	sourceCompatibility = '17'
+}
+
 configurations {
 	compileOnly {
 		extendsFrom annotationProcessor
@@ -23,10 +27,12 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	implementation 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
@@ -38,9 +44,7 @@ dependencies {
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
 	// security
 	implementation 'org.springframework.security:spring-security-crypto:6.2.2'
-
 	implementation 'org.springframework.security:spring-security-oauth2-jose'
-
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
 	implementation 'com.sun.mail:jakarta.mail:2.0.1'
 
@@ -50,6 +54,19 @@ dependencies {
 	// jwt
 	implementation 'com.auth0:java-jwt:4.4.0'
 
+	// health check
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+	// redisson
+	implementation 'org.redisson:redisson-spring-boot-starter:3.35.0'
+
+	// QueryDSL (Jakarta 기반)
+	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+	annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta'
+	// 필요시 jakarta API 추가
+	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
 }
 
 tasks.named('test') {
@@ -59,3 +76,13 @@ tasks.named('test') {
 jar {
 	enabled=false
 }
+
+
+sourceSets {
+	main.java.srcDir 'build/generated/sources/annotationProcessor/java/main'
+}
+
+clean {
+	delete file('build/generated/sources/annotationProcessor/java/main')
+}
+

src/main/java/com/example/braveCoward/batchinsert/DataInsertController.java

@@ -3,6 +3,7 @@
 import java.time.Duration;
 import java.time.Instant;
 
+import com.example.braveCoward.global.exectime.ExecutionTimeLogger;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,6 +21,7 @@ public class DataInsertController implements DataInsertApi {
     private final DataInsertService dataInsertService;
 
     @PostMapping("batch-insert")
+    @ExecutionTimeLogger
     public ResponseEntity<String> insertData(@RequestParam(defaultValue = "1743") int numTeams) {
         Instant start = Instant.now(); // ✅ 시작 시간 기록
 

src/main/java/com/example/braveCoward/batchinsert/DataInsertService.java

@@ -128,7 +128,7 @@ public void insertLargeData(int numTeams) {
 
             for (int d = 0; d < 6; d++) {
                 LocalDate date = LocalDate.now().minusDays(random.nextInt(30));
-                String description = "Do " + UUID.randomUUID().toString().substring(0, 5);
+                String description = "DoDescriptionTest " + UUID.randomUUID().toString().substring(0, 5);
                 LocalDateTime createdAt = randomDateTime();
                 LocalDateTime updatedAt = createdAt.plusDays(random.nextInt(30));
 
@@ -142,7 +142,13 @@ public void insertLargeData(int numTeams) {
     }
 
     private void batchInsert(String sql, List<Object[]> batchList) {
-        jdbcTemplate.batchUpdate(sql, batchList);
+        int batchSize = 500; // 한 번에 500개씩 삽입
+
+        for (int i = 0; i < batchList.size(); i += batchSize) {
+            int endIndex = Math.min(i + batchSize, batchList.size());
+            List<Object[]> batchSubList = batchList.subList(i, endIndex);
+            jdbcTemplate.batchUpdate(sql, batchSubList);
+        }
     }
 
     private List<Long> getInsertedIds(String tableName, int limit) {
@@ -171,4 +177,4 @@ private Long getTeamIdForProject(Long projectId) {
     private Long getProjectIdForPlan(Long planId) {
         return jdbcTemplate.queryForObject("SELECT project_id FROM plan WHERE id = ?", Long.class, planId);
     }
-}
+}

src/main/java/com/example/braveCoward/config/QuerydslConfig.java

@@ -0,0 +1,19 @@
+package com.example.braveCoward.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QuerydslConfig {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(entityManager);
+    }
+}

src/main/java/com/example/braveCoward/config/RedissonConfig.java

@@ -0,0 +1,28 @@
+package com.example.braveCoward.config;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RedissonConfig {
+
+    @Value("${spring.data.redis.host}")
+    private String redisHost;
+
+    @Value("${spring.data.redis.port}")
+    private int redisPort;
+
+    private static final String REDISSION_HOST_PREFIX = "redis://";
+
+    @Bean
+    public RedissonClient redissionClient() {
+        Config config = new Config();
+        config.useSingleServer()
+            .setAddress(REDISSION_HOST_PREFIX + redisHost + ":" + redisPort);
+        return Redisson.create(config);
+    }
+}

src/main/java/com/example/braveCoward/config/WebMVCConfig.java

@@ -8,8 +8,8 @@
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.example.braveCoward.global.ExtractAuthenticationInterceptor;
-import com.example.braveCoward.global.UserIdArgumentResolver;
+import com.example.braveCoward.global.extractuserid.ExtractAuthenticationInterceptor;
+import com.example.braveCoward.global.extractuserid.UserIdArgumentResolver;
 
 import lombok.RequiredArgsConstructor;
 

src/main/java/com/example/braveCoward/controller/DoController.java

@@ -1,5 +1,6 @@
 package com.example.braveCoward.controller;
 
+import com.example.braveCoward.global.exectime.ExecutionTimeLogger;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -53,15 +54,19 @@ public ResponseEntity<Void> deleteDo(
     }
 
     @GetMapping("/plan/{planId}")
-    public ResponseEntity<DosResponse> getDoList(
+    @ExecutionTimeLogger
+    public ResponseEntity<Page<DoResponse>> getDoList(
         @PathVariable Long planId,
-        PageDTO pageDTO
+        @RequestParam(defaultValue = "1") @Min(1) int page,
+        @RequestParam(defaultValue = "10") @Min(1) int size
     ) {
-        DosResponse response = doService.getDos(planId, pageDTO);
+        PageDTO pageDTO = new PageDTO(page, size);
+        Page<DoResponse> response = doService.getDos(planId, pageDTO);
         return ResponseEntity.ok(response);
     }
 
     @GetMapping("/{doId}")
+    @ExecutionTimeLogger
     public ResponseEntity<DoResponse> getDo(
         @PathVariable Long doId
     ) {
@@ -87,6 +92,7 @@ public ResponseEntity<Void> changeDo(
     }
 
     @GetMapping("/search")
+    @ExecutionTimeLogger
     public ResponseEntity<Page<DoResponse>> searchDo(
         @RequestParam String keyword,
         @RequestParam Long projectId,
@@ -98,6 +104,46 @@ public ResponseEntity<Page<DoResponse>> searchDo(
         return ResponseEntity.ok(responses);
     }
 
+
+    @GetMapping("/searchQueryDSL")
+    @ExecutionTimeLogger
+    public ResponseEntity<Page<DoResponse>> searchDoWithQueryDSL(
+            @RequestParam String keyword,
+            @RequestParam Long projectId,
+            @RequestParam(defaultValue = "1") @Min(1) int page,
+            @RequestParam(defaultValue = "10") @Min(1) int size
+    ) {
+        PageDTO pageDTO = new PageDTO(page, size);
+        Page<DoResponse> responses = doService.searchDoWithQueryDSL(keyword, projectId, pageDTO);
+        return ResponseEntity.ok(responses);
+    }
+
+    @GetMapping("/searchStartsWith")
+    @ExecutionTimeLogger
+    public ResponseEntity<Page<DoResponse>> searchDoStartsWith(
+            @RequestParam String keyword,
+            @RequestParam Long projectId,
+            @RequestParam(defaultValue = "1") @Min(1) int page,
+            @RequestParam(defaultValue = "10") @Min(1) int size
+    ) {
+        PageDTO pageDTO = new PageDTO(page, size);
+        Page<DoResponse> responses = doService.searchDoStartsWith(keyword, projectId, pageDTO);
+        return ResponseEntity.ok(responses);
+    }
+
+    @GetMapping("/searchFullText")
+    @ExecutionTimeLogger
+    public ResponseEntity<Page<DoResponse>> searchDoFullText(
+            @RequestParam String keyword,
+            @RequestParam Long projectId,
+            @RequestParam(defaultValue = "1") @Min(1) int page,
+            @RequestParam(defaultValue = "10") @Min(1) int size
+    ) {
+        PageDTO pageDTO = new PageDTO(page, size);
+        Page<DoResponse> responses = doService.searchDoFullText(keyword, projectId, pageDTO);
+        return ResponseEntity.ok(responses);
+    }
+
     @PatchMapping("/complete/{doId}")
     public ResponseEntity<Void> completeDo(
         @PathVariable Long doId

src/main/java/com/example/braveCoward/controller/PlanController.java

@@ -1,7 +1,5 @@
 package com.example.braveCoward.controller;
 
-import java.util.List;
-
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;

src/main/java/com/example/braveCoward/controller/ProjectController.java

@@ -3,7 +3,7 @@
 import com.example.braveCoward.dto.project.ProjectCreateRequest;
 import com.example.braveCoward.dto.project.ProjectCreateResponse;
 
-import com.example.braveCoward.global.UserId;
+import com.example.braveCoward.global.extractuserid.UserId;
 import com.example.braveCoward.dto.project.ProjectResponse;
 
 import com.example.braveCoward.service.ProjectService;

src/main/java/com/example/braveCoward/global/concurrencyguard/ConcurrencyGuard.java

@@ -0,0 +1,22 @@
+package com.example.braveCoward.global.concurrencyguard;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.context.annotation.Profile;
+
+@Documented
+@Target(METHOD)
+@Retention(RUNTIME)
+@Profile("!test")
+public @interface ConcurrencyGuard {
+    String lockName();
+    long waitTime() default 5L;
+    long leaseTime() default 3L;
+    TimeUnit timeUnit() default TimeUnit.SECONDS;
+}