[BSVR-187] infrastructure 모듈 병합 (#107)

* feat: infrastructure 모듈 병합 * fix: 컴포넌트 스캔시 바뀐 패키지 따라가도록 수정 * fix: jpql에서 dto 사용하는 경우 패키지명 수정
depromeet · Aug 3, 2024 · 20445d8 · 20445d8
1 parent c33f364
commit 20445d8
Show file tree

Hide file tree

Showing 80 changed files with 276 additions and 281 deletions.
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -2,8 +2,7 @@ dependencies {
     implementation(project(":common"))
     implementation(project(":domain"))
     implementation(project(":usecase"))
-    implementation(project(":infrastructure:jpa"))
-    implementation(project(":infrastructure:ncp"))
+    implementation(project(":infrastructure"))
 
     // spring
     implementation("org.springframework:spring-aspects")

diff --git a/...ion/src/main/java/org/depromeet/spot/application/common/config/SpotApplicationConfig.java b/...ion/src/main/java/org/depromeet/spot/application/common/config/SpotApplicationConfig.java
@@ -1,13 +1,13 @@
 package org.depromeet.spot.application.common.config;
 
-import org.depromeet.spot.jpa.config.JpaConfig;
-import org.depromeet.spot.ncp.NcpConfig;
+import org.depromeet.spot.infrastructure.aws.AwsConfig;
+import org.depromeet.spot.infrastructure.jpa.config.JpaConfig;
 import org.depromeet.spot.usecase.config.UsecaseConfig;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @ComponentScan(basePackages = {"org.depromeet.spot.application"})
 @Configuration
-@Import(value = {UsecaseConfig.class, JpaConfig.class, NcpConfig.class, SwaggerConfig.class})
+@Import(value = {UsecaseConfig.class, JpaConfig.class, AwsConfig.class, SwaggerConfig.class})
 public class SpotApplicationConfig {}
diff --git a/infrastructure/build.gradle.kts b/infrastructure/build.gradle.kts
@@ -1,2 +1,31 @@
+dependencies {
+    implementation(project(":common"))
+    implementation(project(":domain"))
+    implementation(project(":usecase"))
+
+    // spring
+    implementation("org.springframework.boot:spring-boot-starter")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa:_")
+
+    // mysql
+    runtimeOnly("com.mysql:mysql-connector-j")
+
+    // queryDSL
+    implementation("com.querydsl:querydsl-jpa:_:jakarta")
+    annotationProcessor("com.querydsl:querydsl-apt:_:jakarta")
+    annotationProcessor("jakarta.annotation:jakarta.annotation-api")
+    annotationProcessor("jakarta.persistence:jakarta.persistence-api")
+
+    // p6spy
+    implementation("com.github.gavlyukovskiy:p6spy-spring-boot-starter:_")
+
+    // aws
+    implementation("org.springframework.cloud:spring-cloud-starter-aws:_")
+
+    // webflux (HTTP 요청에 사용)
+    implementation("org.springframework.boot:spring-boot-starter-webflux")
+}
+
 tasks.bootJar { enabled = false }
 tasks.jar { enabled = true }
diff --git a/infrastructure/jpa/build.gradle.kts b/infrastructure/jpa/build.gradle.kts
diff --git a/...ture/jpa/src/main/java/org/depromeet/spot/jpa/block/repository/BlockCustomRepository.java b/...ture/jpa/src/main/java/org/depromeet/spot/jpa/block/repository/BlockCustomRepository.java
diff --git a/...main/java/org/depromeet/spot/jpa/review/repository/image/ReviewImageCustomRepository.java b/...main/java/org/depromeet/spot/jpa/review/repository/image/ReviewImageCustomRepository.java
diff --git a/...java/org/depromeet/spot/jpa/team/repository/hometeam/StadiumHomeTeamCustomRepository.java b/...java/org/depromeet/spot/jpa/team/repository/hometeam/StadiumHomeTeamCustomRepository.java
diff --git a/infrastructure/ncp/build.gradle.kts b/infrastructure/ncp/build.gradle.kts
diff --git a/infrastructure/ncp/src/test/resources/application-test.yml b/infrastructure/ncp/src/test/resources/application-test.yml
diff --git a/...ava/org/depromeet/spot/ncp/NcpConfig.java → ...et/spot/infrastructure/aws/AwsConfig.java b/...ava/org/depromeet/spot/ncp/NcpConfig.java → ...et/spot/infrastructure/aws/AwsConfig.java
@@ -1,4 +1,4 @@
-package org.depromeet.spot.ncp;
+package org.depromeet.spot.infrastructure.aws;
 
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -7,6 +7,6 @@
 
 @Configuration
 @EnableConfigurationProperties
-@ConfigurationPropertiesScan(basePackages = {"org.depromeet.spot.ncp.property"})
-@ComponentScan(basePackages = {"org.depromeet.spot.ncp"})
-public class NcpConfig {}
+@ConfigurationPropertiesScan(basePackages = {"org.depromeet.spot.infrastructure.aws.property"})
+@ComponentScan(basePackages = {"org.depromeet.spot.infrastructure.aws"})
+public class AwsConfig {}
diff --git a/.../spot/ncp/config/ObjectStorageConfig.java → ...cture/aws/config/ObjectStorageConfig.java b/.../spot/ncp/config/ObjectStorageConfig.java → ...cture/aws/config/ObjectStorageConfig.java
@@ -1,6 +1,6 @@
-package org.depromeet.spot.ncp.config;
+package org.depromeet.spot.infrastructure.aws.config;
 
-import org.depromeet.spot.ncp.property.ObjectStorageProperties;
+import org.depromeet.spot.infrastructure.aws.property.ObjectStorageProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;

diff --git a/.../ncp/objectstorage/FileNameGenerator.java → .../aws/objectstorage/FileNameGenerator.java b/.../ncp/objectstorage/FileNameGenerator.java → .../aws/objectstorage/FileNameGenerator.java
@@ -1,4 +1,4 @@
-package org.depromeet.spot.ncp.objectstorage;
+package org.depromeet.spot.infrastructure.aws.objectstorage;
 
 import org.depromeet.spot.domain.media.extension.ImageExtension;
 import org.depromeet.spot.usecase.port.in.util.TimeUsecase;

diff --git a/...spot/ncp/objectstorage/ImageUploader.java → ...ture/aws/objectstorage/ImageUploader.java b/...spot/ncp/objectstorage/ImageUploader.java → ...ture/aws/objectstorage/ImageUploader.java
@@ -1,4 +1,4 @@
-package org.depromeet.spot.ncp.objectstorage;
+package org.depromeet.spot.infrastructure.aws.objectstorage;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -8,7 +8,7 @@
 import org.depromeet.spot.domain.media.MediaProperty;
 import org.depromeet.spot.domain.media.extension.ImageExtension;
 import org.depromeet.spot.domain.media.extension.StadiumSeatMediaExtension;
-import org.depromeet.spot.ncp.config.ObjectStorageConfig;
+import org.depromeet.spot.infrastructure.aws.config.ObjectStorageConfig;
 import org.depromeet.spot.usecase.port.out.media.ImageUploadPort;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

diff --git a/.../objectstorage/PresignedUrlGenerator.java → .../objectstorage/PresignedUrlGenerator.java b/.../objectstorage/PresignedUrlGenerator.java → .../objectstorage/PresignedUrlGenerator.java
@@ -1,11 +1,11 @@
-package org.depromeet.spot.ncp.objectstorage;
+package org.depromeet.spot.infrastructure.aws.objectstorage;
 
 import java.net.URL;
 import java.util.Date;
 
 import org.depromeet.spot.common.exception.media.MediaException.InvalidExtensionException;
 import org.depromeet.spot.domain.media.extension.ImageExtension;
-import org.depromeet.spot.ncp.config.ObjectStorageConfig;
+import org.depromeet.spot.infrastructure.aws.config.ObjectStorageConfig;
 import org.depromeet.spot.usecase.port.out.media.CreatePresignedUrlPort;
 import org.springframework.stereotype.Service;
 

diff --git a/...ncp/property/ObjectStorageProperties.java → ...aws/property/ObjectStorageProperties.java b/...ncp/property/ObjectStorageProperties.java → ...aws/property/ObjectStorageProperties.java
@@ -1,4 +1,4 @@
-package org.depromeet.spot.ncp.property;
+package org.depromeet.spot.infrastructure.aws.property;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

diff --git a/...et/spot/jpa/block/entity/BlockEntity.java → ...ructure/jpa/block/entity/BlockEntity.java b/...et/spot/jpa/block/entity/BlockEntity.java → ...ructure/jpa/block/entity/BlockEntity.java
@@ -1,11 +1,11 @@
-package org.depromeet.spot.jpa.block.entity;
+package org.depromeet.spot.infrastructure.jpa.block.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 
 import org.depromeet.spot.domain.block.Block;
-import org.depromeet.spot.jpa.common.entity.BaseEntity;
+import org.depromeet.spot.infrastructure.jpa.common.entity.BaseEntity;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

diff --git a/...spot/jpa/block/entity/BlockRowEntity.java → ...ture/jpa/block/entity/BlockRowEntity.java b/...spot/jpa/block/entity/BlockRowEntity.java → ...ture/jpa/block/entity/BlockRowEntity.java
@@ -1,4 +1,4 @@
-package org.depromeet.spot.jpa.block.entity;
+package org.depromeet.spot.infrastructure.jpa.block.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.ConstraintMode;
@@ -10,7 +10,7 @@
 import jakarta.persistence.Table;
 
 import org.depromeet.spot.domain.block.BlockRow;
-import org.depromeet.spot.jpa.common.entity.BaseEntity;
+import org.depromeet.spot.infrastructure.jpa.common.entity.BaseEntity;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

diff --git a/...in/java/org/depromeet/spot/infrastructure/jpa/block/repository/BlockCustomRepository.java b/...in/java/org/depromeet/spot/infrastructure/jpa/block/repository/BlockCustomRepository.java
@@ -0,0 +1,36 @@
+package org.depromeet.spot.infrastructure.jpa.block.repository;
+
+import static com.querydsl.core.group.GroupBy.list;
+
+import java.util.List;
+import java.util.Map;
+
+import org.depromeet.spot.infrastructure.jpa.block.entity.BlockEntity;
+import org.depromeet.spot.infrastructure.jpa.block.entity.BlockRowEntity;
+import org.depromeet.spot.infrastructure.jpa.block.entity.QBlockEntity;
+import org.depromeet.spot.infrastructure.jpa.block.entity.QBlockRowEntity;
+import org.springframework.stereotype.Repository;
+
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class BlockCustomRepository {
+
+    private final JPAQueryFactory queryFactory;
+
+    public Map<BlockEntity, List<BlockRowEntity>> findRowInfosBy(final Long sectionId) {
+        return queryFactory
+                .from(QBlockRowEntity.blockRowEntity)
+                .join(QBlockEntity.blockEntity)
+                .on(QBlockRowEntity.blockRowEntity.block.id.eq(QBlockEntity.blockEntity.id))
+                .where(QBlockEntity.blockEntity.sectionId.eq(sectionId))
+                .orderBy(QBlockRowEntity.blockRowEntity.number.asc())
+                .transform(
+                        GroupBy.groupBy(QBlockEntity.blockEntity)
+                                .as(list(QBlockRowEntity.blockRowEntity)));
+    }
+}
diff --git a/.../block/repository/BlockJpaRepository.java → .../block/repository/BlockJpaRepository.java b/.../block/repository/BlockJpaRepository.java → .../block/repository/BlockJpaRepository.java
@@ -1,9 +1,9 @@
-package org.depromeet.spot.jpa.block.repository;
+package org.depromeet.spot.infrastructure.jpa.block.repository;
 
 import java.util.List;
 import java.util.Optional;
 
-import org.depromeet.spot.jpa.block.entity.BlockEntity;
+import org.depromeet.spot.infrastructure.jpa.block.entity.BlockEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

diff --git a/...block/repository/BlockRepositoryImpl.java → ...block/repository/BlockRepositoryImpl.java b/...block/repository/BlockRepositoryImpl.java → ...block/repository/BlockRepositoryImpl.java
@@ -1,4 +1,4 @@
-package org.depromeet.spot.jpa.block.repository;
+package org.depromeet.spot.infrastructure.jpa.block.repository;
 
 import java.util.List;
 import java.util.Map;
@@ -7,9 +7,9 @@
 import org.depromeet.spot.common.exception.block.BlockException.BlockNotFoundException;
 import org.depromeet.spot.domain.block.Block;
 import org.depromeet.spot.domain.block.BlockRow;
-import org.depromeet.spot.jpa.block.entity.BlockEntity;
-import org.depromeet.spot.jpa.block.entity.BlockRowEntity;
-import org.depromeet.spot.jpa.block.repository.row.BlockRowJpaRepository;
+import org.depromeet.spot.infrastructure.jpa.block.entity.BlockEntity;
+import org.depromeet.spot.infrastructure.jpa.block.entity.BlockRowEntity;
+import org.depromeet.spot.infrastructure.jpa.block.repository.row.BlockRowJpaRepository;
 import org.depromeet.spot.usecase.port.out.block.BlockRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/...epository/row/BlockRowJdbcRepository.java → ...epository/row/BlockRowJdbcRepository.java b/...epository/row/BlockRowJdbcRepository.java → ...epository/row/BlockRowJdbcRepository.java
@@ -1,4 +1,4 @@
-package org.depromeet.spot.jpa.block.repository.row;
+package org.depromeet.spot.infrastructure.jpa.block.repository.row;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

diff --git a/...repository/row/BlockRowJpaRepository.java → ...repository/row/BlockRowJpaRepository.java b/...repository/row/BlockRowJpaRepository.java → ...repository/row/BlockRowJpaRepository.java
@@ -1,8 +1,8 @@
-package org.depromeet.spot.jpa.block.repository.row;
+package org.depromeet.spot.infrastructure.jpa.block.repository.row;
 
 import java.util.List;
 
-import org.depromeet.spot.jpa.block.entity.BlockRowEntity;
+import org.depromeet.spot.infrastructure.jpa.block.entity.BlockRowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

diff --git a/...epository/row/BlockRowRepositoryImpl.java → ...epository/row/BlockRowRepositoryImpl.java b/...epository/row/BlockRowRepositoryImpl.java → ...epository/row/BlockRowRepositoryImpl.java
@@ -1,9 +1,9 @@
-package org.depromeet.spot.jpa.block.repository.row;
+package org.depromeet.spot.infrastructure.jpa.block.repository.row;
 
 import java.util.List;
 
 import org.depromeet.spot.domain.block.BlockRow;
-import org.depromeet.spot.jpa.block.entity.BlockRowEntity;
+import org.depromeet.spot.infrastructure.jpa.block.entity.BlockRowEntity;
 import org.depromeet.spot.usecase.port.out.block.BlockRowRepository;
 import org.springframework.stereotype.Repository;