[Refactor] 프로젝트 구조 변경 (#183)

* refactor: 폴더 구조 변경 * fix: 의존성 문제 해결 * del: Apple Test 삭제
PrayHelper · Oct 2, 2024 · 4bcad0b · 4bcad0b
1 parent 7029d99
commit 4bcad0b
Show file tree

Hide file tree

Showing 164 changed files with 635 additions and 639 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '2.7.15'
     id 'io.spring.dependency-management' version '1.0.15.RELEASE'
-    //querydsl 추가
     id "com.ewerk.gradle.plugins.querydsl" version "1.0.10"
 }
 
@@ -17,6 +16,7 @@ configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
+    querydsl.extendsFrom compileClasspath
 }
 
 repositories {
@@ -45,69 +45,64 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
 
-
-    //JWT
+    // JWT
     implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
     implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
     implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
 
-    //Redis
+    // Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
-    //OAuth 2.0
+    // OAuth 2.0
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    //swagger
+    // Swagger
     implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
 
-    //sms
+    // SMS
     implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
 
-    //firebase
+    // Firebase
     implementation 'com.google.firebase:firebase-admin:9.2.0'
 
     implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.0'
 
-    //querydsl 추가
+    // Querydsl
     implementation "com.querydsl:querydsl-jpa:5.0.0"
     annotationProcessor "com.querydsl:querydsl-apt:5.0.0"
 
-    //apple oauth
+    // Apple OAuth
     implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.30.1'
     implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.70'
 
     implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
-//    // flyway
-//    implementation "org.flywaydb:flyway-core"
-//    implementation "org.springframework.boot:spring-boot-starter"
-
 }
 
 tasks.named('test') {
     useJUnitPlatform()
 }
 
-//querydsl 추가 시작
+// Querydsl 설정 시작
 def querydslDir = "$buildDir/generated/querydsl"
 
 querydsl {
     jpa = true
     querydslSourcesDir = querydslDir
 }
+
 sourceSets {
     main.java.srcDir querydslDir
 }
-configurations {
-    compileOnly {
-        extendsFrom annotationProcessor
-    }
-    querydsl.extendsFrom compileClasspath
-}
+
 compileQuerydsl {
     options.annotationProcessorPath = configurations.querydsl
 }
-//querydsl 추가 끝
+
+tasks.named('compileJava') {
+    dependsOn tasks.named('compileQuerydsl')
+}
+// Querydsl 설정 끝
+
 jar {
     enabled = false
 }
-
diff --git a/src/main/java/com/uspray/uspray/InitDb.java b/src/main/java/com/uspray/uspray/InitDb.java
@@ -1,15 +1,16 @@
 package com.uspray.uspray;
 
-import com.uspray.uspray.Enums.Authority;
-import com.uspray.uspray.Enums.CategoryType;
-import com.uspray.uspray.Enums.PrayType;
-import com.uspray.uspray.domain.Category;
-import com.uspray.uspray.domain.Group;
-import com.uspray.uspray.domain.GroupMember;
-import com.uspray.uspray.domain.History;
-import com.uspray.uspray.domain.Member;
-import com.uspray.uspray.domain.Pray;
+import com.uspray.uspray.global.enums.Authority;
+import com.uspray.uspray.global.enums.CategoryType;
+import com.uspray.uspray.global.enums.PrayType;
+import com.uspray.uspray.domain.category.model.Category;
+import com.uspray.uspray.domain.group.model.Group;
+import com.uspray.uspray.domain.group.model.GroupMember;
+import com.uspray.uspray.domain.history.model.History;
+import com.uspray.uspray.domain.member.model.Member;
+import com.uspray.uspray.domain.pray.model.Pray;
 import java.time.LocalDate;
+import javax.annotation.PostConstruct;
 import javax.persistence.EntityManager;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -22,10 +23,10 @@ public class InitDb {
 
     private final InitService initService;
 
-//    @PostConstruct
-//    public void init() {
-//        initService.dbInit();
-//    }
+    @PostConstruct
+    public void init() {
+        initService.dbInit();
+    }
 
     @Component
     @Transactional
@@ -188,6 +189,7 @@ public void dbInit() {
                 .prayType(PrayType.SHARED)
                 .startDate(LocalDate.of(2023, 12, 24))
                 .originPrayId(pray_1.getId())
+                .originMemberId(member2.getId())
                 .build();
             em.persist(pray1);
 
@@ -216,6 +218,11 @@ public void dbInit() {
                 .pray(pray)
                 .build();
             em.persist(history);
+
+            History history1 = History.builder()
+                .pray(pray1)
+                .build();
+            em.persist(history1);
         }
 
     }

diff --git a/...uspray/controller/CategoryController.java → ...tegory/controller/CategoryController.java b/...uspray/controller/CategoryController.java → ...tegory/controller/CategoryController.java
@@ -1,10 +1,10 @@
-package com.uspray.uspray.controller;
+package com.uspray.uspray.domain.category.controller;
 
-import com.uspray.uspray.DTO.ApiResponseDto;
-import com.uspray.uspray.DTO.category.CategoryRequestDto;
-import com.uspray.uspray.DTO.category.CategoryResponseDto;
-import com.uspray.uspray.exception.SuccessStatus;
-import com.uspray.uspray.service.CategoryService;
+import com.uspray.uspray.global.common.dto.ApiResponseDto;
+import com.uspray.uspray.domain.category.dto.CategoryRequestDto;
+import com.uspray.uspray.domain.category.dto.CategoryResponseDto;
+import com.uspray.uspray.global.exception.SuccessStatus;
+import com.uspray.uspray.domain.category.service.CategoryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;

diff --git a/...pray/DTO/category/CategoryRequestDto.java → ...main/category/dto/CategoryRequestDto.java b/...pray/DTO/category/CategoryRequestDto.java → ...main/category/dto/CategoryRequestDto.java
@@ -1,8 +1,8 @@
-package com.uspray.uspray.DTO.category;
+package com.uspray.uspray.domain.category.dto;
 
-import com.uspray.uspray.Enums.CategoryType;
-import com.uspray.uspray.domain.Category;
-import com.uspray.uspray.domain.Member;
+import com.uspray.uspray.global.enums.CategoryType;
+import com.uspray.uspray.domain.category.model.Category;
+import com.uspray.uspray.domain.member.model.Member;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/...ray/DTO/category/CategoryResponseDto.java → ...ain/category/dto/CategoryResponseDto.java b/...ray/DTO/category/CategoryResponseDto.java → ...ain/category/dto/CategoryResponseDto.java
@@ -1,6 +1,6 @@
-package com.uspray.uspray.DTO.category;
+package com.uspray.uspray.domain.category.dto;
 
-import com.uspray.uspray.domain.Category;
+import com.uspray.uspray.domain.category.model.Category;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/...va/com/uspray/uspray/domain/Category.java → ...spray/domain/category/model/Category.java b/...va/com/uspray/uspray/domain/Category.java → ...spray/domain/category/model/Category.java
@@ -1,8 +1,10 @@
-package com.uspray.uspray.domain;
+package com.uspray.uspray.domain.category.model;
 
-import com.uspray.uspray.DTO.category.CategoryRequestDto;
-import com.uspray.uspray.Enums.CategoryType;
-import com.uspray.uspray.common.domain.AuditingTimeEntity;
+import com.uspray.uspray.domain.category.dto.CategoryRequestDto;
+import com.uspray.uspray.global.enums.CategoryType;
+import com.uspray.uspray.global.common.model.AuditingTimeEntity;
+import com.uspray.uspray.domain.member.model.Member;
+import com.uspray.uspray.domain.pray.model.Pray;
 import java.util.List;
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/...ay/infrastructure/CategoryRepository.java → ...tegory/repository/CategoryRepository.java b/...ay/infrastructure/CategoryRepository.java → ...tegory/repository/CategoryRepository.java
@@ -1,12 +1,12 @@
-package com.uspray.uspray.infrastructure;
-
-import com.uspray.uspray.Enums.CategoryType;
-import com.uspray.uspray.domain.Category;
-import com.uspray.uspray.domain.Member;
-import com.uspray.uspray.exception.ErrorStatus;
-import com.uspray.uspray.exception.model.CustomException;
-import com.uspray.uspray.exception.model.NotFoundException;
-import com.uspray.uspray.infrastructure.querydsl.category.CategoryRepositoryCustom;
+package com.uspray.uspray.domain.category.repository;
+
+import com.uspray.uspray.global.enums.CategoryType;
+import com.uspray.uspray.domain.category.model.Category;
+import com.uspray.uspray.domain.member.model.Member;
+import com.uspray.uspray.global.exception.ErrorStatus;
+import com.uspray.uspray.global.exception.model.CustomException;
+import com.uspray.uspray.global.exception.model.NotFoundException;
+import com.uspray.uspray.domain.category.repository.querydsl.CategoryRepositoryCustom;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

diff --git a/...sl/category/CategoryRepositoryCustom.java → ...ry/querydsl/CategoryRepositoryCustom.java b/...sl/category/CategoryRepositoryCustom.java → ...ry/querydsl/CategoryRepositoryCustom.java
@@ -1,6 +1,6 @@
-package com.uspray.uspray.infrastructure.querydsl.category;
+package com.uspray.uspray.domain.category.repository.querydsl;
 
-import com.uspray.uspray.DTO.pray.PrayListResponseDto;
+import com.uspray.uspray.domain.pray.dto.pray.PrayListResponseDto;
 import java.util.List;
 
 public interface CategoryRepositoryCustom {

diff --git a/...ydsl/category/CategoryRepositoryImpl.java → ...tory/querydsl/CategoryRepositoryImpl.java b/...ydsl/category/CategoryRepositoryImpl.java → ...tory/querydsl/CategoryRepositoryImpl.java
@@ -1,17 +1,17 @@
-package com.uspray.uspray.infrastructure.querydsl.category;
+package com.uspray.uspray.domain.category.repository.querydsl;
 
-import static com.uspray.uspray.domain.QCategory.category;
-import static com.uspray.uspray.domain.QMember.member;
-import static com.uspray.uspray.domain.QPray.pray;
+import static com.uspray.uspray.domain.category.model.QCategory.category;
+import static com.uspray.uspray.domain.member.model.QMember.member;
+import static com.uspray.uspray.domain.pray.model.QPray.pray;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import com.uspray.uspray.DTO.pray.PrayListResponseDto;
-import com.uspray.uspray.DTO.pray.response.PrayResponseDto;
-import com.uspray.uspray.DTO.pray.response.QPrayResponseDto;
-import com.uspray.uspray.Enums.PrayType;
-import com.uspray.uspray.domain.Category;
-import com.uspray.uspray.domain.Member;
-import com.uspray.uspray.domain.Pray;
+import com.uspray.uspray.domain.category.model.Category;
+import com.uspray.uspray.domain.member.model.Member;
+import com.uspray.uspray.domain.pray.dto.pray.PrayListResponseDto;
+import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto;
+import com.uspray.uspray.domain.pray.dto.pray.response.QPrayResponseDto;
+import com.uspray.uspray.domain.pray.model.Pray;
+import com.uspray.uspray.global.enums.PrayType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...spray/uspray/service/CategoryService.java → ...ain/category/service/CategoryService.java b/...spray/uspray/service/CategoryService.java → ...ain/category/service/CategoryService.java
@@ -1,16 +1,16 @@
-package com.uspray.uspray.service;
-
-import com.uspray.uspray.DTO.category.CategoryRequestDto;
-import com.uspray.uspray.DTO.category.CategoryResponseDto;
-import com.uspray.uspray.Enums.CategoryType;
-import com.uspray.uspray.domain.Category;
-import com.uspray.uspray.domain.Member;
-import com.uspray.uspray.exception.ErrorStatus;
-import com.uspray.uspray.exception.model.NotFoundException;
-import com.uspray.uspray.infrastructure.CategoryRepository;
-import com.uspray.uspray.infrastructure.MemberRepository;
-import com.uspray.uspray.infrastructure.PrayRepository;
-import com.uspray.uspray.service.facade.PrayFacade;
+package com.uspray.uspray.domain.category.service;
+
+import com.uspray.uspray.domain.category.dto.CategoryRequestDto;
+import com.uspray.uspray.domain.category.dto.CategoryResponseDto;
+import com.uspray.uspray.global.enums.CategoryType;
+import com.uspray.uspray.domain.category.model.Category;
+import com.uspray.uspray.domain.member.model.Member;
+import com.uspray.uspray.global.exception.ErrorStatus;
+import com.uspray.uspray.global.exception.model.NotFoundException;
+import com.uspray.uspray.domain.category.repository.CategoryRepository;
+import com.uspray.uspray.domain.member.repository.MemberRepository;
+import com.uspray.uspray.domain.pray.repository.PrayRepository;
+import com.uspray.uspray.domain.pray.service.PrayFacade;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;

diff --git a/...ay/uspray/controller/GroupController.java → ...ain/group/controller/GroupController.java b/...ay/uspray/controller/GroupController.java → ...ain/group/controller/GroupController.java
@@ -1,13 +1,13 @@
-package com.uspray.uspray.controller;
+package com.uspray.uspray.domain.group.controller;
 
-import com.uspray.uspray.DTO.ApiResponseDto;
-import com.uspray.uspray.DTO.group.request.GroupMemberRequestDto;
-import com.uspray.uspray.DTO.group.request.GroupRequestDto;
-import com.uspray.uspray.DTO.group.response.GroupListResponseDto;
-import com.uspray.uspray.DTO.group.response.GroupMemberResponseDto;
-import com.uspray.uspray.exception.SuccessStatus;
-import com.uspray.uspray.service.facade.GroupFacade;
-import com.uspray.uspray.service.GroupService;
+import com.uspray.uspray.global.common.dto.ApiResponseDto;
+import com.uspray.uspray.domain.group.dto.group.request.GroupMemberRequestDto;
+import com.uspray.uspray.domain.group.dto.group.request.GroupRequestDto;
+import com.uspray.uspray.domain.group.dto.group.response.GroupListResponseDto;
+import com.uspray.uspray.domain.group.dto.group.response.GroupMemberResponseDto;
+import com.uspray.uspray.global.exception.SuccessStatus;
+import com.uspray.uspray.domain.group.service.GroupFacade;
+import com.uspray.uspray.domain.group.service.GroupService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;

diff --git a/...spray/controller/GroupPrayController.java → ...group/controller/GroupPrayController.java b/...spray/controller/GroupPrayController.java → ...group/controller/GroupPrayController.java
@@ -1,16 +1,16 @@
-package com.uspray.uspray.controller;
+package com.uspray.uspray.domain.group.controller;
 
-import com.uspray.uspray.DTO.ApiResponseDto;
-import com.uspray.uspray.DTO.grouppray.GroupPrayRappingDto;
-import com.uspray.uspray.DTO.grouppray.GroupPrayRequestDto;
-import com.uspray.uspray.DTO.grouppray.GroupPrayResponseDto;
-import com.uspray.uspray.DTO.grouppray.ScrapRequestDto;
-import com.uspray.uspray.DTO.pray.PrayListResponseDto;
-import com.uspray.uspray.DTO.pray.request.PrayToGroupPrayDto;
-import com.uspray.uspray.DTO.pray.response.PrayResponseDto;
-import com.uspray.uspray.exception.SuccessStatus;
-import com.uspray.uspray.service.facade.GroupPrayFacade;
-import com.uspray.uspray.service.GroupPrayService;
+import com.uspray.uspray.global.common.dto.ApiResponseDto;
+import com.uspray.uspray.domain.group.dto.grouppray.GroupPrayRappingDto;
+import com.uspray.uspray.domain.group.dto.grouppray.GroupPrayRequestDto;
+import com.uspray.uspray.domain.group.dto.grouppray.GroupPrayResponseDto;
+import com.uspray.uspray.domain.group.dto.grouppray.ScrapRequestDto;
+import com.uspray.uspray.domain.pray.dto.pray.PrayListResponseDto;
+import com.uspray.uspray.domain.pray.dto.pray.request.PrayToGroupPrayDto;
+import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto;
+import com.uspray.uspray.global.exception.SuccessStatus;
+import com.uspray.uspray.domain.group.service.GroupPrayFacade;
+import com.uspray.uspray.domain.group.service.GroupPrayService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;

diff --git a/.../group/request/GroupMemberRequestDto.java → .../group/request/GroupMemberRequestDto.java b/.../group/request/GroupMemberRequestDto.java → .../group/request/GroupMemberRequestDto.java
@@ -1,4 +1,4 @@
-package com.uspray.uspray.DTO.group.request;
+package com.uspray.uspray.domain.group.dto.group.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...ay/DTO/group/request/GroupRequestDto.java → ...up/dto/group/request/GroupRequestDto.java b/...ay/DTO/group/request/GroupRequestDto.java → ...up/dto/group/request/GroupRequestDto.java
@@ -1,4 +1,4 @@
-package com.uspray.uspray.DTO.group.request;
+package com.uspray.uspray.domain.group.dto.group.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...roup/response/GroupDetailResponseDto.java → ...roup/response/GroupDetailResponseDto.java b/...roup/response/GroupDetailResponseDto.java → ...roup/response/GroupDetailResponseDto.java
@@ -1,4 +1,4 @@
-package com.uspray.uspray.DTO.group.response;
+package com.uspray.uspray.domain.group.dto.group.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/.../group/response/GroupListResponseDto.java → .../group/response/GroupListResponseDto.java b/.../group/response/GroupListResponseDto.java → .../group/response/GroupListResponseDto.java
@@ -1,4 +1,4 @@
-package com.uspray.uspray.DTO.group.response;
+package com.uspray.uspray.domain.group.dto.group.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...roup/response/GroupMemberResponseDto.java → ...roup/response/GroupMemberResponseDto.java b/...roup/response/GroupMemberResponseDto.java → ...roup/response/GroupMemberResponseDto.java
@@ -1,4 +1,4 @@
-package com.uspray.uspray.DTO.group.response;
+package com.uspray.uspray.domain.group.dto.group.response;
 
 import com.querydsl.core.annotations.QueryProjection;
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/.../DTO/group/response/GroupResponseDto.java → .../dto/group/response/GroupResponseDto.java b/.../DTO/group/response/GroupResponseDto.java → .../dto/group/response/GroupResponseDto.java
@@ -1,4 +1,4 @@
-package com.uspray.uspray.DTO.group.response;
+package com.uspray.uspray.domain.group.dto.group.response;
 
 import com.querydsl.core.annotations.QueryProjection;
 import io.swagger.v3.oas.annotations.media.Schema;