diff --git a/build.gradle b/build.gradle index db135f30..f934077f 100644 --- 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 index 8b04db16..f86eecfc 100644 --- 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/src/main/java/com/uspray/uspray/controller/CategoryController.java b/src/main/java/com/uspray/uspray/domain/category/controller/CategoryController.java similarity index 93% rename from src/main/java/com/uspray/uspray/controller/CategoryController.java rename to src/main/java/com/uspray/uspray/domain/category/controller/CategoryController.java index 1d94cad3..a4eab676 100644 --- a/src/main/java/com/uspray/uspray/controller/CategoryController.java +++ b/src/main/java/com/uspray/uspray/domain/category/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/src/main/java/com/uspray/uspray/DTO/category/CategoryRequestDto.java b/src/main/java/com/uspray/uspray/domain/category/dto/CategoryRequestDto.java similarity index 83% rename from src/main/java/com/uspray/uspray/DTO/category/CategoryRequestDto.java rename to src/main/java/com/uspray/uspray/domain/category/dto/CategoryRequestDto.java index ed57e8d5..3676c679 100644 --- a/src/main/java/com/uspray/uspray/DTO/category/CategoryRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/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/src/main/java/com/uspray/uspray/DTO/category/CategoryResponseDto.java b/src/main/java/com/uspray/uspray/domain/category/dto/CategoryResponseDto.java similarity index 89% rename from src/main/java/com/uspray/uspray/DTO/category/CategoryResponseDto.java rename to src/main/java/com/uspray/uspray/domain/category/dto/CategoryResponseDto.java index 1cfb3280..c6b94813 100644 --- a/src/main/java/com/uspray/uspray/DTO/category/CategoryResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/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/src/main/java/com/uspray/uspray/domain/Category.java b/src/main/java/com/uspray/uspray/domain/category/model/Category.java similarity index 86% rename from src/main/java/com/uspray/uspray/domain/Category.java rename to src/main/java/com/uspray/uspray/domain/category/model/Category.java index 8419e4fb..86d96762 100644 --- a/src/main/java/com/uspray/uspray/domain/Category.java +++ b/src/main/java/com/uspray/uspray/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/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java b/src/main/java/com/uspray/uspray/domain/category/repository/CategoryRepository.java similarity index 80% rename from src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java rename to src/main/java/com/uspray/uspray/domain/category/repository/CategoryRepository.java index 679d52b6..413486ab 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java +++ b/src/main/java/com/uspray/uspray/domain/category/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/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryCustom.java b/src/main/java/com/uspray/uspray/domain/category/repository/querydsl/CategoryRepositoryCustom.java similarity index 67% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryCustom.java rename to src/main/java/com/uspray/uspray/domain/category/repository/querydsl/CategoryRepositoryCustom.java index 9ef2664f..48cb73bd 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryCustom.java +++ b/src/main/java/com/uspray/uspray/domain/category/repository/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/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryImpl.java b/src/main/java/com/uspray/uspray/domain/category/repository/querydsl/CategoryRepositoryImpl.java similarity index 85% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryImpl.java rename to src/main/java/com/uspray/uspray/domain/category/repository/querydsl/CategoryRepositoryImpl.java index 0351db73..29e56088 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryImpl.java +++ b/src/main/java/com/uspray/uspray/domain/category/repository/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/src/main/java/com/uspray/uspray/service/CategoryService.java b/src/main/java/com/uspray/uspray/domain/category/service/CategoryService.java similarity index 88% rename from src/main/java/com/uspray/uspray/service/CategoryService.java rename to src/main/java/com/uspray/uspray/domain/category/service/CategoryService.java index cf8c322c..f41ae48e 100644 --- a/src/main/java/com/uspray/uspray/service/CategoryService.java +++ b/src/main/java/com/uspray/uspray/domain/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/src/main/java/com/uspray/uspray/controller/GroupController.java b/src/main/java/com/uspray/uspray/domain/group/controller/GroupController.java similarity index 93% rename from src/main/java/com/uspray/uspray/controller/GroupController.java rename to src/main/java/com/uspray/uspray/domain/group/controller/GroupController.java index d5f2755f..3b96ae25 100644 --- a/src/main/java/com/uspray/uspray/controller/GroupController.java +++ b/src/main/java/com/uspray/uspray/domain/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/src/main/java/com/uspray/uspray/controller/GroupPrayController.java b/src/main/java/com/uspray/uspray/domain/group/controller/GroupPrayController.java similarity index 87% rename from src/main/java/com/uspray/uspray/controller/GroupPrayController.java rename to src/main/java/com/uspray/uspray/domain/group/controller/GroupPrayController.java index c4527b6d..2ff8dcac 100644 --- a/src/main/java/com/uspray/uspray/controller/GroupPrayController.java +++ b/src/main/java/com/uspray/uspray/domain/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/src/main/java/com/uspray/uspray/DTO/group/request/GroupMemberRequestDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/group/request/GroupMemberRequestDto.java similarity index 81% rename from src/main/java/com/uspray/uspray/DTO/group/request/GroupMemberRequestDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/group/request/GroupMemberRequestDto.java index dae013d6..1c9519ef 100644 --- a/src/main/java/com/uspray/uspray/DTO/group/request/GroupMemberRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/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/src/main/java/com/uspray/uspray/DTO/group/request/GroupRequestDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/group/request/GroupRequestDto.java similarity index 87% rename from src/main/java/com/uspray/uspray/DTO/group/request/GroupRequestDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/group/request/GroupRequestDto.java index 256b04fa..92fd25a0 100644 --- a/src/main/java/com/uspray/uspray/DTO/group/request/GroupRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/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/src/main/java/com/uspray/uspray/DTO/group/response/GroupDetailResponseDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupDetailResponseDto.java similarity index 84% rename from src/main/java/com/uspray/uspray/DTO/group/response/GroupDetailResponseDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupDetailResponseDto.java index bb5bd747..eca03992 100644 --- a/src/main/java/com/uspray/uspray/DTO/group/response/GroupDetailResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/group/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/src/main/java/com/uspray/uspray/DTO/group/response/GroupListResponseDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupListResponseDto.java similarity index 80% rename from src/main/java/com/uspray/uspray/DTO/group/response/GroupListResponseDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupListResponseDto.java index a822badb..e19a3ab8 100644 --- a/src/main/java/com/uspray/uspray/DTO/group/response/GroupListResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/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/src/main/java/com/uspray/uspray/DTO/group/response/GroupMemberResponseDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupMemberResponseDto.java similarity index 92% rename from src/main/java/com/uspray/uspray/DTO/group/response/GroupMemberResponseDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupMemberResponseDto.java index d50dd41d..aaa42f62 100644 --- a/src/main/java/com/uspray/uspray/DTO/group/response/GroupMemberResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/group/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/src/main/java/com/uspray/uspray/DTO/group/response/GroupResponseDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupResponseDto.java similarity index 95% rename from src/main/java/com/uspray/uspray/DTO/group/response/GroupResponseDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/group/response/GroupResponseDto.java index be652ab0..e36d38a8 100644 --- a/src/main/java/com/uspray/uspray/DTO/group/response/GroupResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/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; diff --git a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayRappingDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayRappingDto.java similarity index 86% rename from src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayRappingDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayRappingDto.java index a0d80603..90e92425 100644 --- a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayRappingDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayRappingDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.grouppray; +package com.uspray.uspray.domain.group.dto.grouppray; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayRequestDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayRequestDto.java similarity index 92% rename from src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayRequestDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayRequestDto.java index 9c71c6ee..482cf8af 100644 --- a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.grouppray; +package com.uspray.uspray.domain.group.dto.grouppray; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; diff --git a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayResponseDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayResponseDto.java similarity index 86% rename from src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayResponseDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayResponseDto.java index 9e2a0eb7..d77c30fd 100644 --- a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayResponseDto.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.DTO.grouppray; +package com.uspray.uspray.domain.group.dto.grouppray; -import com.uspray.uspray.domain.GroupPray; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.ScrapAndHeart; +import com.uspray.uspray.domain.group.model.GroupPray; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.group.model.ScrapAndHeart; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import java.util.Objects; diff --git a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayUpdateDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayUpdateDto.java similarity index 69% rename from src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayUpdateDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayUpdateDto.java index 2bc05630..74194c31 100644 --- a/src/main/java/com/uspray/uspray/DTO/grouppray/GroupPrayUpdateDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayUpdateDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.grouppray; +package com.uspray.uspray.domain.group.dto.grouppray; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/grouppray/ScrapRequestDto.java b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/ScrapRequestDto.java similarity index 88% rename from src/main/java/com/uspray/uspray/DTO/grouppray/ScrapRequestDto.java rename to src/main/java/com/uspray/uspray/domain/group/dto/grouppray/ScrapRequestDto.java index e8f66681..36422ba4 100644 --- a/src/main/java/com/uspray/uspray/DTO/grouppray/ScrapRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/group/dto/grouppray/ScrapRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.grouppray; +package com.uspray.uspray.domain.group.dto.grouppray; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; diff --git a/src/main/java/com/uspray/uspray/domain/Group.java b/src/main/java/com/uspray/uspray/domain/group/model/Group.java similarity index 89% rename from src/main/java/com/uspray/uspray/domain/Group.java rename to src/main/java/com/uspray/uspray/domain/group/model/Group.java index 9cf33ab2..d494eabe 100644 --- a/src/main/java/com/uspray/uspray/domain/Group.java +++ b/src/main/java/com/uspray/uspray/domain/group/model/Group.java @@ -1,8 +1,9 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.group.model; -import com.uspray.uspray.common.domain.AuditingTimeEntity; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.CustomException; +import com.uspray.uspray.global.common.model.AuditingTimeEntity; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.CustomException; import java.util.ArrayList; import java.util.List; import javax.persistence.CascadeType; diff --git a/src/main/java/com/uspray/uspray/domain/GroupMember.java b/src/main/java/com/uspray/uspray/domain/group/model/GroupMember.java similarity index 89% rename from src/main/java/com/uspray/uspray/domain/GroupMember.java rename to src/main/java/com/uspray/uspray/domain/group/model/GroupMember.java index 0808e0b3..5f2ee15d 100644 --- a/src/main/java/com/uspray/uspray/domain/GroupMember.java +++ b/src/main/java/com/uspray/uspray/domain/group/model/GroupMember.java @@ -1,6 +1,7 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.group.model; -import com.uspray.uspray.common.domain.AuditingTimeEntity; +import com.uspray.uspray.global.common.model.AuditingTimeEntity; +import com.uspray.uspray.domain.member.model.Member; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/src/main/java/com/uspray/uspray/domain/GroupPray.java b/src/main/java/com/uspray/uspray/domain/group/model/GroupPray.java similarity index 91% rename from src/main/java/com/uspray/uspray/domain/GroupPray.java rename to src/main/java/com/uspray/uspray/domain/group/model/GroupPray.java index 04cc8e7f..d48bcdcb 100644 --- a/src/main/java/com/uspray/uspray/domain/GroupPray.java +++ b/src/main/java/com/uspray/uspray/domain/group/model/GroupPray.java @@ -1,6 +1,8 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.group.model; -import com.uspray.uspray.common.domain.AuditingTimeEntity; +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.time.LocalDate; import java.util.ArrayList; import java.util.Base64; diff --git a/src/main/java/com/uspray/uspray/domain/ScrapAndHeart.java b/src/main/java/com/uspray/uspray/domain/group/model/ScrapAndHeart.java similarity index 92% rename from src/main/java/com/uspray/uspray/domain/ScrapAndHeart.java rename to src/main/java/com/uspray/uspray/domain/group/model/ScrapAndHeart.java index 3c813324..f7faa6a3 100644 --- a/src/main/java/com/uspray/uspray/domain/ScrapAndHeart.java +++ b/src/main/java/com/uspray/uspray/domain/group/model/ScrapAndHeart.java @@ -1,6 +1,8 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.group.model; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.pray.model.Pray; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/src/main/java/com/uspray/uspray/infrastructure/GroupMemberRepository.java b/src/main/java/com/uspray/uspray/domain/group/repository/GroupMemberRepository.java similarity index 76% rename from src/main/java/com/uspray/uspray/infrastructure/GroupMemberRepository.java rename to src/main/java/com/uspray/uspray/domain/group/repository/GroupMemberRepository.java index 0038f8d0..60d21089 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/GroupMemberRepository.java +++ b/src/main/java/com/uspray/uspray/domain/group/repository/GroupMemberRepository.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.group.repository; -import com.uspray.uspray.domain.Group; -import com.uspray.uspray.domain.GroupMember; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; +import com.uspray.uspray.domain.group.model.Group; +import com.uspray.uspray.domain.group.model.GroupMember; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.NotFoundException; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/uspray/uspray/infrastructure/GroupPrayRepository.java b/src/main/java/com/uspray/uspray/domain/group/repository/GroupPrayRepository.java similarity index 77% rename from src/main/java/com/uspray/uspray/infrastructure/GroupPrayRepository.java rename to src/main/java/com/uspray/uspray/domain/group/repository/GroupPrayRepository.java index 21ae772d..06795383 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/GroupPrayRepository.java +++ b/src/main/java/com/uspray/uspray/domain/group/repository/GroupPrayRepository.java @@ -1,9 +1,9 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.group.repository; -import com.uspray.uspray.domain.Group; -import com.uspray.uspray.domain.GroupPray; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; +import com.uspray.uspray.domain.group.model.Group; +import com.uspray.uspray.domain.group.model.GroupPray; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.NotFoundException; import java.util.List; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/uspray/uspray/infrastructure/GroupRepository.java b/src/main/java/com/uspray/uspray/domain/group/repository/GroupRepository.java similarity index 55% rename from src/main/java/com/uspray/uspray/infrastructure/GroupRepository.java rename to src/main/java/com/uspray/uspray/domain/group/repository/GroupRepository.java index 39648e54..8a17cdda 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/GroupRepository.java +++ b/src/main/java/com/uspray/uspray/domain/group/repository/GroupRepository.java @@ -1,9 +1,9 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.group.repository; -import com.uspray.uspray.domain.Group; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; -import com.uspray.uspray.infrastructure.querydsl.group.GroupRepositoryCustom; +import com.uspray.uspray.domain.group.model.Group; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.NotFoundException; +import com.uspray.uspray.domain.group.repository.querydsl.GroupRepositoryCustom; import org.springframework.data.jpa.repository.JpaRepository; public interface GroupRepository extends JpaRepository, GroupRepositoryCustom { diff --git a/src/main/java/com/uspray/uspray/infrastructure/ScrapAndHeartRepository.java b/src/main/java/com/uspray/uspray/domain/group/repository/ScrapAndHeartRepository.java similarity index 72% rename from src/main/java/com/uspray/uspray/infrastructure/ScrapAndHeartRepository.java rename to src/main/java/com/uspray/uspray/domain/group/repository/ScrapAndHeartRepository.java index c571e0aa..130322a9 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/ScrapAndHeartRepository.java +++ b/src/main/java/com/uspray/uspray/domain/group/repository/ScrapAndHeartRepository.java @@ -1,9 +1,9 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.group.repository; -import com.uspray.uspray.domain.GroupPray; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.domain.ScrapAndHeart; +import com.uspray.uspray.domain.group.model.GroupPray; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.group.model.ScrapAndHeart; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryCustom.java b/src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupRepositoryCustom.java similarity index 55% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryCustom.java rename to src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupRepositoryCustom.java index 891b5af0..a4243a9e 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryCustom.java +++ b/src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupRepositoryCustom.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.infrastructure.querydsl.group; +package com.uspray.uspray.domain.group.repository.querydsl; -import com.uspray.uspray.DTO.group.response.GroupMemberResponseDto; -import com.uspray.uspray.DTO.group.response.GroupResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.GroupMemberResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.GroupResponseDto; import java.util.List; public interface GroupRepositoryCustom { diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryImpl.java b/src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupRepositoryImpl.java similarity index 81% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryImpl.java rename to src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupRepositoryImpl.java index 3775df3b..6d8ca90b 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryImpl.java +++ b/src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupRepositoryImpl.java @@ -1,16 +1,16 @@ -package com.uspray.uspray.infrastructure.querydsl.group; +package com.uspray.uspray.domain.group.repository.querydsl; -import static com.uspray.uspray.domain.QGroup.group; -import static com.uspray.uspray.domain.QGroupMember.groupMember; -import static com.uspray.uspray.domain.QGroupPray.groupPray; -import static com.uspray.uspray.domain.QMember.member; +import static com.uspray.uspray.domain.group.model.QGroup.group; +import static com.uspray.uspray.domain.group.model.QGroupMember.groupMember; +import static com.uspray.uspray.domain.group.model.QGroupPray.groupPray; +import static com.uspray.uspray.domain.member.model.QMember.member; import com.querydsl.core.BooleanBuilder; import com.querydsl.jpa.impl.JPAQueryFactory; -import com.uspray.uspray.DTO.group.response.GroupMemberResponseDto; -import com.uspray.uspray.DTO.group.response.GroupResponseDto; -import com.uspray.uspray.DTO.group.response.QGroupMemberResponseDto; -import com.uspray.uspray.DTO.group.response.QGroupResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.GroupMemberResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.GroupResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.QGroupMemberResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.QGroupResponseDto; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java b/src/main/java/com/uspray/uspray/domain/group/service/GroupFacade.java similarity index 86% rename from src/main/java/com/uspray/uspray/service/facade/GroupFacade.java rename to src/main/java/com/uspray/uspray/domain/group/service/GroupFacade.java index 745cc912..789a6428 100644 --- a/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java +++ b/src/main/java/com/uspray/uspray/domain/group/service/GroupFacade.java @@ -1,15 +1,15 @@ -package com.uspray.uspray.service.facade; - -import com.uspray.uspray.DTO.group.request.GroupRequestDto; -import com.uspray.uspray.domain.Group; -import com.uspray.uspray.domain.GroupMember; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.CustomException; -import com.uspray.uspray.infrastructure.GroupMemberRepository; -import com.uspray.uspray.infrastructure.GroupPrayRepository; -import com.uspray.uspray.infrastructure.GroupRepository; -import com.uspray.uspray.infrastructure.MemberRepository; +package com.uspray.uspray.domain.group.service; + +import com.uspray.uspray.domain.group.dto.group.request.GroupRequestDto; +import com.uspray.uspray.domain.group.model.Group; +import com.uspray.uspray.domain.group.model.GroupMember; +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.domain.group.repository.GroupMemberRepository; +import com.uspray.uspray.domain.group.repository.GroupPrayRepository; +import com.uspray.uspray.domain.group.repository.GroupRepository; +import com.uspray.uspray.domain.member.repository.MemberRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java b/src/main/java/com/uspray/uspray/domain/group/service/GroupPrayFacade.java similarity index 87% rename from src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java rename to src/main/java/com/uspray/uspray/domain/group/service/GroupPrayFacade.java index d5c6b4c9..6b73fd30 100644 --- a/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java +++ b/src/main/java/com/uspray/uspray/domain/group/service/GroupPrayFacade.java @@ -1,31 +1,31 @@ -package com.uspray.uspray.service.facade; - -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.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.GroupPray; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.NotificationLog; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.domain.ScrapAndHeart; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.CustomException; -import com.uspray.uspray.infrastructure.CategoryRepository; -import com.uspray.uspray.infrastructure.GroupMemberRepository; -import com.uspray.uspray.infrastructure.GroupPrayRepository; -import com.uspray.uspray.infrastructure.GroupRepository; -import com.uspray.uspray.infrastructure.MemberRepository; -import com.uspray.uspray.infrastructure.NotificationLogRepository; -import com.uspray.uspray.infrastructure.PrayRepository; -import com.uspray.uspray.infrastructure.ScrapAndHeartRepository; -import com.uspray.uspray.service.FCMNotificationService; +package com.uspray.uspray.domain.group.service; + +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.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.group.model.GroupPray; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.global.push.model.NotificationLog; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.group.model.ScrapAndHeart; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.CustomException; +import com.uspray.uspray.domain.category.repository.CategoryRepository; +import com.uspray.uspray.domain.group.repository.GroupMemberRepository; +import com.uspray.uspray.domain.group.repository.GroupPrayRepository; +import com.uspray.uspray.domain.group.repository.GroupRepository; +import com.uspray.uspray.domain.member.repository.MemberRepository; +import com.uspray.uspray.global.push.repository.NotificationLogRepository; +import com.uspray.uspray.domain.pray.repository.PrayRepository; +import com.uspray.uspray.domain.group.repository.ScrapAndHeartRepository; +import com.uspray.uspray.global.push.service.FCMNotificationService; import java.time.LocalDate; import java.util.ArrayList; import java.util.Base64; diff --git a/src/main/java/com/uspray/uspray/service/GroupPrayService.java b/src/main/java/com/uspray/uspray/domain/group/service/GroupPrayService.java similarity index 79% rename from src/main/java/com/uspray/uspray/service/GroupPrayService.java rename to src/main/java/com/uspray/uspray/domain/group/service/GroupPrayService.java index c72d2690..dcf69d88 100644 --- a/src/main/java/com/uspray/uspray/service/GroupPrayService.java +++ b/src/main/java/com/uspray/uspray/domain/group/service/GroupPrayService.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.domain.group.service; -import com.uspray.uspray.infrastructure.GroupPrayRepository; +import com.uspray.uspray.domain.group.repository.GroupPrayRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/uspray/uspray/service/GroupService.java b/src/main/java/com/uspray/uspray/domain/group/service/GroupService.java similarity index 73% rename from src/main/java/com/uspray/uspray/service/GroupService.java rename to src/main/java/com/uspray/uspray/domain/group/service/GroupService.java index 4091bd32..b508c29c 100644 --- a/src/main/java/com/uspray/uspray/service/GroupService.java +++ b/src/main/java/com/uspray/uspray/domain/group/service/GroupService.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.domain.group.service; -import com.uspray.uspray.DTO.group.response.GroupListResponseDto; -import com.uspray.uspray.DTO.group.response.GroupMemberResponseDto; -import com.uspray.uspray.DTO.group.response.GroupResponseDto; -import com.uspray.uspray.infrastructure.GroupRepository; -import com.uspray.uspray.util.MaskingUtil; +import com.uspray.uspray.domain.group.dto.group.response.GroupListResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.GroupMemberResponseDto; +import com.uspray.uspray.domain.group.dto.group.response.GroupResponseDto; +import com.uspray.uspray.domain.group.repository.GroupRepository; +import com.uspray.uspray.global.util.MaskingUtil; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/uspray/uspray/controller/HistoryController.java b/src/main/java/com/uspray/uspray/domain/history/controller/HistoryController.java similarity index 82% rename from src/main/java/com/uspray/uspray/controller/HistoryController.java rename to src/main/java/com/uspray/uspray/domain/history/controller/HistoryController.java index 7f47afcf..97cc2947 100644 --- a/src/main/java/com/uspray/uspray/controller/HistoryController.java +++ b/src/main/java/com/uspray/uspray/domain/history/controller/HistoryController.java @@ -1,15 +1,15 @@ -package com.uspray.uspray.controller; +package com.uspray.uspray.domain.history.controller; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.DTO.history.request.HistoryRequestDto; -import com.uspray.uspray.DTO.history.request.HistorySearchRequestDto; -import com.uspray.uspray.DTO.history.response.HistoryDetailResponseDto; -import com.uspray.uspray.DTO.history.response.HistoryListResponseDto; -import com.uspray.uspray.DTO.pray.request.PrayRequestDto; -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.service.facade.HistoryFacade; -import com.uspray.uspray.service.HistoryService; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.domain.history.dto.request.HistoryRequestDto; +import com.uspray.uspray.domain.history.dto.request.HistorySearchRequestDto; +import com.uspray.uspray.domain.history.dto.response.HistoryDetailResponseDto; +import com.uspray.uspray.domain.history.dto.response.HistoryListResponseDto; +import com.uspray.uspray.domain.pray.dto.pray.request.PrayRequestDto; +import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto; +import com.uspray.uspray.global.exception.SuccessStatus; +import com.uspray.uspray.domain.history.service.HistoryFacade; +import com.uspray.uspray.domain.history.service.HistoryService; 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/src/main/java/com/uspray/uspray/DTO/history/request/HistoryRequestDto.java b/src/main/java/com/uspray/uspray/domain/history/dto/request/HistoryRequestDto.java similarity index 88% rename from src/main/java/com/uspray/uspray/DTO/history/request/HistoryRequestDto.java rename to src/main/java/com/uspray/uspray/domain/history/dto/request/HistoryRequestDto.java index 56fa7ce2..ddfc2c19 100644 --- a/src/main/java/com/uspray/uspray/DTO/history/request/HistoryRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/history/dto/request/HistoryRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.history.request; +package com.uspray.uspray.domain.history.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/history/request/HistorySearchRequestDto.java b/src/main/java/com/uspray/uspray/domain/history/dto/request/HistorySearchRequestDto.java similarity index 95% rename from src/main/java/com/uspray/uspray/DTO/history/request/HistorySearchRequestDto.java rename to src/main/java/com/uspray/uspray/domain/history/dto/request/HistorySearchRequestDto.java index f3913f8e..a5ddc83c 100644 --- a/src/main/java/com/uspray/uspray/DTO/history/request/HistorySearchRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/history/dto/request/HistorySearchRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.history.request; +package com.uspray.uspray.domain.history.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; diff --git a/src/main/java/com/uspray/uspray/DTO/history/response/HistoryDetailResponseDto.java b/src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryDetailResponseDto.java similarity index 86% rename from src/main/java/com/uspray/uspray/DTO/history/response/HistoryDetailResponseDto.java rename to src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryDetailResponseDto.java index 6589233e..4ddf0dde 100644 --- a/src/main/java/com/uspray/uspray/DTO/history/response/HistoryDetailResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryDetailResponseDto.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.DTO.history.response; +package com.uspray.uspray.domain.history.dto.response; -import com.uspray.uspray.Enums.PrayType; -import com.uspray.uspray.domain.History; -import com.uspray.uspray.domain.Pray; +import com.uspray.uspray.global.enums.PrayType; +import com.uspray.uspray.domain.history.model.History; +import com.uspray.uspray.domain.pray.model.Pray; import java.time.LocalDate; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/DTO/history/response/HistoryListResponseDto.java b/src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryListResponseDto.java similarity index 83% rename from src/main/java/com/uspray/uspray/DTO/history/response/HistoryListResponseDto.java rename to src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryListResponseDto.java index 1da725f3..0762ca43 100644 --- a/src/main/java/com/uspray/uspray/DTO/history/response/HistoryListResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryListResponseDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.history.response; +package com.uspray.uspray.domain.history.dto.response; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/DTO/history/response/HistoryResponseDto.java b/src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryResponseDto.java similarity index 86% rename from src/main/java/com/uspray/uspray/DTO/history/response/HistoryResponseDto.java rename to src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryResponseDto.java index d3da2ef6..481651a9 100644 --- a/src/main/java/com/uspray/uspray/DTO/history/response/HistoryResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/history/dto/response/HistoryResponseDto.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.DTO.history.response; +package com.uspray.uspray.domain.history.dto.response; -import com.uspray.uspray.Enums.PrayType; -import com.uspray.uspray.domain.History; -import com.uspray.uspray.domain.Member; +import com.uspray.uspray.global.enums.PrayType; +import com.uspray.uspray.domain.history.model.History; +import com.uspray.uspray.domain.member.model.Member; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/domain/History.java b/src/main/java/com/uspray/uspray/domain/history/model/History.java similarity index 88% rename from src/main/java/com/uspray/uspray/domain/History.java rename to src/main/java/com/uspray/uspray/domain/history/model/History.java index 4ecd9b3a..c2445a14 100644 --- a/src/main/java/com/uspray/uspray/domain/History.java +++ b/src/main/java/com/uspray/uspray/domain/history/model/History.java @@ -1,7 +1,9 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.history.model; -import com.uspray.uspray.Enums.PrayType; -import com.uspray.uspray.common.domain.AuditingTimeEntity; +import com.uspray.uspray.global.enums.PrayType; +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.time.LocalDate; import java.util.Base64; import javax.persistence.Column; diff --git a/src/main/java/com/uspray/uspray/infrastructure/HistoryRepository.java b/src/main/java/com/uspray/uspray/domain/history/repository/HistoryRepository.java similarity index 74% rename from src/main/java/com/uspray/uspray/infrastructure/HistoryRepository.java rename to src/main/java/com/uspray/uspray/domain/history/repository/HistoryRepository.java index 5352b002..cf758868 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/HistoryRepository.java +++ b/src/main/java/com/uspray/uspray/domain/history/repository/HistoryRepository.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.history.repository; -import com.uspray.uspray.domain.History; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; -import com.uspray.uspray.infrastructure.querydsl.history.HistoryRepositoryCustom; +import com.uspray.uspray.domain.history.model.History; +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.history.repository.querydsl.HistoryRepositoryCustom; import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/history/HistoryRepositoryCustom.java b/src/main/java/com/uspray/uspray/domain/history/repository/querydsl/HistoryRepositoryCustom.java similarity index 57% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/history/HistoryRepositoryCustom.java rename to src/main/java/com/uspray/uspray/domain/history/repository/querydsl/HistoryRepositoryCustom.java index dcae25c6..ae6fe2f6 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/history/HistoryRepositoryCustom.java +++ b/src/main/java/com/uspray/uspray/domain/history/repository/querydsl/HistoryRepositoryCustom.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.infrastructure.querydsl.history; +package com.uspray.uspray.domain.history.repository.querydsl; -import com.uspray.uspray.DTO.history.request.HistorySearchRequestDto; -import com.uspray.uspray.domain.History; +import com.uspray.uspray.domain.history.dto.request.HistorySearchRequestDto; +import com.uspray.uspray.domain.history.model.History; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/history/HistoryRepositoryImpl.java b/src/main/java/com/uspray/uspray/domain/history/repository/querydsl/HistoryRepositoryImpl.java similarity index 88% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/history/HistoryRepositoryImpl.java rename to src/main/java/com/uspray/uspray/domain/history/repository/querydsl/HistoryRepositoryImpl.java index b83d309f..e4cc10db 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/history/HistoryRepositoryImpl.java +++ b/src/main/java/com/uspray/uspray/domain/history/repository/querydsl/HistoryRepositoryImpl.java @@ -1,11 +1,11 @@ -package com.uspray.uspray.infrastructure.querydsl.history; +package com.uspray.uspray.domain.history.repository.querydsl; -import static com.uspray.uspray.domain.QHistory.history; +import static com.uspray.uspray.domain.history.model.QHistory.history; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; -import com.uspray.uspray.DTO.history.request.HistorySearchRequestDto; -import com.uspray.uspray.domain.History; +import com.uspray.uspray.domain.history.dto.request.HistorySearchRequestDto; +import com.uspray.uspray.domain.history.model.History; import java.time.LocalDate; import java.util.Base64; import java.util.List; diff --git a/src/main/java/com/uspray/uspray/service/facade/HistoryFacade.java b/src/main/java/com/uspray/uspray/domain/history/service/HistoryFacade.java similarity index 61% rename from src/main/java/com/uspray/uspray/service/facade/HistoryFacade.java rename to src/main/java/com/uspray/uspray/domain/history/service/HistoryFacade.java index ecd530fa..af33fa7a 100644 --- a/src/main/java/com/uspray/uspray/service/facade/HistoryFacade.java +++ b/src/main/java/com/uspray/uspray/domain/history/service/HistoryFacade.java @@ -1,11 +1,12 @@ -package com.uspray.uspray.service.facade; - -import com.uspray.uspray.DTO.pray.request.PrayRequestDto; -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; -import com.uspray.uspray.domain.History; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.infrastructure.HistoryRepository; -import com.uspray.uspray.infrastructure.MemberRepository; +package com.uspray.uspray.domain.history.service; + +import com.uspray.uspray.domain.pray.dto.pray.request.PrayRequestDto; +import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto; +import com.uspray.uspray.domain.history.model.History; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.pray.service.PrayFacade; +import com.uspray.uspray.domain.history.repository.HistoryRepository; +import com.uspray.uspray.domain.member.repository.MemberRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/uspray/uspray/service/HistoryService.java b/src/main/java/com/uspray/uspray/domain/history/service/HistoryService.java similarity index 77% rename from src/main/java/com/uspray/uspray/service/HistoryService.java rename to src/main/java/com/uspray/uspray/domain/history/service/HistoryService.java index 0b1b07cf..b52ebec0 100644 --- a/src/main/java/com/uspray/uspray/service/HistoryService.java +++ b/src/main/java/com/uspray/uspray/domain/history/service/HistoryService.java @@ -1,19 +1,19 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.domain.history.service; -import com.uspray.uspray.DTO.history.request.HistorySearchRequestDto; -import com.uspray.uspray.DTO.history.response.HistoryDetailResponseDto; -import com.uspray.uspray.DTO.history.response.HistoryListResponseDto; -import com.uspray.uspray.DTO.history.response.HistoryResponseDto; -import com.uspray.uspray.Enums.PrayType; -import com.uspray.uspray.domain.History; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.Pray; -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.HistoryRepository; -import com.uspray.uspray.infrastructure.MemberRepository; -import com.uspray.uspray.infrastructure.PrayRepository; +import com.uspray.uspray.domain.history.dto.request.HistorySearchRequestDto; +import com.uspray.uspray.domain.history.dto.response.HistoryDetailResponseDto; +import com.uspray.uspray.domain.history.dto.response.HistoryListResponseDto; +import com.uspray.uspray.domain.history.dto.response.HistoryResponseDto; +import com.uspray.uspray.global.enums.PrayType; +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 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.history.repository.HistoryRepository; +import com.uspray.uspray.domain.member.repository.MemberRepository; +import com.uspray.uspray.domain.pray.repository.PrayRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/com/uspray/uspray/controller/MemberController.java b/src/main/java/com/uspray/uspray/domain/member/controller/MemberController.java similarity index 87% rename from src/main/java/com/uspray/uspray/controller/MemberController.java rename to src/main/java/com/uspray/uspray/domain/member/controller/MemberController.java index 63edf9a7..6de2285c 100644 --- a/src/main/java/com/uspray/uspray/controller/MemberController.java +++ b/src/main/java/com/uspray/uspray/domain/member/controller/MemberController.java @@ -1,13 +1,13 @@ -package com.uspray.uspray.controller; +package com.uspray.uspray.domain.member.controller; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.DTO.auth.request.CheckPwDTO; -import com.uspray.uspray.DTO.auth.request.FcmTokenDto; -import com.uspray.uspray.DTO.auth.request.OauthNameDto; -import com.uspray.uspray.DTO.notification.NotificationAgreeDto; -import com.uspray.uspray.DTO.notification.NotificationInfoDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.service.MemberService; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.domain.member.dto.request.CheckPwDTO; +import com.uspray.uspray.domain.member.dto.request.FcmTokenDto; +import com.uspray.uspray.domain.member.dto.request.OauthNameDto; +import com.uspray.uspray.domain.member.dto.request.NotificationAgreeDto; +import com.uspray.uspray.domain.member.dto.response.NotificationInfoDto; +import com.uspray.uspray.global.exception.SuccessStatus; +import com.uspray.uspray.domain.member.service.MemberService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/CheckPwDTO.java b/src/main/java/com/uspray/uspray/domain/member/dto/request/CheckPwDTO.java similarity index 59% rename from src/main/java/com/uspray/uspray/DTO/auth/request/CheckPwDTO.java rename to src/main/java/com/uspray/uspray/domain/member/dto/request/CheckPwDTO.java index 8aabfe18..ccbbce5c 100644 --- a/src/main/java/com/uspray/uspray/DTO/auth/request/CheckPwDTO.java +++ b/src/main/java/com/uspray/uspray/domain/member/dto/request/CheckPwDTO.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.auth.request; +package com.uspray.uspray.domain.member.dto.request; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/FcmTokenDto.java b/src/main/java/com/uspray/uspray/domain/member/dto/request/FcmTokenDto.java similarity index 62% rename from src/main/java/com/uspray/uspray/DTO/auth/request/FcmTokenDto.java rename to src/main/java/com/uspray/uspray/domain/member/dto/request/FcmTokenDto.java index 1b97bbba..dd77eda4 100644 --- a/src/main/java/com/uspray/uspray/DTO/auth/request/FcmTokenDto.java +++ b/src/main/java/com/uspray/uspray/domain/member/dto/request/FcmTokenDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.auth.request; +package com.uspray.uspray.domain.member.dto.request; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/notification/NotificationAgreeDto.java b/src/main/java/com/uspray/uspray/domain/member/dto/request/NotificationAgreeDto.java similarity index 69% rename from src/main/java/com/uspray/uspray/DTO/notification/NotificationAgreeDto.java rename to src/main/java/com/uspray/uspray/domain/member/dto/request/NotificationAgreeDto.java index bf02b0dc..39870baf 100644 --- a/src/main/java/com/uspray/uspray/DTO/notification/NotificationAgreeDto.java +++ b/src/main/java/com/uspray/uspray/domain/member/dto/request/NotificationAgreeDto.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.DTO.notification; +package com.uspray.uspray.domain.member.dto.request; -import com.uspray.uspray.Enums.NotificationType; +import com.uspray.uspray.global.enums.NotificationType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/OauthNameDto.java b/src/main/java/com/uspray/uspray/domain/member/dto/request/OauthNameDto.java similarity index 81% rename from src/main/java/com/uspray/uspray/DTO/auth/request/OauthNameDto.java rename to src/main/java/com/uspray/uspray/domain/member/dto/request/OauthNameDto.java index 73d69837..a7da5c8e 100644 --- a/src/main/java/com/uspray/uspray/DTO/auth/request/OauthNameDto.java +++ b/src/main/java/com/uspray/uspray/domain/member/dto/request/OauthNameDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.auth.request; +package com.uspray.uspray.domain.member.dto.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/notification/NotificationInfoDto.java b/src/main/java/com/uspray/uspray/domain/member/dto/response/NotificationInfoDto.java similarity index 89% rename from src/main/java/com/uspray/uspray/DTO/notification/NotificationInfoDto.java rename to src/main/java/com/uspray/uspray/domain/member/dto/response/NotificationInfoDto.java index 57a50d91..5ceefcd4 100644 --- a/src/main/java/com/uspray/uspray/DTO/notification/NotificationInfoDto.java +++ b/src/main/java/com/uspray/uspray/domain/member/dto/response/NotificationInfoDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.notification; +package com.uspray.uspray.domain.member.dto.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/domain/Member.java b/src/main/java/com/uspray/uspray/domain/member/model/Member.java similarity index 89% rename from src/main/java/com/uspray/uspray/domain/Member.java rename to src/main/java/com/uspray/uspray/domain/member/model/Member.java index f4dc14a9..4ce4965f 100644 --- a/src/main/java/com/uspray/uspray/domain/Member.java +++ b/src/main/java/com/uspray/uspray/domain/member/model/Member.java @@ -1,9 +1,11 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.member.model; -import com.uspray.uspray.DTO.notification.NotificationAgreeDto; -import com.uspray.uspray.DTO.notification.NotificationInfoDto; -import com.uspray.uspray.Enums.Authority; -import com.uspray.uspray.common.domain.AuditingTimeEntity; +import com.uspray.uspray.domain.member.dto.request.NotificationAgreeDto; +import com.uspray.uspray.domain.member.dto.response.NotificationInfoDto; +import com.uspray.uspray.global.enums.Authority; +import com.uspray.uspray.global.common.model.AuditingTimeEntity; +import com.uspray.uspray.domain.group.model.GroupMember; +import com.uspray.uspray.domain.group.model.GroupPray; import java.util.ArrayList; import java.util.List; import javax.persistence.CascadeType; diff --git a/src/main/java/com/uspray/uspray/infrastructure/MemberRepository.java b/src/main/java/com/uspray/uspray/domain/member/repository/MemberRepository.java similarity index 63% rename from src/main/java/com/uspray/uspray/infrastructure/MemberRepository.java rename to src/main/java/com/uspray/uspray/domain/member/repository/MemberRepository.java index a0c6eee6..b60c3851 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/MemberRepository.java +++ b/src/main/java/com/uspray/uspray/domain/member/repository/MemberRepository.java @@ -1,10 +1,13 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.member.repository; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.NotFoundException; +import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @Repository @@ -31,4 +34,7 @@ default Member getMemberById(Long id) { return this.findById(id).orElseThrow( () -> new NotFoundException(ErrorStatus.NOT_FOUND_USER_EXCEPTION)); } + + @Query("select m.firebaseToken from Member m where m.firstNotiAgree = :agree") + List getDeviceTokensByFirstNotiAgree(@Param("agree") Boolean agree); } diff --git a/src/main/java/com/uspray/uspray/service/MemberService.java b/src/main/java/com/uspray/uspray/domain/member/service/MemberService.java similarity index 75% rename from src/main/java/com/uspray/uspray/service/MemberService.java rename to src/main/java/com/uspray/uspray/domain/member/service/MemberService.java index b642b6b1..9532deba 100644 --- a/src/main/java/com/uspray/uspray/service/MemberService.java +++ b/src/main/java/com/uspray/uspray/domain/member/service/MemberService.java @@ -1,16 +1,16 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.domain.member.service; -import com.uspray.uspray.DTO.auth.request.CheckPwDTO; -import com.uspray.uspray.DTO.auth.request.FcmTokenDto; -import com.uspray.uspray.DTO.auth.request.OauthNameDto; -import com.uspray.uspray.DTO.notification.NotificationAgreeDto; -import com.uspray.uspray.DTO.notification.NotificationInfoDto; -import com.uspray.uspray.Enums.Authority; -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.MemberRepository; +import com.uspray.uspray.domain.member.dto.request.CheckPwDTO; +import com.uspray.uspray.domain.member.dto.request.FcmTokenDto; +import com.uspray.uspray.domain.member.dto.request.OauthNameDto; +import com.uspray.uspray.domain.member.dto.request.NotificationAgreeDto; +import com.uspray.uspray.domain.member.dto.response.NotificationInfoDto; +import com.uspray.uspray.global.enums.Authority; +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.member.repository.MemberRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/uspray/uspray/controller/PrayController.java b/src/main/java/com/uspray/uspray/domain/pray/controller/PrayController.java similarity index 92% rename from src/main/java/com/uspray/uspray/controller/PrayController.java rename to src/main/java/com/uspray/uspray/domain/pray/controller/PrayController.java index 7e1e9d72..1b8b3619 100644 --- a/src/main/java/com/uspray/uspray/controller/PrayController.java +++ b/src/main/java/com/uspray/uspray/domain/pray/controller/PrayController.java @@ -1,14 +1,14 @@ -package com.uspray.uspray.controller; +package com.uspray.uspray.domain.pray.controller; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.DTO.pray.PrayListResponseDto; -import com.uspray.uspray.DTO.pray.request.PrayRequestDto; -import com.uspray.uspray.DTO.pray.request.PrayUpdateRequestDto; -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.service.facade.PrayFacade; -import com.uspray.uspray.service.PrayService; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.domain.pray.dto.pray.PrayListResponseDto; +import com.uspray.uspray.domain.pray.dto.pray.request.PrayRequestDto; +import com.uspray.uspray.domain.pray.dto.pray.request.PrayUpdateRequestDto; +import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto; +import com.uspray.uspray.global.exception.SuccessStatus; +import com.uspray.uspray.domain.pray.service.PrayFacade; +import com.uspray.uspray.domain.pray.service.PrayService; 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/src/main/java/com/uspray/uspray/controller/ShareController.java b/src/main/java/com/uspray/uspray/domain/pray/controller/ShareController.java similarity index 86% rename from src/main/java/com/uspray/uspray/controller/ShareController.java rename to src/main/java/com/uspray/uspray/domain/pray/controller/ShareController.java index d1cd2b97..2ac95eac 100644 --- a/src/main/java/com/uspray/uspray/controller/ShareController.java +++ b/src/main/java/com/uspray/uspray/domain/pray/controller/ShareController.java @@ -1,14 +1,14 @@ -package com.uspray.uspray.controller; +package com.uspray.uspray.domain.pray.controller; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; -import com.uspray.uspray.DTO.sharedpray.request.SharedPrayDeleteRequestDto; -import com.uspray.uspray.DTO.sharedpray.request.SharedPrayRequestDto; -import com.uspray.uspray.DTO.sharedpray.request.SharedPraySaveRequestDto; -import com.uspray.uspray.DTO.sharedpray.response.SharedPrayResponseDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.service.facade.ShareFacade; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto; +import com.uspray.uspray.domain.pray.dto.sharedpray.request.SharedPrayDeleteRequestDto; +import com.uspray.uspray.domain.pray.dto.sharedpray.request.SharedPrayRequestDto; +import com.uspray.uspray.domain.pray.dto.sharedpray.request.SharedPraySaveRequestDto; +import com.uspray.uspray.domain.pray.dto.sharedpray.response.SharedPrayResponseDto; +import com.uspray.uspray.global.exception.SuccessStatus; +import com.uspray.uspray.domain.pray.service.ShareFacade; 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/src/main/java/com/uspray/uspray/DTO/pray/PrayListResponseDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/PrayListResponseDto.java similarity index 84% rename from src/main/java/com/uspray/uspray/DTO/pray/PrayListResponseDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/pray/PrayListResponseDto.java index 47d2f354..987d3395 100644 --- a/src/main/java/com/uspray/uspray/DTO/pray/PrayListResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/PrayListResponseDto.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.DTO.pray; +package com.uspray.uspray.domain.pray.dto.pray; -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; +import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/DTO/pray/request/PrayRequestDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayRequestDto.java similarity index 83% rename from src/main/java/com/uspray/uspray/DTO/pray/request/PrayRequestDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayRequestDto.java index 569220ba..86d62363 100644 --- a/src/main/java/com/uspray/uspray/DTO/pray/request/PrayRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayRequestDto.java @@ -1,9 +1,9 @@ -package com.uspray.uspray.DTO.pray.request; +package com.uspray.uspray.domain.pray.dto.pray.request; -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.global.enums.PrayType; +import com.uspray.uspray.domain.category.model.Category; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.pray.model.Pray; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/uspray/uspray/DTO/pray/request/PrayToGroupPrayDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayToGroupPrayDto.java similarity index 80% rename from src/main/java/com/uspray/uspray/DTO/pray/request/PrayToGroupPrayDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayToGroupPrayDto.java index 503283d7..b3969d23 100644 --- a/src/main/java/com/uspray/uspray/DTO/pray/request/PrayToGroupPrayDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayToGroupPrayDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.pray.request; +package com.uspray.uspray.domain.pray.dto.pray.request; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/src/main/java/com/uspray/uspray/DTO/pray/request/PrayUpdateRequestDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayUpdateRequestDto.java similarity index 91% rename from src/main/java/com/uspray/uspray/DTO/pray/request/PrayUpdateRequestDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayUpdateRequestDto.java index bc7b5bd4..e60e904b 100644 --- a/src/main/java/com/uspray/uspray/DTO/pray/request/PrayUpdateRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/request/PrayUpdateRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.pray.request; +package com.uspray.uspray.domain.pray.dto.pray.request; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; diff --git a/src/main/java/com/uspray/uspray/DTO/pray/response/PrayResponseDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/response/PrayResponseDto.java similarity index 94% rename from src/main/java/com/uspray/uspray/DTO/pray/response/PrayResponseDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/pray/response/PrayResponseDto.java index bd834d21..6ec4df2c 100644 --- a/src/main/java/com/uspray/uspray/DTO/pray/response/PrayResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/pray/response/PrayResponseDto.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.DTO.pray.response; +package com.uspray.uspray.domain.pray.dto.pray.response; import com.querydsl.core.annotations.QueryProjection; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.Pray; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.pray.model.Pray; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import java.util.Base64; diff --git a/src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPrayDeleteRequestDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPrayDeleteRequestDto.java similarity index 85% rename from src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPrayDeleteRequestDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPrayDeleteRequestDto.java index aff6195a..176b4743 100644 --- a/src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPrayDeleteRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPrayDeleteRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.sharedpray.request; +package com.uspray.uspray.domain.pray.dto.sharedpray.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPrayRequestDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPrayRequestDto.java similarity index 86% rename from src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPrayRequestDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPrayRequestDto.java index b1db0042..064533c1 100644 --- a/src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPrayRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPrayRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.sharedpray.request; +package com.uspray.uspray.domain.pray.dto.sharedpray.request; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPraySaveRequestDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPraySaveRequestDto.java similarity index 88% rename from src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPraySaveRequestDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPraySaveRequestDto.java index c05aae48..2ce8ab94 100644 --- a/src/main/java/com/uspray/uspray/DTO/sharedpray/request/SharedPraySaveRequestDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/request/SharedPraySaveRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.sharedpray.request; +package com.uspray.uspray.domain.pray.dto.sharedpray.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/DTO/sharedpray/response/SharedPrayResponseDto.java b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/response/SharedPrayResponseDto.java similarity index 90% rename from src/main/java/com/uspray/uspray/DTO/sharedpray/response/SharedPrayResponseDto.java rename to src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/response/SharedPrayResponseDto.java index 5d56eb1c..851614c6 100644 --- a/src/main/java/com/uspray/uspray/DTO/sharedpray/response/SharedPrayResponseDto.java +++ b/src/main/java/com/uspray/uspray/domain/pray/dto/sharedpray/response/SharedPrayResponseDto.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.DTO.sharedpray.response; +package com.uspray.uspray.domain.pray.dto.sharedpray.response; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.domain.SharedPray; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.pray.model.SharedPray; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/com/uspray/uspray/domain/Pray.java b/src/main/java/com/uspray/uspray/domain/pray/model/Pray.java similarity index 88% rename from src/main/java/com/uspray/uspray/domain/Pray.java rename to src/main/java/com/uspray/uspray/domain/pray/model/Pray.java index 0b583a77..85e24507 100644 --- a/src/main/java/com/uspray/uspray/domain/Pray.java +++ b/src/main/java/com/uspray/uspray/domain/pray/model/Pray.java @@ -1,10 +1,13 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.pray.model; -import com.uspray.uspray.DTO.pray.request.PrayUpdateRequestDto; -import com.uspray.uspray.Enums.PrayType; -import com.uspray.uspray.common.domain.AuditingTimeEntity; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; +import com.uspray.uspray.domain.pray.dto.pray.request.PrayUpdateRequestDto; +import com.uspray.uspray.global.enums.PrayType; +import com.uspray.uspray.global.common.model.AuditingTimeEntity; +import com.uspray.uspray.domain.category.model.Category; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.group.model.GroupPray; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.NotFoundException; import java.time.LocalDate; import java.util.ArrayList; import java.util.Base64; diff --git a/src/main/java/com/uspray/uspray/domain/SharedPray.java b/src/main/java/com/uspray/uspray/domain/pray/model/SharedPray.java similarity index 86% rename from src/main/java/com/uspray/uspray/domain/SharedPray.java rename to src/main/java/com/uspray/uspray/domain/pray/model/SharedPray.java index 3df107f7..d98b6915 100644 --- a/src/main/java/com/uspray/uspray/domain/SharedPray.java +++ b/src/main/java/com/uspray/uspray/domain/pray/model/SharedPray.java @@ -1,8 +1,7 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.domain.pray.model; -import com.uspray.uspray.common.domain.AuditingTimeEntity; -import java.time.LocalDate; -import java.time.LocalDateTime; +import com.uspray.uspray.global.common.model.AuditingTimeEntity; +import com.uspray.uspray.domain.member.model.Member; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/src/main/java/com/uspray/uspray/infrastructure/PrayRepository.java b/src/main/java/com/uspray/uspray/domain/pray/repository/PrayRepository.java similarity index 84% rename from src/main/java/com/uspray/uspray/infrastructure/PrayRepository.java rename to src/main/java/com/uspray/uspray/domain/pray/repository/PrayRepository.java index df934c5d..c6d37558 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/PrayRepository.java +++ b/src/main/java/com/uspray/uspray/domain/pray/repository/PrayRepository.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.pray.repository; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; -import com.uspray.uspray.infrastructure.querydsl.pray.PrayRepositoryCustom; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.NotFoundException; +import com.uspray.uspray.domain.pray.repository.querydsl.PrayRepositoryCustom; import java.time.LocalDate; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/uspray/uspray/infrastructure/SharedPrayRepository.java b/src/main/java/com/uspray/uspray/domain/pray/repository/SharedPrayRepository.java similarity index 73% rename from src/main/java/com/uspray/uspray/infrastructure/SharedPrayRepository.java rename to src/main/java/com/uspray/uspray/domain/pray/repository/SharedPrayRepository.java index cfcff0d3..7eaa4c89 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/SharedPrayRepository.java +++ b/src/main/java/com/uspray/uspray/domain/pray/repository/SharedPrayRepository.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.domain.pray.repository; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.domain.SharedPray; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.NotFoundException; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.pray.model.SharedPray; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.NotFoundException; import java.time.LocalDate; import java.util.List; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/pray/PrayRepositoryCustom.java b/src/main/java/com/uspray/uspray/domain/pray/repository/querydsl/PrayRepositoryCustom.java similarity index 70% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/pray/PrayRepositoryCustom.java rename to src/main/java/com/uspray/uspray/domain/pray/repository/querydsl/PrayRepositoryCustom.java index 79f0dbe8..0d0c3aee 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/pray/PrayRepositoryCustom.java +++ b/src/main/java/com/uspray/uspray/domain/pray/repository/querydsl/PrayRepositoryCustom.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.infrastructure.querydsl.pray; +package com.uspray.uspray.domain.pray.repository.querydsl; -import com.uspray.uspray.domain.Pray; +import com.uspray.uspray.domain.pray.model.Pray; import java.util.List; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/pray/PrayRepositoryImpl.java b/src/main/java/com/uspray/uspray/domain/pray/repository/querydsl/PrayRepositoryImpl.java similarity index 84% rename from src/main/java/com/uspray/uspray/infrastructure/querydsl/pray/PrayRepositoryImpl.java rename to src/main/java/com/uspray/uspray/domain/pray/repository/querydsl/PrayRepositoryImpl.java index e6d86d89..ccf00ec4 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/pray/PrayRepositoryImpl.java +++ b/src/main/java/com/uspray/uspray/domain/pray/repository/querydsl/PrayRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.infrastructure.querydsl.pray; +package com.uspray.uspray.domain.pray.repository.querydsl; -import static com.uspray.uspray.domain.QCategory.category; -import static com.uspray.uspray.domain.QPray.pray; +import static com.uspray.uspray.domain.category.model.QCategory.category; +import static com.uspray.uspray.domain.pray.model.QPray.pray; import com.querydsl.jpa.impl.JPAQueryFactory; -import com.uspray.uspray.domain.Pray; +import com.uspray.uspray.domain.pray.model.Pray; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java b/src/main/java/com/uspray/uspray/domain/pray/service/PrayFacade.java similarity index 84% rename from src/main/java/com/uspray/uspray/service/facade/PrayFacade.java rename to src/main/java/com/uspray/uspray/domain/pray/service/PrayFacade.java index 113a1829..caba557f 100644 --- a/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java +++ b/src/main/java/com/uspray/uspray/domain/pray/service/PrayFacade.java @@ -1,27 +1,26 @@ -package com.uspray.uspray.service.facade; - -import com.uspray.uspray.DTO.pray.PrayListResponseDto; -import com.uspray.uspray.DTO.pray.request.PrayRequestDto; -import com.uspray.uspray.DTO.pray.request.PrayUpdateRequestDto; -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; -import com.uspray.uspray.Enums.PrayType; -import com.uspray.uspray.domain.Category; -import com.uspray.uspray.domain.History; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.NotificationLog; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.domain.ScrapAndHeart; -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.CategoryRepository; -import com.uspray.uspray.infrastructure.HistoryRepository; -import com.uspray.uspray.infrastructure.MemberRepository; -import com.uspray.uspray.infrastructure.NotificationLogRepository; -import com.uspray.uspray.infrastructure.PrayRepository; -import com.uspray.uspray.infrastructure.ScrapAndHeartRepository; -import com.uspray.uspray.service.FCMNotificationService; -import com.uspray.uspray.service.ShareService; +package com.uspray.uspray.domain.pray.service; + +import com.uspray.uspray.domain.pray.dto.pray.PrayListResponseDto; +import com.uspray.uspray.domain.pray.dto.pray.request.PrayRequestDto; +import com.uspray.uspray.domain.pray.dto.pray.request.PrayUpdateRequestDto; +import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto; +import com.uspray.uspray.global.enums.PrayType; +import com.uspray.uspray.domain.category.model.Category; +import com.uspray.uspray.domain.history.model.History; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.global.push.model.NotificationLog; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.group.model.ScrapAndHeart; +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.CategoryRepository; +import com.uspray.uspray.domain.history.repository.HistoryRepository; +import com.uspray.uspray.domain.member.repository.MemberRepository; +import com.uspray.uspray.global.push.repository.NotificationLogRepository; +import com.uspray.uspray.domain.pray.repository.PrayRepository; +import com.uspray.uspray.domain.group.repository.ScrapAndHeartRepository; +import com.uspray.uspray.global.push.service.FCMNotificationService; import java.time.LocalDate; import java.util.List; import javax.transaction.Transactional; diff --git a/src/main/java/com/uspray/uspray/service/PrayService.java b/src/main/java/com/uspray/uspray/domain/pray/service/PrayService.java similarity index 66% rename from src/main/java/com/uspray/uspray/service/PrayService.java rename to src/main/java/com/uspray/uspray/domain/pray/service/PrayService.java index a79b023d..2c89f5c6 100644 --- a/src/main/java/com/uspray/uspray/service/PrayService.java +++ b/src/main/java/com/uspray/uspray/domain/pray/service/PrayService.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.domain.pray.service; -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.infrastructure.PrayRepository; +import com.uspray.uspray.domain.pray.dto.pray.response.PrayResponseDto; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.pray.repository.PrayRepository; import javax.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java b/src/main/java/com/uspray/uspray/domain/pray/service/ShareFacade.java similarity index 82% rename from src/main/java/com/uspray/uspray/service/facade/ShareFacade.java rename to src/main/java/com/uspray/uspray/domain/pray/service/ShareFacade.java index f417322b..f77893ff 100644 --- a/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java +++ b/src/main/java/com/uspray/uspray/domain/pray/service/ShareFacade.java @@ -1,25 +1,25 @@ -package com.uspray.uspray.service.facade; - -import com.uspray.uspray.DTO.sharedpray.request.SharedPrayDeleteRequestDto; -import com.uspray.uspray.DTO.sharedpray.request.SharedPrayRequestDto; -import com.uspray.uspray.DTO.sharedpray.request.SharedPraySaveRequestDto; -import com.uspray.uspray.DTO.sharedpray.response.SharedPrayResponseDto; -import com.uspray.uspray.Enums.CategoryType; -import com.uspray.uspray.Enums.PrayType; -import com.uspray.uspray.domain.Category; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.NotificationLog; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.domain.SharedPray; -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.CategoryRepository; -import com.uspray.uspray.infrastructure.MemberRepository; -import com.uspray.uspray.infrastructure.NotificationLogRepository; -import com.uspray.uspray.infrastructure.PrayRepository; -import com.uspray.uspray.infrastructure.SharedPrayRepository; -import com.uspray.uspray.service.FCMNotificationService; +package com.uspray.uspray.domain.pray.service; + +import com.uspray.uspray.domain.pray.dto.sharedpray.request.SharedPrayDeleteRequestDto; +import com.uspray.uspray.domain.pray.dto.sharedpray.request.SharedPrayRequestDto; +import com.uspray.uspray.domain.pray.dto.sharedpray.request.SharedPraySaveRequestDto; +import com.uspray.uspray.domain.pray.dto.sharedpray.response.SharedPrayResponseDto; +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.member.model.Member; +import com.uspray.uspray.global.push.model.NotificationLog; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.pray.model.SharedPray; +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.CategoryRepository; +import com.uspray.uspray.domain.member.repository.MemberRepository; +import com.uspray.uspray.global.push.repository.NotificationLogRepository; +import com.uspray.uspray.domain.pray.repository.PrayRepository; +import com.uspray.uspray.domain.pray.repository.SharedPrayRepository; +import com.uspray.uspray.global.push.service.FCMNotificationService; import java.time.LocalDate; import java.util.ArrayList; import java.util.Base64; diff --git a/src/main/java/com/uspray/uspray/service/ShareService.java b/src/main/java/com/uspray/uspray/domain/pray/service/ShareService.java similarity index 78% rename from src/main/java/com/uspray/uspray/service/ShareService.java rename to src/main/java/com/uspray/uspray/domain/pray/service/ShareService.java index 09baa901..ee2fe3da 100644 --- a/src/main/java/com/uspray/uspray/service/ShareService.java +++ b/src/main/java/com/uspray/uspray/domain/pray/service/ShareService.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.domain.pray.service; -import com.uspray.uspray.domain.Pray; -import com.uspray.uspray.domain.SharedPray; -import com.uspray.uspray.infrastructure.SharedPrayRepository; +import com.uspray.uspray.domain.pray.model.Pray; +import com.uspray.uspray.domain.pray.model.SharedPray; +import com.uspray.uspray.domain.pray.repository.SharedPrayRepository; import java.time.LocalDate; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/controller/AuthController.java b/src/main/java/com/uspray/uspray/global/auth/controller/AuthController.java similarity index 74% rename from src/main/java/com/uspray/uspray/controller/AuthController.java rename to src/main/java/com/uspray/uspray/global/auth/controller/AuthController.java index cebe4b95..883800f7 100644 --- a/src/main/java/com/uspray/uspray/controller/AuthController.java +++ b/src/main/java/com/uspray/uspray/global/auth/controller/AuthController.java @@ -1,19 +1,11 @@ -package com.uspray.uspray.controller; +package com.uspray.uspray.global.auth.controller; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.DTO.auth.TokenDto; -import com.uspray.uspray.DTO.auth.request.ChangePwDto; -import com.uspray.uspray.DTO.auth.request.FindIdDto; -import com.uspray.uspray.DTO.auth.request.FindPwDTO; -import com.uspray.uspray.DTO.auth.request.MemberDeleteDto; -import com.uspray.uspray.DTO.auth.request.MemberLoginRequestDto; import com.uspray.uspray.DTO.auth.request.MemberRequestDto; -import com.uspray.uspray.DTO.auth.response.DupCheckResponseDto; -import com.uspray.uspray.DTO.auth.response.LoginTypeResponseDto; import com.uspray.uspray.DTO.auth.response.MemberNameResponseDto; -import com.uspray.uspray.DTO.auth.response.MemberResponseDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.service.AuthService; +import com.uspray.uspray.global.auth.dto.member.TokenDto; +import com.uspray.uspray.global.auth.service.AuthService; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.global.exception.SuccessStatus; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; @@ -46,8 +38,8 @@ public class AuthController { @ApiResponse( responseCode = "201", description = "회원가입 성공", - content = @Content(schema = @Schema(implementation = MemberResponseDto.class))) - public ApiResponseDto signup( + content = @Content(schema = @Schema(implementation = com.uspray.uspray.DTO.auth.response.MemberResponseDto.class))) + public ApiResponseDto signup( @RequestBody @Valid MemberRequestDto memberRequestDto) { return ApiResponseDto.success(SuccessStatus.SIGNUP_SUCCESS, authService.signup(memberRequestDto)); @@ -57,9 +49,9 @@ public ApiResponseDto signup( @ApiResponse( responseCode = "200", description = "로그인 성공", - content = @Content(schema = @Schema(implementation = MemberResponseDto.class))) + content = @Content(schema = @Schema(implementation = com.uspray.uspray.DTO.auth.response.MemberResponseDto.class))) public ApiResponseDto login( - @RequestBody @Valid MemberLoginRequestDto memberLoginRequestDto) { + @RequestBody @Valid com.uspray.uspray.DTO.auth.request.MemberLoginRequestDto memberLoginRequestDto) { return ApiResponseDto.success(SuccessStatus.LOGIN_SUCCESS, authService.login(memberLoginRequestDto)); } @@ -81,21 +73,21 @@ public ApiResponseDto reissue(@Parameter(hidden = true) HttpServletReq @PostMapping("/find-id") @Operation(summary = "아이디 찾기") - public ApiResponseDto findId(@RequestBody FindIdDto findIdDto) { + public ApiResponseDto findId(@RequestBody com.uspray.uspray.DTO.auth.request.FindIdDto findIdDto) { return ApiResponseDto.success(SuccessStatus.FIND_USER_ID_SUCCESS, authService.findId(findIdDto)); } @PostMapping("/find-pw") @Operation(summary = "비밀번호 찾기") - public ApiResponseDto findPw(@RequestBody FindPwDTO findPwDTO) { + public ApiResponseDto findPw(@RequestBody com.uspray.uspray.DTO.auth.request.FindPwDTO findPwDTO) { return ApiResponseDto.success(SuccessStatus.FIND_USER_PW_SUCCESS, authService.findPw( findPwDTO)); } @PostMapping("/change-pw") @Operation(summary = "비밀번호 변경") - public ApiResponseDto changePw(@RequestBody ChangePwDto changePwDto) { + public ApiResponseDto changePw(@RequestBody com.uspray.uspray.DTO.auth.request.ChangePwDto changePwDto) { authService.changePw(changePwDto); return ApiResponseDto.success(SuccessStatus.CHANGE_USER_PW_SUCCESS); } @@ -113,14 +105,14 @@ public ApiResponseDto getName(@Parameter(hidden = true) @ @SecurityRequirement(name = "JWT Auth") public ApiResponseDto withdrawal( @Parameter(hidden = true) @AuthenticationPrincipal User user, - @RequestBody MemberDeleteDto memberDeleteDto) { + @RequestBody com.uspray.uspray.DTO.auth.request.MemberDeleteDto memberDeleteDto) { authService.withdrawal(user.getUsername(), memberDeleteDto); return ApiResponseDto.success(SuccessStatus.WITHDRAWAL_SUCCESS); } @GetMapping("/dup-check/{userId}") @Operation(summary = "아이디 중복 체크") - public ApiResponseDto dupCheck(@PathVariable("userId") String userId) { + public ApiResponseDto dupCheck(@PathVariable("userId") String userId) { return ApiResponseDto.success(SuccessStatus.CHECK_USER_ID_SUCCESS, authService.dupCheck(userId)); @@ -129,7 +121,7 @@ public ApiResponseDto dupCheck(@PathVariable("userId") Stri @GetMapping("/login-check") @Operation(summary = "사용한 로그인 방식 체크(일반, 소셜)") @SecurityRequirement(name = "JWT Auth") - public ApiResponseDto loginCheck (@Parameter(hidden = true) @AuthenticationPrincipal User user) { + public ApiResponseDto loginCheck (@Parameter(hidden = true) @AuthenticationPrincipal User user) { return ApiResponseDto.success(SuccessStatus.LOGIN_CHECK_SUCCESS, authService.loginCheck(user.getUsername())); } } diff --git a/src/main/java/com/uspray/uspray/controller/SmsController.java b/src/main/java/com/uspray/uspray/global/auth/controller/SmsController.java similarity index 77% rename from src/main/java/com/uspray/uspray/controller/SmsController.java rename to src/main/java/com/uspray/uspray/global/auth/controller/SmsController.java index bacc5103..3b57f6b3 100644 --- a/src/main/java/com/uspray/uspray/controller/SmsController.java +++ b/src/main/java/com/uspray/uspray/global/auth/controller/SmsController.java @@ -1,12 +1,12 @@ -package com.uspray.uspray.controller; +package com.uspray.uspray.global.auth.controller; import com.fasterxml.jackson.core.JsonProcessingException; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.DTO.sms.CertificationDto; -import com.uspray.uspray.DTO.sms.MessageDto; -import com.uspray.uspray.DTO.sms.SmsResponseDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.service.SmsService; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.global.auth.dto.sms.CertificationDto; +import com.uspray.uspray.global.auth.dto.sms.MessageDto; +import com.uspray.uspray.global.auth.dto.sms.SmsResponseDto; +import com.uspray.uspray.global.exception.SuccessStatus; +import com.uspray.uspray.global.auth.service.SmsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/uspray/uspray/DTO/auth/TokenDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/TokenDto.java similarity index 86% rename from src/main/java/com/uspray/uspray/DTO/auth/TokenDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/TokenDto.java index aaebbf49..1dae40cd 100644 --- a/src/main/java/com/uspray/uspray/DTO/auth/TokenDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/member/TokenDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.auth; +package com.uspray.uspray.global.auth.dto.member; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/ChangePwDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/ChangePwDto.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/request/ChangePwDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/request/ChangePwDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/FindIdDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/FindIdDto.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/request/FindIdDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/request/FindIdDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/FindPwDTO.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/FindPwDTO.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/request/FindPwDTO.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/request/FindPwDTO.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/MemberDeleteDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberDeleteDto.java similarity index 87% rename from src/main/java/com/uspray/uspray/DTO/auth/request/MemberDeleteDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberDeleteDto.java index 358e9080..bc9ab497 100644 --- a/src/main/java/com/uspray/uspray/DTO/auth/request/MemberDeleteDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberDeleteDto.java @@ -1,6 +1,6 @@ package com.uspray.uspray.DTO.auth.request; -import com.uspray.uspray.Enums.WithdrawReason; +import com.uspray.uspray.global.enums.WithdrawReason; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/MemberLoginRequestDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberLoginRequestDto.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/request/MemberLoginRequestDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberLoginRequestDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/MemberRequestDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberRequestDto.java similarity index 92% rename from src/main/java/com/uspray/uspray/DTO/auth/request/MemberRequestDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberRequestDto.java index ce1d4dbd..a7c20f6b 100644 --- a/src/main/java/com/uspray/uspray/DTO/auth/request/MemberRequestDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/MemberRequestDto.java @@ -1,7 +1,7 @@ package com.uspray.uspray.DTO.auth.request; -import com.uspray.uspray.Enums.Authority; -import com.uspray.uspray.domain.Member; +import com.uspray.uspray.global.enums.Authority; +import com.uspray.uspray.domain.member.model.Member; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/DTO/auth/request/TokenRequestDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/request/TokenRequestDto.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/request/TokenRequestDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/request/TokenRequestDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/response/DupCheckResponseDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/response/DupCheckResponseDto.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/response/DupCheckResponseDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/response/DupCheckResponseDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/response/LoginTypeResponseDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/response/LoginTypeResponseDto.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/response/LoginTypeResponseDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/response/LoginTypeResponseDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/response/MemberNameResponseDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/response/MemberNameResponseDto.java similarity index 100% rename from src/main/java/com/uspray/uspray/DTO/auth/response/MemberNameResponseDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/response/MemberNameResponseDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/auth/response/MemberResponseDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/member/response/MemberResponseDto.java similarity index 92% rename from src/main/java/com/uspray/uspray/DTO/auth/response/MemberResponseDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/member/response/MemberResponseDto.java index 8cec2ca6..dc43cecf 100644 --- a/src/main/java/com/uspray/uspray/DTO/auth/response/MemberResponseDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/member/response/MemberResponseDto.java @@ -1,9 +1,8 @@ package com.uspray.uspray.DTO.auth.response; import com.querydsl.core.annotations.QueryProjection; -import com.uspray.uspray.domain.Member; +import com.uspray.uspray.domain.member.model.Member; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/DTO/sms/CertificationDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/sms/CertificationDto.java similarity index 73% rename from src/main/java/com/uspray/uspray/DTO/sms/CertificationDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/sms/CertificationDto.java index 6421c1b5..fc714cf8 100644 --- a/src/main/java/com/uspray/uspray/DTO/sms/CertificationDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/sms/CertificationDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.sms; +package com.uspray.uspray.global.auth.dto.sms; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/sms/MessageDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/sms/MessageDto.java similarity index 62% rename from src/main/java/com/uspray/uspray/DTO/sms/MessageDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/sms/MessageDto.java index aece7703..36914608 100644 --- a/src/main/java/com/uspray/uspray/DTO/sms/MessageDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/sms/MessageDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.sms; +package com.uspray.uspray.global.auth.dto.sms; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/DTO/sms/SmsRequestDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/sms/SmsRequestDto.java similarity index 86% rename from src/main/java/com/uspray/uspray/DTO/sms/SmsRequestDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/sms/SmsRequestDto.java index 6b32f1d0..1c11c3f6 100644 --- a/src/main/java/com/uspray/uspray/DTO/sms/SmsRequestDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/sms/SmsRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.sms; +package com.uspray.uspray.global.auth.dto.sms; import java.util.List; import lombok.Builder; diff --git a/src/main/java/com/uspray/uspray/DTO/sms/SmsResponseDto.java b/src/main/java/com/uspray/uspray/global/auth/dto/sms/SmsResponseDto.java similarity index 87% rename from src/main/java/com/uspray/uspray/DTO/sms/SmsResponseDto.java rename to src/main/java/com/uspray/uspray/global/auth/dto/sms/SmsResponseDto.java index 6c241b99..ef4bddc0 100644 --- a/src/main/java/com/uspray/uspray/DTO/sms/SmsResponseDto.java +++ b/src/main/java/com/uspray/uspray/global/auth/dto/sms/SmsResponseDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.sms; +package com.uspray.uspray.global.auth.dto.sms; import java.time.LocalDateTime; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/domain/Withdraw.java b/src/main/java/com/uspray/uspray/global/auth/model/Withdraw.java similarity index 83% rename from src/main/java/com/uspray/uspray/domain/Withdraw.java rename to src/main/java/com/uspray/uspray/global/auth/model/Withdraw.java index bbf4b045..018f96db 100644 --- a/src/main/java/com/uspray/uspray/domain/Withdraw.java +++ b/src/main/java/com/uspray/uspray/global/auth/model/Withdraw.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.global.auth.model; -import com.uspray.uspray.Enums.WithdrawReason; -import com.uspray.uspray.common.domain.AuditingTimeEntity; +import com.uspray.uspray.global.enums.WithdrawReason; +import com.uspray.uspray.global.common.model.AuditingTimeEntity; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/main/java/com/uspray/uspray/infrastructure/WithdrawRepository.java b/src/main/java/com/uspray/uspray/global/auth/repository/WithdrawRepository.java similarity index 58% rename from src/main/java/com/uspray/uspray/infrastructure/WithdrawRepository.java rename to src/main/java/com/uspray/uspray/global/auth/repository/WithdrawRepository.java index 8e092066..ca7bcf6e 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/WithdrawRepository.java +++ b/src/main/java/com/uspray/uspray/global/auth/repository/WithdrawRepository.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.global.auth.repository; -import com.uspray.uspray.domain.Withdraw; +import com.uspray.uspray.global.auth.model.Withdraw; import org.springframework.data.jpa.repository.JpaRepository; public interface WithdrawRepository extends JpaRepository { diff --git a/src/main/java/com/uspray/uspray/service/AuthService.java b/src/main/java/com/uspray/uspray/global/auth/service/AuthService.java similarity index 73% rename from src/main/java/com/uspray/uspray/service/AuthService.java rename to src/main/java/com/uspray/uspray/global/auth/service/AuthService.java index 22d491a2..7135e10a 100644 --- a/src/main/java/com/uspray/uspray/service/AuthService.java +++ b/src/main/java/com/uspray/uspray/global/auth/service/AuthService.java @@ -1,25 +1,15 @@ -package com.uspray.uspray.service; - -import com.uspray.uspray.DTO.auth.TokenDto; -import com.uspray.uspray.DTO.auth.request.ChangePwDto; -import com.uspray.uspray.DTO.auth.request.FindIdDto; -import com.uspray.uspray.DTO.auth.request.FindPwDTO; -import com.uspray.uspray.DTO.auth.request.MemberDeleteDto; -import com.uspray.uspray.DTO.auth.request.MemberLoginRequestDto; -import com.uspray.uspray.DTO.auth.request.MemberRequestDto; -import com.uspray.uspray.DTO.auth.response.DupCheckResponseDto; -import com.uspray.uspray.DTO.auth.response.LoginTypeResponseDto; -import com.uspray.uspray.DTO.auth.response.MemberNameResponseDto; -import com.uspray.uspray.DTO.auth.response.MemberResponseDto; -import com.uspray.uspray.Enums.WithdrawReason; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.Withdraw; -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.MemberRepository; -import com.uspray.uspray.infrastructure.WithdrawRepository; -import com.uspray.uspray.jwt.TokenProvider; +package com.uspray.uspray.global.auth.service; + +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.member.repository.MemberRepository; +import com.uspray.uspray.global.auth.dto.member.TokenDto; +import com.uspray.uspray.global.auth.model.Withdraw; +import com.uspray.uspray.global.auth.repository.WithdrawRepository; +import com.uspray.uspray.global.enums.WithdrawReason; +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.global.jwt.TokenProvider; import java.util.Objects; import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; @@ -44,7 +34,8 @@ public class AuthService { private final WithdrawRepository withdrawRepository; @Transactional - public MemberResponseDto signup(MemberRequestDto memberRequestDto) { + public com.uspray.uspray.DTO.auth.response.MemberResponseDto signup( + com.uspray.uspray.DTO.auth.request.MemberRequestDto memberRequestDto) { // 핸드폰번호가 존재하거나 아이디가 존재하면 에러 // 핸드폰 번호 또는 아이디가 이미 존재하는지 확인 if (memberRepository.existsByUserId(memberRequestDto.getUserId())) { @@ -55,12 +46,13 @@ public MemberResponseDto signup(MemberRequestDto memberRequestDto) { } Member member = memberRequestDto.toMember(passwordEncoder); - return MemberResponseDto.of(memberRepository.save(member)); + return com.uspray.uspray.DTO.auth.response.MemberResponseDto.of(memberRepository.save(member)); } @Transactional - public TokenDto login(MemberLoginRequestDto memberLoginRequestDto) { + public TokenDto login( + com.uspray.uspray.DTO.auth.request.MemberLoginRequestDto memberLoginRequestDto) { try { // 1. Login ID/PW 를 기반으로 AuthenticationToken 생성 UsernamePasswordAuthenticationToken authenticationToken = memberLoginRequestDto.toAuthentication(); @@ -120,25 +112,25 @@ public TokenDto reissue(String refreshToken) { } //Custom exception merge된 후 예외처리 하기 - public String findId(FindIdDto findIdDto) { + public String findId(com.uspray.uspray.DTO.auth.request.FindIdDto findIdDto) { return memberRepository.findByNameAndPhone(findIdDto.getName(), findIdDto.getPhone()) .getUserId(); } - public Long findPw(FindPwDTO findPwDTO) { + public Long findPw(com.uspray.uspray.DTO.auth.request.FindPwDTO findPwDTO) { return memberRepository.findByUserIdAndPhone( findPwDTO.getUserId(), findPwDTO.getPhone()).getId(); } @Transactional - public void changePw(ChangePwDto changePwDto) { + public void changePw(com.uspray.uspray.DTO.auth.request.ChangePwDto changePwDto) { memberRepository.getMemberById(changePwDto.getId()) .changePw(passwordEncoder.encode(changePwDto.getPassword())); } @Transactional - public void withdrawal(String userId, MemberDeleteDto memberDeleteDto) { + public void withdrawal(String userId, com.uspray.uspray.DTO.auth.request.MemberDeleteDto memberDeleteDto) { Member member = memberRepository.getMemberByUserId(userId); for (WithdrawReason withdrawReason : memberDeleteDto.getWithdrawReason()) { if (Objects.equals(withdrawReason, WithdrawReason.ETC)) { @@ -156,17 +148,17 @@ public void withdrawal(String userId, MemberDeleteDto memberDeleteDto) { memberRepository.delete(member); } - public MemberNameResponseDto getMemberName(String userId) { - return new MemberNameResponseDto(memberRepository.getMemberByUserId(userId).getName()); + public com.uspray.uspray.DTO.auth.response.MemberNameResponseDto getMemberName(String userId) { + return new com.uspray.uspray.DTO.auth.response.MemberNameResponseDto(memberRepository.getMemberByUserId(userId).getName()); } - public DupCheckResponseDto dupCheck(String userId) { - return new DupCheckResponseDto(memberRepository.existsByUserId(userId)); + public com.uspray.uspray.DTO.auth.response.DupCheckResponseDto dupCheck(String userId) { + return new com.uspray.uspray.DTO.auth.response.DupCheckResponseDto(memberRepository.existsByUserId(userId)); } - public LoginTypeResponseDto loginCheck(String userId) { + public com.uspray.uspray.DTO.auth.response.LoginTypeResponseDto loginCheck(String userId) { Member member = memberRepository.getMemberByUserId(userId); - return LoginTypeResponseDto.builder() + return com.uspray.uspray.DTO.auth.response.LoginTypeResponseDto.builder() .isSocial(member.getSocialId() != null) .build(); } diff --git a/src/main/java/com/uspray/uspray/service/SmsService.java b/src/main/java/com/uspray/uspray/global/auth/service/SmsService.java similarity index 92% rename from src/main/java/com/uspray/uspray/service/SmsService.java rename to src/main/java/com/uspray/uspray/global/auth/service/SmsService.java index a8708937..5fb25a5b 100644 --- a/src/main/java/com/uspray/uspray/service/SmsService.java +++ b/src/main/java/com/uspray/uspray/global/auth/service/SmsService.java @@ -1,15 +1,15 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.global.auth.service; import static java.nio.charset.StandardCharsets.UTF_8; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.uspray.uspray.DTO.sms.CertificationDto; -import com.uspray.uspray.DTO.sms.MessageDto; -import com.uspray.uspray.DTO.sms.SmsRequestDto; -import com.uspray.uspray.DTO.sms.SmsResponseDto; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.CustomException; +import com.uspray.uspray.global.auth.dto.sms.CertificationDto; +import com.uspray.uspray.global.auth.dto.sms.MessageDto; +import com.uspray.uspray.global.auth.dto.sms.SmsRequestDto; +import com.uspray.uspray.global.auth.dto.sms.SmsResponseDto; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.model.CustomException; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/com/uspray/uspray/DTO/ApiResponseDto.java b/src/main/java/com/uspray/uspray/global/common/dto/ApiResponseDto.java similarity index 88% rename from src/main/java/com/uspray/uspray/DTO/ApiResponseDto.java rename to src/main/java/com/uspray/uspray/global/common/dto/ApiResponseDto.java index 8c721ebc..5364fc53 100644 --- a/src/main/java/com/uspray/uspray/DTO/ApiResponseDto.java +++ b/src/main/java/com/uspray/uspray/global/common/dto/ApiResponseDto.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.DTO; +package com.uspray.uspray.global.common.dto; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.SuccessStatus; +import com.uspray.uspray.global.exception.ErrorStatus; +import com.uspray.uspray.global.exception.SuccessStatus; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/common/domain/AuditingTimeEntity.java b/src/main/java/com/uspray/uspray/global/common/model/AuditingTimeEntity.java similarity index 92% rename from src/main/java/com/uspray/uspray/common/domain/AuditingTimeEntity.java rename to src/main/java/com/uspray/uspray/global/common/model/AuditingTimeEntity.java index bacf81ba..003b1323 100644 --- a/src/main/java/com/uspray/uspray/common/domain/AuditingTimeEntity.java +++ b/src/main/java/com/uspray/uspray/global/common/model/AuditingTimeEntity.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.common.domain; +package com.uspray.uspray.global.common.model; import java.time.LocalDateTime; import javax.persistence.Column; diff --git a/src/main/java/com/uspray/uspray/service/SchedulerService.java b/src/main/java/com/uspray/uspray/global/common/service/SchedulerService.java similarity index 69% rename from src/main/java/com/uspray/uspray/service/SchedulerService.java rename to src/main/java/com/uspray/uspray/global/common/service/SchedulerService.java index 8f9eed4a..99948d1a 100644 --- a/src/main/java/com/uspray/uspray/service/SchedulerService.java +++ b/src/main/java/com/uspray/uspray/global/common/service/SchedulerService.java @@ -1,8 +1,10 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.global.common.service; -import com.uspray.uspray.Enums.NotificationType; -import com.uspray.uspray.infrastructure.query.MemberQueryRepository; -import com.uspray.uspray.service.facade.PrayFacade; +import com.uspray.uspray.global.enums.NotificationType; +import com.uspray.uspray.domain.member.repository.MemberRepository; +import com.uspray.uspray.domain.pray.service.PrayFacade; +import com.uspray.uspray.domain.pray.service.ShareService; +import com.uspray.uspray.global.push.service.FCMNotificationService; import java.io.IOException; import java.time.LocalDate; import java.util.List; @@ -14,14 +16,14 @@ @RequiredArgsConstructor public class SchedulerService { - private final MemberQueryRepository memberQueryRepository; + private final MemberRepository memberRepository; private final FCMNotificationService fcmNotificationService; private final ShareService shareService; private final PrayFacade prayFacadeService; @Scheduled(cron = "0 0 8 * * *") public void pushPrayNotification() throws IOException { - List deviceTokens = memberQueryRepository.getDeviceTokensByFirstNotiAgree( + List deviceTokens = memberRepository.getDeviceTokensByFirstNotiAgree( true); for (String device : deviceTokens) { fcmNotificationService.sendMessageTo(device, NotificationType.PRAY_TIME.getTitle(), diff --git a/src/main/java/com/uspray/uspray/config/JwtSecurityConfig.java b/src/main/java/com/uspray/uspray/global/config/JwtSecurityConfig.java similarity index 84% rename from src/main/java/com/uspray/uspray/config/JwtSecurityConfig.java rename to src/main/java/com/uspray/uspray/global/config/JwtSecurityConfig.java index ef53671f..79a91b0a 100644 --- a/src/main/java/com/uspray/uspray/config/JwtSecurityConfig.java +++ b/src/main/java/com/uspray/uspray/global/config/JwtSecurityConfig.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.config; +package com.uspray.uspray.global.config; -import com.uspray.uspray.jwt.JwtFilter; -import com.uspray.uspray.jwt.TokenProvider; +import com.uspray.uspray.global.jwt.JwtFilter; +import com.uspray.uspray.global.jwt.TokenProvider; import lombok.RequiredArgsConstructor; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/src/main/java/com/uspray/uspray/config/QuerydslConfig.java b/src/main/java/com/uspray/uspray/global/config/QuerydslConfig.java similarity index 91% rename from src/main/java/com/uspray/uspray/config/QuerydslConfig.java rename to src/main/java/com/uspray/uspray/global/config/QuerydslConfig.java index 8df2a571..1ef2367e 100644 --- a/src/main/java/com/uspray/uspray/config/QuerydslConfig.java +++ b/src/main/java/com/uspray/uspray/global/config/QuerydslConfig.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.config; +package com.uspray.uspray.global.config; import com.querydsl.jpa.impl.JPAQueryFactory; import javax.persistence.EntityManager; diff --git a/src/main/java/com/uspray/uspray/config/RedisConfig.java b/src/main/java/com/uspray/uspray/global/config/RedisConfig.java similarity index 96% rename from src/main/java/com/uspray/uspray/config/RedisConfig.java rename to src/main/java/com/uspray/uspray/global/config/RedisConfig.java index 5cc39437..60963efc 100644 --- a/src/main/java/com/uspray/uspray/config/RedisConfig.java +++ b/src/main/java/com/uspray/uspray/global/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.config; +package com.uspray.uspray.global.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/uspray/uspray/config/SecurityConfig.java b/src/main/java/com/uspray/uspray/global/config/SecurityConfig.java similarity index 90% rename from src/main/java/com/uspray/uspray/config/SecurityConfig.java rename to src/main/java/com/uspray/uspray/global/config/SecurityConfig.java index 2fd532f5..4dff79c3 100644 --- a/src/main/java/com/uspray/uspray/config/SecurityConfig.java +++ b/src/main/java/com/uspray/uspray/global/config/SecurityConfig.java @@ -1,12 +1,12 @@ -package com.uspray.uspray.config; - -import com.uspray.uspray.external.client.oauth2.CustomOAuth2UserService; -import com.uspray.uspray.external.client.oauth2.OAuth2LoginFailureHandler; -import com.uspray.uspray.external.client.oauth2.OAuth2LoginSuccessHandler; -import com.uspray.uspray.jwt.JwtAccessDeniedHandler; -import com.uspray.uspray.jwt.JwtAuthenticationEntryPoint; -import com.uspray.uspray.jwt.TokenProvider; -import com.uspray.uspray.util.CustomRequestEntityConverter; +package com.uspray.uspray.global.config; + +import com.uspray.uspray.global.external.client.oauth2.CustomOAuth2UserService; +import com.uspray.uspray.global.external.client.oauth2.OAuth2LoginFailureHandler; +import com.uspray.uspray.global.external.client.oauth2.OAuth2LoginSuccessHandler; +import com.uspray.uspray.global.jwt.JwtAccessDeniedHandler; +import com.uspray.uspray.global.jwt.JwtAuthenticationEntryPoint; +import com.uspray.uspray.global.jwt.TokenProvider; +import com.uspray.uspray.global.util.CustomRequestEntityConverter; import java.util.Arrays; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/config/swagger/SwaggerConfig.java b/src/main/java/com/uspray/uspray/global/config/SwaggerConfig.java similarity index 96% rename from src/main/java/com/uspray/uspray/config/swagger/SwaggerConfig.java rename to src/main/java/com/uspray/uspray/global/config/SwaggerConfig.java index 8a8b1e0b..0f7f137b 100644 --- a/src/main/java/com/uspray/uspray/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/uspray/uspray/global/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.config.swagger; +package com.uspray.uspray.global.config; import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn; import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; diff --git a/src/main/java/com/uspray/uspray/config/sql/UserQueries.java b/src/main/java/com/uspray/uspray/global/config/sql/UserQueries.java similarity index 98% rename from src/main/java/com/uspray/uspray/config/sql/UserQueries.java rename to src/main/java/com/uspray/uspray/global/config/sql/UserQueries.java index 97e71098..060ee5e9 100644 --- a/src/main/java/com/uspray/uspray/config/sql/UserQueries.java +++ b/src/main/java/com/uspray/uspray/global/config/sql/UserQueries.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.config.sql; +package com.uspray.uspray.global.config.sql; public class UserQueries { diff --git a/src/main/java/com/uspray/uspray/config/sql/category.sql b/src/main/java/com/uspray/uspray/global/config/sql/category.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/category.sql rename to src/main/java/com/uspray/uspray/global/config/sql/category.sql diff --git a/src/main/java/com/uspray/uspray/config/sql/changePrimaryKey.sql b/src/main/java/com/uspray/uspray/global/config/sql/changePrimaryKey.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/changePrimaryKey.sql rename to src/main/java/com/uspray/uspray/global/config/sql/changePrimaryKey.sql diff --git a/src/main/java/com/uspray/uspray/config/sql/group.sql b/src/main/java/com/uspray/uspray/global/config/sql/group.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/group.sql rename to src/main/java/com/uspray/uspray/global/config/sql/group.sql diff --git a/src/main/java/com/uspray/uspray/config/sql/history.sql b/src/main/java/com/uspray/uspray/global/config/sql/history.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/history.sql rename to src/main/java/com/uspray/uspray/global/config/sql/history.sql diff --git a/src/main/java/com/uspray/uspray/config/sql/pray.sql b/src/main/java/com/uspray/uspray/global/config/sql/pray.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/pray.sql rename to src/main/java/com/uspray/uspray/global/config/sql/pray.sql diff --git a/src/main/java/com/uspray/uspray/config/sql/sharedPray.sql b/src/main/java/com/uspray/uspray/global/config/sql/sharedPray.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/sharedPray.sql rename to src/main/java/com/uspray/uspray/global/config/sql/sharedPray.sql diff --git a/src/main/java/com/uspray/uspray/config/sql/total.sql b/src/main/java/com/uspray/uspray/global/config/sql/total.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/total.sql rename to src/main/java/com/uspray/uspray/global/config/sql/total.sql diff --git a/src/main/java/com/uspray/uspray/config/sql/user.sql b/src/main/java/com/uspray/uspray/global/config/sql/user.sql similarity index 100% rename from src/main/java/com/uspray/uspray/config/sql/user.sql rename to src/main/java/com/uspray/uspray/global/config/sql/user.sql diff --git a/src/main/java/com/uspray/uspray/Enums/Authority.java b/src/main/java/com/uspray/uspray/global/enums/Authority.java similarity index 61% rename from src/main/java/com/uspray/uspray/Enums/Authority.java rename to src/main/java/com/uspray/uspray/global/enums/Authority.java index 5c667968..1cc4ca78 100644 --- a/src/main/java/com/uspray/uspray/Enums/Authority.java +++ b/src/main/java/com/uspray/uspray/global/enums/Authority.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.Enums; +package com.uspray.uspray.global.enums; public enum Authority { ROLE_USER, ROLE_ADMIN, ROLE_GUEST diff --git a/src/main/java/com/uspray/uspray/Enums/CategoryType.java b/src/main/java/com/uspray/uspray/global/enums/CategoryType.java similarity index 89% rename from src/main/java/com/uspray/uspray/Enums/CategoryType.java rename to src/main/java/com/uspray/uspray/global/enums/CategoryType.java index a2e493ed..a3b408ba 100644 --- a/src/main/java/com/uspray/uspray/Enums/CategoryType.java +++ b/src/main/java/com/uspray/uspray/global/enums/CategoryType.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.Enums; +package com.uspray.uspray.global.enums; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/Enums/NotificationType.java b/src/main/java/com/uspray/uspray/global/enums/NotificationType.java similarity index 93% rename from src/main/java/com/uspray/uspray/Enums/NotificationType.java rename to src/main/java/com/uspray/uspray/global/enums/NotificationType.java index b5cb671b..2e7f5ed2 100644 --- a/src/main/java/com/uspray/uspray/Enums/NotificationType.java +++ b/src/main/java/com/uspray/uspray/global/enums/NotificationType.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.Enums; +package com.uspray.uspray.global.enums; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/Enums/PrayType.java b/src/main/java/com/uspray/uspray/global/enums/PrayType.java similarity index 90% rename from src/main/java/com/uspray/uspray/Enums/PrayType.java rename to src/main/java/com/uspray/uspray/global/enums/PrayType.java index 1fea6bfb..f0f4a628 100644 --- a/src/main/java/com/uspray/uspray/Enums/PrayType.java +++ b/src/main/java/com/uspray/uspray/global/enums/PrayType.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.Enums; +package com.uspray.uspray.global.enums; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/Enums/WithdrawReason.java b/src/main/java/com/uspray/uspray/global/enums/WithdrawReason.java similarity index 92% rename from src/main/java/com/uspray/uspray/Enums/WithdrawReason.java rename to src/main/java/com/uspray/uspray/global/enums/WithdrawReason.java index 82f34efd..0755d294 100644 --- a/src/main/java/com/uspray/uspray/Enums/WithdrawReason.java +++ b/src/main/java/com/uspray/uspray/global/enums/WithdrawReason.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.Enums; +package com.uspray.uspray.global.enums; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/common/advice/ControllerExceptionAdvice.java b/src/main/java/com/uspray/uspray/global/exception/ControllerExceptionAdvice.java similarity index 90% rename from src/main/java/com/uspray/uspray/common/advice/ControllerExceptionAdvice.java rename to src/main/java/com/uspray/uspray/global/exception/ControllerExceptionAdvice.java index 90a87d50..c33ef54c 100644 --- a/src/main/java/com/uspray/uspray/common/advice/ControllerExceptionAdvice.java +++ b/src/main/java/com/uspray/uspray/global/exception/ControllerExceptionAdvice.java @@ -1,8 +1,7 @@ -package com.uspray.uspray.common.advice; +package com.uspray.uspray.global.exception; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.CustomException; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.global.exception.model.CustomException; import io.lettuce.core.RedisCommandExecutionException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/uspray/uspray/exception/ErrorStatus.java b/src/main/java/com/uspray/uspray/global/exception/ErrorStatus.java similarity index 99% rename from src/main/java/com/uspray/uspray/exception/ErrorStatus.java rename to src/main/java/com/uspray/uspray/global/exception/ErrorStatus.java index b59e5d04..87a2777f 100644 --- a/src/main/java/com/uspray/uspray/exception/ErrorStatus.java +++ b/src/main/java/com/uspray/uspray/global/exception/ErrorStatus.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.exception; +package com.uspray.uspray.global.exception; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/exception/SuccessStatus.java b/src/main/java/com/uspray/uspray/global/exception/SuccessStatus.java similarity index 99% rename from src/main/java/com/uspray/uspray/exception/SuccessStatus.java rename to src/main/java/com/uspray/uspray/global/exception/SuccessStatus.java index ba97f964..c0d309a5 100644 --- a/src/main/java/com/uspray/uspray/exception/SuccessStatus.java +++ b/src/main/java/com/uspray/uspray/global/exception/SuccessStatus.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.exception; +package com.uspray.uspray.global.exception; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/exception/model/CustomException.java b/src/main/java/com/uspray/uspray/global/exception/model/CustomException.java similarity index 77% rename from src/main/java/com/uspray/uspray/exception/model/CustomException.java rename to src/main/java/com/uspray/uspray/global/exception/model/CustomException.java index 39e70f65..5233b221 100644 --- a/src/main/java/com/uspray/uspray/exception/model/CustomException.java +++ b/src/main/java/com/uspray/uspray/global/exception/model/CustomException.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.exception.model; +package com.uspray.uspray.global.exception.model; -import com.uspray.uspray.exception.ErrorStatus; +import com.uspray.uspray.global.exception.ErrorStatus; import lombok.Getter; @Getter diff --git a/src/main/java/com/uspray/uspray/exception/model/NotFoundException.java b/src/main/java/com/uspray/uspray/global/exception/model/NotFoundException.java similarity index 58% rename from src/main/java/com/uspray/uspray/exception/model/NotFoundException.java rename to src/main/java/com/uspray/uspray/global/exception/model/NotFoundException.java index c5eb30b9..c6b93396 100644 --- a/src/main/java/com/uspray/uspray/exception/model/NotFoundException.java +++ b/src/main/java/com/uspray/uspray/global/exception/model/NotFoundException.java @@ -1,6 +1,7 @@ -package com.uspray.uspray.exception.model; +package com.uspray.uspray.global.exception.model; + +import com.uspray.uspray.global.exception.ErrorStatus; -import com.uspray.uspray.exception.ErrorStatus; public class NotFoundException extends CustomException{ public NotFoundException(ErrorStatus errorStatus) { diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/CustomOAuth2User.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/CustomOAuth2User.java similarity index 87% rename from src/main/java/com/uspray/uspray/external/client/oauth2/CustomOAuth2User.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/CustomOAuth2User.java index 77e483ef..3ac45d50 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/CustomOAuth2User.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/CustomOAuth2User.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.external.client.oauth2; +package com.uspray.uspray.global.external.client.oauth2; -import com.uspray.uspray.Enums.Authority; +import com.uspray.uspray.global.enums.Authority; import java.util.Collection; import java.util.Map; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/CustomOAuth2UserService.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/CustomOAuth2UserService.java similarity index 96% rename from src/main/java/com/uspray/uspray/external/client/oauth2/CustomOAuth2UserService.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/CustomOAuth2UserService.java index c08b0e65..023243ec 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/CustomOAuth2UserService.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/CustomOAuth2UserService.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.external.client.oauth2; +package com.uspray.uspray.global.external.client.oauth2; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.infrastructure.MemberRepository; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.member.repository.MemberRepository; import java.util.Collections; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/OAuth2LoginFailureHandler.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuth2LoginFailureHandler.java similarity index 94% rename from src/main/java/com/uspray/uspray/external/client/oauth2/OAuth2LoginFailureHandler.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuth2LoginFailureHandler.java index 98822072..11567943 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/OAuth2LoginFailureHandler.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuth2LoginFailureHandler.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2; +package com.uspray.uspray.global.external.client.oauth2; import java.io.IOException; import javax.servlet.ServletException; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/OAuth2LoginSuccessHandler.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuth2LoginSuccessHandler.java similarity index 91% rename from src/main/java/com/uspray/uspray/external/client/oauth2/OAuth2LoginSuccessHandler.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuth2LoginSuccessHandler.java index 07abeb43..b2d447ca 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/OAuth2LoginSuccessHandler.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuth2LoginSuccessHandler.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.external.client.oauth2; +package com.uspray.uspray.global.external.client.oauth2; -import com.uspray.uspray.DTO.auth.TokenDto; -import com.uspray.uspray.Enums.Authority; -import com.uspray.uspray.jwt.TokenProvider; +import com.uspray.uspray.global.auth.dto.member.TokenDto; +import com.uspray.uspray.global.enums.Authority; +import com.uspray.uspray.global.jwt.TokenProvider; import java.io.IOException; import java.util.concurrent.TimeUnit; import javax.servlet.ServletException; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/OAuthAttributes.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuthAttributes.java similarity index 81% rename from src/main/java/com/uspray/uspray/external/client/oauth2/OAuthAttributes.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuthAttributes.java index 0bbaa8a7..e03a857d 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/OAuthAttributes.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/OAuthAttributes.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.external.client.oauth2; +package com.uspray.uspray.global.external.client.oauth2; -import com.uspray.uspray.Enums.Authority; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.external.client.oauth2.dto.KakaoOAuth2UserInfo; -import com.uspray.uspray.external.client.oauth2.dto.NaverOAuth2UserInfo; -import com.uspray.uspray.external.client.oauth2.dto.OAuth2UserInfo; +import com.uspray.uspray.global.enums.Authority; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.global.external.client.oauth2.dto.KakaoOAuth2UserInfo; +import com.uspray.uspray.global.external.client.oauth2.dto.NaverOAuth2UserInfo; +import com.uspray.uspray.global.external.client.oauth2.dto.OAuth2UserInfo; import java.util.Map; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleAuthClient.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleAuthClient.java similarity index 81% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleAuthClient.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleAuthClient.java index 7cbedb55..88d4d2b7 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleAuthClient.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleAuthClient.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.external.client.oauth2.apple; +package com.uspray.uspray.global.external.client.oauth2.apple; -import com.uspray.uspray.external.client.oauth2.apple.dto.AppleSocialTokenInfoResponse; +import com.uspray.uspray.global.external.client.oauth2.apple.dto.AppleSocialTokenInfoResponse; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleController.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleController.java similarity index 75% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleController.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleController.java index f91ad2b4..5254b74c 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleController.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleController.java @@ -1,8 +1,8 @@ -package com.uspray.uspray.external.client.oauth2.apple; +package com.uspray.uspray.global.external.client.oauth2.apple; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.external.client.oauth2.apple.dto.AppleAuthCodeDto; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.global.exception.SuccessStatus; +import com.uspray.uspray.global.external.client.oauth2.apple.dto.AppleAuthCodeDto; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleFeignClientConfiguration.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleFeignClientConfiguration.java similarity index 83% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleFeignClientConfiguration.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleFeignClientConfiguration.java index a4f6e6e4..3f7f2be7 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleFeignClientConfiguration.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleFeignClientConfiguration.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple; +package com.uspray.uspray.global.external.client.oauth2.apple; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleFeignClientErrorDecoder.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleFeignClientErrorDecoder.java similarity index 95% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleFeignClientErrorDecoder.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleFeignClientErrorDecoder.java index 0b353590..439763f6 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleFeignClientErrorDecoder.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleFeignClientErrorDecoder.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple; +package com.uspray.uspray.global.external.client.oauth2.apple; import com.fasterxml.jackson.databind.ObjectMapper; import feign.Response; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleMemberService.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleMemberService.java similarity index 84% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleMemberService.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleMemberService.java index 037bf7cb..ae0b0085 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/AppleMemberService.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/AppleMemberService.java @@ -1,13 +1,13 @@ -package com.uspray.uspray.external.client.oauth2.apple; +package com.uspray.uspray.global.external.client.oauth2.apple; -import com.uspray.uspray.DTO.auth.TokenDto; -import com.uspray.uspray.Enums.Authority; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.external.client.oauth2.apple.dto.AppleIdTokenPayload; -import com.uspray.uspray.external.client.oauth2.apple.dto.AppleLoginResponseDto; -import com.uspray.uspray.external.client.oauth2.apple.dto.AppleProperties; -import com.uspray.uspray.infrastructure.MemberRepository; -import com.uspray.uspray.jwt.TokenProvider; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.member.repository.MemberRepository; +import com.uspray.uspray.global.auth.dto.member.TokenDto; +import com.uspray.uspray.global.enums.Authority; +import com.uspray.uspray.global.external.client.oauth2.apple.dto.AppleIdTokenPayload; +import com.uspray.uspray.global.external.client.oauth2.apple.dto.AppleLoginResponseDto; +import com.uspray.uspray.global.external.client.oauth2.apple.dto.AppleProperties; +import com.uspray.uspray.global.jwt.TokenProvider; import io.jsonwebtoken.JwsHeader; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/MyServerException.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/MyServerException.java similarity index 77% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/MyServerException.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/MyServerException.java index 03c18449..44686793 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/MyServerException.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/MyServerException.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple; +package com.uspray.uspray.global.external.client.oauth2.apple; public class MyServerException extends RuntimeException { diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/TokenDecoder.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/TokenDecoder.java similarity index 93% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/TokenDecoder.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/TokenDecoder.java index bca97615..9d3b6c5a 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/TokenDecoder.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/TokenDecoder.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple; +package com.uspray.uspray.global.external.client.oauth2.apple; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleAuthCodeDto.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleAuthCodeDto.java similarity index 60% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleAuthCodeDto.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleAuthCodeDto.java index c27df153..a584d73e 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleAuthCodeDto.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleAuthCodeDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple.dto; +package com.uspray.uspray.global.external.client.oauth2.apple.dto; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleIdTokenPayload.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleIdTokenPayload.java similarity index 64% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleIdTokenPayload.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleIdTokenPayload.java index adcd711f..27d55950 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleIdTokenPayload.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleIdTokenPayload.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple.dto; +package com.uspray.uspray.global.external.client.oauth2.apple.dto; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleLoginResponseDto.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleLoginResponseDto.java similarity index 83% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleLoginResponseDto.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleLoginResponseDto.java index 80b9f6ff..4b59bc29 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleLoginResponseDto.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleLoginResponseDto.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.external.client.oauth2.apple.dto; +package com.uspray.uspray.global.external.client.oauth2.apple.dto; -import com.uspray.uspray.DTO.auth.TokenDto; +import com.uspray.uspray.global.auth.dto.member.TokenDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleProperties.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleProperties.java similarity index 87% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleProperties.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleProperties.java index 7a80b830..3b8aa9d9 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleProperties.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleProperties.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple.dto; +package com.uspray.uspray.global.external.client.oauth2.apple.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleSocialTokenInfoResponse.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleSocialTokenInfoResponse.java similarity index 87% rename from src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleSocialTokenInfoResponse.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleSocialTokenInfoResponse.java index d2a192e4..b0e762f6 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/apple/dto/AppleSocialTokenInfoResponse.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/apple/dto/AppleSocialTokenInfoResponse.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.apple.dto; +package com.uspray.uspray.global.external.client.oauth2.apple.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/dto/KakaoOAuth2UserInfo.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/KakaoOAuth2UserInfo.java similarity index 82% rename from src/main/java/com/uspray/uspray/external/client/oauth2/dto/KakaoOAuth2UserInfo.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/KakaoOAuth2UserInfo.java index 56d7548e..632a308e 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/dto/KakaoOAuth2UserInfo.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/KakaoOAuth2UserInfo.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.dto; +package com.uspray.uspray.global.external.client.oauth2.dto; import java.util.Map; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/dto/NaverOAuth2UserInfo.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/NaverOAuth2UserInfo.java similarity index 87% rename from src/main/java/com/uspray/uspray/external/client/oauth2/dto/NaverOAuth2UserInfo.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/NaverOAuth2UserInfo.java index f2d36db1..64845768 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/dto/NaverOAuth2UserInfo.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/NaverOAuth2UserInfo.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.dto; +package com.uspray.uspray.global.external.client.oauth2.dto; import java.util.Map; diff --git a/src/main/java/com/uspray/uspray/external/client/oauth2/dto/OAuth2UserInfo.java b/src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/OAuth2UserInfo.java similarity index 84% rename from src/main/java/com/uspray/uspray/external/client/oauth2/dto/OAuth2UserInfo.java rename to src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/OAuth2UserInfo.java index 1d5c4ab8..da0f9755 100644 --- a/src/main/java/com/uspray/uspray/external/client/oauth2/dto/OAuth2UserInfo.java +++ b/src/main/java/com/uspray/uspray/global/external/client/oauth2/dto/OAuth2UserInfo.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.external.client.oauth2.dto; +package com.uspray.uspray.global.external.client.oauth2.dto; import java.util.Map; diff --git a/src/main/java/com/uspray/uspray/jwt/CustomeUserDetailsService.java b/src/main/java/com/uspray/uspray/global/jwt/CustomeUserDetailsService.java similarity index 89% rename from src/main/java/com/uspray/uspray/jwt/CustomeUserDetailsService.java rename to src/main/java/com/uspray/uspray/global/jwt/CustomeUserDetailsService.java index 3fca388b..d054751a 100644 --- a/src/main/java/com/uspray/uspray/jwt/CustomeUserDetailsService.java +++ b/src/main/java/com/uspray/uspray/global/jwt/CustomeUserDetailsService.java @@ -1,7 +1,7 @@ -package com.uspray.uspray.jwt; +package com.uspray.uspray.global.jwt; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.infrastructure.MemberRepository; +import com.uspray.uspray.domain.member.model.Member; +import com.uspray.uspray.domain.member.repository.MemberRepository; import java.util.Collections; import lombok.RequiredArgsConstructor; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/uspray/uspray/jwt/JwtAccessDeniedHandler.java b/src/main/java/com/uspray/uspray/global/jwt/JwtAccessDeniedHandler.java similarity index 95% rename from src/main/java/com/uspray/uspray/jwt/JwtAccessDeniedHandler.java rename to src/main/java/com/uspray/uspray/global/jwt/JwtAccessDeniedHandler.java index 2171b2d7..c1691bfc 100644 --- a/src/main/java/com/uspray/uspray/jwt/JwtAccessDeniedHandler.java +++ b/src/main/java/com/uspray/uspray/global/jwt/JwtAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.jwt; +package com.uspray.uspray.global.jwt; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; diff --git a/src/main/java/com/uspray/uspray/jwt/JwtAuthenticationEntryPoint.java b/src/main/java/com/uspray/uspray/global/jwt/JwtAuthenticationEntryPoint.java similarity index 95% rename from src/main/java/com/uspray/uspray/jwt/JwtAuthenticationEntryPoint.java rename to src/main/java/com/uspray/uspray/global/jwt/JwtAuthenticationEntryPoint.java index a7b4a2ff..ad667d83 100644 --- a/src/main/java/com/uspray/uspray/jwt/JwtAuthenticationEntryPoint.java +++ b/src/main/java/com/uspray/uspray/global/jwt/JwtAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.jwt; +package com.uspray.uspray.global.jwt; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; diff --git a/src/main/java/com/uspray/uspray/jwt/JwtFilter.java b/src/main/java/com/uspray/uspray/global/jwt/JwtFilter.java similarity index 98% rename from src/main/java/com/uspray/uspray/jwt/JwtFilter.java rename to src/main/java/com/uspray/uspray/global/jwt/JwtFilter.java index 24f895fa..5dd4fcdc 100644 --- a/src/main/java/com/uspray/uspray/jwt/JwtFilter.java +++ b/src/main/java/com/uspray/uspray/global/jwt/JwtFilter.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.jwt; +package com.uspray.uspray.global.jwt; import lombok.RequiredArgsConstructor; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/uspray/uspray/jwt/TokenProvider.java b/src/main/java/com/uspray/uspray/global/jwt/TokenProvider.java similarity index 98% rename from src/main/java/com/uspray/uspray/jwt/TokenProvider.java rename to src/main/java/com/uspray/uspray/global/jwt/TokenProvider.java index 61cd7f7d..df43d9f0 100644 --- a/src/main/java/com/uspray/uspray/jwt/TokenProvider.java +++ b/src/main/java/com/uspray/uspray/global/jwt/TokenProvider.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.jwt; +package com.uspray.uspray.global.jwt; -import com.uspray.uspray.DTO.auth.TokenDto; +import com.uspray.uspray.global.auth.dto.member.TokenDto; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/uspray/uspray/controller/FCMController.java b/src/main/java/com/uspray/uspray/global/push/controller/FCMController.java similarity index 73% rename from src/main/java/com/uspray/uspray/controller/FCMController.java rename to src/main/java/com/uspray/uspray/global/push/controller/FCMController.java index 0621cb7a..2cc26aff 100644 --- a/src/main/java/com/uspray/uspray/controller/FCMController.java +++ b/src/main/java/com/uspray/uspray/global/push/controller/FCMController.java @@ -1,9 +1,9 @@ -package com.uspray.uspray.controller; +package com.uspray.uspray.global.push.controller; -import com.uspray.uspray.DTO.ApiResponseDto; -import com.uspray.uspray.DTO.notification.FCMNotificationRequestDto; -import com.uspray.uspray.exception.SuccessStatus; -import com.uspray.uspray.service.FCMNotificationService; +import com.uspray.uspray.global.common.dto.ApiResponseDto; +import com.uspray.uspray.global.push.dto.FCMNotificationRequestDto; +import com.uspray.uspray.global.exception.SuccessStatus; +import com.uspray.uspray.global.push.service.FCMNotificationService; import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/uspray/uspray/DTO/notification/FCMNotificationRequestDto.java b/src/main/java/com/uspray/uspray/global/push/dto/FCMNotificationRequestDto.java similarity index 89% rename from src/main/java/com/uspray/uspray/DTO/notification/FCMNotificationRequestDto.java rename to src/main/java/com/uspray/uspray/global/push/dto/FCMNotificationRequestDto.java index 8ed74aa0..d2dde4b4 100644 --- a/src/main/java/com/uspray/uspray/DTO/notification/FCMNotificationRequestDto.java +++ b/src/main/java/com/uspray/uspray/global/push/dto/FCMNotificationRequestDto.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.DTO.notification; +package com.uspray.uspray.global.push.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/uspray/uspray/domain/FCMMessage.java b/src/main/java/com/uspray/uspray/global/push/model/FCMMessage.java similarity index 93% rename from src/main/java/com/uspray/uspray/domain/FCMMessage.java rename to src/main/java/com/uspray/uspray/global/push/model/FCMMessage.java index 3766a9ac..318c1ed8 100644 --- a/src/main/java/com/uspray/uspray/domain/FCMMessage.java +++ b/src/main/java/com/uspray/uspray/global/push/model/FCMMessage.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.global.push.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/uspray/uspray/domain/NotificationLog.java b/src/main/java/com/uspray/uspray/global/push/model/NotificationLog.java similarity index 82% rename from src/main/java/com/uspray/uspray/domain/NotificationLog.java rename to src/main/java/com/uspray/uspray/global/push/model/NotificationLog.java index 652fd49a..20174ad4 100644 --- a/src/main/java/com/uspray/uspray/domain/NotificationLog.java +++ b/src/main/java/com/uspray/uspray/global/push/model/NotificationLog.java @@ -1,6 +1,8 @@ -package com.uspray.uspray.domain; +package com.uspray.uspray.global.push.model; -import com.uspray.uspray.common.domain.AuditingTimeEntity; +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 javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/src/main/java/com/uspray/uspray/infrastructure/NotificationLogRepository.java b/src/main/java/com/uspray/uspray/global/push/repository/NotificationLogRepository.java similarity index 59% rename from src/main/java/com/uspray/uspray/infrastructure/NotificationLogRepository.java rename to src/main/java/com/uspray/uspray/global/push/repository/NotificationLogRepository.java index 18e759ae..351c7916 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/NotificationLogRepository.java +++ b/src/main/java/com/uspray/uspray/global/push/repository/NotificationLogRepository.java @@ -1,6 +1,6 @@ -package com.uspray.uspray.infrastructure; +package com.uspray.uspray.global.push.repository; -import com.uspray.uspray.domain.NotificationLog; +import com.uspray.uspray.global.push.model.NotificationLog; import org.springframework.data.jpa.repository.JpaRepository; public interface NotificationLogRepository extends diff --git a/src/main/java/com/uspray/uspray/service/FCMNotificationService.java b/src/main/java/com/uspray/uspray/global/push/service/FCMNotificationService.java similarity index 96% rename from src/main/java/com/uspray/uspray/service/FCMNotificationService.java rename to src/main/java/com/uspray/uspray/global/push/service/FCMNotificationService.java index df0beffd..f365fcfe 100644 --- a/src/main/java/com/uspray/uspray/service/FCMNotificationService.java +++ b/src/main/java/com/uspray/uspray/global/push/service/FCMNotificationService.java @@ -1,10 +1,10 @@ -package com.uspray.uspray.service; +package com.uspray.uspray.global.push.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.auth.oauth2.GoogleCredentials; import com.google.common.net.HttpHeaders; -import com.uspray.uspray.domain.FCMMessage; +import com.uspray.uspray.global.push.model.FCMMessage; import java.io.IOException; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/uspray/uspray/util/CustomRequestEntityConverter.java b/src/main/java/com/uspray/uspray/global/util/CustomRequestEntityConverter.java similarity index 99% rename from src/main/java/com/uspray/uspray/util/CustomRequestEntityConverter.java rename to src/main/java/com/uspray/uspray/global/util/CustomRequestEntityConverter.java index 3e876837..5c63c86e 100644 --- a/src/main/java/com/uspray/uspray/util/CustomRequestEntityConverter.java +++ b/src/main/java/com/uspray/uspray/global/util/CustomRequestEntityConverter.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.util; +package com.uspray.uspray.global.util; import com.nimbusds.jose.util.IOUtils; import io.jsonwebtoken.JwsHeader; diff --git a/src/main/java/com/uspray/uspray/util/MaskingUtil.java b/src/main/java/com/uspray/uspray/global/util/MaskingUtil.java similarity index 93% rename from src/main/java/com/uspray/uspray/util/MaskingUtil.java rename to src/main/java/com/uspray/uspray/global/util/MaskingUtil.java index b2ea7a77..759d2c2b 100644 --- a/src/main/java/com/uspray/uspray/util/MaskingUtil.java +++ b/src/main/java/com/uspray/uspray/global/util/MaskingUtil.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.util; +package com.uspray.uspray.global.util; public class MaskingUtil { diff --git a/src/main/java/com/uspray/uspray/util/SecurityUtil.java b/src/main/java/com/uspray/uspray/global/util/SecurityUtil.java similarity index 94% rename from src/main/java/com/uspray/uspray/util/SecurityUtil.java rename to src/main/java/com/uspray/uspray/global/util/SecurityUtil.java index dad5a619..ed60cd9b 100644 --- a/src/main/java/com/uspray/uspray/util/SecurityUtil.java +++ b/src/main/java/com/uspray/uspray/global/util/SecurityUtil.java @@ -1,4 +1,4 @@ -package com.uspray.uspray.util; +package com.uspray.uspray.global.util; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/uspray/uspray/infrastructure/query/MemberQueryRepository.java b/src/main/java/com/uspray/uspray/infrastructure/query/MemberQueryRepository.java deleted file mode 100644 index dbcac2db..00000000 --- a/src/main/java/com/uspray/uspray/infrastructure/query/MemberQueryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.uspray.uspray.infrastructure.query; - -import com.uspray.uspray.domain.Member; -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -@Repository -public interface MemberQueryRepository extends JpaRepository { - - @Query("select m.firebaseToken from Member m where m.firstNotiAgree = :agree") - List getDeviceTokensByFirstNotiAgree(@Param("agree") Boolean agree); - -} diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html new file mode 100644 index 00000000..7b30b418 --- /dev/null +++ b/src/main/resources/static/index.html @@ -0,0 +1,3 @@ +Apple +Kakao +Naver \ No newline at end of file