Merge pull request #99 from DSM-Repo/final-refactoring

pr: 패키지 구조 리팩토링

Author: ori0o0p

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.4'
 }
 
-group = 'com.repo'
+group = 'com.dsm'
 version = '0.0.1-SNAPSHOT'
 
 java {
@@ -42,10 +42,6 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     implementation 'javax.xml.bind:jaxb-api:2.3.0'
 
-    // test
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.security:spring-security-test'
-
     // AWS
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.0.0'
 

…n/java/com/repo/whopper/Application.java …/main/java/com/dsm/repo/Application.javasrc/main/java/com/repo/whopper/Application.java renamed to src/main/java/com/dsm/repo/Application.java src/main/java/com/repo/whopper/Application.java renamed to src/main/java/com/dsm/repo/Application.java

@@ -1,17 +1,21 @@
-package com.repo.whopper;
+package com.dsm.repo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
+@EnableWebSecurity
 @EnableFeignClients
+@EnableMethodSecurity
 @SpringBootApplication
 @ConfigurationPropertiesScan
 @ImportAutoConfiguration({FeignAutoConfiguration.class})
-class Application {
+class   Application {
 
     public static void main(final String[] args) {
         SpringApplication.run(

…frastructure/aws/s3/AwsS3Properties.java …epo/external/aws/s3/AwsS3Properties.javasrc/main/java/com/repo/whopper/infrastructure/aws/s3/AwsS3Properties.java renamed to src/main/java/com/dsm/repo/external/aws/s3/AwsS3Properties.java src/main/java/com/repo/whopper/infrastructure/aws/s3/AwsS3Properties.java renamed to src/main/java/com/dsm/repo/external/aws/s3/AwsS3Properties.java

@@ -1,4 +1,4 @@
-package com.repo.whopper.infrastructure.aws.s3;
+package com.dsm.repo.external.aws.s3;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

…per/infrastructure/mongo/MongoUtils.java …/external/database/mongo/MongoUtils.javasrc/main/java/com/repo/whopper/infrastructure/mongo/MongoUtils.java renamed to src/main/java/com/dsm/repo/external/database/mongo/MongoUtils.java src/main/java/com/repo/whopper/infrastructure/mongo/MongoUtils.java renamed to src/main/java/com/dsm/repo/external/database/mongo/MongoUtils.java

@@ -1,11 +1,15 @@
-package com.repo.whopper.infrastructure.mongo;
+package com.dsm.repo.external.database.mongo;
 
 import org.springframework.data.mongodb.core.BulkOperations;
 import org.springframework.data.mongodb.core.query.Query;
 
 import java.util.stream.Stream;
 
 public interface MongoUtils {
+
     <T> Stream<T> find(Query query, Class<T> targetClass);
+
+
     <T> BulkOperations bulkOps(Class<T> targetClass);
-}
+
+}

…infrastructure/mongo/MongoUtilsImpl.java …ernal/database/mongo/MongoUtilsImpl.javasrc/main/java/com/repo/whopper/infrastructure/mongo/MongoUtilsImpl.java renamed to src/main/java/com/dsm/repo/external/database/mongo/MongoUtilsImpl.java src/main/java/com/repo/whopper/infrastructure/mongo/MongoUtilsImpl.java renamed to src/main/java/com/dsm/repo/external/database/mongo/MongoUtilsImpl.java

@@ -1,4 +1,4 @@
-package com.repo.whopper.infrastructure.mongo;
+package com.dsm.repo.external.database.mongo;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.mongodb.core.BulkOperations;
@@ -11,6 +11,7 @@
 @Component
 @RequiredArgsConstructor
 public class MongoUtilsImpl implements MongoUtils {
+
     private final MongoTemplate mongoTemplate;
 
     @Override
@@ -22,4 +23,5 @@ public <T> Stream<T> find(Query query, Class<T> targetClass) {
     public <T> BulkOperations bulkOps(Class<T> targetClass) {
         return mongoTemplate.bulkOps(BulkOperations.BulkMode.UNORDERED, targetClass);
     }
+
 }

…er/infrastructure/redis/RedisConfig.java …l/database/redis/RedisConfiguration.javasrc/main/java/com/repo/whopper/infrastructure/redis/RedisConfig.java renamed to src/main/java/com/dsm/repo/external/database/redis/RedisConfiguration.java src/main/java/com/repo/whopper/infrastructure/redis/RedisConfig.java renamed to src/main/java/com/dsm/repo/external/database/redis/RedisConfiguration.java

@@ -1,4 +1,4 @@
-package com.repo.whopper.infrastructure.redis;
+package com.dsm.repo.external.database.redis;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
@@ -14,11 +14,14 @@
         keyspaceNotificationsConfigParameter = ""  // Elastic Cache는 CONFIG 명령어를 허용하지 않는 이슈
 )
 @RequiredArgsConstructor
-public class RedisConfig {
+class RedisConfiguration {
+
     private final RedisProperties properties;
 
     @Bean
-    public RedisConnectionFactory redisConnectionFactory() {
+    RedisConnectionFactory redisConnectionFactory() {
         return new LettuceConnectionFactory(properties.host(), properties.port());
     }
+
+
 }

…nfrastructure/redis/RedisProperties.java …rnal/database/redis/RedisProperties.javasrc/main/java/com/repo/whopper/infrastructure/redis/RedisProperties.java renamed to src/main/java/com/dsm/repo/external/database/redis/RedisProperties.java src/main/java/com/repo/whopper/infrastructure/redis/RedisProperties.java renamed to src/main/java/com/dsm/repo/external/database/redis/RedisProperties.java

@@ -1,9 +1,10 @@
-package com.repo.whopper.infrastructure.redis;
+package com.dsm.repo.external.database.redis;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "redis")
 public record RedisProperties(
         String host,
         int port
-) {}
+) {
+}

src/main/java/com/dsm/repo/external/exception/ExternalException.java

@@ -0,0 +1,9 @@
+package com.dsm.repo.external.exception;
+
+import com.dsm.repo.external.exception.error.ErrorCode;
+
+public class ExternalException extends WhopperException {
+    public ExternalException(final ErrorCode errorCode) {
+        super(errorCode);
+    }
+}

…/error/exception/ForbiddenException.java …ternal/exception/ForbiddenException.javasrc/main/java/com/repo/whopper/common/error/exception/ForbiddenException.java renamed to src/main/java/com/dsm/repo/external/exception/ForbiddenException.java src/main/java/com/repo/whopper/common/error/exception/ForbiddenException.java renamed to src/main/java/com/dsm/repo/external/exception/ForbiddenException.java

@@ -1,4 +1,6 @@
-package com.repo.whopper.common.error.exception;
+package com.dsm.repo.external.exception;
+
+import com.dsm.repo.external.exception.error.ErrorCode;
 
 public class ForbiddenException extends WhopperException {
     public static final WhopperException EXCEPTION = new ForbiddenException();

…/common/error/GlobalExceptionFilter.java …nal/exception/GlobalExceptionFilter.javasrc/main/java/com/repo/whopper/common/error/GlobalExceptionFilter.java renamed to src/main/java/com/dsm/repo/external/exception/GlobalExceptionFilter.java src/main/java/com/repo/whopper/common/error/GlobalExceptionFilter.java renamed to src/main/java/com/dsm/repo/external/exception/GlobalExceptionFilter.java

@@ -1,7 +1,8 @@
-package com.repo.whopper.common.error;
+package com.dsm.repo.external.exception;
 
-import com.repo.whopper.common.error.exception.WhopperException;
-import com.repo.whopper.common.error.exception.ErrorCode;
+import com.dsm.repo.external.exception.WhopperException;
+import com.dsm.repo.external.exception.error.ErrorCode;
+import com.dsm.repo.external.exception.error.ErrorResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.http.HttpServletRequest;