Merge pull request #104 from Cod2-Crafters/refactor-project-structure

프로젝트 구조 리팩토링 및 정리

Author: 213kky

src/main/java/com/codecrafter/commenting/annotation/Notification.java renamed to src/main/java/com/codecrafter/commenting/common/annotation/Notification.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.annotation;
+package com.codecrafter.commenting.common.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/com/codecrafter/commenting/aop/NotificationAspect.java renamed to src/main/java/com/codecrafter/commenting/common/aop/NotificationAspect.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.aop;
+package com.codecrafter.commenting.common.aop;
 
 import com.codecrafter.commenting.domain.entity.Conversation;
 import com.codecrafter.commenting.domain.entity.MemberInfo;
@@ -34,7 +34,7 @@ public class NotificationAspect {
     private final ConversationRepository conversationRepository;
     private final MailSendService mailSendService;
 
-    @Pointcut("@annotation(com.codecrafter.commenting.annotation.Notification)")
+    @Pointcut("@annotation(com.codecrafter.commenting.common.annotation.Notification)")
     public void annotationPointcut() {
     }
 

src/main/java/com/codecrafter/commenting/config/batch/BatchConfig.java renamed to src/main/java/com/codecrafter/commenting/common/batch/BatchConfig.java

@@ -1,8 +1,7 @@
-package com.codecrafter.commenting.config.batch;
+package com.codecrafter.commenting.common.batch;
 
 import org.quartz.JobDetail;
 import org.quartz.Trigger;
-import org.quartz.CronTrigger;
 import org.quartz.JobBuilder;
 import org.quartz.TriggerBuilder;
 import org.quartz.CronScheduleBuilder;

src/main/java/com/codecrafter/commenting/config/batch/BatchJobLauncher.java renamed to src/main/java/com/codecrafter/commenting/common/batch/BatchJobLauncher.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.batch;
+package com.codecrafter.commenting.common.batch;
 
 import com.codecrafter.commenting.domain.entity.MemberInfo;
 import lombok.RequiredArgsConstructor;

src/main/java/com/codecrafter/commenting/config/batch/BatchScheduler.java renamed to src/main/java/com/codecrafter/commenting/common/batch/BatchScheduler.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.batch;
+package com.codecrafter.commenting.common.batch;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.batch.core.Job;

src/main/java/com/codecrafter/commenting/config/batch/MemberBatchConfig.java renamed to src/main/java/com/codecrafter/commenting/common/batch/MemberBatchConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.batch;
+package com.codecrafter.commenting.common.batch;
 
 import com.codecrafter.commenting.domain.entity.MemberInfo;
 import com.codecrafter.commenting.repository.MemberInfoRepository;

src/main/java/com/codecrafter/commenting/config/batch/MemberScheduler.java renamed to src/main/java/com/codecrafter/commenting/common/batch/MemberScheduler.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.batch;
+package com.codecrafter.commenting.common.batch;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/codecrafter/commenting/config/batch/QuartzConfig.java renamed to src/main/java/com/codecrafter/commenting/common/batch/QuartzConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.batch;
+package com.codecrafter.commenting.common.batch;
 
 import org.quartz.*;
 import org.springframework.context.annotation.Bean;

src/main/java/com/codecrafter/commenting/config/batch/QuartzJobConfig.java renamed to src/main/java/com/codecrafter/commenting/common/batch/QuartzJobConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.batch;
+package com.codecrafter.commenting.common.batch;
 
 import org.quartz.JobBuilder;
 import org.quartz.JobDetail;

src/main/java/com/codecrafter/commenting/config/CachedBodyHttpServletRequest.java renamed to src/main/java/com/codecrafter/commenting/common/cache/CachedBodyHttpServletRequest.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config;
+package com.codecrafter.commenting.common.cache;
 
 import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/codecrafter/commenting/config/CachedBodyServletInputStream.java renamed to src/main/java/com/codecrafter/commenting/common/cache/CachedBodyServletInputStream.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config;
+package com.codecrafter.commenting.common.cache;
 
 import jakarta.servlet.ReadListener;
 import jakarta.servlet.ServletInputStream;

src/main/java/com/codecrafter/commenting/config/filter/ContentCachingFilter.java renamed to src/main/java/com/codecrafter/commenting/common/cache/ContentCachingFilter.java

@@ -1,6 +1,5 @@
-package com.codecrafter.commenting.config.filter;
+package com.codecrafter.commenting.common.cache;
 
-import com.codecrafter.commenting.config.CachedBodyHttpServletRequest;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/codecrafter/commenting/config/async/AsyncConfig.java renamed to src/main/java/com/codecrafter/commenting/common/config/AsyncConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.async;
+package com.codecrafter.commenting.common.config;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;

src/main/java/com/codecrafter/commenting/config/QueryDslConfig.java renamed to src/main/java/com/codecrafter/commenting/common/config/QueryDslConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config;
+package com.codecrafter.commenting.common.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/codecrafter/commenting/config/RedisConfig.java renamed to src/main/java/com/codecrafter/commenting/common/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config;
+package com.codecrafter.commenting.common.config;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;

src/main/java/com/codecrafter/commenting/config/SecurityConfig.java renamed to src/main/java/com/codecrafter/commenting/common/config/SecurityConfig.java

@@ -1,24 +1,17 @@
-package com.codecrafter.commenting.config;
+package com.codecrafter.commenting.common.config;
 
-import com.codecrafter.commenting.config.filter.JwtAuthenticationFilter;
-import com.codecrafter.commenting.config.jwt.TokenProvider;
+import com.codecrafter.commenting.common.filter.JwtAuthenticationFilter;
+import com.codecrafter.commenting.common.jwt.TokenProvider;
 import com.codecrafter.commenting.service.MemberAuthService;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.firewall.HttpFirewall;
 import org.springframework.security.web.firewall.StrictHttpFirewall;

src/main/java/com/codecrafter/commenting/config/WebServiceConfig.java renamed to src/main/java/com/codecrafter/commenting/common/config/WebServiceConfig.java

@@ -1,6 +1,6 @@
-package com.codecrafter.commenting.config;
+package com.codecrafter.commenting.common.config;
 
-import com.codecrafter.commenting.config.filter.ContentCachingFilter;
+import com.codecrafter.commenting.common.cache.ContentCachingFilter;
 import com.codecrafter.commenting.controller.interceptor.ConversationQuestionInterceptor;
 import com.codecrafter.commenting.controller.interceptor.LoginCheckInterceptor;
 import com.codecrafter.commenting.controller.interceptor.RecommendInterceptor;

src/main/java/com/codecrafter/commenting/exception/AuthenticationFailedException.java renamed to src/main/java/com/codecrafter/commenting/common/exception/AuthenticationFailedException.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.exception;
+package com.codecrafter.commenting.common.exception;
 
 public class AuthenticationFailedException extends RuntimeException {
     public AuthenticationFailedException(String message) {

src/main/java/com/codecrafter/commenting/exception/EmailNotFoundException.java renamed to src/main/java/com/codecrafter/commenting/common/exception/EmailNotFoundException.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.exception;
+package com.codecrafter.commenting.common.exception;
 
 public class EmailNotFoundException extends RuntimeException {
     public EmailNotFoundException() {

src/main/java/com/codecrafter/commenting/config/handler/GlobalExceptionHandler.java renamed to src/main/java/com/codecrafter/commenting/common/exception/GlobalExceptionHandler.java

@@ -1,7 +1,6 @@
-package com.codecrafter.commenting.config.handler;
+package com.codecrafter.commenting.common.exception;
 
 import com.codecrafter.commenting.domain.dto.ApiResponse;
-import com.codecrafter.commenting.exception.AuthenticationFailedException;
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/com/codecrafter/commenting/config/filter/JwtAuthenticationFilter.java renamed to src/main/java/com/codecrafter/commenting/common/filter/JwtAuthenticationFilter.java

@@ -1,6 +1,6 @@
-package com.codecrafter.commenting.config.filter;
+package com.codecrafter.commenting.common.filter;
 
-import com.codecrafter.commenting.config.jwt.TokenProvider;
+import com.codecrafter.commenting.common.jwt.TokenProvider;
 import com.codecrafter.commenting.domain.entity.MemberAuth;
 import com.codecrafter.commenting.repository.MemberAuthRepository;
 import io.jsonwebtoken.ExpiredJwtException;

src/main/java/com/codecrafter/commenting/config/jwt/CustomUserDetails.java renamed to src/main/java/com/codecrafter/commenting/common/jwt/CustomUserDetails.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.jwt;
+package com.codecrafter.commenting.common.jwt;
 
 import java.util.Collection;
 import java.util.Collections;

src/main/java/com/codecrafter/commenting/config/jwt/TokenProvider.java renamed to src/main/java/com/codecrafter/commenting/common/jwt/TokenProvider.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.jwt;
+package com.codecrafter.commenting.common.jwt;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;

src/main/java/com/codecrafter/commenting/config/mail/CertificationGenerator.java renamed to src/main/java/com/codecrafter/commenting/common/mail/CertificationGenerator.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.mail;
+package com.codecrafter.commenting.common.mail;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

src/main/java/com/codecrafter/commenting/config/mail/EmailConfig.java renamed to src/main/java/com/codecrafter/commenting/common/mail/EmailConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config.mail;
+package com.codecrafter.commenting.common.mail;
 
 import java.util.Properties;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/codecrafter/commenting/swagger/SwaggerConfig.java renamed to src/main/java/com/codecrafter/commenting/common/swagger/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.swagger;
+package com.codecrafter.commenting.common.swagger;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.models.Components;

src/main/java/com/codecrafter/commenting/swagger/SwaggerDESC.java renamed to src/main/java/com/codecrafter/commenting/common/swagger/SwaggerDESC.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.swagger;
+package com.codecrafter.commenting.common.swagger;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/com/codecrafter/commenting/util/ResponseUtil.java renamed to src/main/java/com/codecrafter/commenting/common/util/ResponseUtil.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.util;
+package com.codecrafter.commenting.common.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletResponse;

src/main/java/com/codecrafter/commenting/config/SecurityUtil.java renamed to src/main/java/com/codecrafter/commenting/common/util/SecurityUtil.java

@@ -1,4 +1,4 @@
-package com.codecrafter.commenting.config;
+package com.codecrafter.commenting.common.util;
 
 import com.codecrafter.commenting.domain.entity.MemberAuth;
 import org.springframework.security.core.Authentication;

src/main/java/com/codecrafter/commenting/config/handler/CustomAccessDeniedHandler.java

@@ -1,12 +1,11 @@
 package com.codecrafter.commenting.controller;
 
-import com.codecrafter.commenting.config.batch.MemberScheduler;
+import com.codecrafter.commenting.common.batch.MemberScheduler;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/codecrafter/commenting/config/handler/OAuth2SuccessHandler.java

@@ -1,29 +1,21 @@
 package com.codecrafter.commenting.controller;
 
-import com.codecrafter.commenting.config.jwt.TokenProvider;
+import com.codecrafter.commenting.common.jwt.TokenProvider;
 import com.codecrafter.commenting.domain.enumeration.Provider;
 import com.codecrafter.commenting.domain.request.SignInRequest;
 import com.codecrafter.commenting.domain.response.SignInResponse;
 import com.codecrafter.commenting.service.MemberAuthService;
 import com.codecrafter.commenting.service.MemberService;
-import io.jsonwebtoken.Claims;
 import io.swagger.v3.oas.annotations.Operation;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
 

src/main/java/com/codecrafter/commenting/controller/BatchController.java

@@ -1,8 +1,8 @@
 package com.codecrafter.commenting.controller.interceptor;
 
-import static com.codecrafter.commenting.util.ResponseUtil.createResponseBody;
+import static com.codecrafter.commenting.common.util.ResponseUtil.createResponseBody;
 
-import com.codecrafter.commenting.config.SecurityUtil;
+import com.codecrafter.commenting.common.util.SecurityUtil;
 import com.codecrafter.commenting.domain.dto.ApiResponse;
 import com.codecrafter.commenting.domain.entity.MemberSetting;
 import com.codecrafter.commenting.domain.enumeration.ApiStatus;

src/main/java/com/codecrafter/commenting/controller/MemberAuthController.java

@@ -1,8 +1,8 @@
 package com.codecrafter.commenting.controller.interceptor;
 
-import static com.codecrafter.commenting.util.ResponseUtil.createResponseBody;
+import static com.codecrafter.commenting.common.util.ResponseUtil.createResponseBody;
 
-import com.codecrafter.commenting.config.SecurityUtil;
+import com.codecrafter.commenting.common.util.SecurityUtil;
 
 import com.codecrafter.commenting.domain.dto.ApiResponse;
 import com.codecrafter.commenting.domain.enumeration.ApiStatus;

src/main/java/com/codecrafter/commenting/controller/interceptor/ConversationQuestionInterceptor.java

@@ -1,8 +1,7 @@
 package com.codecrafter.commenting.controller.interceptor;
 
-import static com.codecrafter.commenting.util.ResponseUtil.createResponseBody;
+import static com.codecrafter.commenting.common.util.ResponseUtil.createResponseBody;
 
-import com.codecrafter.commenting.config.SecurityUtil;
 import com.codecrafter.commenting.domain.dto.ApiResponse;
 import com.codecrafter.commenting.domain.entity.Conversation;
 import com.codecrafter.commenting.domain.enumeration.ApiStatus;

src/main/java/com/codecrafter/commenting/controller/interceptor/LoginCheckInterceptor.java

@@ -1,9 +1,5 @@
 package com.codecrafter.commenting.domain.response;
 
-import com.codecrafter.commenting.domain.entity.Conversation;
-import com.codecrafter.commenting.domain.entity.MemberInfo;
-import io.swagger.v3.oas.annotations.media.Schema;
-
 public record RecommendResponse (
     boolean success, String action
 ){

src/main/java/com/codecrafter/commenting/controller/interceptor/RecommendInterceptor.java

@@ -8,10 +8,6 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-/**
- * @author jiheon
- * ConversationMST 관리 Repository
- */
 public interface ConversationMSTRepository extends JpaRepository<ConversationMST,Long> {
 
     @Query("SELECT COUNT(c) FROM ConversationMST c WHERE c.owner.id = :ownerId")

src/main/java/com/codecrafter/commenting/domain/response/ProfileResponse.java

@@ -1,9 +1,7 @@
 package com.codecrafter.commenting.repository.profile;
 
 import com.codecrafter.commenting.domain.entity.MemberInfo;
-import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 
 public interface ProfileRepository extends JpaRepository<MemberInfo, Long>, ProfileRepositoryCustom {
 

src/main/java/com/codecrafter/commenting/domain/response/RecommendResponse.java

@@ -1,7 +1,7 @@
 package com.codecrafter.commenting.service;
 
 import com.codecrafter.commenting.common.event.dto.NotificationEvent;
-import com.codecrafter.commenting.config.SecurityUtil;
+import com.codecrafter.commenting.common.util.SecurityUtil;
 import com.codecrafter.commenting.domain.entity.Conversation;
 import com.codecrafter.commenting.domain.entity.ConversationMST;
 import com.codecrafter.commenting.domain.entity.MemberAuth;

src/main/java/com/codecrafter/commenting/exception/InvalidCertificationNumberException.java

@@ -1,6 +1,6 @@
 package com.codecrafter.commenting.service;
 
-import com.codecrafter.commenting.config.mail.CertificationGenerator;
+import com.codecrafter.commenting.common.mail.CertificationGenerator;
 import com.codecrafter.commenting.domain.response.EmailCertificationResponse;
 import com.codecrafter.commenting.repository.CertificationNumberRepository;
 import jakarta.mail.MessagingException;