diff --git a/.gitignore b/.gitignore index a4fc9588..241b7e57 100644 --- a/.gitignore +++ b/.gitignore @@ -18,13 +18,13 @@ derby.log # Gradle artifacts .gradle .gradletasknamecache -/build -buildSrc/build -/spring-*/build -/framework-*/build -/integration-tests/build -/src/asciidoc/build -spring-test/test-output/ +**/build +**/buildSrc/build +**/spring-*/build +**/framework-*/build +**/integration-tests/build +**/src/asciidoc/build +**/spring-test/test-output/ # Maven artifacts pom.xml @@ -104,9 +104,9 @@ local.sh .run/ # Static Resources -src/main/resources/static/* -src/test/resources/static/* -./storage +**/src/main/resources/static/docs/* +**/src/main/resources/static/oas/* +storage/* # Yml File local-docker-compose.yml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5aa1cd39..cbdb3634 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:17-jdk -ARG JAR_FILE=build/libs/*.jar +ARG JAR_FILE=get-p-api/build/libs/*.jar ADD ${JAR_FILE} app.jar ENTRYPOINT ["java", "-Duser.timezone=GMT+9", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=dev", "-jar", "/app.jar"] \ No newline at end of file diff --git a/build.gradle b/build.gradle index f73a8162..98efaa88 100644 --- a/build.gradle +++ b/build.gradle @@ -1,208 +1,77 @@ -import org.yaml.snakeyaml.DumperOptions -import org.yaml.snakeyaml.Yaml - plugins { id 'java' id 'org.springframework.boot' version '3.1.4' id 'io.spring.dependency-management' version '1.1.3' - id 'org.asciidoctor.jvm.convert' version '4.0.2' - id 'com.epages.restdocs-api-spec' version '0.18.2' -} - -group = 'es.princip' -version = '0.0.1-SNAPSHOT' - -java { - sourceCompatibility = '17' + id 'java-library' + id 'java-test-fixtures' + id 'maven-publish' } -repositories { - mavenCentral() -} +allprojects { + group = 'es.princip' + version = '0.0.1-SNAPSHOT' -configurations { - compileOnly { - extendsFrom annotationProcessor + repositories { + mavenCentral() } - asciidoctorExt -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - developmentOnly 'org.springframework.boot:spring-boot-devtools' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - - // Validation - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.apache.tika:tika-core:2.9.1' - - // Jpa - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - - // Security - implementation 'org.springframework.boot:spring-boot-starter-security' - testImplementation 'org.springframework.security:spring-security-test' - - // Jwt - implementation 'io.jsonwebtoken:jjwt-api:0.11.5' - implementation 'io.jsonwebtoken:jjwt-impl:0.11.5' - implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5' - - // Database - runtimeOnly 'com.mysql:mysql-connector-j:9.0.0' - implementation 'org.flywaydb:flyway-core' - implementation 'org.flywaydb:flyway-mysql' - - // Lombok - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testCompileOnly 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - // WebSocket - implementation 'org.springframework:spring-websocket:6.0.13' - - // QueryDSL - implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" - annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" - annotationProcessor "jakarta.annotation:jakarta.annotation-api" - annotationProcessor "jakarta.persistence:jakarta.persistence-api" - - // Redis - implementation 'org.springframework.boot:spring-boot-starter-data-redis' - - // Mail - implementation 'com.sun.mail:jakarta.mail:2.0.1' - implementation 'org.springframework.boot:spring-boot-starter-mail:3.2.1' - - // MapStruct - implementation 'org.mapstruct:mapstruct:1.6.0' - annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.0' - - // AOP - implementation 'org.springframework.boot:spring-boot-starter-aop' - - // Test Containers - testImplementation 'org.springframework.boot:spring-boot-testcontainers' - testImplementation 'org.testcontainers:testcontainers:1.19.3' - testImplementation 'org.testcontainers:junit-jupiter:1.19.3' - testImplementation 'org.testcontainers:mysql:1.20.0' - - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1' - - // Swagger - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0' - testImplementation 'com.epages:restdocs-api-spec-mockmvc:0.18.2' - - // Monitoring - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' - - // Spring REST Docs - asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor' - testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' } -ext { - snippetsDir = file('build/generated-snippets') -} - -test { - outputs.dir snippetsDir - useJUnitPlatform() -} - -asciidoctor { - inputs.dir snippetsDir - configurations 'asciidoctorExt' - dependsOn test - sources { - include('**/index.adoc') +subprojects { + apply plugin: 'java' + apply plugin: 'org.springframework.boot' + apply plugin: 'io.spring.dependency-management' + apply plugin: 'java-library' + apply plugin: 'java-test-fixtures' + apply plugin: 'maven-publish' + + java { + sourceCompatibility = '17' + targetCompatibility = '17' } - baseDirFollowsSourceFile() -} -tasks.register('copyDocument', Copy) { - dependsOn asciidoctor - doFirst { - delete file('src/main/resources/static/docs') + configurations { + compileOnly { + extendsFrom annotationProcessor + } } - from asciidoctor.outputDir - into file('src/main/resources/static/docs') -} -openapi3 { - servers = [ - { - url = 'https://api.principes.xyz' - description = '개발 서버' - }, - { - url = 'http://localhost:57020' - description = '로컬 서버' - } - ] - title = 'GET-P API' - description = 'GET-P API 명세서' - version = '0.1.0' - format = 'yaml' -} + test { + useJUnitPlatform() + } -tasks.register('addSecurityConfig') { - dependsOn('openapi3') - doFirst { - def path = "${openapi3.outputDirectory}/openapi3.yaml" - def yaml = new Yaml() - def file = new File(path) - def data = yaml.load(new InputStreamReader(new FileInputStream(new File(path)), 'UTF-8')) + tasks.register('copyTestResults', Copy) { + from 'build/test-results' + into '../build/test-results' + include '**/*.xml' + } - def components = data?.components ?: [:] - def JWT = [ - type: 'http', - scheme: 'bearer', - bearerFormat: 'JWT' - ] - def security = [[JWT: []]] - def securitySchemas = [JWT: JWT] + test.finalizedBy(copyTestResults) - components.securitySchemes = securitySchemas - data.security = security + dependencies { + // Lombok 라이브러리 + compileOnly 'org.projectlombok:lombok:1.18.34' + annotationProcessor 'org.projectlombok:lombok:1.18.34' + testCompileOnly 'org.projectlombok:lombok:1.18.34' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.34' - def options = new DumperOptions().with { - defaultFlowStyle = DumperOptions.FlowStyle.BLOCK - prettyFlow = true - indent = 2 - it - } - def converted = new Yaml(options) - def writer = new OutputStreamWriter(new FileOutputStream(file), 'UTF-8') + // MapStruct 라이브러리 + implementation 'org.mapstruct:mapstruct:1.6.0' + annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.0' - converted.dump(data, writer) - } -} + // Jackson 라이브러리 + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1' -tasks.register('copyOas', Copy) { - dependsOn('addSecurityConfig') - doFirst { - delete file('src/main/resources/static/oas') + // 테스트 프레임워크 + testImplementation 'org.springframework.boot:spring-boot-starter-test:3.3.5' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } - from openapi3.outputDirectory - into file('src/main/resources/static/oas') } -build { - dependsOn copyDocument - dependsOn copyOas +bootJar { + enabled = false } -bootJar { - dependsOn copyDocument - dependsOn copyOas - from (asciidoctor.outputDir) { - into 'static/docs' - } - from (openapi3.outputDirectory) { - into 'static/oas' - } +jar { + enabled = true } \ No newline at end of file diff --git a/get-p-api/build.gradle b/get-p-api/build.gradle new file mode 100644 index 00000000..0bd333c3 --- /dev/null +++ b/get-p-api/build.gradle @@ -0,0 +1,153 @@ +import org.yaml.snakeyaml.DumperOptions +import org.yaml.snakeyaml.Yaml + +plugins { + id 'org.asciidoctor.jvm.convert' version '4.0.2' + id 'com.epages.restdocs-api-spec' version '0.18.2' +} + +configurations { + asciidoctorExt +} + +dependencies { + // 모듈 의존성 + implementation(project(':get-p-domain')) + testImplementation(testFixtures(project(':get-p-domain'))) + implementation(project(':get-p-application')) + implementation(project(':get-p-persistence')) + implementation(project(':get-p-infrastructure')) + + // Spring 개발 도구 + developmentOnly 'org.springframework.boot:spring-boot-devtools:3.3.5' + + // Spring Web + implementation 'org.springframework.boot:spring-boot-starter-web:3.3.5' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.3.5' + + // Spring Validation + implementation 'org.springframework.boot:spring-boot-starter-validation:3.3.5' + + // Spring Security + implementation 'org.springframework.boot:spring-boot-starter-security:3.3.5' + testImplementation 'org.springframework.security:spring-security-test:6.3.4' + + // Spring Data + implementation 'org.springframework.data:spring-data-commons' + + // JWT + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + implementation 'io.jsonwebtoken:jjwt-impl:0.11.5' + implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // Spring REST Docs + asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor:3.0.2' + testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:3.0.2' + testImplementation 'com.epages:restdocs-api-spec-mockmvc:0.18.2' + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0' + + // 모니터링 + implementation 'org.springframework.boot:spring-boot-starter-actuator:3.3.5' + implementation 'io.micrometer:micrometer-registry-prometheus:1.13.6' +} + +ext { + snippetsDir = file('build/generated-snippets') +} + +test { + outputs.dir snippetsDir +} + +asciidoctor { + inputs.dir snippetsDir + configurations 'asciidoctorExt' + dependsOn test + baseDirFollowsSourceFile() +} + +tasks.register('copyDocument', Copy) { + dependsOn asciidoctor + doFirst { + delete file('src/main/resources/static/docs') + } + from asciidoctor.outputDir + into file('src/main/resources/static/docs') +} + +openapi3 { + servers = [ + { + url = 'https://api.principes.xyz' + description = '개발 서버' + }, + { + url = 'http://localhost:57020' + description = '로컬 서버' + } + ] + title = 'GET-P API' + description = 'GET-P API 명세서' + version = '0.1.0' + format = 'yaml' +} + +tasks.register('addSecurityConfig') { + dependsOn('openapi3') + doFirst { + def path = "${projectDir}/${openapi3.outputDirectory}/openapi3.yaml" + def yaml = new Yaml() + def file = new File(path) + def data = yaml.load(new InputStreamReader(new FileInputStream(new File(path)), 'UTF-8')) + + def components = data?.components ?: [:] + def JWT = [ + type: 'http', + scheme: 'bearer', + bearerFormat: 'JWT' + ] + def security = [[JWT: []]] + def securitySchemas = [JWT: JWT] + + components.securitySchemes = securitySchemas + data.security = security + + def options = new DumperOptions().with { + defaultFlowStyle = DumperOptions.FlowStyle.BLOCK + prettyFlow = true + indent = 2 + it + } + def converted = new Yaml(options) + def writer = new OutputStreamWriter(new FileOutputStream(file), 'UTF-8') + + converted.dump(data, writer) + } +} + +tasks.register('copyOas', Copy) { + dependsOn('addSecurityConfig') + doFirst { + delete file('src/main/resources/static/oas') + } + from openapi3.outputDirectory + into file('src/main/resources/static/oas') +} + +bootJar { + dependsOn copyDocument + dependsOn copyOas + from(asciidoctor.outputDir) { + into 'static/docs' + } + from(openapi3.outputDirectory) { + into 'static/oas' + } +} + +build { + dependsOn copyDocument + dependsOn copyOas +} \ No newline at end of file diff --git a/src/docs/asciidoc/auth/login.adoc b/get-p-api/src/docs/asciidoc/auth/login.adoc similarity index 100% rename from src/docs/asciidoc/auth/login.adoc rename to get-p-api/src/docs/asciidoc/auth/login.adoc diff --git a/src/docs/asciidoc/auth/reissue-access-token.adoc b/get-p-api/src/docs/asciidoc/auth/reissue-access-token.adoc similarity index 100% rename from src/docs/asciidoc/auth/reissue-access-token.adoc rename to get-p-api/src/docs/asciidoc/auth/reissue-access-token.adoc diff --git a/src/docs/asciidoc/auth/send-email-verification-code-for-sign-up.adoc b/get-p-api/src/docs/asciidoc/auth/send-email-verification-code-for-sign-up.adoc similarity index 100% rename from src/docs/asciidoc/auth/send-email-verification-code-for-sign-up.adoc rename to get-p-api/src/docs/asciidoc/auth/send-email-verification-code-for-sign-up.adoc diff --git a/src/docs/asciidoc/auth/signup.adoc b/get-p-api/src/docs/asciidoc/auth/signup.adoc similarity index 100% rename from src/docs/asciidoc/auth/signup.adoc rename to get-p-api/src/docs/asciidoc/auth/signup.adoc diff --git a/src/docs/asciidoc/client/edit-my-client.adoc b/get-p-api/src/docs/asciidoc/client/edit-my-client.adoc similarity index 100% rename from src/docs/asciidoc/client/edit-my-client.adoc rename to get-p-api/src/docs/asciidoc/client/edit-my-client.adoc diff --git a/src/docs/asciidoc/client/get-my-client.adoc b/get-p-api/src/docs/asciidoc/client/get-my-client.adoc similarity index 100% rename from src/docs/asciidoc/client/get-my-client.adoc rename to get-p-api/src/docs/asciidoc/client/get-my-client.adoc diff --git a/src/docs/asciidoc/client/register-my-client.adoc b/get-p-api/src/docs/asciidoc/client/register-my-client.adoc similarity index 100% rename from src/docs/asciidoc/client/register-my-client.adoc rename to get-p-api/src/docs/asciidoc/client/register-my-client.adoc diff --git a/src/docs/asciidoc/common/query-parameters-description.adoc b/get-p-api/src/docs/asciidoc/common/query-parameters-description.adoc similarity index 100% rename from src/docs/asciidoc/common/query-parameters-description.adoc rename to get-p-api/src/docs/asciidoc/common/query-parameters-description.adoc diff --git a/src/docs/asciidoc/common/sort-parameters-description.adoc b/get-p-api/src/docs/asciidoc/common/sort-parameters-description.adoc similarity index 100% rename from src/docs/asciidoc/common/sort-parameters-description.adoc rename to get-p-api/src/docs/asciidoc/common/sort-parameters-description.adoc diff --git a/src/docs/asciidoc/index.adoc b/get-p-api/src/docs/asciidoc/index.adoc similarity index 100% rename from src/docs/asciidoc/index.adoc rename to get-p-api/src/docs/asciidoc/index.adoc diff --git a/src/docs/asciidoc/like/like-people.adoc b/get-p-api/src/docs/asciidoc/like/like-people.adoc similarity index 100% rename from src/docs/asciidoc/like/like-people.adoc rename to get-p-api/src/docs/asciidoc/like/like-people.adoc diff --git a/src/docs/asciidoc/like/like-project.adoc b/get-p-api/src/docs/asciidoc/like/like-project.adoc similarity index 100% rename from src/docs/asciidoc/like/like-project.adoc rename to get-p-api/src/docs/asciidoc/like/like-project.adoc diff --git a/src/docs/asciidoc/like/unlike-people.adoc b/get-p-api/src/docs/asciidoc/like/unlike-people.adoc similarity index 100% rename from src/docs/asciidoc/like/unlike-people.adoc rename to get-p-api/src/docs/asciidoc/like/unlike-people.adoc diff --git a/src/docs/asciidoc/like/unlike-project.adoc b/get-p-api/src/docs/asciidoc/like/unlike-project.adoc similarity index 100% rename from src/docs/asciidoc/like/unlike-project.adoc rename to get-p-api/src/docs/asciidoc/like/unlike-project.adoc diff --git a/src/docs/asciidoc/member/get-my-member.adoc b/get-p-api/src/docs/asciidoc/member/get-my-member.adoc similarity index 100% rename from src/docs/asciidoc/member/get-my-member.adoc rename to get-p-api/src/docs/asciidoc/member/get-my-member.adoc diff --git a/src/docs/asciidoc/member/upload-profile-image.adoc b/get-p-api/src/docs/asciidoc/member/upload-profile-image.adoc similarity index 100% rename from src/docs/asciidoc/member/upload-profile-image.adoc rename to get-p-api/src/docs/asciidoc/member/upload-profile-image.adoc diff --git a/src/docs/asciidoc/people/edit-my-people-profile.adoc b/get-p-api/src/docs/asciidoc/people/edit-my-people-profile.adoc similarity index 100% rename from src/docs/asciidoc/people/edit-my-people-profile.adoc rename to get-p-api/src/docs/asciidoc/people/edit-my-people-profile.adoc diff --git a/src/docs/asciidoc/people/edit-my-people.adoc b/get-p-api/src/docs/asciidoc/people/edit-my-people.adoc similarity index 100% rename from src/docs/asciidoc/people/edit-my-people.adoc rename to get-p-api/src/docs/asciidoc/people/edit-my-people.adoc diff --git a/src/docs/asciidoc/people/get-my-people-profile.adoc b/get-p-api/src/docs/asciidoc/people/get-my-people-profile.adoc similarity index 100% rename from src/docs/asciidoc/people/get-my-people-profile.adoc rename to get-p-api/src/docs/asciidoc/people/get-my-people-profile.adoc diff --git a/src/docs/asciidoc/people/get-my-people.adoc b/get-p-api/src/docs/asciidoc/people/get-my-people.adoc similarity index 100% rename from src/docs/asciidoc/people/get-my-people.adoc rename to get-p-api/src/docs/asciidoc/people/get-my-people.adoc diff --git a/src/docs/asciidoc/people/get-people-list.adoc b/get-p-api/src/docs/asciidoc/people/get-people-list.adoc similarity index 100% rename from src/docs/asciidoc/people/get-people-list.adoc rename to get-p-api/src/docs/asciidoc/people/get-people-list.adoc diff --git a/src/docs/asciidoc/people/get-people.adoc b/get-p-api/src/docs/asciidoc/people/get-people.adoc similarity index 100% rename from src/docs/asciidoc/people/get-people.adoc rename to get-p-api/src/docs/asciidoc/people/get-people.adoc diff --git a/src/docs/asciidoc/people/register-my-people-profile.adoc b/get-p-api/src/docs/asciidoc/people/register-my-people-profile.adoc similarity index 100% rename from src/docs/asciidoc/people/register-my-people-profile.adoc rename to get-p-api/src/docs/asciidoc/people/register-my-people-profile.adoc diff --git a/src/docs/asciidoc/people/register-my-people.adoc b/get-p-api/src/docs/asciidoc/people/register-my-people.adoc similarity index 100% rename from src/docs/asciidoc/people/register-my-people.adoc rename to get-p-api/src/docs/asciidoc/people/register-my-people.adoc diff --git a/src/docs/asciidoc/project/apply-project-as-individual.adoc b/get-p-api/src/docs/asciidoc/project/apply-project-as-individual.adoc similarity index 100% rename from src/docs/asciidoc/project/apply-project-as-individual.adoc rename to get-p-api/src/docs/asciidoc/project/apply-project-as-individual.adoc diff --git a/src/docs/asciidoc/project/apply-project-as-team.adoc b/get-p-api/src/docs/asciidoc/project/apply-project-as-team.adoc similarity index 100% rename from src/docs/asciidoc/project/apply-project-as-team.adoc rename to get-p-api/src/docs/asciidoc/project/apply-project-as-team.adoc diff --git a/src/docs/asciidoc/project/approve-teammate.adoc b/get-p-api/src/docs/asciidoc/project/approve-teammate.adoc similarity index 100% rename from src/docs/asciidoc/project/approve-teammate.adoc rename to get-p-api/src/docs/asciidoc/project/approve-teammate.adoc diff --git a/src/docs/asciidoc/project/commission-project.adoc b/get-p-api/src/docs/asciidoc/project/commission-project.adoc similarity index 100% rename from src/docs/asciidoc/project/commission-project.adoc rename to get-p-api/src/docs/asciidoc/project/commission-project.adoc diff --git a/src/docs/asciidoc/project/get-applicants.adoc b/get-p-api/src/docs/asciidoc/project/get-applicants.adoc similarity index 100% rename from src/docs/asciidoc/project/get-applicants.adoc rename to get-p-api/src/docs/asciidoc/project/get-applicants.adoc diff --git a/src/docs/asciidoc/project/get-application-detail.adoc b/get-p-api/src/docs/asciidoc/project/get-application-detail.adoc similarity index 100% rename from src/docs/asciidoc/project/get-application-detail.adoc rename to get-p-api/src/docs/asciidoc/project/get-application-detail.adoc diff --git a/src/docs/asciidoc/project/get-application-form.adoc b/get-p-api/src/docs/asciidoc/project/get-application-form.adoc similarity index 100% rename from src/docs/asciidoc/project/get-application-form.adoc rename to get-p-api/src/docs/asciidoc/project/get-application-form.adoc diff --git a/src/docs/asciidoc/project/get-project.adoc b/get-p-api/src/docs/asciidoc/project/get-project.adoc similarity index 100% rename from src/docs/asciidoc/project/get-project.adoc rename to get-p-api/src/docs/asciidoc/project/get-project.adoc diff --git a/src/docs/asciidoc/project/get-projects.adoc b/get-p-api/src/docs/asciidoc/project/get-projects.adoc similarity index 100% rename from src/docs/asciidoc/project/get-projects.adoc rename to get-p-api/src/docs/asciidoc/project/get-projects.adoc diff --git a/src/docs/asciidoc/project/schedule-meeting.adoc b/get-p-api/src/docs/asciidoc/project/schedule-meeting.adoc similarity index 100% rename from src/docs/asciidoc/project/schedule-meeting.adoc rename to get-p-api/src/docs/asciidoc/project/schedule-meeting.adoc diff --git a/src/docs/asciidoc/project/search-teammates.adoc b/get-p-api/src/docs/asciidoc/project/search-teammates.adoc similarity index 100% rename from src/docs/asciidoc/project/search-teammates.adoc rename to get-p-api/src/docs/asciidoc/project/search-teammates.adoc diff --git a/src/docs/asciidoc/storage/upload-file.adoc b/get-p-api/src/docs/asciidoc/storage/upload-file.adoc similarity index 100% rename from src/docs/asciidoc/storage/upload-file.adoc rename to get-p-api/src/docs/asciidoc/storage/upload-file.adoc diff --git a/src/main/java/es/princip/getp/GetpServerApplication.java b/get-p-api/src/main/java/es/princip/getp/GetpServerApplication.java similarity index 100% rename from src/main/java/es/princip/getp/GetpServerApplication.java rename to get-p-api/src/main/java/es/princip/getp/GetpServerApplication.java diff --git a/src/main/java/es/princip/getp/api/controller/auth/AuthController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/AuthController.java similarity index 90% rename from src/main/java/es/princip/getp/api/controller/auth/AuthController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/auth/AuthController.java index 30f62139..8ba287a0 100644 --- a/src/main/java/es/princip/getp/api/controller/auth/AuthController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/AuthController.java @@ -1,7 +1,7 @@ package es.princip.getp.api.controller.auth; import es.princip.getp.api.controller.auth.dto.request.LoginRequest; -import es.princip.getp.api.controller.auth.dto.response.Token; +import es.princip.getp.application.auth.dto.response.Token; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.auth.service.AuthService; @@ -31,7 +31,9 @@ public class AuthController { */ @PostMapping("/login") public ResponseEntity> login(@RequestBody @Valid final LoginRequest request) { - final Token token = authService.login(request); + final String email = request.email(); + final String password = request.password(); + final Token token = authService.login(email, password); final String authorization = token.grantType() + " " + token.accessToken(); return ResponseEntity.status(HttpStatus.CREATED) .header(HttpHeaders.AUTHORIZATION, authorization) diff --git a/src/main/java/es/princip/getp/api/controller/auth/SignUpCommandMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/SignUpCommandMapper.java similarity index 91% rename from src/main/java/es/princip/getp/api/controller/auth/SignUpCommandMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/auth/SignUpCommandMapper.java index 2196a42d..57205b6f 100644 --- a/src/main/java/es/princip/getp/api/controller/auth/SignUpCommandMapper.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/SignUpCommandMapper.java @@ -2,7 +2,7 @@ import es.princip.getp.api.controller.auth.dto.request.ServiceTermAgreementRequest; import es.princip.getp.api.controller.auth.dto.request.SignUpRequest; -import es.princip.getp.application.auth.command.SignUpCommand; +import es.princip.getp.application.auth.dto.command.SignUpCommand; import es.princip.getp.domain.member.model.ServiceTermAgreementData; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/es/princip/getp/api/controller/auth/SignUpController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/SignUpController.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/auth/SignUpController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/auth/SignUpController.java diff --git a/src/main/java/es/princip/getp/api/controller/auth/dto/request/EmailVerificationCodeRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/EmailVerificationCodeRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/auth/dto/request/EmailVerificationCodeRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/EmailVerificationCodeRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/auth/dto/request/LoginRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/LoginRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/auth/dto/request/LoginRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/LoginRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/auth/dto/request/ServiceTermAgreementRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/ServiceTermAgreementRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/auth/dto/request/ServiceTermAgreementRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/ServiceTermAgreementRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/auth/dto/request/SignUpRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/SignUpRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/auth/dto/request/SignUpRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/auth/dto/request/SignUpRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/client/command/MyClientController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/client/command/MyClientController.java similarity index 90% rename from src/main/java/es/princip/getp/api/controller/client/command/MyClientController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/client/command/MyClientController.java index ec2ad140..ee63a0a3 100644 --- a/src/main/java/es/princip/getp/api/controller/client/command/MyClientController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/client/command/MyClientController.java @@ -2,12 +2,12 @@ import es.princip.getp.api.controller.client.command.dto.request.EditMyClientRequest; import es.princip.getp.api.controller.client.command.dto.request.RegisterMyClientRequest; -import es.princip.getp.api.controller.client.command.dto.response.RegisterMyClientResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.client.dto.response.RegisterMyClientResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.application.client.command.EditClientCommand; -import es.princip.getp.application.client.command.RegisterClientCommand; +import es.princip.getp.application.client.dto.command.EditClientCommand; +import es.princip.getp.application.client.dto.command.RegisterClientCommand; import es.princip.getp.application.client.port.in.EditClientUseCase; import es.princip.getp.application.client.port.in.RegisterClientUseCase; import es.princip.getp.domain.member.model.Member; diff --git a/src/main/java/es/princip/getp/api/controller/client/command/dto/request/EditMyClientRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/client/command/dto/request/EditMyClientRequest.java similarity index 93% rename from src/main/java/es/princip/getp/api/controller/client/command/dto/request/EditMyClientRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/client/command/dto/request/EditMyClientRequest.java index 1909e5e6..5905f3c7 100644 --- a/src/main/java/es/princip/getp/api/controller/client/command/dto/request/EditMyClientRequest.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/client/command/dto/request/EditMyClientRequest.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.client.command.dto.request; -import es.princip.getp.application.client.command.EditClientCommand; +import es.princip.getp.application.client.dto.command.EditClientCommand; import es.princip.getp.domain.client.model.Address; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.EmailPattern; diff --git a/src/main/java/es/princip/getp/api/controller/client/command/dto/request/RegisterMyClientRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/client/command/dto/request/RegisterMyClientRequest.java similarity index 93% rename from src/main/java/es/princip/getp/api/controller/client/command/dto/request/RegisterMyClientRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/client/command/dto/request/RegisterMyClientRequest.java index 15390412..ad7be439 100644 --- a/src/main/java/es/princip/getp/api/controller/client/command/dto/request/RegisterMyClientRequest.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/client/command/dto/request/RegisterMyClientRequest.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.client.command.dto.request; -import es.princip.getp.application.client.command.RegisterClientCommand; +import es.princip.getp.application.client.dto.command.RegisterClientCommand; import es.princip.getp.domain.client.model.Address; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.EmailPattern; diff --git a/src/main/java/es/princip/getp/api/controller/client/query/ClientQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/client/query/ClientQueryController.java similarity index 95% rename from src/main/java/es/princip/getp/api/controller/client/query/ClientQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/client/query/ClientQueryController.java index 244cd921..349e0a7c 100644 --- a/src/main/java/es/princip/getp/api/controller/client/query/ClientQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/client/query/ClientQueryController.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.client.query; -import es.princip.getp.api.controller.client.query.dto.ClientResponse; +import es.princip.getp.application.client.dto.response.ClientResponse; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.client.port.out.ClientQuery; diff --git a/src/main/java/es/princip/getp/api/controller/client/query/MyClientQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/client/query/MyClientQueryController.java similarity index 91% rename from src/main/java/es/princip/getp/api/controller/client/query/MyClientQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/client/query/MyClientQueryController.java index 64c9dc54..22a76249 100644 --- a/src/main/java/es/princip/getp/api/controller/client/query/MyClientQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/client/query/MyClientQueryController.java @@ -1,7 +1,7 @@ package es.princip.getp.api.controller.client.query; -import es.princip.getp.api.controller.client.query.dto.ClientResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.client.dto.response.ClientResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.client.port.out.ClientQuery; diff --git a/src/main/java/es/princip/getp/api/controller/common/mapper/HashtagMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/HashtagMapper.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/common/mapper/HashtagMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/HashtagMapper.java diff --git a/src/main/java/es/princip/getp/api/controller/common/mapper/PhoneNumberMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/PhoneNumberMapper.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/common/mapper/PhoneNumberMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/PhoneNumberMapper.java diff --git a/src/main/java/es/princip/getp/api/controller/common/mapper/TechStackMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/TechStackMapper.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/common/mapper/TechStackMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/TechStackMapper.java diff --git a/src/main/java/es/princip/getp/api/controller/common/mapper/URLMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/URLMapper.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/common/mapper/URLMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/common/mapper/URLMapper.java diff --git a/src/main/java/es/princip/getp/api/controller/like/command/PeopleLikeController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/like/command/PeopleLikeController.java similarity index 97% rename from src/main/java/es/princip/getp/api/controller/like/command/PeopleLikeController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/like/command/PeopleLikeController.java index 4e5cb549..dbe3a0bc 100644 --- a/src/main/java/es/princip/getp/api/controller/like/command/PeopleLikeController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/like/command/PeopleLikeController.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.like.command; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.like.people.port.in.LikePeopleUseCase; diff --git a/src/main/java/es/princip/getp/api/controller/like/command/ProjectLikeController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/like/command/ProjectLikeController.java similarity index 97% rename from src/main/java/es/princip/getp/api/controller/like/command/ProjectLikeController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/like/command/ProjectLikeController.java index 94e9af42..516a70b7 100644 --- a/src/main/java/es/princip/getp/api/controller/like/command/ProjectLikeController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/like/command/ProjectLikeController.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.like.command; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.like.project.port.in.LikeProjectUseCase; diff --git a/src/main/java/es/princip/getp/api/controller/member/command/MyMemberController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/member/command/MyMemberController.java similarity index 89% rename from src/main/java/es/princip/getp/api/controller/member/command/MyMemberController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/member/command/MyMemberController.java index 910420db..0a0fe763 100644 --- a/src/main/java/es/princip/getp/api/controller/member/command/MyMemberController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/member/command/MyMemberController.java @@ -1,10 +1,10 @@ package es.princip.getp.api.controller.member.command; -import es.princip.getp.api.controller.member.command.dto.response.ProfileImageResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.member.dto.response.ProfileImageResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.application.member.command.RegisterProfileImageCommand; +import es.princip.getp.application.member.dto.command.RegisterProfileImageCommand; import es.princip.getp.application.member.port.in.ProfileImageUseCase; import es.princip.getp.domain.member.model.MemberId; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/es/princip/getp/api/controller/member/query/MyMemberQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/member/query/MyMemberQueryController.java similarity index 88% rename from src/main/java/es/princip/getp/api/controller/member/query/MyMemberQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/member/query/MyMemberQueryController.java index 8085cd8f..cef2e57f 100644 --- a/src/main/java/es/princip/getp/api/controller/member/query/MyMemberQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/member/query/MyMemberQueryController.java @@ -1,8 +1,8 @@ package es.princip.getp.api.controller.member.query; import es.princip.getp.api.support.dto.ApiResponse; -import es.princip.getp.api.controller.member.query.dto.response.MemberResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.member.dto.response.MemberResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.domain.member.model.Member; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleController.java similarity index 89% rename from src/main/java/es/princip/getp/api/controller/people/command/MyPeopleController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleController.java index f546d792..9cb953b2 100644 --- a/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleController.java @@ -2,12 +2,12 @@ import es.princip.getp.api.controller.people.command.dto.request.EditPeopleRequest; import es.princip.getp.api.controller.people.command.dto.request.RegisterPeopleRequest; -import es.princip.getp.api.controller.people.command.dto.response.RegisterPeopleResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.people.dto.response.people.RegisterPeopleResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.application.people.command.EditPeopleCommand; -import es.princip.getp.application.people.command.RegisterPeopleCommand; +import es.princip.getp.application.people.dto.command.EditPeopleCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleCommand; import es.princip.getp.application.people.port.in.EditPeopleUseCase; import es.princip.getp.application.people.port.in.RegisterPeopleUseCase; import es.princip.getp.domain.member.model.Member; diff --git a/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleProfileController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleProfileController.java similarity index 92% rename from src/main/java/es/princip/getp/api/controller/people/command/MyPeopleProfileController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleProfileController.java index 41a9890b..b5e03a62 100644 --- a/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleProfileController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/MyPeopleProfileController.java @@ -2,11 +2,11 @@ import es.princip.getp.api.controller.people.command.dto.request.EditPeopleProfileRequest; import es.princip.getp.api.controller.people.command.dto.request.RegisterPeopleProfileRequest; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.application.people.command.EditPeopleProfileCommand; -import es.princip.getp.application.people.command.RegisterPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.EditPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleProfileCommand; import es.princip.getp.application.people.port.in.EditPeopleProfileUseCase; import es.princip.getp.application.people.port.in.RegisterPeopleProfileUseCase; import es.princip.getp.domain.member.model.MemberId; diff --git a/src/main/java/es/princip/getp/api/controller/people/command/PeopleCommandMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/PeopleCommandMapper.java similarity index 89% rename from src/main/java/es/princip/getp/api/controller/people/command/PeopleCommandMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/PeopleCommandMapper.java index b994af5c..2398e447 100644 --- a/src/main/java/es/princip/getp/api/controller/people/command/PeopleCommandMapper.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/PeopleCommandMapper.java @@ -6,8 +6,8 @@ import es.princip.getp.api.controller.people.command.dto.request.EditPeopleProfileRequest; import es.princip.getp.api.controller.people.command.dto.request.PortfolioRequest; import es.princip.getp.api.controller.people.command.dto.request.RegisterPeopleProfileRequest; -import es.princip.getp.application.people.command.EditPeopleProfileCommand; -import es.princip.getp.application.people.command.RegisterPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.EditPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleProfileCommand; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.model.PeopleId; import es.princip.getp.domain.people.model.Portfolio; diff --git a/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleProfileRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleProfileRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleProfileRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleProfileRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleRequest.java similarity index 92% rename from src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleRequest.java index 15039158..2d25ce2d 100644 --- a/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleRequest.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/EditPeopleRequest.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.people.command.dto.request; -import es.princip.getp.application.people.command.EditPeopleCommand; +import es.princip.getp.application.people.dto.command.EditPeopleCommand; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.EmailPattern; import es.princip.getp.domain.common.model.PhoneNumber; diff --git a/src/main/java/es/princip/getp/api/controller/people/command/dto/request/PortfolioRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/PortfolioRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/people/command/dto/request/PortfolioRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/PortfolioRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleProfileRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleProfileRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleProfileRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleProfileRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleRequest.java similarity index 92% rename from src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleRequest.java index 650bca36..7948e347 100644 --- a/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleRequest.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/command/dto/request/RegisterPeopleRequest.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.people.command.dto.request; -import es.princip.getp.application.people.command.RegisterPeopleCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleCommand; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.EmailPattern; import es.princip.getp.domain.common.model.PhoneNumber; diff --git a/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryController.java similarity index 92% rename from src/main/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryController.java index 1e70fb4d..42f8ef95 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryController.java @@ -1,7 +1,7 @@ package es.princip.getp.api.controller.people.query; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.people.port.in.GetMyPeopleQuery; diff --git a/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleQueryController.java similarity index 91% rename from src/main/java/es/princip/getp/api/controller/people/query/MyPeopleQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleQueryController.java index c6aaab5a..913fb7eb 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/query/MyPeopleQueryController.java @@ -1,7 +1,7 @@ package es.princip.getp.api.controller.people.query; -import es.princip.getp.api.controller.people.query.dto.people.MyPeopleResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.people.dto.response.people.MyPeopleResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.people.port.in.GetMyPeopleQuery; diff --git a/src/main/java/es/princip/getp/api/controller/people/query/PeopleQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/people/query/PeopleQueryController.java similarity index 87% rename from src/main/java/es/princip/getp/api/controller/people/query/PeopleQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/people/query/PeopleQueryController.java index 76108bc7..3438f7bf 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/PeopleQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/people/query/PeopleQueryController.java @@ -1,15 +1,15 @@ package es.princip.getp.api.controller.people.query; -import es.princip.getp.api.controller.people.query.dto.people.CardPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.api.security.details.PrincipalDetails; import es.princip.getp.api.support.ControllerSupport; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.api.support.dto.PageResponse; -import es.princip.getp.application.people.command.GetPeopleCommand; -import es.princip.getp.application.people.command.PeopleSearchFilter; +import es.princip.getp.application.auth.service.PrincipalDetails; +import es.princip.getp.application.people.dto.command.GetPeopleCommand; +import es.princip.getp.application.people.dto.command.PeopleSearchFilter; +import es.princip.getp.application.people.dto.response.people.CardPeopleResponse; +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; import es.princip.getp.application.people.port.in.GetPeopleQuery; +import es.princip.getp.application.support.dto.PageResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.people.model.PeopleId; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/es/princip/getp/api/controller/project/command/ApproveTeammateController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ApproveTeammateController.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/project/command/ApproveTeammateController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ApproveTeammateController.java diff --git a/src/main/java/es/princip/getp/api/controller/project/command/ProjectApplicationController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectApplicationController.java similarity index 89% rename from src/main/java/es/princip/getp/api/controller/project/command/ProjectApplicationController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectApplicationController.java index c9c2cb3d..67901a6d 100644 --- a/src/main/java/es/princip/getp/api/controller/project/command/ProjectApplicationController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectApplicationController.java @@ -1,11 +1,11 @@ package es.princip.getp.api.controller.project.command; import es.princip.getp.api.controller.project.command.dto.request.ApplyProjectRequest; -import es.princip.getp.api.controller.project.command.dto.response.ApplyProjectResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.project.apply.dto.response.ApplyProjectResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.application.project.apply.command.ApplyProjectCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectCommand; import es.princip.getp.application.project.apply.port.in.ApplyProjectUseCase; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.apply.model.ProjectApplicationId; diff --git a/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommandMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommandMapper.java similarity index 86% rename from src/main/java/es/princip/getp/api/controller/project/command/ProjectCommandMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommandMapper.java index 0b9fb6c0..b330f01d 100644 --- a/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommandMapper.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommandMapper.java @@ -5,11 +5,11 @@ import es.princip.getp.api.controller.common.mapper.URLMapper; import es.princip.getp.api.controller.people.command.PeopleCommandMapper; import es.princip.getp.api.controller.project.command.dto.request.*; -import es.princip.getp.application.project.apply.command.ApplyProjectAsIndividualCommand; -import es.princip.getp.application.project.apply.command.ApplyProjectAsTeamCommand; -import es.princip.getp.application.project.apply.command.ApplyProjectCommand; -import es.princip.getp.application.project.commission.command.CommissionProjectCommand; -import es.princip.getp.application.project.meeting.command.ScheduleMeetingCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectAsIndividualCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectAsTeamCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectCommand; +import es.princip.getp.application.project.commission.dto.command.CommissionProjectCommand; +import es.princip.getp.application.project.meeting.dto.command.ScheduleMeetingCommand; import es.princip.getp.domain.common.model.AttachmentFile; import es.princip.getp.domain.common.model.URL; import es.princip.getp.domain.member.model.Member; diff --git a/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommissionController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommissionController.java similarity index 90% rename from src/main/java/es/princip/getp/api/controller/project/command/ProjectCommissionController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommissionController.java index 0b15c6ad..4aa11f27 100644 --- a/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommissionController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectCommissionController.java @@ -1,11 +1,11 @@ package es.princip.getp.api.controller.project.command; import es.princip.getp.api.controller.project.command.dto.request.CommissionProjectRequest; -import es.princip.getp.api.controller.project.command.dto.response.CommissionProjectResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.project.commission.dto.response.CommissionProjectResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.application.project.commission.command.CommissionProjectCommand; +import es.princip.getp.application.project.commission.dto.command.CommissionProjectCommand; import es.princip.getp.application.project.commission.port.in.CommissionProjectUseCase; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/src/main/java/es/princip/getp/api/controller/project/command/ProjectMeetingController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectMeetingController.java similarity index 89% rename from src/main/java/es/princip/getp/api/controller/project/command/ProjectMeetingController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectMeetingController.java index d80d3fe3..4f6e3c84 100644 --- a/src/main/java/es/princip/getp/api/controller/project/command/ProjectMeetingController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/ProjectMeetingController.java @@ -1,12 +1,12 @@ package es.princip.getp.api.controller.project.command; import es.princip.getp.api.controller.project.command.dto.request.ScheduleMeetingRequest; -import es.princip.getp.api.controller.project.command.dto.response.ScheduleMeetingResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.project.meeting.dto.response.ScheduleMeetingResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.project.meeting.ProjectMeetingService; -import es.princip.getp.application.project.meeting.command.ScheduleMeetingCommand; +import es.princip.getp.application.project.meeting.dto.command.ScheduleMeetingCommand; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.project.commission.model.ProjectId; import jakarta.validation.Valid; @@ -23,7 +23,6 @@ public class ProjectMeetingController { private final ProjectMeetingService projectMeetingService; - private final ProjectCommandMapper projectCommandMapper; /** diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsIndividualRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsIndividualRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsIndividualRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsIndividualRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsTeamRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsTeamRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsTeamRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectAsTeamRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ApplyProjectRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/request/CommissionProjectRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/CommissionProjectRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/project/command/dto/request/CommissionProjectRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/CommissionProjectRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ScheduleMeetingRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ScheduleMeetingRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/project/command/dto/request/ScheduleMeetingRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/command/dto/request/ScheduleMeetingRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryController.java similarity index 90% rename from src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryController.java index 5af6c63c..3fcc8760 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryController.java @@ -1,14 +1,14 @@ package es.princip.getp.api.controller.project.query; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.CursorDefault; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.api.support.dto.SliceResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; import es.princip.getp.application.project.apply.port.in.GetApplicantQuery; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; +import es.princip.getp.application.support.dto.SliceResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.commission.model.ProjectId; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryController.java similarity index 91% rename from src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryController.java index 1f71f99d..663db504 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryController.java @@ -1,7 +1,7 @@ package es.princip.getp.api.controller.project.query; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.project.apply.port.in.GetApplicationDetailQuery; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationFormQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationFormQueryController.java similarity index 91% rename from src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationFormQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationFormQueryController.java index 35f6adcb..a1bba758 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationFormQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectApplicationFormQueryController.java @@ -1,7 +1,7 @@ package es.princip.getp.api.controller.project.query; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationFormResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationFormResponse; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; import es.princip.getp.application.project.apply.port.in.GetApplicationFormQuery; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryCommandMapper.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryCommandMapper.java similarity index 86% rename from src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryCommandMapper.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryCommandMapper.java index 33d56f7f..6b8ee3da 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryCommandMapper.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryCommandMapper.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.project.query; -import es.princip.getp.application.people.command.SearchTeammateCommand; +import es.princip.getp.application.people.dto.command.SearchTeammateCommand; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; import org.mapstruct.Mapper; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryController.java similarity index 84% rename from src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryController.java index fdb375fe..ff2b1ae2 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/ProjectQueryController.java @@ -1,15 +1,15 @@ package es.princip.getp.api.controller.project.query; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.ControllerSupport; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.api.support.dto.PageResponse; -import es.princip.getp.application.project.commission.command.GetProjectCommand; -import es.princip.getp.application.project.commission.command.ProjectSearchFilter; +import es.princip.getp.application.project.commission.dto.command.GetProjectCommand; +import es.princip.getp.application.project.commission.dto.command.ProjectSearchFilter; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.application.project.commission.port.in.GetProjectQuery; +import es.princip.getp.application.support.dto.PageResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.commission.model.ProjectId; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/SearchTeammateController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/SearchTeammateController.java similarity index 87% rename from src/main/java/es/princip/getp/api/controller/project/query/SearchTeammateController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/project/query/SearchTeammateController.java index 9c304834..a1e47e92 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/SearchTeammateController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/project/query/SearchTeammateController.java @@ -1,15 +1,15 @@ package es.princip.getp.api.controller.project.query; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; import es.princip.getp.api.support.ControllerSupport; import es.princip.getp.api.support.CursorDefault; import es.princip.getp.api.support.dto.ApiResponse; import es.princip.getp.api.support.dto.ApiResponse.ApiSuccessResult; -import es.princip.getp.api.support.dto.SliceResponse; -import es.princip.getp.application.people.command.SearchTeammateCommand; +import es.princip.getp.application.people.dto.command.SearchTeammateCommand; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.project.apply.port.in.SearchTeammateQuery; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; +import es.princip.getp.application.support.dto.SliceResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.web.PageableDefault; import org.springframework.http.HttpStatus; diff --git a/src/main/java/es/princip/getp/api/controller/serviceTerm/ServiceTermController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/serviceTerm/ServiceTermController.java similarity index 70% rename from src/main/java/es/princip/getp/api/controller/serviceTerm/ServiceTermController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/serviceTerm/ServiceTermController.java index 4f8a3655..da91e62c 100644 --- a/src/main/java/es/princip/getp/api/controller/serviceTerm/ServiceTermController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/serviceTerm/ServiceTermController.java @@ -1,7 +1,8 @@ package es.princip.getp.api.controller.serviceTerm; import es.princip.getp.api.controller.serviceTerm.dto.reqeust.ServiceTermRequest; -import es.princip.getp.api.controller.serviceTerm.dto.response.ServiceTermResponse; +import es.princip.getp.application.serviceTerm.dto.command.ServiceTermCommand; +import es.princip.getp.application.serviceTerm.dto.response.ServiceTermResponse; import es.princip.getp.application.serviceTerm.port.in.RegisterServiceTermUseCase; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -19,7 +20,12 @@ public class ServiceTermController { @PostMapping // TODO: 관리자만 접근 가능하도록 권한 제어 - public ServiceTermResponse registerServiceTerm(@RequestBody @Valid ServiceTermRequest serviceTermRequest) { - return ServiceTermResponse.from(registerServiceTermUseCase.register(serviceTermRequest)); + public ServiceTermResponse registerServiceTerm(@RequestBody @Valid ServiceTermRequest request) { + final ServiceTermCommand command = new ServiceTermCommand( + request.tag(), + request.required(), + request.revocable() + ); + return ServiceTermResponse.from(registerServiceTermUseCase.register(command)); } } diff --git a/src/main/java/es/princip/getp/api/controller/serviceTerm/dto/reqeust/ServiceTermRequest.java b/get-p-api/src/main/java/es/princip/getp/api/controller/serviceTerm/dto/reqeust/ServiceTermRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/controller/serviceTerm/dto/reqeust/ServiceTermRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/serviceTerm/dto/reqeust/ServiceTermRequest.java diff --git a/src/main/java/es/princip/getp/api/controller/storage/FileStorageController.java b/get-p-api/src/main/java/es/princip/getp/api/controller/storage/FileStorageController.java similarity index 81% rename from src/main/java/es/princip/getp/api/controller/storage/FileStorageController.java rename to get-p-api/src/main/java/es/princip/getp/api/controller/storage/FileStorageController.java index f3ca8e23..22957267 100644 --- a/src/main/java/es/princip/getp/api/controller/storage/FileStorageController.java +++ b/get-p-api/src/main/java/es/princip/getp/api/controller/storage/FileStorageController.java @@ -1,9 +1,9 @@ package es.princip.getp.api.controller.storage; -import es.princip.getp.api.controller.storage.dto.FileUploadResponse; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.dto.ApiResponse; -import es.princip.getp.application.storage.command.UploadFileCommand; +import es.princip.getp.application.storage.dto.command.UploadFileCommand; +import es.princip.getp.application.storage.dto.response.UploadFileResponse; import es.princip.getp.application.storage.port.in.UploadFileUseCase; import es.princip.getp.domain.member.model.MemberId; import lombok.RequiredArgsConstructor; @@ -30,14 +30,14 @@ public class FileStorageController { @PostMapping("/files") @PreAuthorize("isAuthenticated()") - public ResponseEntity> uploadFile( + public ResponseEntity> uploadFile( @AuthenticationPrincipal final PrincipalDetails principalDetails, @RequestPart final MultipartFile file ) { final MemberId memberId = principalDetails.getMember().getId(); final UploadFileCommand command = new UploadFileCommand(memberId, file); final URI uri = uploadFileUseCase.upload(command); - final FileUploadResponse response = new FileUploadResponse(uri); + final UploadFileResponse response = new UploadFileResponse(uri); return ApiResponse.success(HttpStatus.CREATED, response); } } diff --git a/src/main/java/es/princip/getp/api/handler/AccessDeniedExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/AccessDeniedExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/AccessDeniedExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/AccessDeniedExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/ApplicationLogicExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/ApplicationLogicExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/ApplicationLogicExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/ApplicationLogicExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/AuthenticationExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/AuthenticationExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/AuthenticationExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/AuthenticationExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/DefaultExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/DefaultExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/DefaultExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/DefaultExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/DomainLogicExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/DomainLogicExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/DomainLogicExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/DomainLogicExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/ErrorDescriptionExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/ErrorDescriptionExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/ErrorDescriptionExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/ErrorDescriptionExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/ExternalServerExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/ExternalServerExceptionHandler.java similarity index 92% rename from src/main/java/es/princip/getp/api/handler/ExternalServerExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/ExternalServerExceptionHandler.java index a1591bf2..e57c36ee 100644 --- a/src/main/java/es/princip/getp/api/handler/ExternalServerExceptionHandler.java +++ b/get-p-api/src/main/java/es/princip/getp/api/handler/ExternalServerExceptionHandler.java @@ -2,7 +2,7 @@ import es.princip.getp.api.support.dto.ApiErrorResponse; import es.princip.getp.api.support.dto.ApiErrorResponse.ApiErrorResult; -import es.princip.getp.infrastructure.support.FileStorageException; +import es.princip.getp.application.storage.exception.FileStorageException; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; diff --git a/src/main/java/es/princip/getp/api/handler/FileStorageExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/FileStorageExceptionHandler.java similarity index 91% rename from src/main/java/es/princip/getp/api/handler/FileStorageExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/FileStorageExceptionHandler.java index a8f900b0..a72520d7 100644 --- a/src/main/java/es/princip/getp/api/handler/FileStorageExceptionHandler.java +++ b/get-p-api/src/main/java/es/princip/getp/api/handler/FileStorageExceptionHandler.java @@ -2,7 +2,7 @@ import es.princip.getp.api.support.dto.ApiErrorResponse; import es.princip.getp.api.support.dto.ApiErrorResponse.ApiErrorResult; -import es.princip.getp.infrastructure.support.FileStorageException; +import es.princip.getp.application.storage.exception.FileStorageException; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; diff --git a/src/main/java/es/princip/getp/api/handler/ForbiddenExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/ForbiddenExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/ForbiddenExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/ForbiddenExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/HttpRequestMethodNotSupportedExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/HttpRequestMethodNotSupportedExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/HttpRequestMethodNotSupportedExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/HttpRequestMethodNotSupportedExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/MaxUploadSizeExceededExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/MaxUploadSizeExceededExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/MaxUploadSizeExceededExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/MaxUploadSizeExceededExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/MethodArgumentNotValidExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/MethodArgumentNotValidExceptionHandler.java similarity index 100% rename from src/main/java/es/princip/getp/api/handler/MethodArgumentNotValidExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/MethodArgumentNotValidExceptionHandler.java diff --git a/src/main/java/es/princip/getp/api/handler/NotFoundExceptionHandler.java b/get-p-api/src/main/java/es/princip/getp/api/handler/NotFoundExceptionHandler.java similarity index 93% rename from src/main/java/es/princip/getp/api/handler/NotFoundExceptionHandler.java rename to get-p-api/src/main/java/es/princip/getp/api/handler/NotFoundExceptionHandler.java index bbb0ec64..0d3f931d 100644 --- a/src/main/java/es/princip/getp/api/handler/NotFoundExceptionHandler.java +++ b/get-p-api/src/main/java/es/princip/getp/api/handler/NotFoundExceptionHandler.java @@ -2,7 +2,7 @@ import es.princip.getp.api.support.dto.ApiErrorResponse; import es.princip.getp.api.support.dto.ApiErrorResponse.ApiErrorResult; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.application.support.NotFoundException; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; diff --git a/src/main/java/es/princip/getp/api/security/filter/AccessTokenAuthorizationFilter.java b/get-p-api/src/main/java/es/princip/getp/api/support/AccessTokenAuthorizationFilter.java similarity index 78% rename from src/main/java/es/princip/getp/api/security/filter/AccessTokenAuthorizationFilter.java rename to get-p-api/src/main/java/es/princip/getp/api/support/AccessTokenAuthorizationFilter.java index 8be01a12..b37af6a1 100644 --- a/src/main/java/es/princip/getp/api/security/filter/AccessTokenAuthorizationFilter.java +++ b/get-p-api/src/main/java/es/princip/getp/api/support/AccessTokenAuthorizationFilter.java @@ -1,7 +1,5 @@ -package es.princip.getp.api.security.filter; +package es.princip.getp.api.support; -import es.princip.getp.api.security.exception.ExpiredTokenException; -import es.princip.getp.api.security.exception.InvalidTokenException; import es.princip.getp.application.auth.service.AccessTokenService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -27,14 +25,14 @@ public class AccessTokenAuthorizationFilter extends OncePerRequestFilter { * Access Token을 검증한 뒤, 유효한 경우 SecurityContext에 인증 정보를 저장한다. * Access Token이 없거나 OPTIONS 요청일 경우 필터를 통과한다. * - * @throws ExpiredTokenException Access Token이 만료된 경우 - * @throws InvalidTokenException Access Token이 유효하지 않은 경우 + * @throws es.princip.getp.application.auth.exception.ExpiredTokenException Access Token이 만료된 경우 + * @throws es.princip.getp.application.auth.exception.InvalidTokenException Access Token이 유효하지 않은 경우 */ @Override protected void doFilterInternal( - @NonNull final HttpServletRequest request, - @NonNull final HttpServletResponse response, - @NonNull final FilterChain filterChain + @NonNull final HttpServletRequest request, + @NonNull final HttpServletResponse response, + @NonNull final FilterChain filterChain ) throws ServletException, IOException { if (isOptionsRequest(request)) { filterChain.doFilter(request, response); @@ -53,4 +51,4 @@ protected void doFilterInternal( private boolean isOptionsRequest(HttpServletRequest request) { return HttpMethod.OPTIONS.matches(request.getMethod()); } -} +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/api/security/filter/AccessTokenExceptionFilter.java b/get-p-api/src/main/java/es/princip/getp/api/support/AccessTokenExceptionFilter.java similarity index 94% rename from src/main/java/es/princip/getp/api/security/filter/AccessTokenExceptionFilter.java rename to get-p-api/src/main/java/es/princip/getp/api/support/AccessTokenExceptionFilter.java index 79b17a57..66a0a40a 100644 --- a/src/main/java/es/princip/getp/api/security/filter/AccessTokenExceptionFilter.java +++ b/get-p-api/src/main/java/es/princip/getp/api/support/AccessTokenExceptionFilter.java @@ -1,7 +1,7 @@ -package es.princip.getp.api.security.filter; +package es.princip.getp.api.support; import com.fasterxml.jackson.databind.ObjectMapper; -import es.princip.getp.api.security.exception.JwtTokenException; +import es.princip.getp.application.auth.exception.JwtTokenException; import es.princip.getp.api.support.dto.ApiErrorResponse; import es.princip.getp.api.support.dto.ApiErrorResponse.ApiErrorResult; import es.princip.getp.domain.support.ErrorDescription; diff --git a/src/main/java/es/princip/getp/api/support/ControllerSupport.java b/get-p-api/src/main/java/es/princip/getp/api/support/ControllerSupport.java similarity index 89% rename from src/main/java/es/princip/getp/api/support/ControllerSupport.java rename to get-p-api/src/main/java/es/princip/getp/api/support/ControllerSupport.java index ff6ce230..7abee7e2 100644 --- a/src/main/java/es/princip/getp/api/support/ControllerSupport.java +++ b/get-p-api/src/main/java/es/princip/getp/api/support/ControllerSupport.java @@ -1,6 +1,6 @@ package es.princip.getp.api.support; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/es/princip/getp/api/support/CursorDefault.java b/get-p-api/src/main/java/es/princip/getp/api/support/CursorDefault.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/CursorDefault.java rename to get-p-api/src/main/java/es/princip/getp/api/support/CursorDefault.java diff --git a/src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolver.java b/get-p-api/src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolver.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolver.java rename to get-p-api/src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolver.java diff --git a/src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolverSupport.java b/get-p-api/src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolverSupport.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolverSupport.java rename to get-p-api/src/main/java/es/princip/getp/api/support/CursorHandlerMethodArgumentResolverSupport.java diff --git a/src/main/java/es/princip/getp/api/support/CursorPageRequest.java b/get-p-api/src/main/java/es/princip/getp/api/support/CursorPageRequest.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/CursorPageRequest.java rename to get-p-api/src/main/java/es/princip/getp/api/support/CursorPageRequest.java diff --git a/src/main/java/es/princip/getp/api/support/CursorPageableHandlerMethodArgumentResolver.java b/get-p-api/src/main/java/es/princip/getp/api/support/CursorPageableHandlerMethodArgumentResolver.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/CursorPageableHandlerMethodArgumentResolver.java rename to get-p-api/src/main/java/es/princip/getp/api/support/CursorPageableHandlerMethodArgumentResolver.java diff --git a/src/main/java/es/princip/getp/api/support/CursorParser.java b/get-p-api/src/main/java/es/princip/getp/api/support/CursorParser.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/CursorParser.java rename to get-p-api/src/main/java/es/princip/getp/api/support/CursorParser.java diff --git a/src/main/java/es/princip/getp/api/security/SecurityConfig.java b/get-p-api/src/main/java/es/princip/getp/api/support/SecurityConfig.java similarity index 95% rename from src/main/java/es/princip/getp/api/security/SecurityConfig.java rename to get-p-api/src/main/java/es/princip/getp/api/support/SecurityConfig.java index 437757bb..a100b5f3 100644 --- a/src/main/java/es/princip/getp/api/security/SecurityConfig.java +++ b/get-p-api/src/main/java/es/princip/getp/api/support/SecurityConfig.java @@ -1,7 +1,5 @@ -package es.princip.getp.api.security; +package es.princip.getp.api.support; -import es.princip.getp.api.security.filter.AccessTokenAuthorizationFilter; -import es.princip.getp.api.security.filter.AccessTokenExceptionFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/es/princip/getp/application/config/SwaggerConfig.java b/get-p-api/src/main/java/es/princip/getp/api/support/SwaggerConfig.java similarity index 96% rename from src/main/java/es/princip/getp/application/config/SwaggerConfig.java rename to get-p-api/src/main/java/es/princip/getp/api/support/SwaggerConfig.java index 001d2351..e454dfe5 100644 --- a/src/main/java/es/princip/getp/application/config/SwaggerConfig.java +++ b/get-p-api/src/main/java/es/princip/getp/api/support/SwaggerConfig.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.config; +package es.princip.getp.api.support; import org.springdoc.core.configuration.SpringDocConfiguration; import org.springdoc.core.configuration.SpringDocUIConfiguration; diff --git a/src/main/java/es/princip/getp/api/support/WebMvcConfig.java b/get-p-api/src/main/java/es/princip/getp/api/support/WebMvcConfig.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/WebMvcConfig.java rename to get-p-api/src/main/java/es/princip/getp/api/support/WebMvcConfig.java diff --git a/src/main/java/es/princip/getp/api/support/dto/ApiErrorResponse.java b/get-p-api/src/main/java/es/princip/getp/api/support/dto/ApiErrorResponse.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/dto/ApiErrorResponse.java rename to get-p-api/src/main/java/es/princip/getp/api/support/dto/ApiErrorResponse.java diff --git a/src/main/java/es/princip/getp/api/support/dto/ApiResponse.java b/get-p-api/src/main/java/es/princip/getp/api/support/dto/ApiResponse.java similarity index 100% rename from src/main/java/es/princip/getp/api/support/dto/ApiResponse.java rename to get-p-api/src/main/java/es/princip/getp/api/support/dto/ApiResponse.java diff --git a/src/main/java/es/princip/getp/api/validation/UserMemberType.java b/get-p-api/src/main/java/es/princip/getp/api/validation/UserMemberType.java similarity index 100% rename from src/main/java/es/princip/getp/api/validation/UserMemberType.java rename to get-p-api/src/main/java/es/princip/getp/api/validation/UserMemberType.java diff --git a/src/main/java/es/princip/getp/api/validation/UserMemberTypeValidator.java b/get-p-api/src/main/java/es/princip/getp/api/validation/UserMemberTypeValidator.java similarity index 100% rename from src/main/java/es/princip/getp/api/validation/UserMemberTypeValidator.java rename to get-p-api/src/main/java/es/princip/getp/api/validation/UserMemberTypeValidator.java diff --git a/get-p-api/src/main/resources/api-config.yml b/get-p-api/src/main/resources/api-config.yml new file mode 100644 index 00000000..a03aa461 --- /dev/null +++ b/get-p-api/src/main/resources/api-config.yml @@ -0,0 +1,40 @@ +server: + port: ${SPRING_PORT} + servlet: + context-path: ${BASE_PATH} + +spring: + servlet: + multipart: + max-file-size: 5MB + +springdoc: + api-docs: + enabled: false + swagger-ui: + path: ${SWAGGER_PATH} + url: /oas/openapi3.yaml + +--- +spring: + config: + activate: + on-profile: local + +logging: + level: + org: + springframework: + security: DEBUG + +--- +spring: + config: + activate: + on-profile: dev + +logging: + level: + org: + springframework: + security: DEBUG \ No newline at end of file diff --git a/get-p-api/src/main/resources/application.yml b/get-p-api/src/main/resources/application.yml new file mode 100644 index 00000000..1f5cfde6 --- /dev/null +++ b/get-p-api/src/main/resources/application.yml @@ -0,0 +1,46 @@ +spring: + config: + import: + - api-config.yml + - app-config.yml + - persistence-config.yml + - infra-config.yml + +--- +spring: + config: + activate: + on-profile: local + +logging: + level: + es.princip.getp: DEBUG + +--- +spring: + config: + activate: + on-profile: dev + +logging: + level: + es.princip.getp: DEBUG + +management: + endpoints: + web: + exposure: + include: prometheus + base-path: ${MONITORING_URL} + enabled-by-default: false + jmx: + exposure: + exclude: '*' + include: info, health + endpoint: + prometheus: + enabled: true + info: + enabled: true + health: + enabled: true \ No newline at end of file diff --git a/src/main/resources/static/logo.png b/get-p-api/src/main/resources/static/logo.png similarity index 100% rename from src/main/resources/static/logo.png rename to get-p-api/src/main/resources/static/logo.png diff --git a/src/test/java/es/princip/getp/api/config/MockDaoBeanFactoryPostProcessor.java b/get-p-api/src/test/java/es/princip/getp/api/config/MockDaoBeanFactoryPostProcessor.java similarity index 95% rename from src/test/java/es/princip/getp/api/config/MockDaoBeanFactoryPostProcessor.java rename to get-p-api/src/test/java/es/princip/getp/api/config/MockDaoBeanFactoryPostProcessor.java index 9d26b75a..a8e1ab73 100644 --- a/src/test/java/es/princip/getp/api/config/MockDaoBeanFactoryPostProcessor.java +++ b/get-p-api/src/test/java/es/princip/getp/api/config/MockDaoBeanFactoryPostProcessor.java @@ -1,6 +1,6 @@ package es.princip.getp.api.config; -import org.jetbrains.annotations.NotNull; +import jakarta.validation.constraints.NotNull; import org.junit.platform.commons.util.ClassFilter; import org.junit.platform.commons.util.ReflectionUtils; import org.springframework.beans.BeansException; diff --git a/src/test/java/es/princip/getp/api/config/MockServiceBeanFactoryPostProcessor.java b/get-p-api/src/test/java/es/princip/getp/api/config/MockServiceBeanFactoryPostProcessor.java similarity index 95% rename from src/test/java/es/princip/getp/api/config/MockServiceBeanFactoryPostProcessor.java rename to get-p-api/src/test/java/es/princip/getp/api/config/MockServiceBeanFactoryPostProcessor.java index 97b367d7..66036580 100644 --- a/src/test/java/es/princip/getp/api/config/MockServiceBeanFactoryPostProcessor.java +++ b/get-p-api/src/test/java/es/princip/getp/api/config/MockServiceBeanFactoryPostProcessor.java @@ -1,6 +1,6 @@ package es.princip.getp.api.config; -import org.jetbrains.annotations.NotNull; +import jakarta.validation.constraints.NotNull; import org.junit.platform.commons.util.ClassFilter; import org.junit.platform.commons.util.ReflectionUtils; import org.springframework.beans.BeansException; diff --git a/src/test/java/es/princip/getp/api/controller/auth/AuthControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/auth/AuthControllerTest.java similarity index 96% rename from src/test/java/es/princip/getp/api/controller/auth/AuthControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/auth/AuthControllerTest.java index 7920da36..a9ba859e 100644 --- a/src/test/java/es/princip/getp/api/controller/auth/AuthControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/auth/AuthControllerTest.java @@ -3,7 +3,7 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; import es.princip.getp.api.controller.auth.dto.request.LoginRequest; -import es.princip.getp.api.controller.auth.dto.response.Token; +import es.princip.getp.application.auth.dto.response.Token; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.auth.service.AuthService; import jakarta.servlet.http.HttpServletRequest; @@ -18,6 +18,7 @@ import static es.princip.getp.fixture.common.EmailFixture.EMAIL; import static es.princip.getp.fixture.member.PasswordFixture.PASSWORD; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders; import static org.springframework.restdocs.payload.PayloadDocumentation.*; @@ -38,7 +39,7 @@ class 로그인 { @Test void 사용자는_로그인을_할_수_있다() throws Exception { final Token token = new Token("Bearer", "${ACCESS_TOKEN}", "${REFRESH_TOKEN}"); - given(authService.login(request)).willReturn(token); + given(authService.login(anyString(), anyString())).willReturn(token); mockMvc.perform(post("/auth/login") .content(objectMapper.writeValueAsString(request))) diff --git a/src/test/java/es/princip/getp/api/controller/auth/SignUpControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/auth/SignUpControllerTest.java similarity index 98% rename from src/test/java/es/princip/getp/api/controller/auth/SignUpControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/auth/SignUpControllerTest.java index 8dff2fcf..e330abf7 100644 --- a/src/test/java/es/princip/getp/api/controller/auth/SignUpControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/auth/SignUpControllerTest.java @@ -6,7 +6,7 @@ import es.princip.getp.api.controller.auth.dto.request.ServiceTermAgreementRequest; import es.princip.getp.api.controller.auth.dto.request.SignUpRequest; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.auth.command.SignUpCommand; +import es.princip.getp.application.auth.dto.command.SignUpCommand; import es.princip.getp.application.auth.service.SignUpService; import es.princip.getp.domain.member.model.MemberType; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/es/princip/getp/api/controller/client/command/MyClientControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/client/command/MyClientControllerTest.java similarity index 98% rename from src/test/java/es/princip/getp/api/controller/client/command/MyClientControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/client/command/MyClientControllerTest.java index 38a87069..9b17ca4a 100644 --- a/src/test/java/es/princip/getp/api/controller/client/command/MyClientControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/client/command/MyClientControllerTest.java @@ -5,7 +5,7 @@ import es.princip.getp.api.controller.client.command.dto.request.EditMyClientRequest; import es.princip.getp.api.controller.client.command.dto.request.RegisterMyClientRequest; import es.princip.getp.api.security.annotation.WithCustomMockUser; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.client.port.in.EditClientUseCase; import es.princip.getp.application.client.port.in.RegisterClientUseCase; diff --git a/src/test/java/es/princip/getp/api/controller/client/command/description/EditMyClientRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/client/command/description/EditMyClientRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/client/command/description/EditMyClientRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/client/command/description/EditMyClientRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/client/command/description/RegisterMyClientRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/client/command/description/RegisterMyClientRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/client/command/description/RegisterMyClientRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/client/command/description/RegisterMyClientRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/client/query/ClientQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/client/query/ClientQueryControllerTest.java similarity index 98% rename from src/test/java/es/princip/getp/api/controller/client/query/ClientQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/client/query/ClientQueryControllerTest.java index 96f09f18..5c3b2262 100644 --- a/src/test/java/es/princip/getp/api/controller/client/query/ClientQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/client/query/ClientQueryControllerTest.java @@ -1,6 +1,6 @@ package es.princip.getp.api.controller.client.query; -import es.princip.getp.api.controller.client.query.dto.ClientResponse; +import es.princip.getp.application.client.dto.response.ClientResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.client.port.out.ClientQuery; diff --git a/src/test/java/es/princip/getp/api/controller/client/query/MyClientQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/client/query/MyClientQueryControllerTest.java similarity index 98% rename from src/test/java/es/princip/getp/api/controller/client/query/MyClientQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/client/query/MyClientQueryControllerTest.java index e44d1e0e..4930f915 100644 --- a/src/test/java/es/princip/getp/api/controller/client/query/MyClientQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/client/query/MyClientQueryControllerTest.java @@ -2,7 +2,7 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.client.query.dto.ClientResponse; +import es.princip.getp.application.client.dto.response.ClientResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.client.port.out.ClientQuery; diff --git a/src/test/java/es/princip/getp/api/controller/client/query/description/ClientResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/client/query/description/ClientResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/client/query/description/ClientResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/client/query/description/ClientResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/common/description/BankAccountDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/common/description/BankAccountDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/common/description/BankAccountDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/common/description/BankAccountDescription.java diff --git a/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/AddressResponseFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/AddressResponseFixture.java new file mode 100644 index 00000000..d357e8c8 --- /dev/null +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/AddressResponseFixture.java @@ -0,0 +1,18 @@ +package es.princip.getp.api.controller.common.fixture; + +import es.princip.getp.application.common.dto.response.AddressResponse; +import es.princip.getp.domain.client.model.Address; + +import static es.princip.getp.fixture.client.AddressFixture.address; + +public class AddressResponseFixture { + + public static AddressResponse addressResponse() { + final Address address = address(); + return new AddressResponse( + address.getZipcode(), + address.getStreet(), + address.getDetail() + ); + } +} diff --git a/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/HashtagDtoFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/HashtagDtoFixture.java new file mode 100644 index 00000000..014c0b04 --- /dev/null +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/HashtagDtoFixture.java @@ -0,0 +1,22 @@ +package es.princip.getp.api.controller.common.fixture; + +import es.princip.getp.domain.common.model.Hashtag; + +import java.util.List; + +import static es.princip.getp.fixture.common.HashtagFixture.hashtags; + +public class HashtagDtoFixture { + + public static List hashtagsRequest() { + return hashtags().stream() + .map(Hashtag::getValue) + .toList(); + } + + public static List hashtagsResponse() { + return hashtags().stream() + .map(Hashtag::getValue) + .toList(); + } +} diff --git a/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/TechStackDtoFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/TechStackDtoFixture.java new file mode 100644 index 00000000..8b415053 --- /dev/null +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/common/fixture/TechStackDtoFixture.java @@ -0,0 +1,22 @@ +package es.princip.getp.api.controller.common.fixture; + +import es.princip.getp.domain.common.model.TechStack; + +import java.util.List; + +import static es.princip.getp.fixture.common.TechStackFixture.techStacks; + +public class TechStackDtoFixture { + + public static List techStacksRequest() { + return techStacks().stream() + .map(TechStack::getValue) + .toList(); + } + + public static List techStacksResponse() { + return techStacks().stream() + .map(TechStack::getValue) + .toList(); + } +} diff --git a/src/test/java/es/princip/getp/api/controller/like/command/PeopleLikeControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/like/command/PeopleLikeControllerTest.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/like/command/PeopleLikeControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/like/command/PeopleLikeControllerTest.java diff --git a/src/test/java/es/princip/getp/api/controller/like/command/ProjectLikeControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/like/command/ProjectLikeControllerTest.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/like/command/ProjectLikeControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/like/command/ProjectLikeControllerTest.java diff --git a/src/test/java/es/princip/getp/api/controller/member/command/MyMemberControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/member/command/MyMemberControllerTest.java similarity index 94% rename from src/test/java/es/princip/getp/api/controller/member/command/MyMemberControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/member/command/MyMemberControllerTest.java index d2311b04..73c1adb8 100644 --- a/src/test/java/es/princip/getp/api/controller/member/command/MyMemberControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/member/command/MyMemberControllerTest.java @@ -4,7 +4,7 @@ import com.epages.restdocs.apispec.Schema; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.member.command.RegisterProfileImageCommand; +import es.princip.getp.application.member.dto.command.RegisterProfileImageCommand; import es.princip.getp.application.member.port.in.ProfileImageUseCase; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.member.model.MemberType; @@ -14,8 +14,8 @@ import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; import static es.princip.getp.api.docs.HeaderDescriptorHelper.authorizationHeaderDescription; +import static es.princip.getp.api.controller.member.fixture.MultipartFileFixture.imageMultiPartFile; import static es.princip.getp.fixture.member.ProfileImageFixture.profileImage; -import static es.princip.getp.fixture.storage.MultipartFileFixture.imageMultiPartFile; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders; diff --git a/src/test/java/es/princip/getp/fixture/storage/MultipartFileFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/member/fixture/MultipartFileFixture.java similarity index 57% rename from src/test/java/es/princip/getp/fixture/storage/MultipartFileFixture.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/member/fixture/MultipartFileFixture.java index 9e3e7f5e..35ec1f5e 100644 --- a/src/test/java/es/princip/getp/fixture/storage/MultipartFileFixture.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/member/fixture/MultipartFileFixture.java @@ -1,4 +1,4 @@ -package es.princip.getp.fixture.storage; +package es.princip.getp.api.controller.member.fixture; import org.springframework.mock.web.MockMultipartFile; @@ -10,11 +10,4 @@ public static MockMultipartFile imageMultiPartFile() { new byte[] {0x00, 0x01, 0x02, 0x03} ); } - - public static MockMultipartFile fileMultiPartFile() { - return new MockMultipartFile( - "file", - "dummy".getBytes() - ); - } } diff --git a/src/test/java/es/princip/getp/api/controller/member/query/MyMemberQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/member/query/MyMemberQueryControllerTest.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/member/query/MyMemberQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/member/query/MyMemberQueryControllerTest.java diff --git a/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleControllerTest.java similarity index 97% rename from src/test/java/es/princip/getp/api/controller/people/command/MyPeopleControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleControllerTest.java index 3f4a5ac7..a72fd127 100644 --- a/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleControllerTest.java @@ -6,8 +6,8 @@ import es.princip.getp.api.controller.people.command.dto.request.RegisterPeopleRequest; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.people.command.EditPeopleCommand; -import es.princip.getp.application.people.command.RegisterPeopleCommand; +import es.princip.getp.application.people.dto.command.EditPeopleCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleCommand; import es.princip.getp.application.people.port.in.EditPeopleUseCase; import es.princip.getp.application.people.port.in.RegisterPeopleUseCase; import es.princip.getp.domain.member.model.MemberType; diff --git a/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleProfileControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleProfileControllerTest.java similarity index 93% rename from src/test/java/es/princip/getp/api/controller/people/command/MyPeopleProfileControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleProfileControllerTest.java index 7947c29a..7f0ac282 100644 --- a/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleProfileControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/MyPeopleProfileControllerTest.java @@ -6,8 +6,8 @@ import es.princip.getp.api.controller.people.command.dto.request.RegisterPeopleProfileRequest; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.people.command.EditPeopleProfileCommand; -import es.princip.getp.application.people.command.RegisterPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.EditPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleProfileCommand; import es.princip.getp.application.people.port.in.EditPeopleProfileUseCase; import es.princip.getp.application.people.port.in.RegisterPeopleProfileUseCase; import es.princip.getp.domain.member.model.MemberType; @@ -17,16 +17,16 @@ import org.springframework.test.web.servlet.ResultActions; import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; +import static es.princip.getp.api.controller.common.fixture.HashtagDtoFixture.hashtagsRequest; +import static es.princip.getp.api.controller.common.fixture.TechStackDtoFixture.techStacksRequest; +import static es.princip.getp.api.controller.people.fixture.PortfolioFixture.portfoliosRequest; import static es.princip.getp.api.controller.people.command.description.request.EditPeopleProfileRequestDescription.editPeopleProfileRequestDescription; import static es.princip.getp.api.controller.people.command.description.request.RegisterPeopleProfileRequestDescription.registerPeopleProfileRequestDescription; import static es.princip.getp.api.docs.HeaderDescriptorHelper.authorizationHeaderDescription; import static es.princip.getp.api.docs.StatusFieldDescriptor.statusField; -import static es.princip.getp.fixture.common.HashtagFixture.hashtagsRequest; -import static es.princip.getp.fixture.common.TechStackFixture.techStacksRequest; import static es.princip.getp.fixture.people.ActivityAreaFixture.activityArea; import static es.princip.getp.fixture.people.EducationFixture.education; import static es.princip.getp.fixture.people.IntroductionFixture.introduction; -import static es.princip.getp.fixture.people.PortfolioFixture.portfoliosRequest; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.willDoNothing; import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders; diff --git a/src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleProfileRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleProfileRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleProfileRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleProfileRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/EditPeopleRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleProfileRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleProfileRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleProfileRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleProfileRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/request/RegisterPeopleRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/command/description/response/RegisterPeopleResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/response/RegisterPeopleResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/command/description/response/RegisterPeopleResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/command/description/response/RegisterPeopleResponseDescription.java diff --git a/src/test/java/es/princip/getp/fixture/people/PortfolioFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/fixture/PortfolioFixture.java similarity index 64% rename from src/test/java/es/princip/getp/fixture/people/PortfolioFixture.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/fixture/PortfolioFixture.java index 6cc637af..6a3ef2c2 100644 --- a/src/test/java/es/princip/getp/fixture/people/PortfolioFixture.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/people/fixture/PortfolioFixture.java @@ -1,20 +1,12 @@ -package es.princip.getp.fixture.people; +package es.princip.getp.api.controller.people.fixture; import es.princip.getp.api.controller.people.command.dto.request.PortfolioRequest; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PortfolioResponse; -import es.princip.getp.domain.people.model.Portfolio; +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; import java.util.List; public class PortfolioFixture { - public static List portfolios() { - return List.of( - Portfolio.of("포트폴리오1 내용", "https://github.com/scv1702/1"), - Portfolio.of("포트폴리오2 내용", "https://github.com/scv1702/2") - ); - } - public static List portfoliosRequest() { return List.of( new PortfolioRequest("포트폴리오1 내용", "https://github.com/scv1702/1"), diff --git a/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryControllerTest.java similarity index 89% rename from src/test/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryControllerTest.java index 9d95170d..852ed2f0 100644 --- a/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleProfileQueryControllerTest.java @@ -2,10 +2,10 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; -import es.princip.getp.api.security.details.PrincipalDetails; import es.princip.getp.api.support.ControllerTest; +import es.princip.getp.application.auth.service.PrincipalDetails; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.application.people.port.in.GetMyPeopleQuery; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.member.model.MemberType; @@ -15,14 +15,14 @@ import org.springframework.test.web.servlet.ResultActions; import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; +import static es.princip.getp.api.controller.common.fixture.HashtagDtoFixture.hashtagsResponse; +import static es.princip.getp.api.controller.common.fixture.TechStackDtoFixture.techStacksResponse; +import static es.princip.getp.api.controller.people.fixture.PortfolioFixture.portfoliosResponse; import static es.princip.getp.api.controller.people.query.description.DetailPeopleProfileResponseDescription.detailPeopleProfileResponseDescription; import static es.princip.getp.api.docs.HeaderDescriptorHelper.authorizationHeaderDescription; -import static es.princip.getp.fixture.common.HashtagFixture.hashtagsResponse; -import static es.princip.getp.fixture.common.TechStackFixture.techStacksResponse; import static es.princip.getp.fixture.people.ActivityAreaFixture.activityArea; import static es.princip.getp.fixture.people.EducationFixture.education; import static es.princip.getp.fixture.people.IntroductionFixture.introduction; -import static es.princip.getp.fixture.people.PortfolioFixture.portfoliosResponse; import static org.mockito.BDDMockito.given; import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders; import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; diff --git a/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleQueryControllerTest.java similarity index 96% rename from src/test/java/es/princip/getp/api/controller/people/query/MyPeopleQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleQueryControllerTest.java index e4269c61..928d3374 100644 --- a/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/MyPeopleQueryControllerTest.java @@ -2,9 +2,9 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.people.query.dto.people.MyPeopleResponse; +import es.princip.getp.application.people.dto.response.people.MyPeopleResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.people.port.in.GetMyPeopleQuery; import es.princip.getp.domain.member.model.MemberId; diff --git a/src/test/java/es/princip/getp/api/controller/people/query/PeopleQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/PeopleQueryControllerTest.java similarity index 92% rename from src/test/java/es/princip/getp/api/controller/people/query/PeopleQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/PeopleQueryControllerTest.java index bdae76cb..16210ed3 100644 --- a/src/test/java/es/princip/getp/api/controller/people/query/PeopleQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/PeopleQueryControllerTest.java @@ -2,19 +2,18 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.people.query.dto.people.CardPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.CardPeopleProfileResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.people.command.GetPeopleCommand; +import es.princip.getp.application.people.dto.command.GetPeopleCommand; +import es.princip.getp.application.people.dto.response.people.CardPeopleResponse; +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.CardPeopleProfileResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.application.people.port.in.GetPeopleQuery; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.model.PeopleId; import es.princip.getp.fixture.member.MemberFixture; - import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -24,21 +23,21 @@ import java.util.List; import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; +import static es.princip.getp.api.controller.common.fixture.HashtagDtoFixture.hashtagsResponse; +import static es.princip.getp.api.controller.common.fixture.TechStackDtoFixture.techStacksResponse; +import static es.princip.getp.api.controller.people.fixture.PortfolioFixture.portfoliosResponse; import static es.princip.getp.api.controller.people.query.description.DetailPeopleResponseDescription.detailPeopleResponseDescription; import static es.princip.getp.api.controller.people.query.description.GetCardPeoplePageQueryParametersDescription.getCardPeoplePageQueryParametersDescription; import static es.princip.getp.api.controller.people.query.description.PagedCardPeopleResponseDescription.pagedCardPeopleResponseDescription; import static es.princip.getp.api.docs.HeaderDescriptorHelper.authorizationHeaderDescription; import static es.princip.getp.api.docs.PageResponseDescriptor.pageResponseFieldDescriptors; import static es.princip.getp.domain.member.model.MemberType.ROLE_CLIENT; -import static es.princip.getp.fixture.common.HashtagFixture.hashtagsResponse; -import static es.princip.getp.fixture.common.TechStackFixture.techStacksResponse; import static es.princip.getp.fixture.member.NicknameFixture.NICKNAME; import static es.princip.getp.fixture.member.ProfileImageFixture.profileImage; import static es.princip.getp.fixture.people.ActivityAreaFixture.activityArea; import static es.princip.getp.fixture.people.EducationFixture.education; import static es.princip.getp.fixture.people.IntroductionFixture.INTRODUCTION; import static es.princip.getp.fixture.people.IntroductionFixture.introduction; -import static es.princip.getp.fixture.people.PortfolioFixture.portfoliosResponse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.spy; diff --git a/src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleProfileResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleProfileResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleProfileResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleProfileResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/DetailPeopleResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/query/description/GetCardPeoplePageQueryParametersDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/GetCardPeoplePageQueryParametersDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/query/description/GetCardPeoplePageQueryParametersDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/GetCardPeoplePageQueryParametersDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/query/description/MyPeopleResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/MyPeopleResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/query/description/MyPeopleResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/MyPeopleResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/query/description/PagedCardPeopleResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/PagedCardPeopleResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/query/description/PagedCardPeopleResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/PagedCardPeopleResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/people/query/description/PublicDetailPeopleResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/PublicDetailPeopleResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/people/query/description/PublicDetailPeopleResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/people/query/description/PublicDetailPeopleResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/ApproveTeammateControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ApproveTeammateControllerTest.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/ApproveTeammateControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ApproveTeammateControllerTest.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/ProjectApplicationControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectApplicationControllerTest.java similarity index 98% rename from src/test/java/es/princip/getp/api/controller/project/command/ProjectApplicationControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectApplicationControllerTest.java index 790c921f..8acffff8 100644 --- a/src/test/java/es/princip/getp/api/controller/project/command/ProjectApplicationControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectApplicationControllerTest.java @@ -5,7 +5,7 @@ import es.princip.getp.api.controller.project.command.dto.request.ApplyProjectRequest; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.project.apply.command.ApplyProjectCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectCommand; import es.princip.getp.application.project.apply.port.in.ApplyProjectUseCase; import es.princip.getp.domain.member.model.MemberType; import es.princip.getp.domain.project.apply.model.ProjectApplicationId; diff --git a/src/test/java/es/princip/getp/api/controller/project/command/ProjectCommissionControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectCommissionControllerTest.java similarity index 97% rename from src/test/java/es/princip/getp/api/controller/project/command/ProjectCommissionControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectCommissionControllerTest.java index 033e93ec..5321e34a 100644 --- a/src/test/java/es/princip/getp/api/controller/project/command/ProjectCommissionControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectCommissionControllerTest.java @@ -6,7 +6,7 @@ import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.project.commission.ProjectCommissionService; -import es.princip.getp.application.project.commission.command.CommissionProjectCommand; +import es.princip.getp.application.project.commission.dto.command.CommissionProjectCommand; import es.princip.getp.domain.member.model.MemberType; import es.princip.getp.domain.project.commission.model.ProjectId; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/es/princip/getp/api/controller/project/command/ProjectMeetingControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectMeetingControllerTest.java similarity index 97% rename from src/test/java/es/princip/getp/api/controller/project/command/ProjectMeetingControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectMeetingControllerTest.java index 24886d37..3a1e1134 100644 --- a/src/test/java/es/princip/getp/api/controller/project/command/ProjectMeetingControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/ProjectMeetingControllerTest.java @@ -6,7 +6,7 @@ import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.project.meeting.ProjectMeetingService; -import es.princip.getp.application.project.meeting.command.ScheduleMeetingCommand; +import es.princip.getp.application.project.meeting.dto.command.ScheduleMeetingCommand; import es.princip.getp.domain.member.model.MemberType; import es.princip.getp.domain.project.commission.model.ProjectId; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsIndividualRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsIndividualRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsIndividualRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsIndividualRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsTeamRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsTeamRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsTeamRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectAsTeamRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ApplyProjectResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/CommissionProjectResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingRequestDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingRequestDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingRequestDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingRequestDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/description/ScheduleMeetingResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/fixture/ApplyProjectRequestFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/fixture/ApplyProjectRequestFixture.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/command/fixture/ApplyProjectRequestFixture.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/fixture/ApplyProjectRequestFixture.java diff --git a/src/test/java/es/princip/getp/api/controller/project/command/fixture/CommissionProjectRequestFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/fixture/CommissionProjectRequestFixture.java similarity index 92% rename from src/test/java/es/princip/getp/api/controller/project/command/fixture/CommissionProjectRequestFixture.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/command/fixture/CommissionProjectRequestFixture.java index d89a14a6..74d840cd 100644 --- a/src/test/java/es/princip/getp/api/controller/project/command/fixture/CommissionProjectRequestFixture.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/command/fixture/CommissionProjectRequestFixture.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.util.List; -import static es.princip.getp.fixture.common.HashtagFixture.hashtagsRequest; +import static es.princip.getp.api.controller.common.fixture.HashtagDtoFixture.hashtagsRequest; import static es.princip.getp.fixture.project.ProjectFixture.*; public class CommissionProjectRequestFixture { diff --git a/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryControllerTest.java similarity index 95% rename from src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryControllerTest.java index fce36d0d..a86e454c 100644 --- a/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicantQueryControllerTest.java @@ -2,13 +2,13 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantTeammateResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.api.support.dto.SliceResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantTeammateResponse; import es.princip.getp.application.project.apply.port.in.GetApplicantQuery; import es.princip.getp.application.support.CursorPageable; +import es.princip.getp.application.support.dto.SliceResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailFormControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailFormControllerTest.java similarity index 91% rename from src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailFormControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailFormControllerTest.java index 3b6b4f9f..2a120f4d 100644 --- a/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailFormControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailFormControllerTest.java @@ -2,10 +2,10 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailTeammateResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationFormResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationFormResponse; import es.princip.getp.application.project.apply.port.in.GetApplicationFormQuery; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; @@ -18,23 +18,23 @@ import java.util.List; import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; +import static es.princip.getp.api.controller.common.fixture.TechStackDtoFixture.techStacksResponse; +import static es.princip.getp.api.controller.people.fixture.PortfolioFixture.portfoliosResponse; import static es.princip.getp.api.controller.project.query.description.ProjectApplicationFormResponseDescription.projectApplicationFormResponseDescription; +import static es.princip.getp.api.controller.project.query.fixture.ProjectDetailResponseFixture.projectDetailResponse; import static es.princip.getp.api.docs.HeaderDescriptorHelper.authorizationHeaderDescription; import static es.princip.getp.domain.member.model.MemberType.ROLE_CLIENT; import static es.princip.getp.domain.project.apply.model.ProjectApplicationStatus.COMPLETED; import static es.princip.getp.domain.project.apply.model.ProjectApplicationType.TEAM; import static es.princip.getp.domain.project.apply.model.TeammateStatus.APPROVED; import static es.princip.getp.domain.project.apply.model.TeammateStatus.PENDING; -import static es.princip.getp.fixture.common.TechStackFixture.techStacksResponse; import static es.princip.getp.fixture.member.NicknameFixture.NICKNAME; import static es.princip.getp.fixture.member.ProfileImageFixture.profileImage; import static es.princip.getp.fixture.people.ActivityAreaFixture.ACTIVITY_AREA; import static es.princip.getp.fixture.people.EducationFixture.education; import static es.princip.getp.fixture.people.IntroductionFixture.INTRODUCTION; -import static es.princip.getp.fixture.people.PortfolioFixture.portfoliosResponse; import static es.princip.getp.fixture.project.ProjectApplicationFixture.DESCRIPTION; import static es.princip.getp.fixture.project.ProjectApplicationFixture.expectedDuration; -import static es.princip.getp.fixture.project.ProjectQueryResponseFixture.projectDetailResponse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; diff --git a/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryControllerTest.java similarity index 94% rename from src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryControllerTest.java index fcb53ed4..9e94a0d3 100644 --- a/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectApplicationDetailQueryControllerTest.java @@ -2,8 +2,8 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailTeammateResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; import es.princip.getp.application.project.apply.port.in.GetApplicationDetailQuery; @@ -19,6 +19,7 @@ import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document; import static es.princip.getp.api.controller.project.query.description.ProjectApplicationDetailResponseDescription.projectApplicationDetailResponseDescription; +import static es.princip.getp.api.controller.project.query.fixture.ProjectDetailResponseFixture.projectDetailResponse; import static es.princip.getp.api.docs.HeaderDescriptorHelper.authorizationHeaderDescription; import static es.princip.getp.domain.member.model.MemberType.ROLE_PEOPLE; import static es.princip.getp.domain.project.apply.model.ProjectApplicationStatus.COMPLETED; @@ -29,7 +30,6 @@ import static es.princip.getp.fixture.member.ProfileImageFixture.profileImage; import static es.princip.getp.fixture.project.ProjectApplicationFixture.DESCRIPTION; import static es.princip.getp.fixture.project.ProjectApplicationFixture.expectedDuration; -import static es.princip.getp.fixture.project.ProjectQueryResponseFixture.projectDetailResponse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; diff --git a/src/test/java/es/princip/getp/api/controller/project/query/ProjectQueryControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectQueryControllerTest.java similarity index 92% rename from src/test/java/es/princip/getp/api/controller/project/query/ProjectQueryControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectQueryControllerTest.java index 6cd754aa..ba98ab03 100644 --- a/src/test/java/es/princip/getp/api/controller/project/query/ProjectQueryControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/ProjectQueryControllerTest.java @@ -3,11 +3,11 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.project.commission.command.GetProjectCommand; +import es.princip.getp.application.project.commission.dto.command.GetProjectCommand; import es.princip.getp.application.project.commission.port.in.GetProjectQuery; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; @@ -25,11 +25,11 @@ import static es.princip.getp.api.controller.project.query.description.DetailProjectResponseDescription.detailProjectResponseDescription; import static es.princip.getp.api.controller.project.query.description.GetProjectsQueryParametersDescription.getProjectsQueryParametersDescription; import static es.princip.getp.api.controller.project.query.description.PagedCardProjectResponseDescription.pagedCardProjectResponseDescription; +import static es.princip.getp.api.controller.project.query.fixture.ProjectCardResponseFixture.projectCardResponse; +import static es.princip.getp.api.controller.project.query.fixture.ProjectDetailResponseFixture.projectDetailResponse; import static es.princip.getp.api.docs.HeaderDescriptorHelper.authorizationHeaderDescription; import static es.princip.getp.api.docs.PageResponseDescriptor.pageResponseFieldDescriptors; import static es.princip.getp.domain.member.model.MemberType.ROLE_PEOPLE; -import static es.princip.getp.fixture.project.ProjectQueryResponseFixture.projectCardResponse; -import static es.princip.getp.fixture.project.ProjectQueryResponseFixture.projectDetailResponse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.spy; diff --git a/src/test/java/es/princip/getp/api/controller/project/query/SearchTeammateControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/SearchTeammateControllerTest.java similarity index 95% rename from src/test/java/es/princip/getp/api/controller/project/query/SearchTeammateControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/SearchTeammateControllerTest.java index 8ea956e0..42eae5c1 100644 --- a/src/test/java/es/princip/getp/api/controller/project/query/SearchTeammateControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/SearchTeammateControllerTest.java @@ -2,11 +2,11 @@ import com.epages.restdocs.apispec.ResourceSnippetParameters; import com.epages.restdocs.apispec.Schema; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.api.support.dto.SliceResponse; -import es.princip.getp.application.people.command.SearchTeammateCommand; +import es.princip.getp.application.people.dto.command.SearchTeammateCommand; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.project.apply.port.in.SearchTeammateQuery; +import es.princip.getp.application.support.dto.SliceResponse; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.project.commission.model.ProjectId; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/DetailProjectResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/DetailProjectResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/DetailProjectResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/DetailProjectResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/GetProjectsQueryParametersDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/GetProjectsQueryParametersDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/GetProjectsQueryParametersDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/GetProjectsQueryParametersDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/PagedCardProjectResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/PagedCardProjectResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/PagedCardProjectResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/PagedCardProjectResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/PagedProjectApplicantResponseFields.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/PagedProjectApplicantResponseFields.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/PagedProjectApplicantResponseFields.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/PagedProjectApplicantResponseFields.java diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationDetailResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationDetailResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationDetailResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationDetailResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationFormResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationFormResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationFormResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/ProjectApplicationFormResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateQueryParametersDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateQueryParametersDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateQueryParametersDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateQueryParametersDescription.java diff --git a/src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/description/SearchTeammateResponseDescription.java diff --git a/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/fixture/ProjectCardResponseFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/fixture/ProjectCardResponseFixture.java new file mode 100644 index 00000000..9a4126b3 --- /dev/null +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/fixture/ProjectCardResponseFixture.java @@ -0,0 +1,32 @@ +package es.princip.getp.api.controller.project.query.fixture; + +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.domain.common.model.Duration; +import es.princip.getp.domain.project.commission.model.ProjectId; +import es.princip.getp.domain.project.commission.model.ProjectStatus; + +import java.time.LocalDate; + +import static es.princip.getp.api.controller.common.fixture.HashtagDtoFixture.hashtagsResponse; +import static es.princip.getp.fixture.project.ProjectFixture.*; + +public class ProjectCardResponseFixture { + + public static ProjectCardResponse projectCardResponse(final ProjectId projectId) { + return new ProjectCardResponse( + projectId.getValue(), + TITLE, + PAYMENT, + RECRUITMENT_COUNT, + 5L, + 10L, + Duration.of( + LocalDate.of(2024, 7, 1), + LocalDate.of(2024, 7, 7) + ), + hashtagsResponse(), + DESCRIPTION, + ProjectStatus.APPLICATION_OPENED + ); + } +} diff --git a/src/test/java/es/princip/getp/fixture/project/ProjectQueryResponseFixture.java b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/fixture/ProjectDetailResponseFixture.java similarity index 60% rename from src/test/java/es/princip/getp/fixture/project/ProjectQueryResponseFixture.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/project/query/fixture/ProjectDetailResponseFixture.java index b94233d4..986cd33d 100644 --- a/src/test/java/es/princip/getp/fixture/project/ProjectQueryResponseFixture.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/project/query/fixture/ProjectDetailResponseFixture.java @@ -1,8 +1,7 @@ -package es.princip.getp.fixture.project; +package es.princip.getp.api.controller.project.query.fixture; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectClientResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.domain.common.model.Duration; import es.princip.getp.domain.project.commission.model.MeetingType; import es.princip.getp.domain.project.commission.model.ProjectCategory; @@ -12,30 +11,12 @@ import java.time.LocalDate; import java.util.List; -import static es.princip.getp.fixture.client.AddressFixture.addressResponse; -import static es.princip.getp.fixture.common.HashtagFixture.hashtagsResponse; +import static es.princip.getp.api.controller.common.fixture.AddressResponseFixture.addressResponse; +import static es.princip.getp.api.controller.common.fixture.HashtagDtoFixture.hashtagsResponse; import static es.princip.getp.fixture.member.NicknameFixture.NICKNAME; import static es.princip.getp.fixture.project.ProjectFixture.*; -public class ProjectQueryResponseFixture { - - public static ProjectCardResponse projectCardResponse(final ProjectId projectId) { - return new ProjectCardResponse( - projectId.getValue(), - TITLE, - PAYMENT, - RECRUITMENT_COUNT, - 5L, - 10L, - Duration.of( - LocalDate.of(2024, 7, 1), - LocalDate.of(2024, 7, 7) - ), - hashtagsResponse(), - DESCRIPTION, - ProjectStatus.APPLICATION_OPENED - ); - } +public class ProjectDetailResponseFixture { public static ProjectDetailResponse projectDetailResponse(final ProjectId projectId) { return new ProjectDetailResponse( diff --git a/src/test/java/es/princip/getp/api/controller/storage/FileStorageControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/controller/storage/FileStorageControllerTest.java similarity index 97% rename from src/test/java/es/princip/getp/api/controller/storage/FileStorageControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/controller/storage/FileStorageControllerTest.java index 8536a726..b55e84ac 100644 --- a/src/test/java/es/princip/getp/api/controller/storage/FileStorageControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/controller/storage/FileStorageControllerTest.java @@ -4,7 +4,7 @@ import com.epages.restdocs.apispec.Schema; import es.princip.getp.api.security.annotation.WithCustomMockUser; import es.princip.getp.api.support.ControllerTest; -import es.princip.getp.application.storage.command.UploadFileCommand; +import es.princip.getp.application.storage.dto.command.UploadFileCommand; import es.princip.getp.application.storage.port.in.UploadFileUseCase; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/es/princip/getp/api/docs/ConstraintDescriptor.java b/get-p-api/src/test/java/es/princip/getp/api/docs/ConstraintDescriptor.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/ConstraintDescriptor.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/ConstraintDescriptor.java diff --git a/src/test/java/es/princip/getp/api/docs/EnumDescriptor.java b/get-p-api/src/test/java/es/princip/getp/api/docs/EnumDescriptor.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/EnumDescriptor.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/EnumDescriptor.java diff --git a/src/test/java/es/princip/getp/api/docs/HeaderDescriptorHelper.java b/get-p-api/src/test/java/es/princip/getp/api/docs/HeaderDescriptorHelper.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/HeaderDescriptorHelper.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/HeaderDescriptorHelper.java diff --git a/src/test/java/es/princip/getp/api/docs/PageResponseDescriptor.java b/get-p-api/src/test/java/es/princip/getp/api/docs/PageResponseDescriptor.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/PageResponseDescriptor.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/PageResponseDescriptor.java diff --git a/src/test/java/es/princip/getp/api/docs/PaginationDescription.java b/get-p-api/src/test/java/es/princip/getp/api/docs/PaginationDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/PaginationDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/PaginationDescription.java diff --git a/src/test/java/es/princip/getp/api/docs/ParameterDescriptorHelper.java b/get-p-api/src/test/java/es/princip/getp/api/docs/ParameterDescriptorHelper.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/ParameterDescriptorHelper.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/ParameterDescriptorHelper.java diff --git a/src/test/java/es/princip/getp/api/docs/SliceResponseDescription.java b/get-p-api/src/test/java/es/princip/getp/api/docs/SliceResponseDescription.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/SliceResponseDescription.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/SliceResponseDescription.java diff --git a/src/test/java/es/princip/getp/api/docs/StatusFieldDescriptor.java b/get-p-api/src/test/java/es/princip/getp/api/docs/StatusFieldDescriptor.java similarity index 100% rename from src/test/java/es/princip/getp/api/docs/StatusFieldDescriptor.java rename to get-p-api/src/test/java/es/princip/getp/api/docs/StatusFieldDescriptor.java diff --git a/src/test/java/es/princip/getp/api/security/PrincipalDetailsParameterResolver.java b/get-p-api/src/test/java/es/princip/getp/api/security/PrincipalDetailsParameterResolver.java similarity index 94% rename from src/test/java/es/princip/getp/api/security/PrincipalDetailsParameterResolver.java rename to get-p-api/src/test/java/es/princip/getp/api/security/PrincipalDetailsParameterResolver.java index a00f8b55..81511f84 100644 --- a/src/test/java/es/princip/getp/api/security/PrincipalDetailsParameterResolver.java +++ b/get-p-api/src/test/java/es/princip/getp/api/security/PrincipalDetailsParameterResolver.java @@ -1,6 +1,6 @@ package es.princip.getp.api.security; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolutionException; diff --git a/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUser.java b/get-p-api/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUser.java similarity index 100% rename from src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUser.java rename to get-p-api/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUser.java diff --git a/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUserSecurityContextFactory.java b/get-p-api/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUserSecurityContextFactory.java similarity index 97% rename from src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUserSecurityContextFactory.java rename to get-p-api/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUserSecurityContextFactory.java index 4b3d4d98..a1848ce4 100644 --- a/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUserSecurityContextFactory.java +++ b/get-p-api/src/test/java/es/princip/getp/api/security/annotation/WithCustomMockUserSecurityContextFactory.java @@ -1,6 +1,6 @@ package es.princip.getp.api.security.annotation; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.service.PrincipalDetails; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.PhoneNumber; import es.princip.getp.domain.member.model.*; diff --git a/src/test/java/es/princip/getp/api/support/ControllerTest.java b/get-p-api/src/test/java/es/princip/getp/api/support/ControllerTest.java similarity index 89% rename from src/test/java/es/princip/getp/api/support/ControllerTest.java rename to get-p-api/src/test/java/es/princip/getp/api/support/ControllerTest.java index 8b8988df..a6fce910 100644 --- a/src/test/java/es/princip/getp/api/support/ControllerTest.java +++ b/get-p-api/src/test/java/es/princip/getp/api/support/ControllerTest.java @@ -4,7 +4,6 @@ import es.princip.getp.api.config.MockDaoBeanFactoryPostProcessor; import es.princip.getp.api.config.MockServiceBeanFactoryPostProcessor; import es.princip.getp.api.security.PrincipalDetailsParameterResolver; -import es.princip.getp.api.security.SecurityConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; @@ -19,9 +18,7 @@ import org.springframework.restdocs.RestDocumentationContextProvider; import org.springframework.restdocs.RestDocumentationExtension; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; -import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder; import org.springframework.test.web.servlet.result.MockMvcResultHandlers; @@ -31,11 +28,8 @@ import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration; import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @WebMvcTest -@ActiveProfiles("test") @ComponentScan("es.princip.getp.api") @Execution(ExecutionMode.SAME_THREAD) @TestInstance(TestInstance.Lifecycle.PER_CLASS) @@ -99,10 +93,4 @@ void setUp(final WebApplicationContext context, final RestDocumentationContextPr .addFilters(new CharacterEncodingFilter("UTF-8", true)) .build(); } - - protected static void expectForbidden(final ResultActions result) throws Exception { - result - .andExpect(status().isForbidden()) - .andDo(print()); - } } diff --git a/src/test/java/es/princip/getp/api/support/CursorParserTest.java b/get-p-api/src/test/java/es/princip/getp/api/support/CursorParserTest.java similarity index 100% rename from src/test/java/es/princip/getp/api/support/CursorParserTest.java rename to get-p-api/src/test/java/es/princip/getp/api/support/CursorParserTest.java diff --git a/src/test/java/es/princip/getp/config/ObjectMapperConfig.java b/get-p-api/src/test/java/es/princip/getp/config/ObjectMapperConfig.java similarity index 100% rename from src/test/java/es/princip/getp/config/ObjectMapperConfig.java rename to get-p-api/src/test/java/es/princip/getp/config/ObjectMapperConfig.java diff --git a/get-p-api/src/test/resources/application.yml b/get-p-api/src/test/resources/application.yml new file mode 100644 index 00000000..ffe4b429 --- /dev/null +++ b/get-p-api/src/test/resources/application.yml @@ -0,0 +1,13 @@ +server: + servlet: + context-path: ${BASE_PATH} + +spring: + messages: + basename: messages/validation, messages/error + +logging: + level: + org: + springframework: + security: DEBUG \ No newline at end of file diff --git a/src/test/resources/org/springframework/restdocs/templates/asciidoctor/query-parameters.snippet b/get-p-api/src/test/resources/org/springframework/restdocs/templates/asciidoctor/query-parameters.snippet similarity index 100% rename from src/test/resources/org/springframework/restdocs/templates/asciidoctor/query-parameters.snippet rename to get-p-api/src/test/resources/org/springframework/restdocs/templates/asciidoctor/query-parameters.snippet diff --git a/src/test/resources/org/springframework/restdocs/templates/asciidoctor/request-fields.snippet b/get-p-api/src/test/resources/org/springframework/restdocs/templates/asciidoctor/request-fields.snippet similarity index 100% rename from src/test/resources/org/springframework/restdocs/templates/asciidoctor/request-fields.snippet rename to get-p-api/src/test/resources/org/springframework/restdocs/templates/asciidoctor/request-fields.snippet diff --git a/src/test/resources/org/springframework/restdocs/templates/asciidoctor/response-fields.snippet b/get-p-api/src/test/resources/org/springframework/restdocs/templates/asciidoctor/response-fields.snippet similarity index 100% rename from src/test/resources/org/springframework/restdocs/templates/asciidoctor/response-fields.snippet rename to get-p-api/src/test/resources/org/springframework/restdocs/templates/asciidoctor/response-fields.snippet diff --git a/get-p-application/build.gradle b/get-p-application/build.gradle new file mode 100644 index 00000000..7f0ef650 --- /dev/null +++ b/get-p-application/build.gradle @@ -0,0 +1,42 @@ +dependencies { + // 모듈 의존성 + implementation(project(':get-p-domain')) + testImplementation(testFixtures(project(':get-p-domain'))) + + // Spring AOP + implementation 'org.springframework.boot:spring-boot-starter-aop:3.3.5' + + // Spring Web + implementation 'org.springframework.boot:spring-boot-starter-web:3.3.5' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.3.5' + + // Spring Validation + implementation 'org.springframework.boot:spring-boot-starter-validation:3.3.5' + + // Spring Data + implementation 'org.springframework.data:spring-data-commons' + + // Spring Transaction + implementation 'org.springframework:spring-tx' + + // Spring Security + implementation 'org.springframework.boot:spring-boot-starter-security:3.3.5' + testImplementation 'org.springframework.security:spring-security-test:6.3.4' + + // JWT + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + implementation 'io.jsonwebtoken:jjwt-impl:0.11.5' + implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // 메일 + implementation 'com.sun.mail:jakarta.mail:2.0.1' + implementation 'org.springframework.boot:spring-boot-starter-mail:3.2.1' +} + +bootJar { + enabled = false +} + +jar { + enabled = true +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/application/auth/command/SignUpCommand.java b/get-p-application/src/main/java/es/princip/getp/application/auth/dto/command/SignUpCommand.java similarity index 88% rename from src/main/java/es/princip/getp/application/auth/command/SignUpCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/dto/command/SignUpCommand.java index 14b3736f..ab9a72d0 100644 --- a/src/main/java/es/princip/getp/application/auth/command/SignUpCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/dto/command/SignUpCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.auth.command; +package es.princip.getp.application.auth.dto.command; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.member.model.MemberType; diff --git a/src/main/java/es/princip/getp/api/controller/auth/dto/response/Token.java b/get-p-application/src/main/java/es/princip/getp/application/auth/dto/response/Token.java similarity index 62% rename from src/main/java/es/princip/getp/api/controller/auth/dto/response/Token.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/dto/response/Token.java index 942c8d96..b1318b73 100644 --- a/src/main/java/es/princip/getp/api/controller/auth/dto/response/Token.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/dto/response/Token.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.auth.dto.response; +package es.princip.getp.application.auth.dto.response; public record Token( String grantType, diff --git a/src/main/java/es/princip/getp/application/auth/exception/DuplicatedEmailException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/DuplicatedEmailException.java similarity index 100% rename from src/main/java/es/princip/getp/application/auth/exception/DuplicatedEmailException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/DuplicatedEmailException.java diff --git a/src/main/java/es/princip/getp/api/security/exception/ExpiredTokenException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/ExpiredTokenException.java similarity index 86% rename from src/main/java/es/princip/getp/api/security/exception/ExpiredTokenException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/ExpiredTokenException.java index 3a8c6ca7..b1742fab 100644 --- a/src/main/java/es/princip/getp/api/security/exception/ExpiredTokenException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/ExpiredTokenException.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.security.exception; +package es.princip.getp.application.auth.exception; import es.princip.getp.domain.support.ErrorDescription; diff --git a/src/main/java/es/princip/getp/application/auth/exception/FailedVerificationCodeSendingException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/FailedVerificationCodeSendingException.java similarity index 100% rename from src/main/java/es/princip/getp/application/auth/exception/FailedVerificationCodeSendingException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/FailedVerificationCodeSendingException.java diff --git a/src/main/java/es/princip/getp/application/auth/exception/IncorrectEmailOrPasswordException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/IncorrectEmailOrPasswordException.java similarity index 100% rename from src/main/java/es/princip/getp/application/auth/exception/IncorrectEmailOrPasswordException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/IncorrectEmailOrPasswordException.java diff --git a/src/main/java/es/princip/getp/application/auth/exception/IncorrectVerificationCodeException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/IncorrectVerificationCodeException.java similarity index 100% rename from src/main/java/es/princip/getp/application/auth/exception/IncorrectVerificationCodeException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/IncorrectVerificationCodeException.java diff --git a/src/main/java/es/princip/getp/api/security/exception/InvalidTokenException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/InvalidTokenException.java similarity index 87% rename from src/main/java/es/princip/getp/api/security/exception/InvalidTokenException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/InvalidTokenException.java index 83158564..9af399fa 100644 --- a/src/main/java/es/princip/getp/api/security/exception/InvalidTokenException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/InvalidTokenException.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.security.exception; +package es.princip.getp.application.auth.exception; import es.princip.getp.domain.support.ErrorDescription; diff --git a/src/main/java/es/princip/getp/api/security/exception/JwtTokenException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/JwtTokenException.java similarity index 85% rename from src/main/java/es/princip/getp/api/security/exception/JwtTokenException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/JwtTokenException.java index 23f1d9f6..c0bdb690 100644 --- a/src/main/java/es/princip/getp/api/security/exception/JwtTokenException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/JwtTokenException.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.security.exception; +package es.princip.getp.application.auth.exception; import es.princip.getp.domain.support.DomainLogicException; import es.princip.getp.domain.support.ErrorDescription; diff --git a/src/main/java/es/princip/getp/application/auth/exception/NotFoundVerificationException.java b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/NotFoundVerificationException.java similarity index 88% rename from src/main/java/es/princip/getp/application/auth/exception/NotFoundVerificationException.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/exception/NotFoundVerificationException.java index 97ce74fc..373bb87d 100644 --- a/src/main/java/es/princip/getp/application/auth/exception/NotFoundVerificationException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/exception/NotFoundVerificationException.java @@ -1,7 +1,7 @@ package es.princip.getp.application.auth.exception; +import es.princip.getp.application.support.NotFoundException; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; public class NotFoundVerificationException extends NotFoundException { diff --git a/src/main/java/es/princip/getp/application/auth/infra/EmailVerificationCodeSender.java b/get-p-application/src/main/java/es/princip/getp/application/auth/infra/EmailVerificationCodeSender.java similarity index 95% rename from src/main/java/es/princip/getp/application/auth/infra/EmailVerificationCodeSender.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/infra/EmailVerificationCodeSender.java index c515805b..4472fd46 100644 --- a/src/main/java/es/princip/getp/application/auth/infra/EmailVerificationCodeSender.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/infra/EmailVerificationCodeSender.java @@ -12,7 +12,7 @@ @Service @RequiredArgsConstructor -public class EmailVerificationCodeSender implements VerificationCodeSender { +class EmailVerificationCodeSender implements VerificationCodeSender { private final SendMailUseCase sendMailUseCase; diff --git a/get-p-application/src/main/java/es/princip/getp/application/auth/infra/SecurityPasswordEncoder.java b/get-p-application/src/main/java/es/princip/getp/application/auth/infra/SecurityPasswordEncoder.java new file mode 100644 index 00000000..951797a5 --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/infra/SecurityPasswordEncoder.java @@ -0,0 +1,22 @@ +package es.princip.getp.application.auth.infra; + +import es.princip.getp.domain.member.PasswordEncoder; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +class SecurityPasswordEncoder implements PasswordEncoder { + + private final org.springframework.security.crypto.password.PasswordEncoder passwordEncoder; + + @Override + public String encode(CharSequence rawPassword) { + return passwordEncoder.encode(rawPassword); + } + + @Override + public boolean matches(CharSequence rawPassword, String encodedPassword) { + return passwordEncoder.matches(rawPassword, encodedPassword); + } +} diff --git a/src/main/java/es/princip/getp/application/auth/service/AccessTokenService.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/AccessTokenService.java similarity index 100% rename from src/main/java/es/princip/getp/application/auth/service/AccessTokenService.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/AccessTokenService.java diff --git a/src/main/java/es/princip/getp/application/auth/service/AuthService.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/AuthService.java similarity index 85% rename from src/main/java/es/princip/getp/application/auth/service/AuthService.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/AuthService.java index 52ba1eb0..5ac2bdc3 100644 --- a/src/main/java/es/princip/getp/application/auth/service/AuthService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/AuthService.java @@ -1,8 +1,6 @@ package es.princip.getp.application.auth.service; -import es.princip.getp.api.controller.auth.dto.request.LoginRequest; -import es.princip.getp.api.controller.auth.dto.response.Token; -import es.princip.getp.api.security.details.PrincipalDetails; +import es.princip.getp.application.auth.dto.response.Token; import es.princip.getp.application.auth.exception.IncorrectEmailOrPasswordException; import es.princip.getp.domain.member.model.Member; import jakarta.servlet.http.HttpServletRequest; @@ -22,10 +20,7 @@ public class AuthService { private final RefreshTokenService refreshTokenService; @Transactional - public Token login(final LoginRequest request) { - final String email = request.email(); - final String password = request.password(); - + public Token login(final String email, final String password) { try { final UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(email, password); diff --git a/get-p-application/src/main/java/es/princip/getp/application/auth/service/EmailVerificationRepository.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/EmailVerificationRepository.java new file mode 100644 index 00000000..6db4ba2f --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/EmailVerificationRepository.java @@ -0,0 +1,10 @@ +package es.princip.getp.application.auth.service; + +import es.princip.getp.domain.auth.EmailVerification; + +public interface EmailVerificationRepository { + + void deleteById(String email); + void save(EmailVerification verification); + EmailVerification findById(String email); +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/application/auth/service/JwtTokenService.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/JwtTokenService.java similarity index 95% rename from src/main/java/es/princip/getp/application/auth/service/JwtTokenService.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/JwtTokenService.java index 7f84459a..e4cdc64a 100644 --- a/src/main/java/es/princip/getp/application/auth/service/JwtTokenService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/JwtTokenService.java @@ -1,8 +1,7 @@ package es.princip.getp.application.auth.service; -import es.princip.getp.api.security.details.PrincipalDetails; -import es.princip.getp.api.security.exception.ExpiredTokenException; -import es.princip.getp.api.security.exception.InvalidTokenException; +import es.princip.getp.application.auth.exception.ExpiredTokenException; +import es.princip.getp.application.auth.exception.InvalidTokenException; import es.princip.getp.application.member.port.out.LoadMemberPort; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.member.model.Member; diff --git a/src/main/java/es/princip/getp/api/security/details/PrincipalDetails.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/PrincipalDetails.java similarity index 96% rename from src/main/java/es/princip/getp/api/security/details/PrincipalDetails.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/PrincipalDetails.java index 446d5d50..613809e4 100644 --- a/src/main/java/es/princip/getp/api/security/details/PrincipalDetails.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/PrincipalDetails.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.security.details; +package es.princip.getp.application.auth.service; import es.princip.getp.domain.member.model.Member; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/es/princip/getp/api/security/details/PrincipalDetailsService.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/PrincipalDetailsService.java similarity index 93% rename from src/main/java/es/princip/getp/api/security/details/PrincipalDetailsService.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/PrincipalDetailsService.java index ea0eaf46..1d29cb75 100644 --- a/src/main/java/es/princip/getp/api/security/details/PrincipalDetailsService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/PrincipalDetailsService.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.security.details; +package es.princip.getp.application.auth.service; import es.princip.getp.application.member.port.out.LoadMemberPort; import es.princip.getp.domain.common.model.Email; diff --git a/get-p-application/src/main/java/es/princip/getp/application/auth/service/RefreshTokenRepository.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/RefreshTokenRepository.java new file mode 100644 index 00000000..1472c69d --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/RefreshTokenRepository.java @@ -0,0 +1,9 @@ +package es.princip.getp.application.auth.service; + +import es.princip.getp.domain.auth.RefreshToken; + +public interface RefreshTokenRepository { + + boolean existsByRefreshToken(String refreshToken); + void save(RefreshToken refreshToken); +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/application/auth/service/RefreshTokenService.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/RefreshTokenService.java similarity index 92% rename from src/main/java/es/princip/getp/application/auth/service/RefreshTokenService.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/RefreshTokenService.java index 9e49c1a1..41e4b1fa 100644 --- a/src/main/java/es/princip/getp/application/auth/service/RefreshTokenService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/RefreshTokenService.java @@ -1,7 +1,8 @@ package es.princip.getp.application.auth.service; -import es.princip.getp.api.security.exception.InvalidTokenException; +import es.princip.getp.application.auth.exception.InvalidTokenException; import es.princip.getp.application.member.port.out.LoadMemberPort; +import es.princip.getp.domain.auth.RefreshToken; import es.princip.getp.domain.member.model.MemberId; import io.jsonwebtoken.Claims; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/es/princip/getp/application/auth/service/SignUpService.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/SignUpService.java similarity index 95% rename from src/main/java/es/princip/getp/application/auth/service/SignUpService.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/SignUpService.java index ef715cc0..113db7be 100644 --- a/src/main/java/es/princip/getp/application/auth/service/SignUpService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/SignUpService.java @@ -1,18 +1,18 @@ package es.princip.getp.application.auth.service; -import es.princip.getp.application.auth.command.SignUpCommand; +import es.princip.getp.application.auth.dto.command.SignUpCommand; import es.princip.getp.application.auth.exception.DuplicatedEmailException; import es.princip.getp.application.member.port.out.CheckMemberPort; import es.princip.getp.application.member.port.out.SaveMemberPort; import es.princip.getp.application.serviceTerm.port.out.CheckServiceTermPort; import es.princip.getp.application.serviceTerm.port.out.LoadServiceTermPort; import es.princip.getp.domain.common.model.Email; +import es.princip.getp.domain.member.PasswordEncoder; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.ServiceTermAgreementData; import es.princip.getp.domain.serviceTerm.model.ServiceTerm; import es.princip.getp.domain.serviceTerm.model.ServiceTermTag; import lombok.RequiredArgsConstructor; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/es/princip/getp/application/auth/service/TokenFactory.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/TokenFactory.java similarity index 92% rename from src/main/java/es/princip/getp/application/auth/service/TokenFactory.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/TokenFactory.java index 9afa094b..3b28d80c 100644 --- a/src/main/java/es/princip/getp/application/auth/service/TokenFactory.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/TokenFactory.java @@ -1,6 +1,6 @@ package es.princip.getp.application.auth.service; -import es.princip.getp.api.controller.auth.dto.response.Token; +import es.princip.getp.application.auth.dto.response.Token; import es.princip.getp.domain.member.model.Member; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/es/princip/getp/application/auth/service/VerificationCodeSender.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/VerificationCodeSender.java similarity index 100% rename from src/main/java/es/princip/getp/application/auth/service/VerificationCodeSender.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/VerificationCodeSender.java diff --git a/src/main/java/es/princip/getp/application/auth/service/VerificationService.java b/get-p-application/src/main/java/es/princip/getp/application/auth/service/VerificationService.java similarity index 91% rename from src/main/java/es/princip/getp/application/auth/service/VerificationService.java rename to get-p-application/src/main/java/es/princip/getp/application/auth/service/VerificationService.java index 4facfd31..0459b435 100644 --- a/src/main/java/es/princip/getp/application/auth/service/VerificationService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/auth/service/VerificationService.java @@ -1,7 +1,7 @@ package es.princip.getp.application.auth.service; import es.princip.getp.application.auth.exception.IncorrectVerificationCodeException; -import es.princip.getp.application.auth.exception.NotFoundVerificationException; +import es.princip.getp.domain.auth.EmailVerification; import es.princip.getp.domain.common.model.Email; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -44,12 +44,11 @@ public void sendVerificationCode(Email email) { @Transactional public void verifyEmail(final Email email, final String verificationCode) { - final EmailVerification verification = verificationRepository.findById(email.getValue()) - .orElseThrow(NotFoundVerificationException::new); + final EmailVerification verification = verificationRepository.findById(email.getValue()); if (!verification.verify(verificationCode)) { throw new IncorrectVerificationCodeException(); } - verificationRepository.delete(verification); + verificationRepository.deleteById(email.getValue()); } private static String generateRandomCode(int length) { diff --git a/src/main/java/es/princip/getp/application/client/command/EditClientCommand.java b/get-p-application/src/main/java/es/princip/getp/application/client/dto/command/EditClientCommand.java similarity index 89% rename from src/main/java/es/princip/getp/application/client/command/EditClientCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/client/dto/command/EditClientCommand.java index 30a4a7a9..4791355a 100644 --- a/src/main/java/es/princip/getp/application/client/command/EditClientCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/dto/command/EditClientCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.client.command; +package es.princip.getp.application.client.dto.command; import es.princip.getp.domain.client.model.Address; import es.princip.getp.domain.common.model.Email; diff --git a/src/main/java/es/princip/getp/application/client/command/RegisterClientCommand.java b/get-p-application/src/main/java/es/princip/getp/application/client/dto/command/RegisterClientCommand.java similarity index 89% rename from src/main/java/es/princip/getp/application/client/command/RegisterClientCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/client/dto/command/RegisterClientCommand.java index 22db4486..aec5942a 100644 --- a/src/main/java/es/princip/getp/application/client/command/RegisterClientCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/dto/command/RegisterClientCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.client.command; +package es.princip.getp.application.client.dto.command; import es.princip.getp.domain.client.model.Address; import es.princip.getp.domain.common.model.Email; diff --git a/src/main/java/es/princip/getp/api/controller/client/query/dto/ClientResponse.java b/get-p-application/src/main/java/es/princip/getp/application/client/dto/response/ClientResponse.java similarity index 84% rename from src/main/java/es/princip/getp/api/controller/client/query/dto/ClientResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/client/dto/response/ClientResponse.java index 4c5d961a..e5353e1a 100644 --- a/src/main/java/es/princip/getp/api/controller/client/query/dto/ClientResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/dto/response/ClientResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.client.query.dto; +package es.princip.getp.application.client.dto.response; import es.princip.getp.domain.client.model.Address; diff --git a/get-p-application/src/main/java/es/princip/getp/application/client/dto/response/RegisterMyClientResponse.java b/get-p-application/src/main/java/es/princip/getp/application/client/dto/response/RegisterMyClientResponse.java new file mode 100644 index 00000000..bd2aad27 --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/client/dto/response/RegisterMyClientResponse.java @@ -0,0 +1,6 @@ +package es.princip.getp.application.client.dto.response; + +public record RegisterMyClientResponse( + Long clientId +) { +} diff --git a/src/main/java/es/princip/getp/application/client/exception/AlreadyExistsClientException.java b/get-p-application/src/main/java/es/princip/getp/application/client/exception/AlreadyExistsClientException.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/exception/AlreadyExistsClientException.java rename to get-p-application/src/main/java/es/princip/getp/application/client/exception/AlreadyExistsClientException.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/NotFoundClientException.java b/get-p-application/src/main/java/es/princip/getp/application/client/exception/NotFoundClientException.java similarity index 54% rename from src/main/java/es/princip/getp/persistence/adapter/client/NotFoundClientException.java rename to get-p-application/src/main/java/es/princip/getp/application/client/exception/NotFoundClientException.java index 4bca1a05..8b073880 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/client/NotFoundClientException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/exception/NotFoundClientException.java @@ -1,14 +1,14 @@ -package es.princip.getp.persistence.adapter.client; +package es.princip.getp.application.client.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.application.support.NotFoundException; -class NotFoundClientException extends NotFoundException { +public class NotFoundClientException extends NotFoundException { private static final String code = "NOT_FOUND_CLIENT"; private static final String message = "존재하지 않는 의뢰자입니다."; - NotFoundClientException() { + public NotFoundClientException() { super(ErrorDescription.of(code, message)); } } diff --git a/src/main/java/es/princip/getp/application/client/port/in/EditClientUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/in/EditClientUseCase.java similarity index 65% rename from src/main/java/es/princip/getp/application/client/port/in/EditClientUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/in/EditClientUseCase.java index f780c3f8..a756f57a 100644 --- a/src/main/java/es/princip/getp/application/client/port/in/EditClientUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/port/in/EditClientUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.client.port.in; -import es.princip.getp.application.client.command.EditClientCommand; +import es.princip.getp.application.client.dto.command.EditClientCommand; public interface EditClientUseCase { diff --git a/src/main/java/es/princip/getp/application/client/port/in/RegisterClientUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/in/RegisterClientUseCase.java similarity index 72% rename from src/main/java/es/princip/getp/application/client/port/in/RegisterClientUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/in/RegisterClientUseCase.java index 440e9bc5..b9686626 100644 --- a/src/main/java/es/princip/getp/application/client/port/in/RegisterClientUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/port/in/RegisterClientUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.client.port.in; -import es.princip.getp.application.client.command.RegisterClientCommand; +import es.princip.getp.application.client.dto.command.RegisterClientCommand; import es.princip.getp.domain.client.model.ClientId; public interface RegisterClientUseCase { diff --git a/src/main/java/es/princip/getp/application/client/port/in/RemoveClientUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/in/RemoveClientUseCase.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/port/in/RemoveClientUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/in/RemoveClientUseCase.java diff --git a/src/main/java/es/princip/getp/application/client/port/out/CheckClientPort.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/out/CheckClientPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/port/out/CheckClientPort.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/out/CheckClientPort.java diff --git a/src/main/java/es/princip/getp/application/client/port/out/ClientQuery.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/out/ClientQuery.java similarity index 71% rename from src/main/java/es/princip/getp/application/client/port/out/ClientQuery.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/out/ClientQuery.java index 3afb1304..9842a8f1 100644 --- a/src/main/java/es/princip/getp/application/client/port/out/ClientQuery.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/port/out/ClientQuery.java @@ -1,7 +1,7 @@ package es.princip.getp.application.client.port.out; -import es.princip.getp.api.controller.client.query.dto.ClientResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectClientResponse; +import es.princip.getp.application.client.dto.response.ClientResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; import es.princip.getp.domain.client.model.ClientId; import es.princip.getp.domain.member.model.MemberId; diff --git a/src/main/java/es/princip/getp/application/client/port/out/DeleteClientPort.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/out/DeleteClientPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/port/out/DeleteClientPort.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/out/DeleteClientPort.java diff --git a/src/main/java/es/princip/getp/application/client/port/out/LoadClientPort.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/out/LoadClientPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/port/out/LoadClientPort.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/out/LoadClientPort.java diff --git a/src/main/java/es/princip/getp/application/client/port/out/SaveClientPort.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/out/SaveClientPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/port/out/SaveClientPort.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/out/SaveClientPort.java diff --git a/src/main/java/es/princip/getp/application/client/port/out/UpdateClientPort.java b/get-p-application/src/main/java/es/princip/getp/application/client/port/out/UpdateClientPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/port/out/UpdateClientPort.java rename to get-p-application/src/main/java/es/princip/getp/application/client/port/out/UpdateClientPort.java diff --git a/src/main/java/es/princip/getp/application/client/service/EditClientService.java b/get-p-application/src/main/java/es/princip/getp/application/client/service/EditClientService.java similarity index 88% rename from src/main/java/es/princip/getp/application/client/service/EditClientService.java rename to get-p-application/src/main/java/es/princip/getp/application/client/service/EditClientService.java index 870ff0d8..694367dd 100644 --- a/src/main/java/es/princip/getp/application/client/service/EditClientService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/service/EditClientService.java @@ -1,10 +1,10 @@ package es.princip.getp.application.client.service; -import es.princip.getp.application.client.command.EditClientCommand; +import es.princip.getp.application.client.dto.command.EditClientCommand; import es.princip.getp.application.client.port.in.EditClientUseCase; import es.princip.getp.application.client.port.out.LoadClientPort; import es.princip.getp.application.client.port.out.UpdateClientPort; -import es.princip.getp.application.member.command.EditMemberCommand; +import es.princip.getp.application.member.dto.command.EditMemberCommand; import es.princip.getp.application.member.port.in.EditMemberUseCase; import es.princip.getp.domain.client.model.Client; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/es/princip/getp/application/client/service/RegisterClientService.java b/get-p-application/src/main/java/es/princip/getp/application/client/service/RegisterClientService.java similarity index 92% rename from src/main/java/es/princip/getp/application/client/service/RegisterClientService.java rename to get-p-application/src/main/java/es/princip/getp/application/client/service/RegisterClientService.java index bc95a2d9..efecb651 100644 --- a/src/main/java/es/princip/getp/application/client/service/RegisterClientService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/client/service/RegisterClientService.java @@ -1,11 +1,11 @@ package es.princip.getp.application.client.service; -import es.princip.getp.application.client.command.RegisterClientCommand; +import es.princip.getp.application.client.dto.command.RegisterClientCommand; import es.princip.getp.application.client.exception.AlreadyExistsClientException; import es.princip.getp.application.client.port.in.RegisterClientUseCase; import es.princip.getp.application.client.port.out.CheckClientPort; import es.princip.getp.application.client.port.out.SaveClientPort; -import es.princip.getp.application.member.command.EditMemberCommand; +import es.princip.getp.application.member.dto.command.EditMemberCommand; import es.princip.getp.application.member.port.in.EditMemberUseCase; import es.princip.getp.domain.client.model.Client; import es.princip.getp.domain.client.model.ClientId; diff --git a/src/main/java/es/princip/getp/application/client/service/RemoveRegisterClientService.java b/get-p-application/src/main/java/es/princip/getp/application/client/service/RemoveRegisterClientService.java similarity index 100% rename from src/main/java/es/princip/getp/application/client/service/RemoveRegisterClientService.java rename to get-p-application/src/main/java/es/princip/getp/application/client/service/RemoveRegisterClientService.java diff --git a/src/main/java/es/princip/getp/api/controller/common/dto/AddressResponse.java b/get-p-application/src/main/java/es/princip/getp/application/common/dto/response/AddressResponse.java similarity index 62% rename from src/main/java/es/princip/getp/api/controller/common/dto/AddressResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/common/dto/response/AddressResponse.java index 3114c2b3..fcb9057c 100644 --- a/src/main/java/es/princip/getp/api/controller/common/dto/AddressResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/common/dto/response/AddressResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.common.dto; +package es.princip.getp.application.common.dto.response; public record AddressResponse( String zipcode, diff --git a/src/main/java/es/princip/getp/application/config/AopConfig.java b/get-p-application/src/main/java/es/princip/getp/application/config/AopConfig.java similarity index 100% rename from src/main/java/es/princip/getp/application/config/AopConfig.java rename to get-p-application/src/main/java/es/princip/getp/application/config/AopConfig.java diff --git a/src/main/java/es/princip/getp/application/config/TimeTraceAop.java b/get-p-application/src/main/java/es/princip/getp/application/config/TimeTraceAop.java similarity index 100% rename from src/main/java/es/princip/getp/application/config/TimeTraceAop.java rename to get-p-application/src/main/java/es/princip/getp/application/config/TimeTraceAop.java diff --git a/src/main/java/es/princip/getp/application/like/exception/AlreadyLikedException.java b/get-p-application/src/main/java/es/princip/getp/application/like/exception/AlreadyLikedException.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/exception/AlreadyLikedException.java rename to get-p-application/src/main/java/es/princip/getp/application/like/exception/AlreadyLikedException.java diff --git a/src/main/java/es/princip/getp/application/like/exception/NeverLikedException.java b/get-p-application/src/main/java/es/princip/getp/application/like/exception/NeverLikedException.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/exception/NeverLikedException.java rename to get-p-application/src/main/java/es/princip/getp/application/like/exception/NeverLikedException.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/exception/NotFoundLikeException.java b/get-p-application/src/main/java/es/princip/getp/application/like/exception/NotFoundLikeException.java similarity index 75% rename from src/main/java/es/princip/getp/persistence/adapter/like/exception/NotFoundLikeException.java rename to get-p-application/src/main/java/es/princip/getp/application/like/exception/NotFoundLikeException.java index 5855d276..32be50fa 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/like/exception/NotFoundLikeException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/like/exception/NotFoundLikeException.java @@ -1,7 +1,7 @@ -package es.princip.getp.persistence.adapter.like.exception; +package es.princip.getp.application.like.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.application.support.NotFoundException; public class NotFoundLikeException extends NotFoundException { diff --git a/src/main/java/es/princip/getp/application/like/people/port/in/LikePeopleUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/port/in/LikePeopleUseCase.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/port/in/LikePeopleUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/port/in/LikePeopleUseCase.java diff --git a/src/main/java/es/princip/getp/application/like/people/port/in/UnlikePeopleUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/port/in/UnlikePeopleUseCase.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/port/in/UnlikePeopleUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/port/in/UnlikePeopleUseCase.java diff --git a/src/main/java/es/princip/getp/application/like/people/port/out/CheckPeopleLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/CheckPeopleLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/port/out/CheckPeopleLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/CheckPeopleLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/people/port/out/CountPeopleLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/CountPeopleLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/port/out/CountPeopleLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/CountPeopleLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/people/port/out/DeletePeopleLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/DeletePeopleLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/port/out/DeletePeopleLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/DeletePeopleLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/people/port/out/LoadPeopleLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/LoadPeopleLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/port/out/LoadPeopleLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/LoadPeopleLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/people/port/out/SavePeopleLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/SavePeopleLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/port/out/SavePeopleLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/port/out/SavePeopleLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/people/service/LikePeopleService.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/service/LikePeopleService.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/service/LikePeopleService.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/service/LikePeopleService.java diff --git a/src/main/java/es/princip/getp/application/like/people/service/UnlikePeopleService.java b/get-p-application/src/main/java/es/princip/getp/application/like/people/service/UnlikePeopleService.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/people/service/UnlikePeopleService.java rename to get-p-application/src/main/java/es/princip/getp/application/like/people/service/UnlikePeopleService.java diff --git a/src/main/java/es/princip/getp/application/like/project/port/in/LikeProjectUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/in/LikeProjectUseCase.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/port/in/LikeProjectUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/in/LikeProjectUseCase.java diff --git a/src/main/java/es/princip/getp/application/like/project/port/in/UnlikeProjectUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/in/UnlikeProjectUseCase.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/port/in/UnlikeProjectUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/in/UnlikeProjectUseCase.java diff --git a/src/main/java/es/princip/getp/application/like/project/port/out/CheckProjectLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/CheckProjectLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/port/out/CheckProjectLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/CheckProjectLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/project/port/out/CountProjectLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/CountProjectLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/port/out/CountProjectLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/CountProjectLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/project/port/out/DeleteProjectLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/DeleteProjectLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/port/out/DeleteProjectLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/DeleteProjectLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/project/port/out/FindLikedProjectPort.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/FindLikedProjectPort.java similarity index 78% rename from src/main/java/es/princip/getp/application/like/project/port/out/FindLikedProjectPort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/FindLikedProjectPort.java index 2e698e78..028425a2 100644 --- a/src/main/java/es/princip/getp/application/like/project/port/out/FindLikedProjectPort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/FindLikedProjectPort.java @@ -1,6 +1,6 @@ package es.princip.getp.application.like.project.port.out; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; import es.princip.getp.domain.member.model.MemberId; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/es/princip/getp/application/like/project/port/out/LoadProjectLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/LoadProjectLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/port/out/LoadProjectLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/LoadProjectLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/project/port/out/SaveProjectLikePort.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/SaveProjectLikePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/port/out/SaveProjectLikePort.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/port/out/SaveProjectLikePort.java diff --git a/src/main/java/es/princip/getp/application/like/project/service/LikeProjectService.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/service/LikeProjectService.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/service/LikeProjectService.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/service/LikeProjectService.java diff --git a/src/main/java/es/princip/getp/application/like/project/service/UnlikeProjectService.java b/get-p-application/src/main/java/es/princip/getp/application/like/project/service/UnlikeProjectService.java similarity index 100% rename from src/main/java/es/princip/getp/application/like/project/service/UnlikeProjectService.java rename to get-p-application/src/main/java/es/princip/getp/application/like/project/service/UnlikeProjectService.java diff --git a/src/main/java/es/princip/getp/application/mail/SendMailService.java b/get-p-application/src/main/java/es/princip/getp/application/mail/SendMailService.java similarity index 100% rename from src/main/java/es/princip/getp/application/mail/SendMailService.java rename to get-p-application/src/main/java/es/princip/getp/application/mail/SendMailService.java diff --git a/src/main/java/es/princip/getp/application/mail/command/SendMailCommand.java b/get-p-application/src/main/java/es/princip/getp/application/mail/command/SendMailCommand.java similarity index 100% rename from src/main/java/es/princip/getp/application/mail/command/SendMailCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/mail/command/SendMailCommand.java diff --git a/src/main/java/es/princip/getp/application/mail/port/in/SendMailUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/mail/port/in/SendMailUseCase.java similarity index 100% rename from src/main/java/es/princip/getp/application/mail/port/in/SendMailUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/mail/port/in/SendMailUseCase.java diff --git a/src/main/java/es/princip/getp/application/member/command/EditMemberCommand.java b/get-p-application/src/main/java/es/princip/getp/application/member/dto/command/EditMemberCommand.java similarity index 78% rename from src/main/java/es/princip/getp/application/member/command/EditMemberCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/member/dto/command/EditMemberCommand.java index 78a49632..c01ae64c 100644 --- a/src/main/java/es/princip/getp/application/member/command/EditMemberCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/dto/command/EditMemberCommand.java @@ -1,9 +1,9 @@ -package es.princip.getp.application.member.command; +package es.princip.getp.application.member.dto.command; -import es.princip.getp.application.client.command.EditClientCommand; -import es.princip.getp.application.client.command.RegisterClientCommand; -import es.princip.getp.application.people.command.EditPeopleCommand; -import es.princip.getp.application.people.command.RegisterPeopleCommand; +import es.princip.getp.application.client.dto.command.EditClientCommand; +import es.princip.getp.application.client.dto.command.RegisterClientCommand; +import es.princip.getp.application.people.dto.command.EditPeopleCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleCommand; import es.princip.getp.domain.common.model.PhoneNumber; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.member.model.Nickname; diff --git a/src/main/java/es/princip/getp/application/member/command/RegisterProfileImageCommand.java b/get-p-application/src/main/java/es/princip/getp/application/member/dto/command/RegisterProfileImageCommand.java similarity index 78% rename from src/main/java/es/princip/getp/application/member/command/RegisterProfileImageCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/member/dto/command/RegisterProfileImageCommand.java index 193c7413..e57d9422 100644 --- a/src/main/java/es/princip/getp/application/member/command/RegisterProfileImageCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/dto/command/RegisterProfileImageCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.member.command; +package es.princip.getp.application.member.dto.command; import es.princip.getp.domain.member.model.MemberId; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/es/princip/getp/api/controller/member/query/dto/response/MemberResponse.java b/get-p-application/src/main/java/es/princip/getp/application/member/dto/response/MemberResponse.java similarity index 94% rename from src/main/java/es/princip/getp/api/controller/member/query/dto/response/MemberResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/member/dto/response/MemberResponse.java index 5df34466..b10ddc12 100644 --- a/src/main/java/es/princip/getp/api/controller/member/query/dto/response/MemberResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/dto/response/MemberResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.member.query.dto.response; +package es.princip.getp.application.member.dto.response; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberType; diff --git a/get-p-application/src/main/java/es/princip/getp/application/member/dto/response/ProfileImageResponse.java b/get-p-application/src/main/java/es/princip/getp/application/member/dto/response/ProfileImageResponse.java new file mode 100644 index 00000000..b30604e4 --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/member/dto/response/ProfileImageResponse.java @@ -0,0 +1,4 @@ +package es.princip.getp.application.member.dto.response; + +public record ProfileImageResponse(String profileImageUri) { +} diff --git a/src/main/java/es/princip/getp/persistence/adapter/member/NotFoundMemberException.java b/get-p-application/src/main/java/es/princip/getp/application/member/exception/NotFoundMemberException.java similarity index 75% rename from src/main/java/es/princip/getp/persistence/adapter/member/NotFoundMemberException.java rename to get-p-application/src/main/java/es/princip/getp/application/member/exception/NotFoundMemberException.java index 3ede4426..cfc041b9 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/member/NotFoundMemberException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/exception/NotFoundMemberException.java @@ -1,7 +1,7 @@ -package es.princip.getp.persistence.adapter.member; +package es.princip.getp.application.member.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.application.support.NotFoundException; public class NotFoundMemberException extends NotFoundException { diff --git a/src/main/java/es/princip/getp/application/member/exception/NotSupportedProfileImageExtensionException.java b/get-p-application/src/main/java/es/princip/getp/application/member/exception/NotSupportedProfileImageExtensionException.java similarity index 100% rename from src/main/java/es/princip/getp/application/member/exception/NotSupportedProfileImageExtensionException.java rename to get-p-application/src/main/java/es/princip/getp/application/member/exception/NotSupportedProfileImageExtensionException.java diff --git a/src/main/java/es/princip/getp/application/member/port/in/EditMemberUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/member/port/in/EditMemberUseCase.java similarity index 66% rename from src/main/java/es/princip/getp/application/member/port/in/EditMemberUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/member/port/in/EditMemberUseCase.java index 83c70cd0..c47944e0 100644 --- a/src/main/java/es/princip/getp/application/member/port/in/EditMemberUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/port/in/EditMemberUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.member.port.in; -import es.princip.getp.application.member.command.EditMemberCommand; +import es.princip.getp.application.member.dto.command.EditMemberCommand; public interface EditMemberUseCase { diff --git a/src/main/java/es/princip/getp/application/member/port/in/ProfileImageUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/member/port/in/ProfileImageUseCase.java similarity index 66% rename from src/main/java/es/princip/getp/application/member/port/in/ProfileImageUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/member/port/in/ProfileImageUseCase.java index fb33c4a2..913adffb 100644 --- a/src/main/java/es/princip/getp/application/member/port/in/ProfileImageUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/port/in/ProfileImageUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.member.port.in; -import es.princip.getp.application.member.command.RegisterProfileImageCommand; +import es.princip.getp.application.member.dto.command.RegisterProfileImageCommand; public interface ProfileImageUseCase { diff --git a/src/main/java/es/princip/getp/application/member/port/out/CheckMemberPort.java b/get-p-application/src/main/java/es/princip/getp/application/member/port/out/CheckMemberPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/member/port/out/CheckMemberPort.java rename to get-p-application/src/main/java/es/princip/getp/application/member/port/out/CheckMemberPort.java diff --git a/src/main/java/es/princip/getp/application/member/port/out/LoadMemberPort.java b/get-p-application/src/main/java/es/princip/getp/application/member/port/out/LoadMemberPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/member/port/out/LoadMemberPort.java rename to get-p-application/src/main/java/es/princip/getp/application/member/port/out/LoadMemberPort.java diff --git a/src/main/java/es/princip/getp/application/member/port/out/SaveMemberPort.java b/get-p-application/src/main/java/es/princip/getp/application/member/port/out/SaveMemberPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/member/port/out/SaveMemberPort.java rename to get-p-application/src/main/java/es/princip/getp/application/member/port/out/SaveMemberPort.java diff --git a/src/main/java/es/princip/getp/application/member/port/out/UpdateMemberPort.java b/get-p-application/src/main/java/es/princip/getp/application/member/port/out/UpdateMemberPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/member/port/out/UpdateMemberPort.java rename to get-p-application/src/main/java/es/princip/getp/application/member/port/out/UpdateMemberPort.java diff --git a/src/main/java/es/princip/getp/application/member/service/MemberService.java b/get-p-application/src/main/java/es/princip/getp/application/member/service/MemberService.java similarity index 93% rename from src/main/java/es/princip/getp/application/member/service/MemberService.java rename to get-p-application/src/main/java/es/princip/getp/application/member/service/MemberService.java index af796f2a..af2da428 100644 --- a/src/main/java/es/princip/getp/application/member/service/MemberService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/service/MemberService.java @@ -1,6 +1,6 @@ package es.princip.getp.application.member.service; -import es.princip.getp.application.member.command.EditMemberCommand; +import es.princip.getp.application.member.dto.command.EditMemberCommand; import es.princip.getp.application.member.port.in.EditMemberUseCase; import es.princip.getp.application.member.port.out.LoadMemberPort; import es.princip.getp.application.member.port.out.UpdateMemberPort; diff --git a/src/main/java/es/princip/getp/application/member/service/ProfileImageService.java b/get-p-application/src/main/java/es/princip/getp/application/member/service/ProfileImageService.java similarity index 95% rename from src/main/java/es/princip/getp/application/member/service/ProfileImageService.java rename to get-p-application/src/main/java/es/princip/getp/application/member/service/ProfileImageService.java index d41032ba..fa49119c 100644 --- a/src/main/java/es/princip/getp/application/member/service/ProfileImageService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/member/service/ProfileImageService.java @@ -1,6 +1,6 @@ package es.princip.getp.application.member.service; -import es.princip.getp.application.member.command.RegisterProfileImageCommand; +import es.princip.getp.application.member.dto.command.RegisterProfileImageCommand; import es.princip.getp.application.member.exception.NotSupportedProfileImageExtensionException; import es.princip.getp.application.member.port.in.ProfileImageUseCase; import es.princip.getp.application.member.port.out.LoadMemberPort; @@ -67,7 +67,7 @@ private ProfileImage saveProfileImage(final Member member, final MultipartFile i } private Path getPathToSaveProfileImage(final Member member, final MultipartFile image) { - final String memberId = String.valueOf(member.getId()); + final String memberId = String.valueOf(member.getId().getValue()); final String fileName = StringUtil.generateRandomFilename(image.getOriginalFilename()); return Paths.get(memberId).resolve(PROFILE_IMAGE_PREFIX).resolve(fileName); } diff --git a/src/main/java/es/princip/getp/application/people/command/EditPeopleCommand.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/EditPeopleCommand.java similarity index 85% rename from src/main/java/es/princip/getp/application/people/command/EditPeopleCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/EditPeopleCommand.java index 0725a2c8..fe65d108 100644 --- a/src/main/java/es/princip/getp/application/people/command/EditPeopleCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/EditPeopleCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.PhoneNumber; diff --git a/src/main/java/es/princip/getp/application/people/command/EditPeopleProfileCommand.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/EditPeopleProfileCommand.java similarity index 90% rename from src/main/java/es/princip/getp/application/people/command/EditPeopleProfileCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/EditPeopleProfileCommand.java index 6d2eecf4..36efafde 100644 --- a/src/main/java/es/princip/getp/application/people/command/EditPeopleProfileCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/EditPeopleProfileCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import es.princip.getp.domain.common.model.Hashtag; import es.princip.getp.domain.common.model.TechStack; diff --git a/src/main/java/es/princip/getp/application/people/command/GetPeopleCommand.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/GetPeopleCommand.java similarity index 79% rename from src/main/java/es/princip/getp/application/people/command/GetPeopleCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/GetPeopleCommand.java index 2a0c0042..0ee45a95 100644 --- a/src/main/java/es/princip/getp/application/people/command/GetPeopleCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/GetPeopleCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import es.princip.getp.domain.member.model.Member; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/es/princip/getp/application/people/command/PeopleSearchFilter.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/PeopleSearchFilter.java similarity index 84% rename from src/main/java/es/princip/getp/application/people/command/PeopleSearchFilter.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/PeopleSearchFilter.java index f4b353fb..2d4d43d4 100644 --- a/src/main/java/es/princip/getp/application/people/command/PeopleSearchFilter.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/PeopleSearchFilter.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import lombok.Getter; diff --git a/src/main/java/es/princip/getp/application/people/command/PeopleSearchOrder.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/PeopleSearchOrder.java similarity index 83% rename from src/main/java/es/princip/getp/application/people/command/PeopleSearchOrder.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/PeopleSearchOrder.java index b0107674..3e48a36a 100644 --- a/src/main/java/es/princip/getp/application/people/command/PeopleSearchOrder.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/PeopleSearchOrder.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import es.princip.getp.util.StringUtil; diff --git a/src/main/java/es/princip/getp/application/people/command/RegisterPeopleCommand.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/RegisterPeopleCommand.java similarity index 86% rename from src/main/java/es/princip/getp/application/people/command/RegisterPeopleCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/RegisterPeopleCommand.java index 85b9646e..5fe70b6b 100644 --- a/src/main/java/es/princip/getp/application/people/command/RegisterPeopleCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/RegisterPeopleCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.PhoneNumber; diff --git a/src/main/java/es/princip/getp/application/people/command/RegisterPeopleProfileCommand.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/RegisterPeopleProfileCommand.java similarity index 90% rename from src/main/java/es/princip/getp/application/people/command/RegisterPeopleProfileCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/RegisterPeopleProfileCommand.java index cbd86718..783d12d4 100644 --- a/src/main/java/es/princip/getp/application/people/command/RegisterPeopleProfileCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/RegisterPeopleProfileCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import es.princip.getp.domain.common.model.Hashtag; import es.princip.getp.domain.common.model.TechStack; diff --git a/src/main/java/es/princip/getp/application/people/command/SearchTeammateCommand.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/SearchTeammateCommand.java similarity index 84% rename from src/main/java/es/princip/getp/application/people/command/SearchTeammateCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/command/SearchTeammateCommand.java index 4ae231e6..f4c3ed7e 100644 --- a/src/main/java/es/princip/getp/application/people/command/SearchTeammateCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/command/SearchTeammateCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.people.command; +package es.princip.getp.application.people.dto.command; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; diff --git a/src/main/java/es/princip/getp/api/controller/people/query/dto/people/CardPeopleResponse.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/CardPeopleResponse.java similarity index 64% rename from src/main/java/es/princip/getp/api/controller/people/query/dto/people/CardPeopleResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/CardPeopleResponse.java index 2dd50ea5..6f89de04 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/dto/people/CardPeopleResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/CardPeopleResponse.java @@ -1,6 +1,6 @@ -package es.princip.getp.api.controller.people.query.dto.people; +package es.princip.getp.application.people.dto.response.people; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.CardPeopleProfileResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.CardPeopleProfileResponse; public record CardPeopleResponse( Long peopleId, diff --git a/src/main/java/es/princip/getp/api/controller/people/query/dto/people/MyPeopleResponse.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/MyPeopleResponse.java similarity index 82% rename from src/main/java/es/princip/getp/api/controller/people/query/dto/people/MyPeopleResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/MyPeopleResponse.java index 78c9c39b..e9fc4a27 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/dto/people/MyPeopleResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/MyPeopleResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.people.query.dto.people; +package es.princip.getp.application.people.dto.response.people; import java.time.LocalDateTime; diff --git a/src/main/java/es/princip/getp/api/controller/people/query/dto/people/PeopleDetailResponse.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/PeopleDetailResponse.java similarity index 89% rename from src/main/java/es/princip/getp/api/controller/people/query/dto/people/PeopleDetailResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/PeopleDetailResponse.java index 3c671203..c5fee5a4 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/dto/people/PeopleDetailResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/PeopleDetailResponse.java @@ -1,12 +1,12 @@ -package es.princip.getp.api.controller.people.query.dto.people; +package es.princip.getp.application.people.dto.response.people; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PortfolioResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; import es.princip.getp.domain.people.model.Education; import lombok.Getter; diff --git a/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/RegisterPeopleResponse.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/RegisterPeopleResponse.java new file mode 100644 index 00000000..2ffab5cc --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/people/RegisterPeopleResponse.java @@ -0,0 +1,4 @@ +package es.princip.getp.application.people.dto.response.people; + +public record RegisterPeopleResponse(Long peopleId) { +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/CardPeopleProfileResponse.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/CardPeopleProfileResponse.java similarity index 90% rename from src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/CardPeopleProfileResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/CardPeopleProfileResponse.java index 193d0a5a..8042d6e0 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/CardPeopleProfileResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/CardPeopleProfileResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.people.query.dto.peopleProfile; +package es.princip.getp.application.people.dto.response.peopleProfile; import es.princip.getp.domain.common.model.Hashtag; import es.princip.getp.domain.people.model.PeopleProfile; diff --git a/src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/PeopleProfileDetailResponse.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/PeopleProfileDetailResponse.java similarity index 95% rename from src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/PeopleProfileDetailResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/PeopleProfileDetailResponse.java index ee7aed13..864ed46f 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/PeopleProfileDetailResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/PeopleProfileDetailResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.people.query.dto.peopleProfile; +package es.princip.getp.application.people.dto.response.peopleProfile; import java.util.List; diff --git a/src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/PortfolioResponse.java b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/PortfolioResponse.java similarity index 57% rename from src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/PortfolioResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/PortfolioResponse.java index a308dd4f..368819d7 100644 --- a/src/main/java/es/princip/getp/api/controller/people/query/dto/peopleProfile/PortfolioResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/dto/response/peopleProfile/PortfolioResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.people.query.dto.peopleProfile; +package es.princip.getp.application.people.dto.response.peopleProfile; public record PortfolioResponse( String description, diff --git a/src/main/java/es/princip/getp/application/people/exception/AlreadyExistsPeopleException.java b/get-p-application/src/main/java/es/princip/getp/application/people/exception/AlreadyExistsPeopleException.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/exception/AlreadyExistsPeopleException.java rename to get-p-application/src/main/java/es/princip/getp/application/people/exception/AlreadyExistsPeopleException.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/NotFoundPeopleException.java b/get-p-application/src/main/java/es/princip/getp/application/people/exception/NotFoundPeopleException.java similarity index 80% rename from src/main/java/es/princip/getp/persistence/adapter/people/NotFoundPeopleException.java rename to get-p-application/src/main/java/es/princip/getp/application/people/exception/NotFoundPeopleException.java index 862637e3..61917343 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/people/NotFoundPeopleException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/exception/NotFoundPeopleException.java @@ -1,12 +1,12 @@ -package es.princip.getp.persistence.adapter.people; +package es.princip.getp.application.people.exception; +import es.princip.getp.application.support.NotFoundException; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; import java.util.Collection; import java.util.stream.Collectors; -class NotFoundPeopleException extends NotFoundException { +public class NotFoundPeopleException extends NotFoundException { private static final String code = "NOT_FOUND_PEOPLE"; private static final String message = "존재하지 않는 피플입니다."; diff --git a/src/main/java/es/princip/getp/application/people/mapper/PeopleDataMapper.java b/get-p-application/src/main/java/es/princip/getp/application/people/mapper/PeopleDataMapper.java similarity index 71% rename from src/main/java/es/princip/getp/application/people/mapper/PeopleDataMapper.java rename to get-p-application/src/main/java/es/princip/getp/application/people/mapper/PeopleDataMapper.java index acafc5f1..771f6b07 100644 --- a/src/main/java/es/princip/getp/application/people/mapper/PeopleDataMapper.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/mapper/PeopleDataMapper.java @@ -1,7 +1,7 @@ package es.princip.getp.application.people.mapper; -import es.princip.getp.application.people.command.EditPeopleProfileCommand; -import es.princip.getp.application.people.command.RegisterPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.EditPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleProfileCommand; import es.princip.getp.domain.people.model.PeopleProfileData; import org.mapstruct.Mapper; diff --git a/src/main/java/es/princip/getp/application/people/mapper/PeopleMapper.java b/get-p-application/src/main/java/es/princip/getp/application/people/mapper/PeopleMapper.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/mapper/PeopleMapper.java rename to get-p-application/src/main/java/es/princip/getp/application/people/mapper/PeopleMapper.java diff --git a/src/main/java/es/princip/getp/application/people/port/in/EditPeopleProfileUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/EditPeopleProfileUseCase.java similarity index 65% rename from src/main/java/es/princip/getp/application/people/port/in/EditPeopleProfileUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/in/EditPeopleProfileUseCase.java index f9055539..a7da1f42 100644 --- a/src/main/java/es/princip/getp/application/people/port/in/EditPeopleProfileUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/EditPeopleProfileUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.people.port.in; -import es.princip.getp.application.people.command.EditPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.EditPeopleProfileCommand; public interface EditPeopleProfileUseCase { diff --git a/src/main/java/es/princip/getp/application/people/port/in/EditPeopleUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/EditPeopleUseCase.java similarity index 65% rename from src/main/java/es/princip/getp/application/people/port/in/EditPeopleUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/in/EditPeopleUseCase.java index 1016c75f..d08d87ea 100644 --- a/src/main/java/es/princip/getp/application/people/port/in/EditPeopleUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/EditPeopleUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.people.port.in; -import es.princip.getp.application.people.command.EditPeopleCommand; +import es.princip.getp.application.people.dto.command.EditPeopleCommand; public interface EditPeopleUseCase { diff --git a/src/main/java/es/princip/getp/application/people/port/in/GetMyPeopleQuery.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/GetMyPeopleQuery.java similarity index 71% rename from src/main/java/es/princip/getp/application/people/port/in/GetMyPeopleQuery.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/in/GetMyPeopleQuery.java index 4c53bf27..da4d4131 100644 --- a/src/main/java/es/princip/getp/application/people/port/in/GetMyPeopleQuery.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/GetMyPeopleQuery.java @@ -1,7 +1,7 @@ package es.princip.getp.application.people.port.in; -import es.princip.getp.api.controller.people.query.dto.people.MyPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.people.MyPeopleResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.domain.member.model.MemberId; public interface GetMyPeopleQuery { diff --git a/src/main/java/es/princip/getp/application/people/port/in/GetPeopleQuery.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/GetPeopleQuery.java similarity index 67% rename from src/main/java/es/princip/getp/application/people/port/in/GetPeopleQuery.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/in/GetPeopleQuery.java index 59042966..0a447b5a 100644 --- a/src/main/java/es/princip/getp/application/people/port/in/GetPeopleQuery.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/GetPeopleQuery.java @@ -1,8 +1,8 @@ package es.princip.getp.application.people.port.in; -import es.princip.getp.api.controller.people.query.dto.people.CardPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.application.people.command.GetPeopleCommand; +import es.princip.getp.application.people.dto.response.people.CardPeopleResponse; +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; +import es.princip.getp.application.people.dto.command.GetPeopleCommand; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.people.model.PeopleId; import org.springframework.data.domain.Page; diff --git a/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleProfileUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleProfileUseCase.java similarity index 65% rename from src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleProfileUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleProfileUseCase.java index 86db1282..2ca49284 100644 --- a/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleProfileUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleProfileUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.people.port.in; -import es.princip.getp.application.people.command.RegisterPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleProfileCommand; public interface RegisterPeopleProfileUseCase { diff --git a/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleUseCase.java similarity index 72% rename from src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleUseCase.java index d139919d..c6541d6a 100644 --- a/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/in/RegisterPeopleUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.people.port.in; -import es.princip.getp.application.people.command.RegisterPeopleCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleCommand; import es.princip.getp.domain.people.model.PeopleId; public interface RegisterPeopleUseCase { diff --git a/src/main/java/es/princip/getp/application/people/port/out/CheckPeoplePort.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/CheckPeoplePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/port/out/CheckPeoplePort.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/out/CheckPeoplePort.java diff --git a/src/main/java/es/princip/getp/application/people/port/out/DeletePeoplePort.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/DeletePeoplePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/port/out/DeletePeoplePort.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/out/DeletePeoplePort.java diff --git a/src/main/java/es/princip/getp/application/people/port/out/FindMyPeoplePort.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/FindMyPeoplePort.java similarity index 71% rename from src/main/java/es/princip/getp/application/people/port/out/FindMyPeoplePort.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/out/FindMyPeoplePort.java index 2759ba08..639c48c1 100644 --- a/src/main/java/es/princip/getp/application/people/port/out/FindMyPeoplePort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/FindMyPeoplePort.java @@ -1,7 +1,7 @@ package es.princip.getp.application.people.port.out; -import es.princip.getp.api.controller.people.query.dto.people.MyPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.people.MyPeopleResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.domain.member.model.MemberId; public interface FindMyPeoplePort { diff --git a/src/main/java/es/princip/getp/application/people/port/out/FindPeoplePort.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/FindPeoplePort.java similarity index 73% rename from src/main/java/es/princip/getp/application/people/port/out/FindPeoplePort.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/out/FindPeoplePort.java index 44eae50e..592c368b 100644 --- a/src/main/java/es/princip/getp/application/people/port/out/FindPeoplePort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/FindPeoplePort.java @@ -1,8 +1,8 @@ package es.princip.getp.application.people.port.out; -import es.princip.getp.api.controller.people.query.dto.people.CardPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.application.people.command.PeopleSearchFilter; +import es.princip.getp.application.people.dto.response.people.CardPeopleResponse; +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; +import es.princip.getp.application.people.dto.command.PeopleSearchFilter; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.model.PeopleId; diff --git a/src/main/java/es/princip/getp/application/people/port/out/LoadPeoplePort.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/LoadPeoplePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/port/out/LoadPeoplePort.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/out/LoadPeoplePort.java diff --git a/src/main/java/es/princip/getp/application/people/port/out/SavePeoplePort.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/SavePeoplePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/port/out/SavePeoplePort.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/out/SavePeoplePort.java diff --git a/src/main/java/es/princip/getp/application/people/port/out/UpdatePeoplePort.java b/get-p-application/src/main/java/es/princip/getp/application/people/port/out/UpdatePeoplePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/port/out/UpdatePeoplePort.java rename to get-p-application/src/main/java/es/princip/getp/application/people/port/out/UpdatePeoplePort.java diff --git a/src/main/java/es/princip/getp/application/people/service/DeletePeopleService.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/DeletePeopleService.java similarity index 100% rename from src/main/java/es/princip/getp/application/people/service/DeletePeopleService.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/DeletePeopleService.java diff --git a/src/main/java/es/princip/getp/application/people/service/EditPeopleProfileService.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/EditPeopleProfileService.java similarity index 89% rename from src/main/java/es/princip/getp/application/people/service/EditPeopleProfileService.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/EditPeopleProfileService.java index 9bb3b478..8ae4860e 100644 --- a/src/main/java/es/princip/getp/application/people/service/EditPeopleProfileService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/service/EditPeopleProfileService.java @@ -1,6 +1,6 @@ package es.princip.getp.application.people.service; -import es.princip.getp.application.people.command.EditPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.EditPeopleProfileCommand; import es.princip.getp.application.people.mapper.PeopleDataMapper; import es.princip.getp.application.people.port.in.EditPeopleProfileUseCase; import es.princip.getp.application.people.port.out.LoadPeoplePort; @@ -15,7 +15,7 @@ @Service @Transactional(readOnly = true) @RequiredArgsConstructor -public class EditPeopleProfileService implements EditPeopleProfileUseCase { +class EditPeopleProfileService implements EditPeopleProfileUseCase { private final LoadPeoplePort loadPeoplePort; private final UpdatePeoplePort updatePeoplePort; diff --git a/src/main/java/es/princip/getp/application/people/service/EditPeopleService.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/EditPeopleService.java similarity index 84% rename from src/main/java/es/princip/getp/application/people/service/EditPeopleService.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/EditPeopleService.java index 8f9a7eff..e2a2b6f0 100644 --- a/src/main/java/es/princip/getp/application/people/service/EditPeopleService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/service/EditPeopleService.java @@ -1,8 +1,8 @@ package es.princip.getp.application.people.service; -import es.princip.getp.application.member.command.EditMemberCommand; +import es.princip.getp.application.member.dto.command.EditMemberCommand; import es.princip.getp.application.member.port.in.EditMemberUseCase; -import es.princip.getp.application.people.command.EditPeopleCommand; +import es.princip.getp.application.people.dto.command.EditPeopleCommand; import es.princip.getp.application.people.port.in.EditPeopleUseCase; import es.princip.getp.application.people.port.out.LoadPeoplePort; import es.princip.getp.application.people.port.out.UpdatePeoplePort; @@ -14,7 +14,7 @@ @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class EditPeopleService implements EditPeopleUseCase { +class EditPeopleService implements EditPeopleUseCase { private final EditMemberUseCase editMemberUseCase; diff --git a/src/main/java/es/princip/getp/application/people/service/GetMyPeopleService.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/GetMyPeopleService.java similarity index 82% rename from src/main/java/es/princip/getp/application/people/service/GetMyPeopleService.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/GetMyPeopleService.java index df122c38..91f54a70 100644 --- a/src/main/java/es/princip/getp/application/people/service/GetMyPeopleService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/service/GetMyPeopleService.java @@ -1,7 +1,7 @@ package es.princip.getp.application.people.service; -import es.princip.getp.api.controller.people.query.dto.people.MyPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.people.MyPeopleResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.application.people.port.in.GetMyPeopleQuery; import es.princip.getp.application.people.port.out.FindMyPeoplePort; import es.princip.getp.domain.member.model.MemberId; @@ -12,7 +12,7 @@ @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class GetMyPeopleService implements GetMyPeopleQuery { +class GetMyPeopleService implements GetMyPeopleQuery { private final FindMyPeoplePort findMyPeoplePort; diff --git a/src/main/java/es/princip/getp/application/people/service/GetPeopleService.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/GetPeopleService.java similarity index 89% rename from src/main/java/es/princip/getp/application/people/service/GetPeopleService.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/GetPeopleService.java index 3ded709b..fdaead33 100644 --- a/src/main/java/es/princip/getp/application/people/service/GetPeopleService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/service/GetPeopleService.java @@ -1,9 +1,9 @@ package es.princip.getp.application.people.service; -import es.princip.getp.api.controller.people.query.dto.people.CardPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.application.people.command.GetPeopleCommand; -import es.princip.getp.application.people.command.PeopleSearchFilter; +import es.princip.getp.application.people.dto.command.GetPeopleCommand; +import es.princip.getp.application.people.dto.command.PeopleSearchFilter; +import es.princip.getp.application.people.dto.response.people.CardPeopleResponse; +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; import es.princip.getp.application.people.port.in.GetPeopleQuery; import es.princip.getp.application.people.port.out.FindPeoplePort; import es.princip.getp.application.support.MosaicFactory; @@ -18,14 +18,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static es.princip.getp.application.support.ApplicationQueryUtil.isNotLogined; - import java.util.Optional; +import static es.princip.getp.application.support.ApplicationQueryUtil.isNotLogined; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class GetPeopleService implements GetPeopleQuery { +class GetPeopleService implements GetPeopleQuery { private final FindPeoplePort findPeoplePort; private final MosaicFactory mosaicFactory; diff --git a/src/main/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolver.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolver.java similarity index 91% rename from src/main/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolver.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolver.java index ef6ccdc1..ea86b549 100644 --- a/src/main/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolver.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolver.java @@ -1,17 +1,16 @@ package es.princip.getp.application.people.service; -import java.util.List; - +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; +import es.princip.getp.application.support.MosaicResolver; +import es.princip.getp.application.support.MosaicResolverSupport; +import es.princip.getp.domain.people.model.Education; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; import org.springframework.stereotype.Service; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PortfolioResponse; -import es.princip.getp.application.support.MosaicResolver; -import es.princip.getp.application.support.MosaicResolverSupport; -import es.princip.getp.domain.people.model.Education; +import java.util.List; @Service class PeopleDetailResponseMosaicResolver extends MosaicResolverSupport diff --git a/src/main/java/es/princip/getp/application/people/service/RegisterPeopleProfileService.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/RegisterPeopleProfileService.java similarity index 88% rename from src/main/java/es/princip/getp/application/people/service/RegisterPeopleProfileService.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/RegisterPeopleProfileService.java index 1311833d..8a1cca5b 100644 --- a/src/main/java/es/princip/getp/application/people/service/RegisterPeopleProfileService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/service/RegisterPeopleProfileService.java @@ -1,6 +1,6 @@ package es.princip.getp.application.people.service; -import es.princip.getp.application.people.command.RegisterPeopleProfileCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleProfileCommand; import es.princip.getp.application.people.mapper.PeopleDataMapper; import es.princip.getp.application.people.port.in.RegisterPeopleProfileUseCase; import es.princip.getp.application.people.port.out.LoadPeoplePort; @@ -15,7 +15,7 @@ @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class RegisterPeopleProfileService implements RegisterPeopleProfileUseCase { +class RegisterPeopleProfileService implements RegisterPeopleProfileUseCase { private final LoadPeoplePort loadPeoplePort; private final UpdatePeoplePort updatePeoplePort; diff --git a/src/main/java/es/princip/getp/application/people/service/RegisterPeopleService.java b/get-p-application/src/main/java/es/princip/getp/application/people/service/RegisterPeopleService.java similarity index 89% rename from src/main/java/es/princip/getp/application/people/service/RegisterPeopleService.java rename to get-p-application/src/main/java/es/princip/getp/application/people/service/RegisterPeopleService.java index 5c5eecc2..646a8c67 100644 --- a/src/main/java/es/princip/getp/application/people/service/RegisterPeopleService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/people/service/RegisterPeopleService.java @@ -1,8 +1,8 @@ package es.princip.getp.application.people.service; -import es.princip.getp.application.member.command.EditMemberCommand; +import es.princip.getp.application.member.dto.command.EditMemberCommand; import es.princip.getp.application.member.port.in.EditMemberUseCase; -import es.princip.getp.application.people.command.RegisterPeopleCommand; +import es.princip.getp.application.people.dto.command.RegisterPeopleCommand; import es.princip.getp.application.people.exception.AlreadyExistsPeopleException; import es.princip.getp.application.people.mapper.PeopleMapper; import es.princip.getp.application.people.port.in.RegisterPeopleUseCase; @@ -17,7 +17,7 @@ @Service @RequiredArgsConstructor @Transactional(readOnly = true) -public class RegisterPeopleService implements RegisterPeopleUseCase { +class RegisterPeopleService implements RegisterPeopleUseCase { private final PeopleMapper peopleMapper; diff --git a/src/main/java/es/princip/getp/application/project/apply/ApplyProjectService.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ApplyProjectService.java similarity index 95% rename from src/main/java/es/princip/getp/application/project/apply/ApplyProjectService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/ApplyProjectService.java index 70c3b11a..505ac70d 100644 --- a/src/main/java/es/princip/getp/application/project/apply/ApplyProjectService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ApplyProjectService.java @@ -1,8 +1,8 @@ package es.princip.getp.application.project.apply; import es.princip.getp.application.people.port.out.LoadPeoplePort; -import es.princip.getp.application.project.apply.command.ApplyProjectAsTeamCommand; -import es.princip.getp.application.project.apply.command.ApplyProjectCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectAsTeamCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectCommand; import es.princip.getp.application.project.apply.exception.AlreadyAppliedProjectException; import es.princip.getp.application.project.apply.port.in.ApplyProjectUseCase; import es.princip.getp.application.project.apply.port.out.CheckProjectApplicationPort; diff --git a/src/main/java/es/princip/getp/application/project/apply/ApproveTeammateService.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ApproveTeammateService.java similarity index 95% rename from src/main/java/es/princip/getp/application/project/apply/ApproveTeammateService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/ApproveTeammateService.java index 7e86f97a..d9a367e3 100644 --- a/src/main/java/es/princip/getp/application/project/apply/ApproveTeammateService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ApproveTeammateService.java @@ -1,7 +1,7 @@ package es.princip.getp.application.project.apply; import es.princip.getp.application.people.port.out.LoadPeoplePort; -import es.princip.getp.application.project.apply.command.ApproveTeammateCommand; +import es.princip.getp.application.project.apply.dto.command.ApproveTeammateCommand; import es.princip.getp.application.project.apply.port.in.ApproveTeammateUseCase; import es.princip.getp.application.project.apply.port.out.LoadProjectApplicantPort; import es.princip.getp.application.project.apply.port.out.UpdateProjectApplicantPort; diff --git a/src/main/java/es/princip/getp/application/project/apply/DevTeamApprovalLinkGenerator.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/DevTeamApprovalLinkGenerator.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/DevTeamApprovalLinkGenerator.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/DevTeamApprovalLinkGenerator.java diff --git a/src/main/java/es/princip/getp/application/project/apply/EmailTeamApprovalRequestSender.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/EmailTeamApprovalRequestSender.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/EmailTeamApprovalRequestSender.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/EmailTeamApprovalRequestSender.java diff --git a/src/main/java/es/princip/getp/application/project/apply/GetApplicantService.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicantService.java similarity index 93% rename from src/main/java/es/princip/getp/application/project/apply/GetApplicantService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicantService.java index d8fa1c47..a1164464 100644 --- a/src/main/java/es/princip/getp/application/project/apply/GetApplicantService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicantService.java @@ -1,8 +1,7 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; -import es.princip.getp.api.support.dto.SliceResponse; import es.princip.getp.application.client.port.out.LoadClientPort; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; import es.princip.getp.application.project.apply.exception.NotMyProjectException; import es.princip.getp.application.project.apply.port.in.GetApplicantQuery; import es.princip.getp.application.project.apply.port.out.FindProjectApplicantPort; @@ -10,6 +9,7 @@ import es.princip.getp.application.project.commission.port.out.LoadProjectPort; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; +import es.princip.getp.application.support.dto.SliceResponse; import es.princip.getp.domain.client.model.Client; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.commission.model.Project; diff --git a/src/main/java/es/princip/getp/application/project/apply/GetApplicationDetailService.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicationDetailService.java similarity index 90% rename from src/main/java/es/princip/getp/application/project/apply/GetApplicationDetailService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicationDetailService.java index 0161ea75..47a716c6 100644 --- a/src/main/java/es/princip/getp/application/project/apply/GetApplicationDetailService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicationDetailService.java @@ -1,11 +1,11 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; import es.princip.getp.application.people.port.out.LoadPeoplePort; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailResponse; import es.princip.getp.application.project.apply.exception.NotMyProjectApplicationException; import es.princip.getp.application.project.apply.port.in.GetApplicationDetailQuery; import es.princip.getp.application.project.apply.port.out.LoadProjectApplicantPort; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.application.project.commission.port.out.FindProjectPort; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.people.model.People; diff --git a/src/main/java/es/princip/getp/application/project/apply/GetApplicationFormService.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicationFormService.java similarity index 89% rename from src/main/java/es/princip/getp/application/project/apply/GetApplicationFormService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicationFormService.java index 89b76e19..f899005d 100644 --- a/src/main/java/es/princip/getp/application/project/apply/GetApplicationFormService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/GetApplicationFormService.java @@ -1,8 +1,7 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationFormResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; import es.princip.getp.application.client.port.out.LoadClientPort; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.application.project.apply.exception.NotMyProjectException; import es.princip.getp.application.project.apply.port.in.GetApplicationFormQuery; import es.princip.getp.application.project.apply.port.out.LoadProjectApplicantPort; @@ -31,7 +30,7 @@ class GetApplicationFormService implements GetApplicationFormQuery { private final ProjectApplicationFormResponseFactory responseFactory; @Override - public ProjectApplicationFormResponse getApplicationFormBy( + public es.princip.getp.application.project.apply.dto.response.ProjectApplicationFormResponse getApplicationFormBy( final Member member, final ProjectApplicationId applicationId ) { diff --git a/src/main/java/es/princip/getp/application/project/apply/LocalTeamApprovalLinkGenerator.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/LocalTeamApprovalLinkGenerator.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/LocalTeamApprovalLinkGenerator.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/LocalTeamApprovalLinkGenerator.java diff --git a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDataMapper.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDataMapper.java similarity index 78% rename from src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDataMapper.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDataMapper.java index d1dc8823..9a5f5a9a 100644 --- a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDataMapper.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDataMapper.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.application.project.apply.command.ApplyProjectCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectCommand; import es.princip.getp.domain.project.apply.model.ProjectApplicationData; import org.mapstruct.Mapper; diff --git a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailResponseFactory.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailResponseFactory.java similarity index 93% rename from src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailResponseFactory.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailResponseFactory.java index 36decf29..b475eef0 100644 --- a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailResponseFactory.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailResponseFactory.java @@ -1,7 +1,7 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailResponse; import es.princip.getp.domain.common.model.AttachmentFile; import es.princip.getp.domain.common.model.URL; import es.princip.getp.domain.project.apply.model.IndividualProjectApplication; diff --git a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailTeammateResponseFactory.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailTeammateResponseFactory.java similarity index 93% rename from src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailTeammateResponseFactory.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailTeammateResponseFactory.java index c3b69059..b8dc5bdf 100644 --- a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailTeammateResponseFactory.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationDetailTeammateResponseFactory.java @@ -1,8 +1,8 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailTeammateResponse; import es.princip.getp.application.member.port.out.LoadMemberPort; import es.princip.getp.application.people.port.out.LoadPeoplePort; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailTeammateResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.people.model.People; import es.princip.getp.domain.people.model.PeopleId; diff --git a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationFormResponseFactory.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationFormResponseFactory.java similarity index 94% rename from src/main/java/es/princip/getp/application/project/apply/ProjectApplicationFormResponseFactory.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationFormResponseFactory.java index e26cbec3..1f0a162e 100644 --- a/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationFormResponseFactory.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/ProjectApplicationFormResponseFactory.java @@ -1,10 +1,10 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PortfolioResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationFormResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; import es.princip.getp.application.member.port.out.LoadMemberPort; +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; import es.princip.getp.application.people.port.out.LoadPeoplePort; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationFormResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.domain.common.model.AttachmentFile; import es.princip.getp.domain.common.model.TechStack; import es.princip.getp.domain.common.model.URL; diff --git a/src/main/java/es/princip/getp/application/project/apply/SearchTeammateService.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/SearchTeammateService.java similarity index 86% rename from src/main/java/es/princip/getp/application/project/apply/SearchTeammateService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/SearchTeammateService.java index 44f2d819..280accb5 100644 --- a/src/main/java/es/princip/getp/application/project/apply/SearchTeammateService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/SearchTeammateService.java @@ -1,13 +1,13 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; -import es.princip.getp.api.support.dto.SliceResponse; -import es.princip.getp.application.people.command.SearchTeammateCommand; +import es.princip.getp.application.people.dto.command.SearchTeammateCommand; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.project.apply.port.in.SearchTeammateQuery; import es.princip.getp.application.project.apply.port.out.FindTeammatePort; import es.princip.getp.application.project.apply.port.out.SerializeTeammateCursorPort; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; +import es.princip.getp.application.support.dto.SliceResponse; import es.princip.getp.domain.project.commission.model.ProjectId; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Slice; diff --git a/src/main/java/es/princip/getp/application/project/apply/TeamApprovalLinkGenerator.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/TeamApprovalLinkGenerator.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/TeamApprovalLinkGenerator.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/TeamApprovalLinkGenerator.java diff --git a/src/main/java/es/princip/getp/application/project/apply/TeamApprovalRequestSender.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/TeamApprovalRequestSender.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/TeamApprovalRequestSender.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/TeamApprovalRequestSender.java diff --git a/src/main/java/es/princip/getp/application/project/apply/TeamApprovalTokenService.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/TeamApprovalTokenService.java similarity index 91% rename from src/main/java/es/princip/getp/application/project/apply/TeamApprovalTokenService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/TeamApprovalTokenService.java index f5b56ee7..9b7a4a4b 100644 --- a/src/main/java/es/princip/getp/application/project/apply/TeamApprovalTokenService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/TeamApprovalTokenService.java @@ -1,8 +1,8 @@ package es.princip.getp.application.project.apply; -import es.princip.getp.api.security.exception.ExpiredTokenException; -import es.princip.getp.api.security.exception.InvalidTokenException; -import es.princip.getp.application.project.apply.command.ApproveTeammateCommand; +import es.princip.getp.application.auth.exception.ExpiredTokenException; +import es.princip.getp.application.auth.exception.InvalidTokenException; +import es.princip.getp.application.project.apply.dto.command.ApproveTeammateCommand; import es.princip.getp.domain.people.model.PeopleId; import es.princip.getp.domain.project.apply.model.ProjectApplicationId; import io.jsonwebtoken.*; diff --git a/src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectAsIndividualCommand.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectAsIndividualCommand.java similarity index 91% rename from src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectAsIndividualCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectAsIndividualCommand.java index fe1b881f..87b4a669 100644 --- a/src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectAsIndividualCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectAsIndividualCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.apply.command; +package es.princip.getp.application.project.apply.dto.command; import es.princip.getp.domain.common.model.AttachmentFile; import es.princip.getp.domain.common.model.Duration; diff --git a/src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectAsTeamCommand.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectAsTeamCommand.java similarity index 93% rename from src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectAsTeamCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectAsTeamCommand.java index ccc01c9e..ef298e05 100644 --- a/src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectAsTeamCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectAsTeamCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.apply.command; +package es.princip.getp.application.project.apply.dto.command; import es.princip.getp.domain.common.model.AttachmentFile; import es.princip.getp.domain.common.model.Duration; diff --git a/src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectCommand.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectCommand.java similarity index 90% rename from src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectCommand.java index 2651cea8..c7c92ecc 100644 --- a/src/main/java/es/princip/getp/application/project/apply/command/ApplyProjectCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApplyProjectCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.apply.command; +package es.princip.getp.application.project.apply.dto.command; import es.princip.getp.domain.common.model.AttachmentFile; import es.princip.getp.domain.common.model.Duration; diff --git a/src/main/java/es/princip/getp/application/project/apply/command/ApproveTeammateCommand.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApproveTeammateCommand.java similarity index 78% rename from src/main/java/es/princip/getp/application/project/apply/command/ApproveTeammateCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApproveTeammateCommand.java index 45f8efcf..169d1898 100644 --- a/src/main/java/es/princip/getp/application/project/apply/command/ApproveTeammateCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/command/ApproveTeammateCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.apply.command; +package es.princip.getp.application.project.apply.dto.command; import es.princip.getp.domain.people.model.PeopleId; import es.princip.getp.domain.project.apply.model.ProjectApplicationId; diff --git a/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ApplyProjectResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ApplyProjectResponse.java new file mode 100644 index 00000000..b7422d2e --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ApplyProjectResponse.java @@ -0,0 +1,6 @@ +package es.princip.getp.application.project.apply.dto.response; + +public record ApplyProjectResponse( + Long applicationId +) { +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicantResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicantResponse.java similarity index 89% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicantResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicantResponse.java index 9b7320de..a3b7123d 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicantResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicantResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.apply.dto.response; import com.fasterxml.jackson.annotation.JsonInclude; import es.princip.getp.domain.people.model.Education; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicantTeammateResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicantTeammateResponse.java similarity index 65% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicantTeammateResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicantTeammateResponse.java index 1229a62b..1645c29c 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicantTeammateResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicantTeammateResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.apply.dto.response; public record ProjectApplicantTeammateResponse( Long peopleId, diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationDetailResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationDetailResponse.java similarity index 82% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationDetailResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationDetailResponse.java index 30aabd6f..1250dfa9 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationDetailResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationDetailResponse.java @@ -1,6 +1,7 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.apply.dto.response; import com.fasterxml.jackson.annotation.JsonInclude; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.domain.common.model.Duration; import es.princip.getp.domain.project.apply.model.ProjectApplicationStatus; import es.princip.getp.domain.project.apply.model.ProjectApplicationType; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationDetailTeammateResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationDetailTeammateResponse.java similarity index 77% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationDetailTeammateResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationDetailTeammateResponse.java index e71d441f..553aa7c5 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationDetailTeammateResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationDetailTeammateResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.apply.dto.response; import es.princip.getp.domain.project.apply.model.TeammateStatus; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationFormResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationFormResponse.java similarity index 81% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationFormResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationFormResponse.java index 36dd85f1..fc39352e 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectApplicationFormResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/ProjectApplicationFormResponse.java @@ -1,7 +1,8 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.apply.dto.response; import com.fasterxml.jackson.annotation.JsonInclude; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PortfolioResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.domain.common.model.Duration; import es.princip.getp.domain.people.model.Education; import es.princip.getp.domain.project.apply.model.ProjectApplicationStatus; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/SearchTeammateResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/SearchTeammateResponse.java similarity index 63% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/SearchTeammateResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/SearchTeammateResponse.java index d73651a2..6de9ce65 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/SearchTeammateResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/dto/response/SearchTeammateResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.apply.dto.response; public record SearchTeammateResponse( Long peopleId, diff --git a/src/main/java/es/princip/getp/application/project/apply/exception/AlreadyAppliedProjectException.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/AlreadyAppliedProjectException.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/exception/AlreadyAppliedProjectException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/AlreadyAppliedProjectException.java diff --git a/src/main/java/es/princip/getp/application/project/apply/exception/FailedTeamApprovalRequestSendingException.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/FailedTeamApprovalRequestSendingException.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/exception/FailedTeamApprovalRequestSendingException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/FailedTeamApprovalRequestSendingException.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/NotFoundProjectApplicationException.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/NotFoundProjectApplicationException.java similarity index 61% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/NotFoundProjectApplicationException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/NotFoundProjectApplicationException.java index 683680d1..0f713aa2 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/apply/NotFoundProjectApplicationException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/NotFoundProjectApplicationException.java @@ -1,9 +1,9 @@ -package es.princip.getp.persistence.adapter.project.apply; +package es.princip.getp.application.project.apply.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.domain.support.ErrorDescriptionException; -public class NotFoundProjectApplicationException extends NotFoundException { +public class NotFoundProjectApplicationException extends ErrorDescriptionException { private static final String code = "NOT_FOUND_PROJECT_APPLICATION"; private static final String message = "존재하지 않는 프로젝트 지원 내역입니다."; diff --git a/src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectApplicationException.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectApplicationException.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectApplicationException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectApplicationException.java diff --git a/src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectException.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectException.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/exception/NotMyProjectException.java diff --git a/src/main/java/es/princip/getp/application/project/apply/port/in/ApplyProjectUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/ApplyProjectUseCase.java similarity index 74% rename from src/main/java/es/princip/getp/application/project/apply/port/in/ApplyProjectUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/ApplyProjectUseCase.java index fdabb1cd..d8736833 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/in/ApplyProjectUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/ApplyProjectUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply.port.in; -import es.princip.getp.application.project.apply.command.ApplyProjectCommand; +import es.princip.getp.application.project.apply.dto.command.ApplyProjectCommand; import es.princip.getp.domain.project.apply.model.ProjectApplicationId; public interface ApplyProjectUseCase { diff --git a/src/main/java/es/princip/getp/application/project/apply/port/in/ApproveTeammateUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/ApproveTeammateUseCase.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/port/in/ApproveTeammateUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/ApproveTeammateUseCase.java diff --git a/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicantQuery.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicantQuery.java similarity index 75% rename from src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicantQuery.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicantQuery.java index d17820c0..4a6f7595 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicantQuery.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicantQuery.java @@ -1,9 +1,9 @@ package es.princip.getp.application.project.apply.port.in; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; -import es.princip.getp.api.support.dto.SliceResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; +import es.princip.getp.application.support.dto.SliceResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationDetailQuery.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationDetailQuery.java similarity index 79% rename from src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationDetailQuery.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationDetailQuery.java index d77644d3..1d421685 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationDetailQuery.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationDetailQuery.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply.port.in; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationDetailResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationDetailResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.apply.model.ProjectApplicationId; diff --git a/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationFormQuery.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationFormQuery.java similarity index 79% rename from src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationFormQuery.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationFormQuery.java index 22798b98..b2b2d85a 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationFormQuery.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/GetApplicationFormQuery.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply.port.in; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicationFormResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicationFormResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.apply.model.ProjectApplicationId; diff --git a/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/SearchTeammateQuery.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/SearchTeammateQuery.java new file mode 100644 index 00000000..cee9310c --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/in/SearchTeammateQuery.java @@ -0,0 +1,10 @@ +package es.princip.getp.application.project.apply.port.in; + +import es.princip.getp.application.people.dto.command.SearchTeammateCommand; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; +import es.princip.getp.application.support.dto.SliceResponse; + +public interface SearchTeammateQuery { + + SliceResponse search(SearchTeammateCommand command); +} diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/CheckProjectApplicationPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/CheckProjectApplicationPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/port/out/CheckProjectApplicationPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/CheckProjectApplicationPort.java diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/CountProjectApplicationPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/CountProjectApplicationPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/port/out/CountProjectApplicationPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/CountProjectApplicationPort.java diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/FindProjectApplicantPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/FindProjectApplicantPort.java similarity index 83% rename from src/main/java/es/princip/getp/application/project/apply/port/out/FindProjectApplicantPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/FindProjectApplicantPort.java index d1a8d7e6..73478ed0 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/out/FindProjectApplicantPort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/FindProjectApplicantPort.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply.port.out; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/FindTeammatePort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/FindTeammatePort.java similarity index 83% rename from src/main/java/es/princip/getp/application/project/apply/port/out/FindTeammatePort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/FindTeammatePort.java index 956d16fc..85c25fcd 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/out/FindTeammatePort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/FindTeammatePort.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply.port.out; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/LoadProjectApplicantPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/LoadProjectApplicantPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/port/out/LoadProjectApplicantPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/LoadProjectApplicantPort.java diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/SaveProjectApplicationPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SaveProjectApplicationPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/port/out/SaveProjectApplicationPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SaveProjectApplicationPort.java diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeApplicantCursorPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeApplicantCursorPort.java similarity index 71% rename from src/main/java/es/princip/getp/application/project/apply/port/out/SerializeApplicantCursorPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeApplicantCursorPort.java index 5abd09f1..3c376916 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeApplicantCursorPort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeApplicantCursorPort.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply.port.out; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; import org.springframework.data.domain.Slice; public interface SerializeApplicantCursorPort { diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeTeammateCursorPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeTeammateCursorPort.java similarity index 72% rename from src/main/java/es/princip/getp/application/project/apply/port/out/SerializeTeammateCursorPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeTeammateCursorPort.java index f7f9c882..8f96f35a 100644 --- a/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeTeammateCursorPort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/SerializeTeammateCursorPort.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.apply.port.out; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import org.springframework.data.domain.Slice; public interface SerializeTeammateCursorPort { diff --git a/src/main/java/es/princip/getp/application/project/apply/port/out/UpdateProjectApplicantPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/UpdateProjectApplicantPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/apply/port/out/UpdateProjectApplicantPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/apply/port/out/UpdateProjectApplicantPort.java diff --git a/src/main/java/es/princip/getp/application/project/commission/GetProjectService.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/GetProjectService.java similarity index 89% rename from src/main/java/es/princip/getp/application/project/commission/GetProjectService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/GetProjectService.java index 8642948d..1da40950 100644 --- a/src/main/java/es/princip/getp/application/project/commission/GetProjectService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/GetProjectService.java @@ -1,9 +1,9 @@ package es.princip.getp.application.project.commission; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; -import es.princip.getp.application.project.commission.command.GetProjectCommand; -import es.princip.getp.application.project.commission.command.ProjectSearchFilter; +import es.princip.getp.application.project.commission.dto.command.GetProjectCommand; +import es.princip.getp.application.project.commission.dto.command.ProjectSearchFilter; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.application.project.commission.port.in.GetProjectQuery; import es.princip.getp.application.project.commission.port.out.FindProjectPort; import es.princip.getp.application.support.MosaicFactory; @@ -18,10 +18,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static es.princip.getp.application.support.ApplicationQueryUtil.isNotLogined; - import java.util.Optional; +import static es.princip.getp.application.support.ApplicationQueryUtil.isNotLogined; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) diff --git a/src/main/java/es/princip/getp/application/project/commission/ProjectCommissionService.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectCommissionService.java similarity index 94% rename from src/main/java/es/princip/getp/application/project/commission/ProjectCommissionService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectCommissionService.java index 4b764f78..17a3aab5 100644 --- a/src/main/java/es/princip/getp/application/project/commission/ProjectCommissionService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectCommissionService.java @@ -1,7 +1,7 @@ package es.princip.getp.application.project.commission; import es.princip.getp.application.client.port.out.LoadClientPort; -import es.princip.getp.application.project.commission.command.CommissionProjectCommand; +import es.princip.getp.application.project.commission.dto.command.CommissionProjectCommand; import es.princip.getp.application.project.commission.port.in.CommissionProjectUseCase; import es.princip.getp.application.project.commission.port.out.SaveProjectPort; import es.princip.getp.domain.client.model.ClientId; diff --git a/src/main/java/es/princip/getp/application/project/commission/ProjectDataMapper.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectDataMapper.java similarity index 79% rename from src/main/java/es/princip/getp/application/project/commission/ProjectDataMapper.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectDataMapper.java index b6808aaf..aee8c796 100644 --- a/src/main/java/es/princip/getp/application/project/commission/ProjectDataMapper.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectDataMapper.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.commission; -import es.princip.getp.application.project.commission.command.CommissionProjectCommand; +import es.princip.getp.application.project.commission.dto.command.CommissionProjectCommand; import es.princip.getp.domain.client.model.ClientId; import es.princip.getp.domain.project.commission.model.ProjectData; import org.mapstruct.Mapper; diff --git a/src/main/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolver.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolver.java similarity index 87% rename from src/main/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolver.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolver.java index e51c1bcd..19e47ee8 100644 --- a/src/main/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolver.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolver.java @@ -1,8 +1,8 @@ package es.princip.getp.application.project.commission; -import es.princip.getp.api.controller.common.dto.AddressResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectClientResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; +import es.princip.getp.application.common.dto.response.AddressResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.application.support.MosaicResolver; import es.princip.getp.application.support.MosaicResolverSupport; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/es/princip/getp/application/project/commission/command/CommissionProjectCommand.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/CommissionProjectCommand.java similarity index 91% rename from src/main/java/es/princip/getp/application/project/commission/command/CommissionProjectCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/CommissionProjectCommand.java index 9a8ead78..7b2a5e1a 100644 --- a/src/main/java/es/princip/getp/application/project/commission/command/CommissionProjectCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/CommissionProjectCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.commission.command; +package es.princip.getp.application.project.commission.dto.command; import es.princip.getp.domain.common.model.AttachmentFile; import es.princip.getp.domain.common.model.Duration; diff --git a/src/main/java/es/princip/getp/application/project/commission/command/GetProjectCommand.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/GetProjectCommand.java similarity index 75% rename from src/main/java/es/princip/getp/application/project/commission/command/GetProjectCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/GetProjectCommand.java index 51a11ed4..e75ffad4 100644 --- a/src/main/java/es/princip/getp/application/project/commission/command/GetProjectCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/GetProjectCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.commission.command; +package es.princip.getp.application.project.commission.dto.command; import es.princip.getp.domain.member.model.Member; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/es/princip/getp/application/project/commission/command/ProjectSearchFilter.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/ProjectSearchFilter.java similarity index 89% rename from src/main/java/es/princip/getp/application/project/commission/command/ProjectSearchFilter.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/ProjectSearchFilter.java index 6db7e94f..f82e940e 100644 --- a/src/main/java/es/princip/getp/application/project/commission/command/ProjectSearchFilter.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/ProjectSearchFilter.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.commission.command; +package es.princip.getp.application.project.commission.dto.command; import lombok.Getter; diff --git a/src/main/java/es/princip/getp/application/project/commission/command/ProjectSearchOrder.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/ProjectSearchOrder.java similarity index 81% rename from src/main/java/es/princip/getp/application/project/commission/command/ProjectSearchOrder.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/ProjectSearchOrder.java index bfcf4b07..ab85f93d 100644 --- a/src/main/java/es/princip/getp/application/project/commission/command/ProjectSearchOrder.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/command/ProjectSearchOrder.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.commission.command; +package es.princip.getp.application.project.commission.dto.command; import es.princip.getp.util.StringUtil; diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/response/CommissionProjectResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/CommissionProjectResponse.java similarity index 52% rename from src/main/java/es/princip/getp/api/controller/project/command/dto/response/CommissionProjectResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/CommissionProjectResponse.java index 78f3070e..95d4c5e9 100644 --- a/src/main/java/es/princip/getp/api/controller/project/command/dto/response/CommissionProjectResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/CommissionProjectResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.project.command.dto.response; +package es.princip.getp.application.project.commission.dto.response; public record CommissionProjectResponse( Long projectId diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectCardResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectCardResponse.java similarity index 94% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectCardResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectCardResponse.java index cd3dbca0..c67e2d89 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectCardResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectCardResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.commission.dto.response; import es.princip.getp.domain.common.model.Duration; import es.princip.getp.domain.common.model.Hashtag; diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectClientResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectClientResponse.java similarity index 65% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectClientResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectClientResponse.java index 62073fa0..eb99c83d 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectClientResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectClientResponse.java @@ -1,10 +1,10 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.commission.dto.response; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; import com.fasterxml.jackson.annotation.JsonInclude; -import es.princip.getp.api.controller.common.dto.AddressResponse; +import es.princip.getp.application.common.dto.response.AddressResponse; public record ProjectClientResponse( @JsonInclude(NON_NULL) Long clientId, diff --git a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectDetailResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectDetailResponse.java similarity index 97% rename from src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectDetailResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectDetailResponse.java index ceb80050..819b82e8 100644 --- a/src/main/java/es/princip/getp/api/controller/project/query/dto/ProjectDetailResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/dto/response/ProjectDetailResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.controller.project.query.dto; +package es.princip.getp.application.project.commission.dto.response; import com.fasterxml.jackson.annotation.JsonInclude; import es.princip.getp.domain.common.model.Duration; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/commission/NotFoundProjectException.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/exception/NotFoundProjectException.java similarity index 59% rename from src/main/java/es/princip/getp/persistence/adapter/project/commission/NotFoundProjectException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/exception/NotFoundProjectException.java index 86c331c3..bef395cf 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/commission/NotFoundProjectException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/exception/NotFoundProjectException.java @@ -1,9 +1,9 @@ -package es.princip.getp.persistence.adapter.project.commission; +package es.princip.getp.application.project.commission.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.domain.support.ErrorDescriptionException; -public class NotFoundProjectException extends NotFoundException { +public class NotFoundProjectException extends ErrorDescriptionException { private static final String code = "NOT_FOUND_PROJECT"; private static final String message = "존재하지 않는 프로젝트입니다."; diff --git a/src/main/java/es/princip/getp/application/project/commission/port/in/CommissionProjectUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/in/CommissionProjectUseCase.java similarity index 72% rename from src/main/java/es/princip/getp/application/project/commission/port/in/CommissionProjectUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/port/in/CommissionProjectUseCase.java index 1341e5f2..522aabf2 100644 --- a/src/main/java/es/princip/getp/application/project/commission/port/in/CommissionProjectUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/in/CommissionProjectUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.commission.port.in; -import es.princip.getp.application.project.commission.command.CommissionProjectCommand; +import es.princip.getp.application.project.commission.dto.command.CommissionProjectCommand; import es.princip.getp.domain.project.commission.model.ProjectId; public interface CommissionProjectUseCase { diff --git a/src/main/java/es/princip/getp/application/project/commission/port/in/GetProjectQuery.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/in/GetProjectQuery.java similarity index 61% rename from src/main/java/es/princip/getp/application/project/commission/port/in/GetProjectQuery.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/port/in/GetProjectQuery.java index a99059e7..18d56ba2 100644 --- a/src/main/java/es/princip/getp/application/project/commission/port/in/GetProjectQuery.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/in/GetProjectQuery.java @@ -1,8 +1,8 @@ package es.princip.getp.application.project.commission.port.in; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; -import es.princip.getp.application.project.commission.command.GetProjectCommand; +import es.princip.getp.application.project.commission.dto.command.GetProjectCommand; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.project.commission.model.ProjectId; import org.springframework.data.domain.Page; diff --git a/src/main/java/es/princip/getp/application/project/commission/port/out/FindProjectPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/FindProjectPort.java similarity index 67% rename from src/main/java/es/princip/getp/application/project/commission/port/out/FindProjectPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/FindProjectPort.java index dde38586..29d8de9e 100644 --- a/src/main/java/es/princip/getp/application/project/commission/port/out/FindProjectPort.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/FindProjectPort.java @@ -1,8 +1,8 @@ package es.princip.getp.application.project.commission.port.out; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; -import es.princip.getp.application.project.commission.command.ProjectSearchFilter; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.command.ProjectSearchFilter; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/src/main/java/es/princip/getp/application/project/commission/port/out/LoadProjectPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/LoadProjectPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/commission/port/out/LoadProjectPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/LoadProjectPort.java diff --git a/src/main/java/es/princip/getp/application/project/commission/port/out/SaveProjectPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/SaveProjectPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/commission/port/out/SaveProjectPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/SaveProjectPort.java diff --git a/src/main/java/es/princip/getp/application/project/commission/port/out/UpdateProjectPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/UpdateProjectPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/commission/port/out/UpdateProjectPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/commission/port/out/UpdateProjectPort.java diff --git a/src/main/java/es/princip/getp/application/project/meeting/EmailMeetingSender.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/EmailMeetingSender.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/EmailMeetingSender.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/EmailMeetingSender.java diff --git a/src/main/java/es/princip/getp/application/project/meeting/MeetingSender.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/MeetingSender.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/MeetingSender.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/MeetingSender.java diff --git a/src/main/java/es/princip/getp/application/project/meeting/ProjectMeetingService.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/ProjectMeetingService.java similarity index 97% rename from src/main/java/es/princip/getp/application/project/meeting/ProjectMeetingService.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/ProjectMeetingService.java index 4ff57bf4..fce04014 100644 --- a/src/main/java/es/princip/getp/application/project/meeting/ProjectMeetingService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/ProjectMeetingService.java @@ -4,7 +4,7 @@ import es.princip.getp.application.people.port.out.LoadPeoplePort; import es.princip.getp.application.project.apply.port.out.CheckProjectApplicationPort; import es.princip.getp.application.project.commission.port.out.LoadProjectPort; -import es.princip.getp.application.project.meeting.command.ScheduleMeetingCommand; +import es.princip.getp.application.project.meeting.dto.command.ScheduleMeetingCommand; import es.princip.getp.application.project.meeting.exception.NotApplicantException; import es.princip.getp.application.project.meeting.exception.NotClientOfProjectException; import es.princip.getp.application.project.meeting.port.out.SaveProjectMeetingPort; diff --git a/src/main/java/es/princip/getp/application/project/meeting/command/ScheduleMeetingCommand.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/dto/command/ScheduleMeetingCommand.java similarity index 88% rename from src/main/java/es/princip/getp/application/project/meeting/command/ScheduleMeetingCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/dto/command/ScheduleMeetingCommand.java index 9e0065d9..edda3d9b 100644 --- a/src/main/java/es/princip/getp/application/project/meeting/command/ScheduleMeetingCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/dto/command/ScheduleMeetingCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.project.meeting.command; +package es.princip.getp.application.project.meeting.dto.command; import es.princip.getp.domain.common.model.MeetingSchedule; import es.princip.getp.domain.common.model.PhoneNumber; diff --git a/get-p-application/src/main/java/es/princip/getp/application/project/meeting/dto/response/ScheduleMeetingResponse.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/dto/response/ScheduleMeetingResponse.java new file mode 100644 index 00000000..1c088d3c --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/dto/response/ScheduleMeetingResponse.java @@ -0,0 +1,6 @@ +package es.princip.getp.application.project.meeting.dto.response; + +public record ScheduleMeetingResponse( + Long meetingId +) { +} diff --git a/src/main/java/es/princip/getp/application/project/meeting/exception/FailedMeetingSendingException.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/FailedMeetingSendingException.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/exception/FailedMeetingSendingException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/FailedMeetingSendingException.java diff --git a/src/main/java/es/princip/getp/application/project/meeting/exception/NotApplicantException.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/NotApplicantException.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/exception/NotApplicantException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/NotApplicantException.java diff --git a/src/main/java/es/princip/getp/application/project/meeting/exception/NotClientOfProjectException.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/NotClientOfProjectException.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/exception/NotClientOfProjectException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/NotClientOfProjectException.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/NotFoundProjectMeetingException.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/NotFoundProjectMeetingException.java similarity index 60% rename from src/main/java/es/princip/getp/persistence/adapter/project/meeting/NotFoundProjectMeetingException.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/NotFoundProjectMeetingException.java index 1861a440..f6951787 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/NotFoundProjectMeetingException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/exception/NotFoundProjectMeetingException.java @@ -1,9 +1,9 @@ -package es.princip.getp.persistence.adapter.project.meeting; +package es.princip.getp.application.project.meeting.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.domain.support.ErrorDescriptionException; -class NotFoundProjectMeetingException extends NotFoundException { +public class NotFoundProjectMeetingException extends ErrorDescriptionException { private static final String code = "NOT_FOUND_PROJECT_MEETING"; private static final String message = "존재하지 않는 미팅입니다."; diff --git a/src/main/java/es/princip/getp/application/project/meeting/port/out/LoadProjectMeetingPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/port/out/LoadProjectMeetingPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/port/out/LoadProjectMeetingPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/port/out/LoadProjectMeetingPort.java diff --git a/src/main/java/es/princip/getp/application/project/meeting/port/out/SaveProjectMeetingPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/port/out/SaveProjectMeetingPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/port/out/SaveProjectMeetingPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/port/out/SaveProjectMeetingPort.java diff --git a/src/main/java/es/princip/getp/application/project/meeting/port/out/UpdateProjectMeetingPort.java b/get-p-application/src/main/java/es/princip/getp/application/project/meeting/port/out/UpdateProjectMeetingPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/project/meeting/port/out/UpdateProjectMeetingPort.java rename to get-p-application/src/main/java/es/princip/getp/application/project/meeting/port/out/UpdateProjectMeetingPort.java diff --git a/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/dto/command/ServiceTermCommand.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/dto/command/ServiceTermCommand.java new file mode 100644 index 00000000..ce528117 --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/dto/command/ServiceTermCommand.java @@ -0,0 +1,8 @@ +package es.princip.getp.application.serviceTerm.dto.command; + +public record ServiceTermCommand( + String tag, + boolean required, + boolean revocable +) { +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/api/controller/serviceTerm/dto/response/ServiceTermResponse.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/dto/response/ServiceTermResponse.java similarity index 74% rename from src/main/java/es/princip/getp/api/controller/serviceTerm/dto/response/ServiceTermResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/dto/response/ServiceTermResponse.java index 2b6e963d..d4c9e7da 100644 --- a/src/main/java/es/princip/getp/api/controller/serviceTerm/dto/response/ServiceTermResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/dto/response/ServiceTermResponse.java @@ -1,10 +1,9 @@ -package es.princip.getp.api.controller.serviceTerm.dto.response; +package es.princip.getp.application.serviceTerm.dto.response; import es.princip.getp.domain.serviceTerm.model.ServiceTerm; -import jakarta.validation.constraints.NotNull; public record ServiceTermResponse( - @NotNull String tag, + String tag, boolean required, boolean revocable ) { diff --git a/src/main/java/es/princip/getp/application/serviceTerm/exception/DuplicatedTagException.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/exception/DuplicatedTagException.java similarity index 100% rename from src/main/java/es/princip/getp/application/serviceTerm/exception/DuplicatedTagException.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/exception/DuplicatedTagException.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/NotFoundServiceTermException.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/exception/NotFoundServiceTermException.java similarity index 55% rename from src/main/java/es/princip/getp/persistence/adapter/serviceTerm/NotFoundServiceTermException.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/exception/NotFoundServiceTermException.java index 95188975..ad5c0904 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/NotFoundServiceTermException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/exception/NotFoundServiceTermException.java @@ -1,20 +1,20 @@ -package es.princip.getp.persistence.adapter.serviceTerm; +package es.princip.getp.application.serviceTerm.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.persistence.support.NotFoundException; +import es.princip.getp.application.support.NotFoundException; import java.util.Set; -class NotFoundServiceTermException extends NotFoundException { +public class NotFoundServiceTermException extends NotFoundException { private static final String code = "NOT_FOUND_SERVICE_TERM"; private static final String message = "존재하지 않는 서비스 약관입니다."; - NotFoundServiceTermException(final Set tags) { + public NotFoundServiceTermException(final Set tags) { super(ErrorDescription.of(code, formatMessage(tags))); } - static String formatMessage(final Set tags) { + public static String formatMessage(final Set tags) { return String.format("%s은(는) %s", String.join(", ", tags), message); } } diff --git a/src/main/java/es/princip/getp/application/serviceTerm/port/in/RegisterServiceTermUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/in/RegisterServiceTermUseCase.java similarity index 55% rename from src/main/java/es/princip/getp/application/serviceTerm/port/in/RegisterServiceTermUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/in/RegisterServiceTermUseCase.java index a3547b7f..30d43181 100644 --- a/src/main/java/es/princip/getp/application/serviceTerm/port/in/RegisterServiceTermUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/in/RegisterServiceTermUseCase.java @@ -1,9 +1,9 @@ package es.princip.getp.application.serviceTerm.port.in; -import es.princip.getp.api.controller.serviceTerm.dto.reqeust.ServiceTermRequest; +import es.princip.getp.application.serviceTerm.dto.command.ServiceTermCommand; import es.princip.getp.domain.serviceTerm.model.ServiceTerm; public interface RegisterServiceTermUseCase { - ServiceTerm register(ServiceTermRequest request); + ServiceTerm register(ServiceTermCommand command); } diff --git a/src/main/java/es/princip/getp/application/serviceTerm/port/out/CheckServiceTermPort.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/out/CheckServiceTermPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/serviceTerm/port/out/CheckServiceTermPort.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/out/CheckServiceTermPort.java diff --git a/src/main/java/es/princip/getp/application/serviceTerm/port/out/LoadServiceTermPort.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/out/LoadServiceTermPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/serviceTerm/port/out/LoadServiceTermPort.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/out/LoadServiceTermPort.java diff --git a/src/main/java/es/princip/getp/application/serviceTerm/port/out/SaveServiceTermPort.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/out/SaveServiceTermPort.java similarity index 100% rename from src/main/java/es/princip/getp/application/serviceTerm/port/out/SaveServiceTermPort.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/port/out/SaveServiceTermPort.java diff --git a/src/main/java/es/princip/getp/application/serviceTerm/service/ServiceTermService.java b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/service/ServiceTermService.java similarity index 78% rename from src/main/java/es/princip/getp/application/serviceTerm/service/ServiceTermService.java rename to get-p-application/src/main/java/es/princip/getp/application/serviceTerm/service/ServiceTermService.java index f565de90..eb82e27f 100644 --- a/src/main/java/es/princip/getp/application/serviceTerm/service/ServiceTermService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/serviceTerm/service/ServiceTermService.java @@ -1,6 +1,6 @@ package es.princip.getp.application.serviceTerm.service; -import es.princip.getp.api.controller.serviceTerm.dto.reqeust.ServiceTermRequest; +import es.princip.getp.application.serviceTerm.dto.command.ServiceTermCommand; import es.princip.getp.application.serviceTerm.exception.DuplicatedTagException; import es.princip.getp.application.serviceTerm.port.in.RegisterServiceTermUseCase; import es.princip.getp.application.serviceTerm.port.out.CheckServiceTermPort; @@ -21,12 +21,12 @@ public class ServiceTermService implements RegisterServiceTermUseCase { @Override @Transactional - public ServiceTerm register(final ServiceTermRequest request) { - final ServiceTermTag tag = ServiceTermTag.of(request.tag()); + public ServiceTerm register(final ServiceTermCommand command) { + final ServiceTermTag tag = ServiceTermTag.of(command.tag()); if (checkServiceTermPort.existsBy(tag)) { throw new DuplicatedTagException(); } - final ServiceTerm serviceTerm = new ServiceTerm(tag, request.required(), request.revocable()); + final ServiceTerm serviceTerm = new ServiceTerm(tag, command.required(), command.revocable()); saveServiceTermPort.save(serviceTerm); return serviceTerm; } diff --git a/src/main/java/es/princip/getp/application/storage/FileLog.java b/get-p-application/src/main/java/es/princip/getp/application/storage/FileLog.java similarity index 100% rename from src/main/java/es/princip/getp/application/storage/FileLog.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/FileLog.java diff --git a/src/main/java/es/princip/getp/application/storage/UploadFileService.java b/get-p-application/src/main/java/es/princip/getp/application/storage/UploadFileService.java similarity index 93% rename from src/main/java/es/princip/getp/application/storage/UploadFileService.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/UploadFileService.java index 43b19691..239b3b87 100644 --- a/src/main/java/es/princip/getp/application/storage/UploadFileService.java +++ b/get-p-application/src/main/java/es/princip/getp/application/storage/UploadFileService.java @@ -1,12 +1,12 @@ package es.princip.getp.application.storage; -import es.princip.getp.application.storage.command.UploadFileCommand; +import es.princip.getp.application.storage.dto.command.UploadFileCommand; import es.princip.getp.application.storage.exception.NotSupportedExtensionException; import es.princip.getp.application.storage.port.in.UploadFileUseCase; import es.princip.getp.application.storage.port.out.LogFilePort; import es.princip.getp.application.storage.port.out.StoreFilePort; import es.princip.getp.domain.member.model.MemberId; -import es.princip.getp.infrastructure.adapter.storage.exception.FailedFileSaveException; +import es.princip.getp.application.storage.exception.FailedFileSaveException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/es/princip/getp/application/storage/command/UploadFileCommand.java b/get-p-application/src/main/java/es/princip/getp/application/storage/dto/command/UploadFileCommand.java similarity index 77% rename from src/main/java/es/princip/getp/application/storage/command/UploadFileCommand.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/dto/command/UploadFileCommand.java index fab911e1..c717fbd0 100644 --- a/src/main/java/es/princip/getp/application/storage/command/UploadFileCommand.java +++ b/get-p-application/src/main/java/es/princip/getp/application/storage/dto/command/UploadFileCommand.java @@ -1,4 +1,4 @@ -package es.princip.getp.application.storage.command; +package es.princip.getp.application.storage.dto.command; import es.princip.getp.domain.member.model.MemberId; import org.springframework.web.multipart.MultipartFile; diff --git a/get-p-application/src/main/java/es/princip/getp/application/storage/dto/response/UploadFileResponse.java b/get-p-application/src/main/java/es/princip/getp/application/storage/dto/response/UploadFileResponse.java new file mode 100644 index 00000000..e99e903c --- /dev/null +++ b/get-p-application/src/main/java/es/princip/getp/application/storage/dto/response/UploadFileResponse.java @@ -0,0 +1,6 @@ +package es.princip.getp.application.storage.dto.response; + +import java.net.URI; + +public record UploadFileResponse(URI fileUri) { +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/infrastructure/adapter/storage/exception/FailedFileDeleteException.java b/get-p-application/src/main/java/es/princip/getp/application/storage/exception/FailedFileDeleteException.java similarity index 75% rename from src/main/java/es/princip/getp/infrastructure/adapter/storage/exception/FailedFileDeleteException.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/exception/FailedFileDeleteException.java index fdbb8dbb..e00a8bd8 100644 --- a/src/main/java/es/princip/getp/infrastructure/adapter/storage/exception/FailedFileDeleteException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/storage/exception/FailedFileDeleteException.java @@ -1,7 +1,6 @@ -package es.princip.getp.infrastructure.adapter.storage.exception; +package es.princip.getp.application.storage.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.infrastructure.support.FileStorageException; public class FailedFileDeleteException extends FileStorageException { diff --git a/src/main/java/es/princip/getp/infrastructure/adapter/storage/exception/FailedFileSaveException.java b/get-p-application/src/main/java/es/princip/getp/application/storage/exception/FailedFileSaveException.java similarity index 75% rename from src/main/java/es/princip/getp/infrastructure/adapter/storage/exception/FailedFileSaveException.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/exception/FailedFileSaveException.java index 0a3c3a6c..3521a9f4 100644 --- a/src/main/java/es/princip/getp/infrastructure/adapter/storage/exception/FailedFileSaveException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/storage/exception/FailedFileSaveException.java @@ -1,7 +1,6 @@ -package es.princip.getp.infrastructure.adapter.storage.exception; +package es.princip.getp.application.storage.exception; import es.princip.getp.domain.support.ErrorDescription; -import es.princip.getp.infrastructure.support.FileStorageException; public class FailedFileSaveException extends FileStorageException { diff --git a/src/main/java/es/princip/getp/infrastructure/support/FileStorageException.java b/get-p-application/src/main/java/es/princip/getp/application/storage/exception/FileStorageException.java similarity index 86% rename from src/main/java/es/princip/getp/infrastructure/support/FileStorageException.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/exception/FileStorageException.java index 51d305d9..a4c2b9f8 100644 --- a/src/main/java/es/princip/getp/infrastructure/support/FileStorageException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/storage/exception/FileStorageException.java @@ -1,4 +1,4 @@ -package es.princip.getp.infrastructure.support; +package es.princip.getp.application.storage.exception; import es.princip.getp.domain.support.ErrorDescription; import es.princip.getp.domain.support.ErrorDescriptionException; diff --git a/src/main/java/es/princip/getp/application/storage/exception/NotSupportedExtensionException.java b/get-p-application/src/main/java/es/princip/getp/application/storage/exception/NotSupportedExtensionException.java similarity index 100% rename from src/main/java/es/princip/getp/application/storage/exception/NotSupportedExtensionException.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/exception/NotSupportedExtensionException.java diff --git a/src/main/java/es/princip/getp/application/storage/port/in/UploadFileUseCase.java b/get-p-application/src/main/java/es/princip/getp/application/storage/port/in/UploadFileUseCase.java similarity index 68% rename from src/main/java/es/princip/getp/application/storage/port/in/UploadFileUseCase.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/port/in/UploadFileUseCase.java index 750a085a..47e31ed6 100644 --- a/src/main/java/es/princip/getp/application/storage/port/in/UploadFileUseCase.java +++ b/get-p-application/src/main/java/es/princip/getp/application/storage/port/in/UploadFileUseCase.java @@ -1,6 +1,6 @@ package es.princip.getp.application.storage.port.in; -import es.princip.getp.application.storage.command.UploadFileCommand; +import es.princip.getp.application.storage.dto.command.UploadFileCommand; import java.net.URI; diff --git a/src/main/java/es/princip/getp/application/storage/port/out/DeleteFilePort.java b/get-p-application/src/main/java/es/princip/getp/application/storage/port/out/DeleteFilePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/storage/port/out/DeleteFilePort.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/port/out/DeleteFilePort.java diff --git a/src/main/java/es/princip/getp/application/storage/port/out/LogFilePort.java b/get-p-application/src/main/java/es/princip/getp/application/storage/port/out/LogFilePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/storage/port/out/LogFilePort.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/port/out/LogFilePort.java diff --git a/src/main/java/es/princip/getp/application/storage/port/out/StoreFilePort.java b/get-p-application/src/main/java/es/princip/getp/application/storage/port/out/StoreFilePort.java similarity index 100% rename from src/main/java/es/princip/getp/application/storage/port/out/StoreFilePort.java rename to get-p-application/src/main/java/es/princip/getp/application/storage/port/out/StoreFilePort.java diff --git a/src/main/java/es/princip/getp/application/support/ApplicationLogicException.java b/get-p-application/src/main/java/es/princip/getp/application/support/ApplicationLogicException.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/ApplicationLogicException.java rename to get-p-application/src/main/java/es/princip/getp/application/support/ApplicationLogicException.java diff --git a/src/main/java/es/princip/getp/application/support/ApplicationQueryUtil.java b/get-p-application/src/main/java/es/princip/getp/application/support/ApplicationQueryUtil.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/ApplicationQueryUtil.java rename to get-p-application/src/main/java/es/princip/getp/application/support/ApplicationQueryUtil.java diff --git a/src/main/java/es/princip/getp/application/support/Cursor.java b/get-p-application/src/main/java/es/princip/getp/application/support/Cursor.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/Cursor.java rename to get-p-application/src/main/java/es/princip/getp/application/support/Cursor.java diff --git a/src/main/java/es/princip/getp/application/support/CursorPageable.java b/get-p-application/src/main/java/es/princip/getp/application/support/CursorPageable.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/CursorPageable.java rename to get-p-application/src/main/java/es/princip/getp/application/support/CursorPageable.java diff --git a/src/main/java/es/princip/getp/application/support/ExternalServerException.java b/get-p-application/src/main/java/es/princip/getp/application/support/ExternalServerException.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/ExternalServerException.java rename to get-p-application/src/main/java/es/princip/getp/application/support/ExternalServerException.java diff --git a/src/main/java/es/princip/getp/application/support/ForbiddenException.java b/get-p-application/src/main/java/es/princip/getp/application/support/ForbiddenException.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/ForbiddenException.java rename to get-p-application/src/main/java/es/princip/getp/application/support/ForbiddenException.java diff --git a/src/main/java/es/princip/getp/application/support/MosaicFactory.java b/get-p-application/src/main/java/es/princip/getp/application/support/MosaicFactory.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/MosaicFactory.java rename to get-p-application/src/main/java/es/princip/getp/application/support/MosaicFactory.java diff --git a/src/main/java/es/princip/getp/application/support/MosaicResolver.java b/get-p-application/src/main/java/es/princip/getp/application/support/MosaicResolver.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/MosaicResolver.java rename to get-p-application/src/main/java/es/princip/getp/application/support/MosaicResolver.java diff --git a/src/main/java/es/princip/getp/application/support/MosaicResolverSupport.java b/get-p-application/src/main/java/es/princip/getp/application/support/MosaicResolverSupport.java similarity index 100% rename from src/main/java/es/princip/getp/application/support/MosaicResolverSupport.java rename to get-p-application/src/main/java/es/princip/getp/application/support/MosaicResolverSupport.java diff --git a/src/main/java/es/princip/getp/persistence/support/NotFoundException.java b/get-p-application/src/main/java/es/princip/getp/application/support/NotFoundException.java similarity index 88% rename from src/main/java/es/princip/getp/persistence/support/NotFoundException.java rename to get-p-application/src/main/java/es/princip/getp/application/support/NotFoundException.java index d39ca765..e1be8d46 100644 --- a/src/main/java/es/princip/getp/persistence/support/NotFoundException.java +++ b/get-p-application/src/main/java/es/princip/getp/application/support/NotFoundException.java @@ -1,4 +1,4 @@ -package es.princip.getp.persistence.support; +package es.princip.getp.application.support; import es.princip.getp.domain.support.ErrorDescription; import es.princip.getp.domain.support.ErrorDescriptionException; diff --git a/src/main/java/es/princip/getp/api/support/dto/PageResponse.java b/get-p-application/src/main/java/es/princip/getp/application/support/dto/PageResponse.java similarity index 97% rename from src/main/java/es/princip/getp/api/support/dto/PageResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/support/dto/PageResponse.java index 8475ad70..6fa21520 100644 --- a/src/main/java/es/princip/getp/api/support/dto/PageResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/support/dto/PageResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.support.dto; +package es.princip.getp.application.support.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/es/princip/getp/api/support/dto/SliceResponse.java b/get-p-application/src/main/java/es/princip/getp/application/support/dto/SliceResponse.java similarity index 97% rename from src/main/java/es/princip/getp/api/support/dto/SliceResponse.java rename to get-p-application/src/main/java/es/princip/getp/application/support/dto/SliceResponse.java index 6764d776..6188b4db 100644 --- a/src/main/java/es/princip/getp/api/support/dto/SliceResponse.java +++ b/get-p-application/src/main/java/es/princip/getp/application/support/dto/SliceResponse.java @@ -1,4 +1,4 @@ -package es.princip.getp.api.support.dto; +package es.princip.getp.application.support.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/es/princip/getp/util/StringUtil.java b/get-p-application/src/main/java/es/princip/getp/util/StringUtil.java similarity index 100% rename from src/main/java/es/princip/getp/util/StringUtil.java rename to get-p-application/src/main/java/es/princip/getp/util/StringUtil.java diff --git a/get-p-application/src/main/resources/app-config.yml b/get-p-application/src/main/resources/app-config.yml new file mode 100644 index 00000000..c145d139 --- /dev/null +++ b/get-p-application/src/main/resources/app-config.yml @@ -0,0 +1,34 @@ +spring: + mail: + host: smtp.gmail.com + port: ${GMAIL_PORT} + username: ${GMAIL_USERNAME} + password: ${GMAIL_PASSWORD} + properties: + mail: + smtp: + auth: true + starttls: + enable: true + required: true + connectiontimeout: 5000 + timeout: 5000 + writetimeout: 5000 + templates: + logo: classpath:/static/logo.png + + verification-code: + length: ${VERIFICATION_CODE_LENGTH} + expire-time: ${VERIFICATION_CODE_EXPIRE_TIME} + + jwt: + secret: ${JWT_SECRET} + access-token: + expire-time: ${JWT_ACCESS_TOKEN_EXPIRE_TIME} + refresh-token: + expire-time: ${JWT_REFRESH_TOKEN_EXPIRE_TIME} + teammate-approval-token: + expire-time: ${JWT_TEAMMATE_APPROVAL_TOKEN_EXPIRE_TIME} + + messages: + basename: messages/validation, messages/messages \ No newline at end of file diff --git a/src/main/resources/junit-platform.properties b/get-p-application/src/main/resources/junit-platform.properties similarity index 100% rename from src/main/resources/junit-platform.properties rename to get-p-application/src/main/resources/junit-platform.properties diff --git a/src/main/resources/messages/messages.properties b/get-p-application/src/main/resources/messages/messages.properties similarity index 100% rename from src/main/resources/messages/messages.properties rename to get-p-application/src/main/resources/messages/messages.properties diff --git a/src/main/resources/messages/validation.properties b/get-p-application/src/main/resources/messages/validation.properties similarity index 100% rename from src/main/resources/messages/validation.properties rename to get-p-application/src/main/resources/messages/validation.properties diff --git a/src/main/resources/templates/teammate-approval.html b/get-p-application/src/main/resources/templates/teammate-approval.html similarity index 100% rename from src/main/resources/templates/teammate-approval.html rename to get-p-application/src/main/resources/templates/teammate-approval.html diff --git a/src/test/java/es/princip/getp/application/auth/service/VerificationServiceTest.java b/get-p-application/src/test/java/es/princip/getp/application/auth/service/VerificationServiceTest.java similarity index 79% rename from src/test/java/es/princip/getp/application/auth/service/VerificationServiceTest.java rename to get-p-application/src/test/java/es/princip/getp/application/auth/service/VerificationServiceTest.java index 411d0603..346de97e 100644 --- a/src/test/java/es/princip/getp/application/auth/service/VerificationServiceTest.java +++ b/get-p-application/src/test/java/es/princip/getp/application/auth/service/VerificationServiceTest.java @@ -2,6 +2,7 @@ import es.princip.getp.application.auth.exception.IncorrectVerificationCodeException; import es.princip.getp.application.auth.exception.NotFoundVerificationException; +import es.princip.getp.domain.auth.EmailVerification; import es.princip.getp.domain.common.model.Email; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -12,13 +13,12 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Optional; - import static es.princip.getp.fixture.auth.EmailVerificationFixture.emailVerification; import static es.princip.getp.fixture.common.EmailFixture.email; import static org.assertj.core.api.Assertions.assertThatCode; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) @@ -66,20 +66,22 @@ class VerifyEmail { @Test void verifyEmail() { final Email email = email(); - String verificationCode = "1234"; - EmailVerification emailVerification = emailVerification(email, verificationCode); - when(emailVerificationRepository.findById(email.getValue())).thenReturn(Optional.of(emailVerification)); + final String verificationCode = "1234"; + final EmailVerification emailVerification = emailVerification(email, verificationCode); + given(emailVerificationRepository.findById(email.getValue())) + .willReturn(emailVerification); emailVerificationService.verifyEmail(email, verificationCode); - verify(emailVerificationRepository, times(1)).delete(emailVerification); + verify(emailVerificationRepository, times(1)).deleteById(email.getValue()); } @DisplayName("유효하지 않은 이메일 인증인 경우 실패한다.") @Test void verifyEmail_WhenEmailVerificationIsInvalid_ShouldThrowException() { final Email email = email(); - when(emailVerificationRepository.findById(email.getValue())).thenReturn(Optional.empty()); + given(emailVerificationRepository.findById(email.getValue())) + .willThrow(NotFoundVerificationException.class); assertThatCode(() -> emailVerificationService.verifyEmail(email, "1234")) .isInstanceOf(NotFoundVerificationException.class); @@ -89,9 +91,10 @@ void verifyEmail_WhenEmailVerificationIsInvalid_ShouldThrowException() { @Test void verifyEmail_WhenVerificationCodeIsIncorrect_ShouldThrowException() { final Email email = email(); - String verificationCode = "5678"; - EmailVerification emailVerification = emailVerification(email, verificationCode); - when(emailVerificationRepository.findById(email.getValue())).thenReturn(Optional.of(emailVerification)); + final String verificationCode = "5678"; + final EmailVerification emailVerification = emailVerification(email, verificationCode); + given(emailVerificationRepository.findById(email.getValue())) + .willReturn(emailVerification); assertThatCode(() -> emailVerificationService.verifyEmail(email, "1234")) .isInstanceOf(IncorrectVerificationCodeException.class); diff --git a/get-p-application/src/test/java/es/princip/getp/application/common/fixture/AddressResponseFixture.java b/get-p-application/src/test/java/es/princip/getp/application/common/fixture/AddressResponseFixture.java new file mode 100644 index 00000000..75e61be7 --- /dev/null +++ b/get-p-application/src/test/java/es/princip/getp/application/common/fixture/AddressResponseFixture.java @@ -0,0 +1,18 @@ +package es.princip.getp.application.common.fixture; + +import es.princip.getp.application.common.dto.response.AddressResponse; +import es.princip.getp.domain.client.model.Address; + +import static es.princip.getp.fixture.client.AddressFixture.address; + +public class AddressResponseFixture { + + public static AddressResponse addressResponse() { + final Address address = address(); + return new AddressResponse( + address.getZipcode(), + address.getStreet(), + address.getDetail() + ); + } +} diff --git a/get-p-application/src/test/java/es/princip/getp/application/common/fixture/HashtagDtoFixture.java b/get-p-application/src/test/java/es/princip/getp/application/common/fixture/HashtagDtoFixture.java new file mode 100644 index 00000000..2fde09ed --- /dev/null +++ b/get-p-application/src/test/java/es/princip/getp/application/common/fixture/HashtagDtoFixture.java @@ -0,0 +1,22 @@ +package es.princip.getp.application.common.fixture; + +import es.princip.getp.domain.common.model.Hashtag; + +import java.util.List; + +import static es.princip.getp.fixture.common.HashtagFixture.hashtags; + +public class HashtagDtoFixture { + + public static List hashtagsRequest() { + return hashtags().stream() + .map(Hashtag::getValue) + .toList(); + } + + public static List hashtagsResponse() { + return hashtags().stream() + .map(Hashtag::getValue) + .toList(); + } +} diff --git a/get-p-application/src/test/java/es/princip/getp/application/common/fixture/TechStackDtoFixture.java b/get-p-application/src/test/java/es/princip/getp/application/common/fixture/TechStackDtoFixture.java new file mode 100644 index 00000000..ce9a83e4 --- /dev/null +++ b/get-p-application/src/test/java/es/princip/getp/application/common/fixture/TechStackDtoFixture.java @@ -0,0 +1,22 @@ +package es.princip.getp.application.common.fixture; + +import es.princip.getp.domain.common.model.TechStack; + +import java.util.List; + +import static es.princip.getp.fixture.common.TechStackFixture.techStacks; + +public class TechStackDtoFixture { + + public static List techStacksRequest() { + return techStacks().stream() + .map(TechStack::getValue) + .toList(); + } + + public static List techStacksResponse() { + return techStacks().stream() + .map(TechStack::getValue) + .toList(); + } +} diff --git a/src/test/java/es/princip/getp/application/like/people/service/LikePeopleMockingUtil.java b/get-p-application/src/test/java/es/princip/getp/application/like/people/service/LikePeopleMockingUtil.java similarity index 100% rename from src/test/java/es/princip/getp/application/like/people/service/LikePeopleMockingUtil.java rename to get-p-application/src/test/java/es/princip/getp/application/like/people/service/LikePeopleMockingUtil.java diff --git a/src/test/java/es/princip/getp/application/like/people/service/LikePeopleServiceTest.java b/get-p-application/src/test/java/es/princip/getp/application/like/people/service/LikePeopleServiceTest.java similarity index 100% rename from src/test/java/es/princip/getp/application/like/people/service/LikePeopleServiceTest.java rename to get-p-application/src/test/java/es/princip/getp/application/like/people/service/LikePeopleServiceTest.java diff --git a/src/test/java/es/princip/getp/application/like/people/service/UnlikePeopleServiceTest.java b/get-p-application/src/test/java/es/princip/getp/application/like/people/service/UnlikePeopleServiceTest.java similarity index 100% rename from src/test/java/es/princip/getp/application/like/people/service/UnlikePeopleServiceTest.java rename to get-p-application/src/test/java/es/princip/getp/application/like/people/service/UnlikePeopleServiceTest.java diff --git a/src/test/java/es/princip/getp/application/like/project/service/LikeProjectMockingUtil.java b/get-p-application/src/test/java/es/princip/getp/application/like/project/service/LikeProjectMockingUtil.java similarity index 100% rename from src/test/java/es/princip/getp/application/like/project/service/LikeProjectMockingUtil.java rename to get-p-application/src/test/java/es/princip/getp/application/like/project/service/LikeProjectMockingUtil.java diff --git a/src/test/java/es/princip/getp/application/like/project/service/LikeProjectServiceTest.java b/get-p-application/src/test/java/es/princip/getp/application/like/project/service/LikeProjectServiceTest.java similarity index 100% rename from src/test/java/es/princip/getp/application/like/project/service/LikeProjectServiceTest.java rename to get-p-application/src/test/java/es/princip/getp/application/like/project/service/LikeProjectServiceTest.java diff --git a/src/test/java/es/princip/getp/application/like/project/service/UnlikeProjectServiceTest.java b/get-p-application/src/test/java/es/princip/getp/application/like/project/service/UnlikeProjectServiceTest.java similarity index 100% rename from src/test/java/es/princip/getp/application/like/project/service/UnlikeProjectServiceTest.java rename to get-p-application/src/test/java/es/princip/getp/application/like/project/service/UnlikeProjectServiceTest.java diff --git a/get-p-application/src/test/java/es/princip/getp/application/people/fixture/PortfolioResponseFixture.java b/get-p-application/src/test/java/es/princip/getp/application/people/fixture/PortfolioResponseFixture.java new file mode 100644 index 00000000..e4cd61de --- /dev/null +++ b/get-p-application/src/test/java/es/princip/getp/application/people/fixture/PortfolioResponseFixture.java @@ -0,0 +1,19 @@ +package es.princip.getp.application.people.fixture; + +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; + +import java.util.List; + +import static es.princip.getp.fixture.people.PortfolioFixture.portfolios; + +public class PortfolioResponseFixture { + + public static List portfolioResponses() { + return portfolios().stream() + .map(portfolio -> new PortfolioResponse( + portfolio.getDescription(), + portfolio.getUrl().getValue() + )) + .toList(); + } +} diff --git a/src/test/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolverTest.java b/get-p-application/src/test/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolverTest.java similarity index 80% rename from src/test/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolverTest.java rename to get-p-application/src/test/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolverTest.java index e03fea49..38616965 100644 --- a/src/test/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolverTest.java +++ b/get-p-application/src/test/java/es/princip/getp/application/people/service/PeopleDetailResponseMosaicResolverTest.java @@ -1,10 +1,10 @@ package es.princip.getp.application.people.service; -import static org.mockito.BDDMockito.given; - -import java.util.Locale; -import java.util.List; - +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; +import es.princip.getp.domain.member.model.MemberId; +import es.princip.getp.domain.people.model.Education; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,21 +13,19 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.context.MessageSource; -import static org.assertj.core.api.SoftAssertions.assertSoftly; -import static es.princip.getp.fixture.common.HashtagFixture.hashtagsResponse; -import static es.princip.getp.fixture.common.TechStackFixture.techStacksResponse; +import java.util.List; +import java.util.Locale; + +import static es.princip.getp.application.common.fixture.HashtagDtoFixture.hashtagsResponse; +import static es.princip.getp.application.people.fixture.PortfolioResponseFixture.portfolioResponses; +import static es.princip.getp.application.common.fixture.TechStackDtoFixture.techStacksResponse; import static es.princip.getp.fixture.member.NicknameFixture.NICKNAME; import static es.princip.getp.fixture.member.ProfileImageFixture.profileImage; import static es.princip.getp.fixture.people.ActivityAreaFixture.activityArea; import static es.princip.getp.fixture.people.EducationFixture.education; import static es.princip.getp.fixture.people.IntroductionFixture.introduction; -import static es.princip.getp.fixture.people.PortfolioFixture.portfoliosResponse; - -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PortfolioResponse; -import es.princip.getp.domain.member.model.MemberId; -import es.princip.getp.domain.people.model.Education; +import static org.assertj.core.api.SoftAssertions.assertSoftly; +import static org.mockito.BDDMockito.given; @ExtendWith(MockitoExtension.class) class PeopleDetailResponseMosaicResolverTest { @@ -40,21 +38,21 @@ class PeopleDetailResponseMosaicResolverTest { private final MemberId memberId = new MemberId(1L); private final PeopleDetailResponse response = new PeopleDetailResponse( - 1L, - NICKNAME, - profileImage(memberId).getUrl(), - 0, - 0, - true, - new PeopleProfileDetailResponse( - introduction(), - activityArea(), - education(), - techStacksResponse(), - hashtagsResponse(), - portfoliosResponse() - ) - ); + 1L, + NICKNAME, + profileImage(memberId).getUrl(), + 0, + 0, + true, + new PeopleProfileDetailResponse( + introduction(), + activityArea(), + education(), + techStacksResponse(), + hashtagsResponse(), + portfolioResponses() + ) + ); @BeforeEach void setup() { diff --git a/get-p-application/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseFixture.java b/get-p-application/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseFixture.java new file mode 100644 index 00000000..32ba550f --- /dev/null +++ b/get-p-application/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseFixture.java @@ -0,0 +1,54 @@ +package es.princip.getp.application.project.commission; + +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; +import es.princip.getp.domain.common.model.Duration; +import es.princip.getp.domain.project.commission.model.MeetingType; +import es.princip.getp.domain.project.commission.model.ProjectCategory; +import es.princip.getp.domain.project.commission.model.ProjectId; +import es.princip.getp.domain.project.commission.model.ProjectStatus; + +import java.time.LocalDate; +import java.util.List; + +import static es.princip.getp.application.common.fixture.HashtagDtoFixture.hashtagsResponse; +import static es.princip.getp.application.common.fixture.AddressResponseFixture.addressResponse; +import static es.princip.getp.fixture.member.NicknameFixture.NICKNAME; +import static es.princip.getp.fixture.project.ProjectFixture.*; + +public class ProjectDetailResponseFixture { + + public static ProjectDetailResponse projectDetailResponse(final ProjectId projectId) { + return new ProjectDetailResponse( + projectId.getValue(), + TITLE, + PAYMENT, + RECRUITMENT_COUNT, + 5L, + Duration.of( + LocalDate.of(2024, 7, 1), + LocalDate.of(2024, 7, 7) + ), + Duration.of( + LocalDate.of(2024, 7, 14), + LocalDate.of(2024, 7, 21) + ), + DESCRIPTION, + MeetingType.IN_PERSON, + ProjectCategory.BACKEND, + ProjectStatus.APPLICATION_OPENED, + List.of( + "https://example.com/attachment1", + "https://example.com/attachment2" + ), + hashtagsResponse(), + 5L, + true, + new ProjectClientResponse( + 1L, + NICKNAME, + addressResponse() + ) + ); + } +} diff --git a/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolverTest.java b/get-p-application/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolverTest.java similarity index 89% rename from src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolverTest.java rename to get-p-application/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolverTest.java index a32b6fcc..32ab2ebc 100644 --- a/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolverTest.java +++ b/get-p-application/src/test/java/es/princip/getp/application/project/commission/ProjectDetailResponseMosaicResolverTest.java @@ -1,9 +1,8 @@ package es.princip.getp.application.project.commission; -import es.princip.getp.api.controller.project.query.dto.ProjectClientResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.domain.project.commission.model.ProjectId; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -14,13 +13,13 @@ import java.util.Locale; +import static es.princip.getp.application.project.commission.ProjectDetailResponseFixture.projectDetailResponse; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import static es.princip.getp.fixture.project.ProjectQueryResponseFixture.projectDetailResponse; import static org.mockito.BDDMockito.given; @ExtendWith(MockitoExtension.class) class ProjectDetailResponseMosaicResolverTest { - + @Mock private MessageSource messageSource; @InjectMocks private ProjectDetailResponseMosaicResolver resolver; diff --git a/src/test/java/es/princip/getp/application/project/meeting/ProjectMeetingServiceTest.java b/get-p-application/src/test/java/es/princip/getp/application/project/meeting/ProjectMeetingServiceTest.java similarity index 98% rename from src/test/java/es/princip/getp/application/project/meeting/ProjectMeetingServiceTest.java rename to get-p-application/src/test/java/es/princip/getp/application/project/meeting/ProjectMeetingServiceTest.java index 72b99f1b..fcf89bf9 100644 --- a/src/test/java/es/princip/getp/application/project/meeting/ProjectMeetingServiceTest.java +++ b/get-p-application/src/test/java/es/princip/getp/application/project/meeting/ProjectMeetingServiceTest.java @@ -4,7 +4,7 @@ import es.princip.getp.application.people.port.out.LoadPeoplePort; import es.princip.getp.application.project.apply.port.out.CheckProjectApplicationPort; import es.princip.getp.application.project.commission.port.out.LoadProjectPort; -import es.princip.getp.application.project.meeting.command.ScheduleMeetingCommand; +import es.princip.getp.application.project.meeting.dto.command.ScheduleMeetingCommand; import es.princip.getp.application.project.meeting.exception.NotApplicantException; import es.princip.getp.application.project.meeting.exception.NotClientOfProjectException; import es.princip.getp.application.project.meeting.port.out.SaveProjectMeetingPort; diff --git a/src/test/java/es/princip/getp/application/project/meeting/ScheduleMeetingCommandFixture.java b/get-p-application/src/test/java/es/princip/getp/application/project/meeting/ScheduleMeetingCommandFixture.java similarity index 90% rename from src/test/java/es/princip/getp/application/project/meeting/ScheduleMeetingCommandFixture.java rename to get-p-application/src/test/java/es/princip/getp/application/project/meeting/ScheduleMeetingCommandFixture.java index 555e1743..35abe8b5 100644 --- a/src/test/java/es/princip/getp/application/project/meeting/ScheduleMeetingCommandFixture.java +++ b/get-p-application/src/test/java/es/princip/getp/application/project/meeting/ScheduleMeetingCommandFixture.java @@ -1,6 +1,6 @@ package es.princip.getp.application.project.meeting; -import es.princip.getp.application.project.meeting.command.ScheduleMeetingCommand; +import es.princip.getp.application.project.meeting.dto.command.ScheduleMeetingCommand; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.model.PeopleId; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/get-p-domain/build.gradle b/get-p-domain/build.gradle new file mode 100644 index 00000000..27d0684a --- /dev/null +++ b/get-p-domain/build.gradle @@ -0,0 +1,12 @@ +dependencies { + // Spring Validation + implementation 'org.springframework.boot:spring-boot-starter-validation:3.3.5' +} + +bootJar { + enabled = false +} + +jar { + enabled = true +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/application/auth/service/EmailVerification.java b/get-p-domain/src/main/java/es/princip/getp/domain/auth/EmailVerification.java similarity index 61% rename from src/main/java/es/princip/getp/application/auth/service/EmailVerification.java rename to get-p-domain/src/main/java/es/princip/getp/domain/auth/EmailVerification.java index 3c899c93..c87d6a53 100644 --- a/src/main/java/es/princip/getp/application/auth/service/EmailVerification.java +++ b/get-p-domain/src/main/java/es/princip/getp/domain/auth/EmailVerification.java @@ -1,37 +1,41 @@ -package es.princip.getp.application.auth.service; +package es.princip.getp.domain.auth; import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.data.annotation.Id; -import org.springframework.data.redis.core.RedisHash; -import org.springframework.data.redis.core.TimeToLive; import java.time.LocalDateTime; -import java.util.concurrent.TimeUnit; @Getter -@RedisHash(value = "email_verification") @EqualsAndHashCode(exclude = "expiration") @NoArgsConstructor(access = AccessLevel.PROTECTED) public class EmailVerification { - @Id private String email; - private String verificationCode; - - private LocalDateTime createdAt; - - @TimeToLive(unit = TimeUnit.MILLISECONDS) private Long expiration; + private LocalDateTime createdAt; - public EmailVerification(String email, String verificationCode, Long expiration) { + public EmailVerification( + final String email, + final String verificationCode, + final Long expiration + ) { this.email = email; this.verificationCode = verificationCode; - this.createdAt = LocalDateTime.now(); this.expiration = expiration; + this.createdAt = LocalDateTime.now(); + } + + public EmailVerification( + final String email, + final String verificationCode, + final Long expiration, + final LocalDateTime createdAt + ) { + this(email, verificationCode, expiration); + this.createdAt = createdAt; } public boolean verify(String verificationCode) { diff --git a/src/main/java/es/princip/getp/application/auth/service/RefreshToken.java b/get-p-domain/src/main/java/es/princip/getp/domain/auth/RefreshToken.java similarity index 51% rename from src/main/java/es/princip/getp/application/auth/service/RefreshToken.java rename to get-p-domain/src/main/java/es/princip/getp/domain/auth/RefreshToken.java index 661ba75b..3981b2f7 100644 --- a/src/main/java/es/princip/getp/application/auth/service/RefreshToken.java +++ b/get-p-domain/src/main/java/es/princip/getp/domain/auth/RefreshToken.java @@ -1,25 +1,13 @@ -package es.princip.getp.application.auth.service; +package es.princip.getp.domain.auth; import es.princip.getp.domain.member.model.MemberId; import lombok.Getter; -import org.springframework.data.annotation.Id; -import org.springframework.data.redis.core.RedisHash; -import org.springframework.data.redis.core.TimeToLive; -import org.springframework.data.redis.core.index.Indexed; - -import java.util.concurrent.TimeUnit; @Getter -@RedisHash(value = "token_verification") public class RefreshToken { - @Id private Long memberId; - - @Indexed private String refreshToken; - - @TimeToLive(unit = TimeUnit.MILLISECONDS) private Long expiration; public RefreshToken(final MemberId memberId, final String refreshToken, final Long expiration) { diff --git a/src/main/java/es/princip/getp/domain/client/model/Address.java b/get-p-domain/src/main/java/es/princip/getp/domain/client/model/Address.java similarity index 100% rename from src/main/java/es/princip/getp/domain/client/model/Address.java rename to get-p-domain/src/main/java/es/princip/getp/domain/client/model/Address.java diff --git a/src/main/java/es/princip/getp/domain/client/model/Client.java b/get-p-domain/src/main/java/es/princip/getp/domain/client/model/Client.java similarity index 100% rename from src/main/java/es/princip/getp/domain/client/model/Client.java rename to get-p-domain/src/main/java/es/princip/getp/domain/client/model/Client.java diff --git a/src/main/java/es/princip/getp/domain/client/model/ClientId.java b/get-p-domain/src/main/java/es/princip/getp/domain/client/model/ClientId.java similarity index 100% rename from src/main/java/es/princip/getp/domain/client/model/ClientId.java rename to get-p-domain/src/main/java/es/princip/getp/domain/client/model/ClientId.java diff --git a/src/main/java/es/princip/getp/domain/common/exception/StartDateIsAfterEndDateException.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/exception/StartDateIsAfterEndDateException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/exception/StartDateIsAfterEndDateException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/exception/StartDateIsAfterEndDateException.java diff --git a/src/main/java/es/princip/getp/domain/common/exception/StartTimeIsAfterEndTimeException.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/exception/StartTimeIsAfterEndTimeException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/exception/StartTimeIsAfterEndTimeException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/exception/StartTimeIsAfterEndTimeException.java diff --git a/src/main/java/es/princip/getp/domain/common/infrastructure/SystemClockHolder.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/infrastructure/SystemClockHolder.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/infrastructure/SystemClockHolder.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/infrastructure/SystemClockHolder.java diff --git a/src/main/java/es/princip/getp/domain/common/model/AttachmentFile.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/AttachmentFile.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/AttachmentFile.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/AttachmentFile.java diff --git a/src/main/java/es/princip/getp/domain/common/model/BankAccount.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/BankAccount.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/BankAccount.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/BankAccount.java diff --git a/src/main/java/es/princip/getp/domain/common/model/Duration.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/Duration.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/Duration.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/Duration.java diff --git a/src/main/java/es/princip/getp/domain/common/model/Email.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/Email.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/Email.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/Email.java diff --git a/src/main/java/es/princip/getp/domain/common/model/EmailPattern.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/EmailPattern.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/EmailPattern.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/EmailPattern.java diff --git a/src/main/java/es/princip/getp/domain/common/model/Hashtag.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/Hashtag.java similarity index 78% rename from src/main/java/es/princip/getp/domain/common/model/Hashtag.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/Hashtag.java index 424de08f..187d74d8 100644 --- a/src/main/java/es/princip/getp/domain/common/model/Hashtag.java +++ b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/Hashtag.java @@ -1,18 +1,14 @@ package es.princip.getp.domain.common.model; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotBlank; import lombok.*; @Getter @ToString -@Embeddable @EqualsAndHashCode @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Hashtag { - @Column(name = "hashtag") @NotBlank private String value; diff --git a/src/main/java/es/princip/getp/domain/common/model/MeetingSchedule.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/MeetingSchedule.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/MeetingSchedule.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/MeetingSchedule.java diff --git a/src/main/java/es/princip/getp/domain/common/model/PhoneNumber.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/PhoneNumber.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/PhoneNumber.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/PhoneNumber.java diff --git a/src/main/java/es/princip/getp/domain/common/model/PhoneNumberPattern.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/PhoneNumberPattern.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/PhoneNumberPattern.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/PhoneNumberPattern.java diff --git a/src/main/java/es/princip/getp/domain/common/model/TechStack.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/TechStack.java similarity index 64% rename from src/main/java/es/princip/getp/domain/common/model/TechStack.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/TechStack.java index 94adb47c..cfa42cfa 100644 --- a/src/main/java/es/princip/getp/domain/common/model/TechStack.java +++ b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/TechStack.java @@ -1,20 +1,14 @@ package es.princip.getp.domain.common.model; -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotBlank; -import lombok.AccessLevel; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; -@Embeddable @Getter +@ToString @EqualsAndHashCode @NoArgsConstructor(access = AccessLevel.PROTECTED) public class TechStack { - @Column(name = "tech_stack") @NotBlank private String value; diff --git a/src/main/java/es/princip/getp/domain/common/model/URL.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/URL.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/URL.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/URL.java diff --git a/src/main/java/es/princip/getp/domain/common/model/URLPattern.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/model/URLPattern.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/model/URLPattern.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/model/URLPattern.java diff --git a/src/main/java/es/princip/getp/domain/common/service/ClockHolder.java b/get-p-domain/src/main/java/es/princip/getp/domain/common/service/ClockHolder.java similarity index 100% rename from src/main/java/es/princip/getp/domain/common/service/ClockHolder.java rename to get-p-domain/src/main/java/es/princip/getp/domain/common/service/ClockHolder.java diff --git a/src/main/java/es/princip/getp/domain/like/people/model/PeopleLike.java b/get-p-domain/src/main/java/es/princip/getp/domain/like/people/model/PeopleLike.java similarity index 100% rename from src/main/java/es/princip/getp/domain/like/people/model/PeopleLike.java rename to get-p-domain/src/main/java/es/princip/getp/domain/like/people/model/PeopleLike.java diff --git a/src/main/java/es/princip/getp/domain/like/project/model/ProjectLike.java b/get-p-domain/src/main/java/es/princip/getp/domain/like/project/model/ProjectLike.java similarity index 100% rename from src/main/java/es/princip/getp/domain/like/project/model/ProjectLike.java rename to get-p-domain/src/main/java/es/princip/getp/domain/like/project/model/ProjectLike.java diff --git a/get-p-domain/src/main/java/es/princip/getp/domain/member/PasswordEncoder.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/PasswordEncoder.java new file mode 100644 index 00000000..35e0e03c --- /dev/null +++ b/get-p-domain/src/main/java/es/princip/getp/domain/member/PasswordEncoder.java @@ -0,0 +1,8 @@ +package es.princip.getp.domain.member; + +public interface PasswordEncoder { + + String encode(final CharSequence rawPassword); + + boolean matches(final CharSequence rawPassword, final String encodedPassword); +} diff --git a/src/main/java/es/princip/getp/domain/member/exception/NotAgreedAllRequiredServiceTermException.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/exception/NotAgreedAllRequiredServiceTermException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/exception/NotAgreedAllRequiredServiceTermException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/exception/NotAgreedAllRequiredServiceTermException.java diff --git a/src/main/java/es/princip/getp/domain/member/model/Member.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/Member.java similarity index 98% rename from src/main/java/es/princip/getp/domain/member/model/Member.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/Member.java index 64170b22..913ad80a 100644 --- a/src/main/java/es/princip/getp/domain/member/model/Member.java +++ b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/Member.java @@ -2,13 +2,13 @@ import es.princip.getp.domain.common.model.Email; import es.princip.getp.domain.common.model.PhoneNumber; +import es.princip.getp.domain.member.PasswordEncoder; import es.princip.getp.domain.member.exception.NotAgreedAllRequiredServiceTermException; import es.princip.getp.domain.serviceTerm.model.ServiceTermTag; import es.princip.getp.domain.support.BaseEntity; import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; -import org.springframework.security.crypto.password.PasswordEncoder; import java.time.LocalDateTime; import java.util.Collections; diff --git a/src/main/java/es/princip/getp/domain/member/model/MemberId.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/MemberId.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/model/MemberId.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/MemberId.java diff --git a/src/main/java/es/princip/getp/domain/member/model/MemberType.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/MemberType.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/model/MemberType.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/MemberType.java diff --git a/src/main/java/es/princip/getp/domain/member/model/Nickname.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/Nickname.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/model/Nickname.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/Nickname.java diff --git a/src/main/java/es/princip/getp/domain/member/model/Password.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/Password.java similarity index 95% rename from src/main/java/es/princip/getp/domain/member/model/Password.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/Password.java index 33083ffc..e00cc784 100644 --- a/src/main/java/es/princip/getp/domain/member/model/Password.java +++ b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/Password.java @@ -1,11 +1,11 @@ package es.princip.getp.domain.member.model; +import es.princip.getp.domain.member.PasswordEncoder; import es.princip.getp.domain.support.BaseModel; import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import org.springframework.security.crypto.password.PasswordEncoder; @Getter @ToString diff --git a/src/main/java/es/princip/getp/domain/member/model/PasswordPattern.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/PasswordPattern.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/model/PasswordPattern.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/PasswordPattern.java diff --git a/src/main/java/es/princip/getp/domain/member/model/ProfileImage.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/ProfileImage.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/model/ProfileImage.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/ProfileImage.java diff --git a/src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreement.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreement.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreement.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreement.java diff --git a/src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreementData.java b/get-p-domain/src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreementData.java similarity index 100% rename from src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreementData.java rename to get-p-domain/src/main/java/es/princip/getp/domain/member/model/ServiceTermAgreementData.java diff --git a/src/main/java/es/princip/getp/domain/people/exception/AlreadyRegisteredPeopleProfileException.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/exception/AlreadyRegisteredPeopleProfileException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/exception/AlreadyRegisteredPeopleProfileException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/exception/AlreadyRegisteredPeopleProfileException.java diff --git a/src/main/java/es/princip/getp/domain/people/exception/NotRegisteredPeopleProfileException.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/exception/NotRegisteredPeopleProfileException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/exception/NotRegisteredPeopleProfileException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/exception/NotRegisteredPeopleProfileException.java diff --git a/src/main/java/es/princip/getp/domain/people/model/Education.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/Education.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/Education.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/Education.java diff --git a/src/main/java/es/princip/getp/domain/people/model/People.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/People.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/People.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/People.java diff --git a/src/main/java/es/princip/getp/domain/people/model/PeopleId.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleId.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/PeopleId.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleId.java diff --git a/src/main/java/es/princip/getp/domain/people/model/PeopleInfo.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleInfo.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/PeopleInfo.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleInfo.java diff --git a/src/main/java/es/princip/getp/domain/people/model/PeopleProfile.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleProfile.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/PeopleProfile.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleProfile.java diff --git a/src/main/java/es/princip/getp/domain/people/model/PeopleProfileData.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleProfileData.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/PeopleProfileData.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleProfileData.java diff --git a/src/main/java/es/princip/getp/domain/people/model/PeopleType.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleType.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/PeopleType.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/PeopleType.java diff --git a/src/main/java/es/princip/getp/domain/people/model/Portfolio.java b/get-p-domain/src/main/java/es/princip/getp/domain/people/model/Portfolio.java similarity index 100% rename from src/main/java/es/princip/getp/domain/people/model/Portfolio.java rename to get-p-domain/src/main/java/es/princip/getp/domain/people/model/Portfolio.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/exception/ClosedProjectApplicationException.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/exception/ClosedProjectApplicationException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/exception/ClosedProjectApplicationException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/exception/ClosedProjectApplicationException.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/IndividualProjectApplication.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/IndividualProjectApplication.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/IndividualProjectApplication.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/IndividualProjectApplication.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplication.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplication.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplication.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplication.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationData.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationData.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationData.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationData.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationId.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationId.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationId.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationId.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationStatus.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationStatus.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationStatus.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationStatus.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationType.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationType.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationType.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/ProjectApplicationType.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/TeamProjectApplication.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/TeamProjectApplication.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/TeamProjectApplication.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/TeamProjectApplication.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/Teammate.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/Teammate.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/Teammate.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/Teammate.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/TeammateId.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/TeammateId.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/TeammateId.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/TeammateId.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/model/TeammateStatus.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/TeammateStatus.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/model/TeammateStatus.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/model/TeammateStatus.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplier.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplier.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplier.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplier.java diff --git a/src/main/java/es/princip/getp/domain/project/apply/service/TeamProjectApplier.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/apply/service/TeamProjectApplier.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/apply/service/TeamProjectApplier.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/apply/service/TeamProjectApplier.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/exception/ApplicationDurationNotBeforeEstimatedDurationException.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/exception/ApplicationDurationNotBeforeEstimatedDurationException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/exception/ApplicationDurationNotBeforeEstimatedDurationException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/exception/ApplicationDurationNotBeforeEstimatedDurationException.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/exception/EndedApplicationDurationException.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/exception/EndedApplicationDurationException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/exception/EndedApplicationDurationException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/exception/EndedApplicationDurationException.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/model/MeetingType.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/MeetingType.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/model/MeetingType.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/MeetingType.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/model/Project.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/Project.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/model/Project.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/Project.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/model/ProjectCategory.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectCategory.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/model/ProjectCategory.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectCategory.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/model/ProjectData.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectData.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/model/ProjectData.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectData.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/model/ProjectId.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectId.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/model/ProjectId.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectId.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/model/ProjectStatus.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectStatus.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/model/ProjectStatus.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/model/ProjectStatus.java diff --git a/src/main/java/es/princip/getp/domain/project/commission/service/ProjectCommissioner.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/commission/service/ProjectCommissioner.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/commission/service/ProjectCommissioner.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/commission/service/ProjectCommissioner.java diff --git a/src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeeting.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeeting.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeeting.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeeting.java diff --git a/src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeetingId.java b/get-p-domain/src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeetingId.java similarity index 100% rename from src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeetingId.java rename to get-p-domain/src/main/java/es/princip/getp/domain/project/meeting/model/ProjectMeetingId.java diff --git a/src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTerm.java b/get-p-domain/src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTerm.java similarity index 100% rename from src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTerm.java rename to get-p-domain/src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTerm.java diff --git a/src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTermTag.java b/get-p-domain/src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTermTag.java similarity index 100% rename from src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTermTag.java rename to get-p-domain/src/main/java/es/princip/getp/domain/serviceTerm/model/ServiceTermTag.java diff --git a/src/main/java/es/princip/getp/domain/support/BaseEntity.java b/get-p-domain/src/main/java/es/princip/getp/domain/support/BaseEntity.java similarity index 100% rename from src/main/java/es/princip/getp/domain/support/BaseEntity.java rename to get-p-domain/src/main/java/es/princip/getp/domain/support/BaseEntity.java diff --git a/src/main/java/es/princip/getp/domain/support/BaseModel.java b/get-p-domain/src/main/java/es/princip/getp/domain/support/BaseModel.java similarity index 100% rename from src/main/java/es/princip/getp/domain/support/BaseModel.java rename to get-p-domain/src/main/java/es/princip/getp/domain/support/BaseModel.java diff --git a/src/main/java/es/princip/getp/domain/support/DomainLogicException.java b/get-p-domain/src/main/java/es/princip/getp/domain/support/DomainLogicException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/support/DomainLogicException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/support/DomainLogicException.java diff --git a/src/main/java/es/princip/getp/domain/support/ErrorDescription.java b/get-p-domain/src/main/java/es/princip/getp/domain/support/ErrorDescription.java similarity index 100% rename from src/main/java/es/princip/getp/domain/support/ErrorDescription.java rename to get-p-domain/src/main/java/es/princip/getp/domain/support/ErrorDescription.java diff --git a/src/main/java/es/princip/getp/domain/support/ErrorDescriptionException.java b/get-p-domain/src/main/java/es/princip/getp/domain/support/ErrorDescriptionException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/support/ErrorDescriptionException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/support/ErrorDescriptionException.java diff --git a/src/main/java/es/princip/getp/domain/support/NotValidDomainModelException.java b/get-p-domain/src/main/java/es/princip/getp/domain/support/NotValidDomainModelException.java similarity index 100% rename from src/main/java/es/princip/getp/domain/support/NotValidDomainModelException.java rename to get-p-domain/src/main/java/es/princip/getp/domain/support/NotValidDomainModelException.java diff --git a/get-p-domain/src/main/resources/junit-platform.properties b/get-p-domain/src/main/resources/junit-platform.properties new file mode 100644 index 00000000..0627373a --- /dev/null +++ b/get-p-domain/src/main/resources/junit-platform.properties @@ -0,0 +1,5 @@ +junit.jupiter.execution.parallel.enabled=true +junit.jupiter.execution.parallel.mode.classes.default=concurrent +junit.jupiter.execution.parallel.mode.default=same_thread +junit.jupiter.execution.parallel.config.strategy=dynamic +junit.jupiter.execution.parallel.config.dynamic.factor=1 \ No newline at end of file diff --git a/src/test/java/es/princip/getp/domain/client/model/AddressTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/client/model/AddressTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/client/model/AddressTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/client/model/AddressTest.java diff --git a/src/test/java/es/princip/getp/domain/common/infrastructure/StubClockHolder.java b/get-p-domain/src/test/java/es/princip/getp/domain/common/infrastructure/StubClockHolder.java similarity index 100% rename from src/test/java/es/princip/getp/domain/common/infrastructure/StubClockHolder.java rename to get-p-domain/src/test/java/es/princip/getp/domain/common/infrastructure/StubClockHolder.java diff --git a/src/test/java/es/princip/getp/domain/common/model/BankAccountTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/common/model/BankAccountTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/common/model/BankAccountTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/common/model/BankAccountTest.java diff --git a/src/test/java/es/princip/getp/domain/common/model/DurationTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/common/model/DurationTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/common/model/DurationTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/common/model/DurationTest.java diff --git a/src/test/java/es/princip/getp/domain/common/model/EmailTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/common/model/EmailTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/common/model/EmailTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/common/model/EmailTest.java diff --git a/src/test/java/es/princip/getp/domain/member/infra/SimplePasswordEncoder.java b/get-p-domain/src/test/java/es/princip/getp/domain/member/infra/SimplePasswordEncoder.java similarity index 85% rename from src/test/java/es/princip/getp/domain/member/infra/SimplePasswordEncoder.java rename to get-p-domain/src/test/java/es/princip/getp/domain/member/infra/SimplePasswordEncoder.java index d2c346b3..19a5717b 100644 --- a/src/test/java/es/princip/getp/domain/member/infra/SimplePasswordEncoder.java +++ b/get-p-domain/src/test/java/es/princip/getp/domain/member/infra/SimplePasswordEncoder.java @@ -1,8 +1,10 @@ package es.princip.getp.domain.member.infra; -import org.springframework.security.crypto.password.PasswordEncoder; + +import es.princip.getp.domain.member.PasswordEncoder; public class SimplePasswordEncoder implements PasswordEncoder { + @Override public String encode(final CharSequence rawPassword) { return rawPassword.toString(); diff --git a/src/test/java/es/princip/getp/domain/member/model/MemberTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/member/model/MemberTest.java similarity index 98% rename from src/test/java/es/princip/getp/domain/member/model/MemberTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/member/model/MemberTest.java index 3e5a737c..10fe0c14 100644 --- a/src/test/java/es/princip/getp/domain/member/model/MemberTest.java +++ b/get-p-domain/src/test/java/es/princip/getp/domain/member/model/MemberTest.java @@ -1,6 +1,7 @@ package es.princip.getp.domain.member.model; import es.princip.getp.domain.common.model.PhoneNumber; +import es.princip.getp.domain.member.PasswordEncoder; import es.princip.getp.domain.member.exception.NotAgreedAllRequiredServiceTermException; import es.princip.getp.domain.member.infra.SimplePasswordEncoder; import es.princip.getp.domain.serviceTerm.model.ServiceTermTag; @@ -9,7 +10,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.security.crypto.password.PasswordEncoder; import java.util.Set; diff --git a/src/test/java/es/princip/getp/domain/member/model/PasswordTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/member/model/PasswordTest.java similarity index 97% rename from src/test/java/es/princip/getp/domain/member/model/PasswordTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/member/model/PasswordTest.java index 846bddd4..27a370c3 100644 --- a/src/test/java/es/princip/getp/domain/member/model/PasswordTest.java +++ b/get-p-domain/src/test/java/es/princip/getp/domain/member/model/PasswordTest.java @@ -1,13 +1,13 @@ package es.princip.getp.domain.member.model; -import es.princip.getp.domain.support.NotValidDomainModelException; +import es.princip.getp.domain.member.PasswordEncoder; import es.princip.getp.domain.member.infra.SimplePasswordEncoder; +import es.princip.getp.domain.support.NotValidDomainModelException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.security.crypto.password.PasswordEncoder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/src/test/java/es/princip/getp/domain/people/model/PeopleTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/people/model/PeopleTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/people/model/PeopleTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/people/model/PeopleTest.java diff --git a/src/test/java/es/princip/getp/domain/project/apply/model/TeamProjectApplicationTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/project/apply/model/TeamProjectApplicationTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/project/apply/model/TeamProjectApplicationTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/project/apply/model/TeamProjectApplicationTest.java diff --git a/src/test/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplierTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplierTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplierTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/project/apply/service/IndividualProjectApplierTest.java diff --git a/src/test/java/es/princip/getp/domain/project/apply/service/TeamProjectApplierTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/project/apply/service/TeamProjectApplierTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/project/apply/service/TeamProjectApplierTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/project/apply/service/TeamProjectApplierTest.java diff --git a/src/test/java/es/princip/getp/domain/project/commission/model/ProjectStatusTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/project/commission/model/ProjectStatusTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/project/commission/model/ProjectStatusTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/project/commission/model/ProjectStatusTest.java diff --git a/src/test/java/es/princip/getp/domain/project/commission/model/ProjectTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/project/commission/model/ProjectTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/project/commission/model/ProjectTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/project/commission/model/ProjectTest.java diff --git a/src/test/java/es/princip/getp/domain/project/commission/service/ProjectCommissionerTest.java b/get-p-domain/src/test/java/es/princip/getp/domain/project/commission/service/ProjectCommissionerTest.java similarity index 100% rename from src/test/java/es/princip/getp/domain/project/commission/service/ProjectCommissionerTest.java rename to get-p-domain/src/test/java/es/princip/getp/domain/project/commission/service/ProjectCommissionerTest.java diff --git a/src/test/java/es/princip/getp/fixture/auth/EmailVerificationFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/auth/EmailVerificationFixture.java similarity index 84% rename from src/test/java/es/princip/getp/fixture/auth/EmailVerificationFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/auth/EmailVerificationFixture.java index 79b6919d..579ffa2c 100644 --- a/src/test/java/es/princip/getp/fixture/auth/EmailVerificationFixture.java +++ b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/auth/EmailVerificationFixture.java @@ -1,6 +1,6 @@ package es.princip.getp.fixture.auth; -import es.princip.getp.application.auth.service.EmailVerification; +import es.princip.getp.domain.auth.EmailVerification; import es.princip.getp.domain.common.model.Email; public class EmailVerificationFixture { diff --git a/src/test/java/es/princip/getp/fixture/client/AddressFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/client/AddressFixture.java similarity index 69% rename from src/test/java/es/princip/getp/fixture/client/AddressFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/client/AddressFixture.java index 61818b3b..71c8a58f 100644 --- a/src/test/java/es/princip/getp/fixture/client/AddressFixture.java +++ b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/client/AddressFixture.java @@ -1,6 +1,5 @@ package es.princip.getp.fixture.client; -import es.princip.getp.api.controller.common.dto.AddressResponse; import es.princip.getp.domain.client.model.Address; public class AddressFixture { @@ -12,8 +11,4 @@ public class AddressFixture { public static Address address() { return new Address(ZIPCODE, STREET, DETAIL); } - - public static AddressResponse addressResponse() { - return new AddressResponse(ZIPCODE, STREET, DETAIL); - } } diff --git a/src/test/java/es/princip/getp/fixture/client/BankAccountFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/client/BankAccountFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/client/BankAccountFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/client/BankAccountFixture.java diff --git a/src/test/java/es/princip/getp/fixture/client/ClientFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/client/ClientFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/client/ClientFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/client/ClientFixture.java diff --git a/src/test/java/es/princip/getp/fixture/common/EmailFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/EmailFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/common/EmailFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/EmailFixture.java diff --git a/src/test/java/es/princip/getp/fixture/common/HashtagFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/HashtagFixture.java similarity index 51% rename from src/test/java/es/princip/getp/fixture/common/HashtagFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/HashtagFixture.java index 15da22fd..bd66116d 100644 --- a/src/test/java/es/princip/getp/fixture/common/HashtagFixture.java +++ b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/HashtagFixture.java @@ -12,18 +12,4 @@ public static List hashtags() { Hashtag.from("#해시태그2") ); } - - public static List hashtagsRequest() { - return List.of( - "#해시태그1", - "#해시태그2" - ); - } - - public static List hashtagsResponse() { - return List.of( - "#해시태그1", - "#해시태그2" - ); - } } diff --git a/src/test/java/es/princip/getp/fixture/common/TechStackFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/TechStackFixture.java similarity index 61% rename from src/test/java/es/princip/getp/fixture/common/TechStackFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/TechStackFixture.java index 3a5547df..472dd13b 100644 --- a/src/test/java/es/princip/getp/fixture/common/TechStackFixture.java +++ b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/common/TechStackFixture.java @@ -13,12 +13,4 @@ public static List techStacks() { TechStack.from("JPA") ); } - - public static List techStacksRequest() { - return List.of("Java", "Spring", "JPA"); - } - - public static List techStacksResponse() { - return List.of("Java", "Spring", "JPA"); - } } diff --git a/src/test/java/es/princip/getp/fixture/like/PeopleLikeFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/like/PeopleLikeFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/like/PeopleLikeFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/like/PeopleLikeFixture.java diff --git a/src/test/java/es/princip/getp/fixture/like/ProjectLikeFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/like/ProjectLikeFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/like/ProjectLikeFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/like/ProjectLikeFixture.java diff --git a/src/test/java/es/princip/getp/fixture/member/MemberFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/MemberFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/member/MemberFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/MemberFixture.java diff --git a/src/test/java/es/princip/getp/fixture/member/NicknameFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/NicknameFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/member/NicknameFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/NicknameFixture.java diff --git a/src/test/java/es/princip/getp/fixture/member/PasswordFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/PasswordFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/member/PasswordFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/PasswordFixture.java diff --git a/src/test/java/es/princip/getp/fixture/member/PhoneNumberFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/PhoneNumberFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/member/PhoneNumberFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/PhoneNumberFixture.java diff --git a/src/test/java/es/princip/getp/fixture/member/ProfileImageFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/ProfileImageFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/member/ProfileImageFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/member/ProfileImageFixture.java diff --git a/src/test/java/es/princip/getp/fixture/people/ActivityAreaFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/ActivityAreaFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/people/ActivityAreaFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/ActivityAreaFixture.java diff --git a/src/test/java/es/princip/getp/fixture/people/EducationFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/EducationFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/people/EducationFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/EducationFixture.java diff --git a/src/test/java/es/princip/getp/fixture/people/IntroductionFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/IntroductionFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/people/IntroductionFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/IntroductionFixture.java diff --git a/src/test/java/es/princip/getp/fixture/people/PeopleFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/PeopleFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/people/PeopleFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/PeopleFixture.java diff --git a/src/test/java/es/princip/getp/fixture/people/PeopleProfileFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/PeopleProfileFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/people/PeopleProfileFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/PeopleProfileFixture.java diff --git a/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/PortfolioFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/PortfolioFixture.java new file mode 100644 index 00000000..375ffe48 --- /dev/null +++ b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/people/PortfolioFixture.java @@ -0,0 +1,15 @@ +package es.princip.getp.fixture.people; + +import es.princip.getp.domain.people.model.Portfolio; + +import java.util.List; + +public class PortfolioFixture { + + public static List portfolios() { + return List.of( + Portfolio.of("포트폴리오1 내용", "https://github.com/scv1702/1"), + Portfolio.of("포트폴리오2 내용", "https://github.com/scv1702/2") + ); + } +} diff --git a/src/test/java/es/princip/getp/fixture/project/ApplicantsCountFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ApplicantsCountFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/project/ApplicantsCountFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ApplicantsCountFixture.java diff --git a/src/test/java/es/princip/getp/fixture/project/AttachmentFileFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/AttachmentFileFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/project/AttachmentFileFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/AttachmentFileFixture.java diff --git a/src/test/java/es/princip/getp/fixture/project/ProjectApplicationFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ProjectApplicationFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/project/ProjectApplicationFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ProjectApplicationFixture.java diff --git a/src/test/java/es/princip/getp/fixture/project/ProjectFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ProjectFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/project/ProjectFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ProjectFixture.java diff --git a/src/test/java/es/princip/getp/fixture/project/ProjectMeetingFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ProjectMeetingFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/project/ProjectMeetingFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/project/ProjectMeetingFixture.java diff --git a/src/test/java/es/princip/getp/fixture/storage/StorageFixture.java b/get-p-domain/src/testFixtures/java/es/princip/getp/fixture/storage/StorageFixture.java similarity index 100% rename from src/test/java/es/princip/getp/fixture/storage/StorageFixture.java rename to get-p-domain/src/testFixtures/java/es/princip/getp/fixture/storage/StorageFixture.java diff --git a/get-p-infrastructure/build.gradle b/get-p-infrastructure/build.gradle new file mode 100644 index 00000000..dd50e793 --- /dev/null +++ b/get-p-infrastructure/build.gradle @@ -0,0 +1,17 @@ +dependencies { + // 모듈 의존성 + implementation(project(':get-p-application')) + implementation(project(':get-p-domain')) + testImplementation(testFixtures(project(':get-p-domain'))) + + // Spring Web + implementation 'org.springframework.boot:spring-boot-starter-web:3.3.5' +} + +bootJar { + enabled = false +} + +jar { + enabled = true +} diff --git a/src/main/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapter.java b/get-p-infrastructure/src/main/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapter.java similarity index 92% rename from src/main/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapter.java rename to get-p-infrastructure/src/main/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapter.java index c66c6271..51875d9e 100644 --- a/src/main/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapter.java +++ b/get-p-infrastructure/src/main/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapter.java @@ -2,8 +2,8 @@ import es.princip.getp.application.storage.port.out.DeleteFilePort; import es.princip.getp.application.storage.port.out.StoreFilePort; -import es.princip.getp.infrastructure.adapter.storage.exception.FailedFileDeleteException; -import es.princip.getp.infrastructure.adapter.storage.exception.FailedFileSaveException; +import es.princip.getp.application.storage.exception.FailedFileDeleteException; +import es.princip.getp.application.storage.exception.FailedFileSaveException; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/get-p-infrastructure/src/main/resources/infra-config.yml b/get-p-infrastructure/src/main/resources/infra-config.yml new file mode 100644 index 00000000..e2186413 --- /dev/null +++ b/get-p-infrastructure/src/main/resources/infra-config.yml @@ -0,0 +1,5 @@ +spring: + storage: + local: + path: ${STORAGE_PATH} + base-uri: ${STORAGE_BASE_URI} \ No newline at end of file diff --git a/src/test/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapterTest.java b/get-p-infrastructure/src/test/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapterTest.java similarity index 93% rename from src/test/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapterTest.java rename to get-p-infrastructure/src/test/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapterTest.java index dce092f0..3dd81575 100644 --- a/src/test/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapterTest.java +++ b/get-p-infrastructure/src/test/java/es/princip/getp/infrastructure/adapter/storage/FileLocalStorageAdapterTest.java @@ -9,9 +9,9 @@ import java.net.URI; import java.nio.file.Path; -import static es.princip.getp.fixture.storage.MultipartFileFixture.fileMultiPartFile; import static es.princip.getp.fixture.storage.StorageFixture.BASE_URI; import static es.princip.getp.fixture.storage.StorageFixture.STORAGE_PATH; +import static es.princip.getp.infrastructure.adapter.storage.fixure.MultipartFileFixture.fileMultiPartFile; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatPath; diff --git a/get-p-infrastructure/src/test/java/es/princip/getp/infrastructure/adapter/storage/fixure/MultipartFileFixture.java b/get-p-infrastructure/src/test/java/es/princip/getp/infrastructure/adapter/storage/fixure/MultipartFileFixture.java new file mode 100644 index 00000000..6d7c78ff --- /dev/null +++ b/get-p-infrastructure/src/test/java/es/princip/getp/infrastructure/adapter/storage/fixure/MultipartFileFixture.java @@ -0,0 +1,13 @@ +package es.princip.getp.infrastructure.adapter.storage.fixure; + +import org.springframework.mock.web.MockMultipartFile; + +public class MultipartFileFixture { + + public static MockMultipartFile fileMultiPartFile() { + return new MockMultipartFile( + "file", + "dummy".getBytes() + ); + } +} diff --git a/get-p-infrastructure/src/test/resources/application.yml b/get-p-infrastructure/src/test/resources/application.yml new file mode 100644 index 00000000..e2186413 --- /dev/null +++ b/get-p-infrastructure/src/test/resources/application.yml @@ -0,0 +1,5 @@ +spring: + storage: + local: + path: ${STORAGE_PATH} + base-uri: ${STORAGE_BASE_URI} \ No newline at end of file diff --git a/get-p-persistence/build.gradle b/get-p-persistence/build.gradle new file mode 100644 index 00000000..447f2b14 --- /dev/null +++ b/get-p-persistence/build.gradle @@ -0,0 +1,44 @@ +dependencies { + // 모듈 의존성 + implementation(project(':get-p-domain')) + implementation(project(':get-p-application')) + testImplementation(testFixtures(project(':get-p-domain'))) + + // Spring Validation + implementation 'org.springframework.boot:spring-boot-starter-validation:3.3.5' + + // Spring Data + implementation 'org.springframework.boot:spring-boot-starter-data-jpa:3.3.5' + implementation 'org.springframework.boot:spring-boot-starter-data-redis:3.3.5' + + // Flyway + implementation 'org.flywaydb:flyway-core:9.16.3' + implementation 'org.flywaydb:flyway-mysql:9.16.3' + + // JDBC MySQL 드라이버 + runtimeOnly 'com.mysql:mysql-connector-j:9.0.0' + + // QueryDSL + implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api:3.0.0" + annotationProcessor "jakarta.persistence:jakarta.persistence-api:3.0.0" + + // Testcontainers + testImplementation 'org.springframework.boot:spring-boot-testcontainers:3.3.5' + testImplementation 'org.testcontainers:testcontainers:1.19.3' + testImplementation 'org.testcontainers:junit-jupiter:1.19.3' + testImplementation 'org.testcontainers:mysql:1.20.0' +} + +ext { + snippetsDir = file('build/generated-snippets') +} + +bootJar { + enabled = false +} + +jar { + enabled = true +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/persistence/adapter/BaseTimeJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/BaseTimeJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/BaseTimeJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/BaseTimeJpaEntity.java diff --git a/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationKeyValueRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationKeyValueRepository.java new file mode 100644 index 00000000..7c5a8672 --- /dev/null +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationKeyValueRepository.java @@ -0,0 +1,7 @@ +package es.princip.getp.persistence.adapter.auth; + +import org.springframework.data.keyvalue.repository.KeyValueRepository; + +public interface EmailVerificationKeyValueRepository extends KeyValueRepository { + +} \ No newline at end of file diff --git a/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationRedisEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationRedisEntity.java new file mode 100644 index 00000000..cf99714c --- /dev/null +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationRedisEntity.java @@ -0,0 +1,39 @@ +package es.princip.getp.persistence.adapter.auth; + +import es.princip.getp.domain.auth.EmailVerification; +import lombok.AccessLevel; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.TimeToLive; + +import java.time.LocalDateTime; +import java.util.concurrent.TimeUnit; + +@Getter +@RedisHash(value = "email_verification") +@EqualsAndHashCode(exclude = "expiration") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class EmailVerificationRedisEntity { + + @Id + private String email; + + private String verificationCode; + + private LocalDateTime createdAt; + + @TimeToLive(unit = TimeUnit.MILLISECONDS) + private Long expiration; + + public static EmailVerificationRedisEntity from(final EmailVerification verification) { + final EmailVerificationRedisEntity entity = new EmailVerificationRedisEntity(); + entity.email = verification.getEmail(); + entity.verificationCode = verification.getVerificationCode(); + entity.createdAt = verification.getCreatedAt(); + entity.expiration = verification.getExpiration(); + return entity; + } +} diff --git a/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationRedisRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationRedisRepository.java new file mode 100644 index 00000000..5385a2f7 --- /dev/null +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/EmailVerificationRedisRepository.java @@ -0,0 +1,37 @@ +package es.princip.getp.persistence.adapter.auth; + +import es.princip.getp.application.auth.exception.NotFoundVerificationException; +import es.princip.getp.application.auth.service.EmailVerificationRepository; +import es.princip.getp.domain.auth.EmailVerification; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class EmailVerificationRedisRepository implements EmailVerificationRepository { + + private final EmailVerificationKeyValueRepository repository; + + @Override + public void deleteById(final String email) { + repository.deleteById(email); + } + + @Override + public void save(final EmailVerification verification) { + final EmailVerificationRedisEntity entity = EmailVerificationRedisEntity.from(verification); + repository.save(entity); + } + + @Override + public EmailVerification findById(String email) { + return repository.findById(email) + .map(entity -> new EmailVerification( + entity.getEmail(), + entity.getVerificationCode(), + entity.getExpiration(), + entity.getCreatedAt() + )) + .orElseThrow(NotFoundVerificationException::new); + } +} \ No newline at end of file diff --git a/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenKeyValueRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenKeyValueRepository.java new file mode 100644 index 00000000..a3ec4498 --- /dev/null +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenKeyValueRepository.java @@ -0,0 +1,8 @@ +package es.princip.getp.persistence.adapter.auth; + +import org.springframework.data.keyvalue.repository.KeyValueRepository; + +public interface RefreshTokenKeyValueRepository extends KeyValueRepository { + + boolean existsByRefreshToken(String refreshToken); +} \ No newline at end of file diff --git a/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenRedisEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenRedisEntity.java new file mode 100644 index 00000000..455ac389 --- /dev/null +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenRedisEntity.java @@ -0,0 +1,32 @@ +package es.princip.getp.persistence.adapter.auth; + +import es.princip.getp.domain.auth.RefreshToken; +import lombok.Getter; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.TimeToLive; +import org.springframework.data.redis.core.index.Indexed; + +import java.util.concurrent.TimeUnit; + +@Getter +@RedisHash(value = "token_verification") +public class RefreshTokenRedisEntity { + + @Id + private Long memberId; + + @Indexed + private String refreshToken; + + @TimeToLive(unit = TimeUnit.MILLISECONDS) + private Long expiration; + + public static RefreshTokenRedisEntity from(final RefreshToken token) { + final RefreshTokenRedisEntity entity = new RefreshTokenRedisEntity(); + entity.memberId = token.getMemberId(); + entity.refreshToken = token.getRefreshToken(); + entity.expiration = token.getExpiration(); + return entity; + } +} diff --git a/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenRedisRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenRedisRepository.java new file mode 100644 index 00000000..bb5e8199 --- /dev/null +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/auth/RefreshTokenRedisRepository.java @@ -0,0 +1,24 @@ +package es.princip.getp.persistence.adapter.auth; + +import es.princip.getp.application.auth.service.RefreshTokenRepository; +import es.princip.getp.domain.auth.RefreshToken; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class RefreshTokenRedisRepository implements RefreshTokenRepository { + + private final RefreshTokenKeyValueRepository repository; + + @Override + public boolean existsByRefreshToken(final String refreshToken) { + return repository.existsByRefreshToken(refreshToken); + } + + @Override + public void save(final RefreshToken refreshToken) { + final RefreshTokenRedisEntity entity = RefreshTokenRedisEntity.from(refreshToken); + repository.save(entity); + } +} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/AddressJpaVO.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/AddressJpaVO.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/client/AddressJpaVO.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/AddressJpaVO.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/BankAccountJpaVO.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/BankAccountJpaVO.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/client/BankAccountJpaVO.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/BankAccountJpaVO.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceAdapter.java similarity index 95% rename from src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceAdapter.java index 257c0dcf..e6c7cabc 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceAdapter.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.client; +import es.princip.getp.application.client.exception.NotFoundClientException; import es.princip.getp.application.client.port.out.*; import es.princip.getp.domain.client.model.Client; import es.princip.getp.domain.client.model.ClientId; diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceMapper.java similarity index 92% rename from src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceMapper.java index b3ba6d1c..f042f72c 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceMapper.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientPersistenceMapper.java @@ -1,6 +1,6 @@ package es.princip.getp.persistence.adapter.client; -import es.princip.getp.api.controller.common.dto.AddressResponse; +import es.princip.getp.application.common.dto.response.AddressResponse; import es.princip.getp.domain.client.model.Address; import es.princip.getp.domain.client.model.Client; import es.princip.getp.domain.common.model.BankAccount; diff --git a/src/main/java/es/princip/getp/persistence/adapter/client/ClientQueryDslQuery.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientQueryDslQuery.java similarity index 93% rename from src/main/java/es/princip/getp/persistence/adapter/client/ClientQueryDslQuery.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientQueryDslQuery.java index 0cdd1943..fc7021c6 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/client/ClientQueryDslQuery.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/client/ClientQueryDslQuery.java @@ -1,8 +1,9 @@ package es.princip.getp.persistence.adapter.client; import com.querydsl.core.Tuple; -import es.princip.getp.api.controller.client.query.dto.ClientResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectClientResponse; +import es.princip.getp.application.client.dto.response.ClientResponse; +import es.princip.getp.application.client.exception.NotFoundClientException; +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; import es.princip.getp.application.client.port.out.ClientQuery; import es.princip.getp.domain.client.model.ClientId; import es.princip.getp.domain.member.model.MemberId; diff --git a/src/main/java/es/princip/getp/persistence/adapter/common/DurationJpaVO.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/DurationJpaVO.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/common/DurationJpaVO.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/DurationJpaVO.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/common/mapper/AttachmentFilePersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/AttachmentFilePersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/common/mapper/AttachmentFilePersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/AttachmentFilePersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/common/mapper/DurationPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/DurationPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/common/mapper/DurationPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/DurationPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/common/mapper/HashtagPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/HashtagPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/common/mapper/HashtagPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/HashtagPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/common/mapper/PhoneNumberPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/PhoneNumberPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/common/mapper/PhoneNumberPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/PhoneNumberPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/common/mapper/TechStackPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/TechStackPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/common/mapper/TechStackPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/TechStackPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/common/mapper/URLPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/URLPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/common/mapper/URLPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/common/mapper/URLPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapter.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapter.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceAdapter.java similarity index 96% rename from src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceAdapter.java index f732be82..fb538173 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceAdapter.java @@ -8,7 +8,7 @@ import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.model.PeopleId; -import es.princip.getp.persistence.adapter.like.exception.NotFoundLikeException; +import es.princip.getp.application.like.exception.NotFoundLikeException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/people/PeopleLikePersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapter.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapter.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceAdapter.java similarity index 96% rename from src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceAdapter.java index 16c6ae65..1cac6339 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceAdapter.java @@ -8,7 +8,7 @@ import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.project.commission.model.ProjectId; -import es.princip.getp.persistence.adapter.like.exception.NotFoundLikeException; +import es.princip.getp.application.like.exception.NotFoundLikeException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/like/project/ProjectLikePersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceAdapter.java similarity index 96% rename from src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceAdapter.java index c57681d5..6b987bc7 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceAdapter.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.member; +import es.princip.getp.application.member.exception.NotFoundMemberException; import es.princip.getp.application.member.port.out.CheckMemberPort; import es.princip.getp.application.member.port.out.LoadMemberPort; import es.princip.getp.application.member.port.out.SaveMemberPort; diff --git a/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceUtil.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceUtil.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceUtil.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/MemberPersistenceUtil.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/member/ServiceTermAgreementJpaVO.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/ServiceTermAgreementJpaVO.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/member/ServiceTermAgreementJpaVO.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/member/ServiceTermAgreementJpaVO.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapter.java similarity index 92% rename from src/main/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapter.java index 7f254f2a..705cfaa0 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapter.java @@ -2,8 +2,9 @@ import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.Expressions; -import es.princip.getp.api.controller.people.query.dto.people.MyPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.people.MyPeopleResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.exception.NotFoundPeopleException; import es.princip.getp.application.people.port.out.FindMyPeoplePort; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.exception.NotRegisteredPeopleProfileException; diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapter.java similarity index 96% rename from src/main/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapter.java index 5ef451a8..2856888b 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapter.java @@ -3,11 +3,12 @@ import com.querydsl.core.Tuple; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.jpa.impl.JPAQuery; -import es.princip.getp.api.controller.people.query.dto.people.CardPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; +import es.princip.getp.application.people.dto.response.people.CardPeopleResponse; +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; import es.princip.getp.application.like.people.port.out.CheckPeopleLikePort; import es.princip.getp.application.like.people.port.out.CountPeopleLikePort; -import es.princip.getp.application.people.command.PeopleSearchFilter; +import es.princip.getp.application.people.dto.command.PeopleSearchFilter; +import es.princip.getp.application.people.exception.NotFoundPeopleException; import es.princip.getp.application.people.port.out.FindPeoplePort; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/PeopleJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeopleJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/people/PeopleJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeopleJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceAdapter.java similarity index 97% rename from src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceAdapter.java index b9e77813..18f28d87 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceAdapter.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.people; +import es.princip.getp.application.people.exception.NotFoundPeopleException; import es.princip.getp.application.people.port.out.*; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.model.People; diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceUtil.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceUtil.java similarity index 95% rename from src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceUtil.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceUtil.java index d57897a7..aa28ca4e 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceUtil.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceUtil.java @@ -2,7 +2,7 @@ import com.querydsl.core.types.Order; import com.querydsl.core.types.OrderSpecifier; -import es.princip.getp.application.people.command.PeopleSearchOrder; +import es.princip.getp.application.people.dto.command.PeopleSearchOrder; import es.princip.getp.domain.people.model.PeopleId; import es.princip.getp.persistence.adapter.people.model.PeopleJpaEntity; import es.princip.getp.persistence.adapter.people.model.QPeopleJpaEntity; diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeopleQueryMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeopleQueryMapper.java similarity index 84% rename from src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeopleQueryMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeopleQueryMapper.java index be367c8c..59a0c1f6 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeopleQueryMapper.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/mapper/PeopleQueryMapper.java @@ -1,8 +1,8 @@ package es.princip.getp.persistence.adapter.people.mapper; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.CardPeopleProfileResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PortfolioResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.CardPeopleProfileResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PortfolioResponse; import es.princip.getp.persistence.adapter.common.mapper.TechStackPersistenceMapper; import es.princip.getp.persistence.adapter.people.model.PeopleProfileJpaVO; import es.princip.getp.persistence.adapter.people.model.PortfolioJpaVO; diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleProfileJpaVO.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleProfileJpaVO.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleProfileJpaVO.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/model/PeopleProfileJpaVO.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/people/model/PortfolioJpaVO.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/model/PortfolioJpaVO.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/people/model/PortfolioJpaVO.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/people/model/PortfolioJpaVO.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceUtil.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceUtil.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceUtil.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/ProjectPersistenceUtil.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/ProjectQueryMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/ProjectQueryMapper.java similarity index 88% rename from src/main/java/es/princip/getp/persistence/adapter/project/ProjectQueryMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/ProjectQueryMapper.java index b7ee477b..86a3c56d 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/ProjectQueryMapper.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/ProjectQueryMapper.java @@ -1,7 +1,7 @@ package es.princip.getp.persistence.adapter.project; -import es.princip.getp.api.controller.project.query.dto.ProjectClientResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.persistence.adapter.common.mapper.DurationPersistenceMapper; import es.princip.getp.persistence.adapter.project.commission.ProjectJpaEntity; import org.mapstruct.Mapper; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapter.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapter.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindProjectApplicantAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindProjectApplicantAdapter.java similarity index 96% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/FindProjectApplicantAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindProjectApplicantAdapter.java index 2e7881f1..1c6491c9 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindProjectApplicantAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindProjectApplicantAdapter.java @@ -5,8 +5,8 @@ import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantTeammateResponse; import es.princip.getp.application.project.apply.port.out.FindProjectApplicantPort; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapter.java similarity index 97% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapter.java index 25f94bb0..00e4b0c0 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapter.java @@ -4,7 +4,7 @@ import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQuery; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.project.apply.port.out.FindTeammatePort; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceAdapter.java similarity index 96% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceAdapter.java index d7390dc6..60e14bd4 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceAdapter.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.project.apply; +import es.princip.getp.application.project.apply.exception.NotFoundProjectApplicationException; import es.princip.getp.application.project.apply.port.out.CheckProjectApplicationPort; import es.princip.getp.application.project.apply.port.out.LoadProjectApplicantPort; import es.princip.getp.application.project.apply.port.out.SaveProjectApplicationPort; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeApplicantCursorAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeApplicantCursorAdapter.java similarity index 94% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeApplicantCursorAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeApplicantCursorAdapter.java index b49fa590..7814abe7 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeApplicantCursorAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeApplicantCursorAdapter.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import es.princip.getp.api.controller.project.query.dto.ProjectApplicantResponse; +import es.princip.getp.application.project.apply.dto.response.ProjectApplicantResponse; import es.princip.getp.application.project.apply.port.out.SerializeApplicantCursorPort; import es.princip.getp.application.support.Cursor; import es.princip.getp.persistence.support.SerializeCursorException; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapter.java similarity index 94% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapter.java index e7b630fb..05c5cb40 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapter.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.project.apply.port.out.SerializeTeammateCursorPort; import es.princip.getp.application.support.Cursor; import es.princip.getp.persistence.support.SerializeCursorException; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/IndividualProjectApplicationJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/IndividualProjectApplicationJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/model/IndividualProjectApplicationJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/IndividualProjectApplicationJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/ProjectApplicationJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/ProjectApplicationJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/model/ProjectApplicationJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/ProjectApplicationJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeamProjectApplicationJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeamProjectApplicationJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeamProjectApplicationJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeamProjectApplicationJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeammateJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeammateJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeammateJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/apply/model/TeammateJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapter.java similarity index 93% rename from src/main/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapter.java index f5566ff2..3b59baeb 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapter.java @@ -4,15 +4,16 @@ import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQuery; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectClientResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectClientResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; import es.princip.getp.application.client.port.out.ClientQuery; import es.princip.getp.application.like.project.port.out.CheckProjectLikePort; import es.princip.getp.application.like.project.port.out.CountProjectLikePort; import es.princip.getp.application.project.apply.port.out.CountProjectApplicationPort; -import es.princip.getp.application.project.commission.command.ProjectSearchFilter; -import es.princip.getp.application.project.commission.command.ProjectSearchOrder; +import es.princip.getp.application.project.commission.dto.command.ProjectSearchFilter; +import es.princip.getp.application.project.commission.dto.command.ProjectSearchOrder; +import es.princip.getp.application.project.commission.exception.NotFoundProjectException; import es.princip.getp.application.project.commission.port.out.FindProjectPort; import es.princip.getp.domain.client.model.ClientId; import es.princip.getp.domain.member.model.Member; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectPersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectPersistenceAdapter.java similarity index 94% rename from src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectPersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectPersistenceAdapter.java index 08c06bc3..68256212 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectPersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/commission/ProjectPersistenceAdapter.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.project.commission; +import es.princip.getp.application.project.commission.exception.NotFoundProjectException; import es.princip.getp.application.project.commission.port.out.LoadProjectPort; import es.princip.getp.application.project.commission.port.out.SaveProjectPort; import es.princip.getp.application.project.commission.port.out.UpdateProjectPort; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceAdapter.java similarity index 94% rename from src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceAdapter.java index e7b5529d..e0c60cf3 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceAdapter.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.project.meeting; +import es.princip.getp.application.project.meeting.exception.NotFoundProjectMeetingException; import es.princip.getp.application.project.meeting.port.out.LoadProjectMeetingPort; import es.princip.getp.application.project.meeting.port.out.SaveProjectMeetingPort; import es.princip.getp.application.project.meeting.port.out.UpdateProjectMeetingPort; diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/ProjectMeetingPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/MeetingScheduleJpaVO.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/MeetingScheduleJpaVO.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/MeetingScheduleJpaVO.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/MeetingScheduleJpaVO.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/ProjectMeetingJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/ProjectMeetingJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/ProjectMeetingJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/project/meeting/model/ProjectMeetingJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapter.java similarity index 95% rename from src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapter.java index 028482df..2c8617cb 100644 --- a/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapter.java +++ b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapter.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.serviceTerm; +import es.princip.getp.application.serviceTerm.exception.NotFoundServiceTermException; import es.princip.getp.application.serviceTerm.port.out.CheckServiceTermPort; import es.princip.getp.application.serviceTerm.port.out.LoadServiceTermPort; import es.princip.getp.application.serviceTerm.port.out.SaveServiceTermPort; diff --git a/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaEntity.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaEntity.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaEntity.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaEntity.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaRepository.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaRepository.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaRepository.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogJpaRepository.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceAdapter.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceAdapter.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceAdapter.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceAdapter.java diff --git a/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceMapper.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceMapper.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceMapper.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/adapter/storage/FileLogPersistenceMapper.java diff --git a/src/main/java/es/princip/getp/persistence/config/JpaAuditingConfig.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/config/JpaAuditingConfig.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/config/JpaAuditingConfig.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/config/JpaAuditingConfig.java diff --git a/src/main/java/es/princip/getp/persistence/support/QueryDslSupport.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/support/QueryDslSupport.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/support/QueryDslSupport.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/support/QueryDslSupport.java diff --git a/src/main/java/es/princip/getp/persistence/support/SerializeCursorException.java b/get-p-persistence/src/main/java/es/princip/getp/persistence/support/SerializeCursorException.java similarity index 100% rename from src/main/java/es/princip/getp/persistence/support/SerializeCursorException.java rename to get-p-persistence/src/main/java/es/princip/getp/persistence/support/SerializeCursorException.java diff --git a/src/main/resources/db/data/e2e-test.sql b/get-p-persistence/src/main/resources/db/data/e2e-test.sql similarity index 100% rename from src/main/resources/db/data/e2e-test.sql rename to get-p-persistence/src/main/resources/db/data/e2e-test.sql diff --git a/src/main/resources/db/migration/V1__init.sql b/get-p-persistence/src/main/resources/db/migration/V1__init.sql similarity index 100% rename from src/main/resources/db/migration/V1__init.sql rename to get-p-persistence/src/main/resources/db/migration/V1__init.sql diff --git a/src/main/resources/db/migration/V2__alter_like_member_id.sql b/get-p-persistence/src/main/resources/db/migration/V2__alter_like_member_id.sql similarity index 100% rename from src/main/resources/db/migration/V2__alter_like_member_id.sql rename to get-p-persistence/src/main/resources/db/migration/V2__alter_like_member_id.sql diff --git a/src/main/resources/db/migration/V3__add_project_recruitment_count.sql b/get-p-persistence/src/main/resources/db/migration/V3__add_project_recruitment_count.sql similarity index 100% rename from src/main/resources/db/migration/V3__add_project_recruitment_count.sql rename to get-p-persistence/src/main/resources/db/migration/V3__add_project_recruitment_count.sql diff --git a/src/main/resources/db/migration/V4__divide_project_application.sql b/get-p-persistence/src/main/resources/db/migration/V4__divide_project_application.sql similarity index 100% rename from src/main/resources/db/migration/V4__divide_project_application.sql rename to get-p-persistence/src/main/resources/db/migration/V4__divide_project_application.sql diff --git a/src/main/resources/db/migration/V5__create_teammate.sql b/get-p-persistence/src/main/resources/db/migration/V5__create_teammate.sql similarity index 100% rename from src/main/resources/db/migration/V5__create_teammate.sql rename to get-p-persistence/src/main/resources/db/migration/V5__create_teammate.sql diff --git a/src/main/resources/db/migration/V6__add_project_category_etc.sql b/get-p-persistence/src/main/resources/db/migration/V6__add_project_category_etc.sql similarity index 100% rename from src/main/resources/db/migration/V6__add_project_category_etc.sql rename to get-p-persistence/src/main/resources/db/migration/V6__add_project_category_etc.sql diff --git a/src/main/resources/db/migration/V7__add_project_status.sql b/get-p-persistence/src/main/resources/db/migration/V7__add_project_status.sql similarity index 100% rename from src/main/resources/db/migration/V7__add_project_status.sql rename to get-p-persistence/src/main/resources/db/migration/V7__add_project_status.sql diff --git a/get-p-persistence/src/main/resources/persistence-config.yml b/get-p-persistence/src/main/resources/persistence-config.yml new file mode 100644 index 00000000..45161029 --- /dev/null +++ b/get-p-persistence/src/main/resources/persistence-config.yml @@ -0,0 +1,71 @@ +spring: + datasource: + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + + data: + redis: + host: ${REDIS_HOST} + port: ${REDIS_PORT} + password: ${REDIS_PASSWORD} + + flyway: + enabled: true + baseline-on-migrate: true + +--- +spring: + config: + activate: + on-profile: local + + jpa: + hibernate: + ddl-auto: validate + properties: + hibernate: + show_sql: true + format_sql: true + highlight_sql: true + use_sql_comments: true + jdbc: + time_zone: Asia/Seoul + default_batch_fetch_size: 20 + dialect: org.hibernate.dialect.MySQLDialect + +logging: + level: + org: + type: + descriptor: + sql: + BasicBinder: TRACE + +--- +spring: + config: + activate: + on-profile: dev + + jpa: + hibernate: + ddl-auto: validate + properties: + hibernate: + show_sql: true + format_sql: true + highlight_sql: true + use_sql_comments: true + jdbc: + time_zone: Asia/Seoul + default_batch_fetch_size: 20 + dialect: org.hibernate.dialect.MySQLDialect + +logging: + level: + org: + type: + descriptor: + sql: + BasicBinder: TRACE \ No newline at end of file diff --git a/get-p-persistence/src/test/java/es/princip/getp/PersistenceTestApplication.java b/get-p-persistence/src/test/java/es/princip/getp/PersistenceTestApplication.java new file mode 100644 index 00000000..afd585ab --- /dev/null +++ b/get-p-persistence/src/test/java/es/princip/getp/PersistenceTestApplication.java @@ -0,0 +1,11 @@ +package es.princip.getp; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PersistenceTestApplication { + public static void main(String[] args) { + SpringApplication.run(PersistenceTestApplication.class, args); + } +} diff --git a/src/test/java/es/princip/getp/persistence/adapter/client/ClientDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/client/ClientDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/client/ClientDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/client/ClientDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapterTest.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/people/CountPeopleLikeAdapterTest.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/people/PeopleLikeDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapterTest.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/project/CountProjectLikeAdapterTest.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/like/project/ProjectLikeDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/member/MemberDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/member/MemberDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/member/MemberDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/member/MemberDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapterTest.java similarity index 93% rename from src/test/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapterTest.java index f5b8906d..8fed0f6f 100644 --- a/src/test/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapterTest.java +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/FindMyPeopleAdapterTest.java @@ -1,7 +1,7 @@ package es.princip.getp.persistence.adapter.people; -import es.princip.getp.api.controller.people.query.dto.people.MyPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.peopleProfile.PeopleProfileDetailResponse; +import es.princip.getp.application.people.dto.response.people.MyPeopleResponse; +import es.princip.getp.application.people.dto.response.peopleProfile.PeopleProfileDetailResponse; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.persistence.adapter.member.MemberDataLoader; import es.princip.getp.persistence.support.DataLoader; diff --git a/src/test/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapterTest.java similarity index 95% rename from src/test/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapterTest.java index 8345268b..696062fc 100644 --- a/src/test/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapterTest.java +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/FindPeopleAdapterTest.java @@ -1,8 +1,8 @@ package es.princip.getp.persistence.adapter.people; -import es.princip.getp.api.controller.people.query.dto.people.CardPeopleResponse; -import es.princip.getp.api.controller.people.query.dto.people.PeopleDetailResponse; -import es.princip.getp.application.people.command.PeopleSearchFilter; +import es.princip.getp.application.people.dto.response.people.CardPeopleResponse; +import es.princip.getp.application.people.dto.response.people.PeopleDetailResponse; +import es.princip.getp.application.people.dto.command.PeopleSearchFilter; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.people.model.PeopleId; diff --git a/src/test/java/es/princip/getp/persistence/adapter/people/PeopleDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/PeopleDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/people/PeopleDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/PeopleDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceFixture.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceFixture.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceFixture.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/PeoplePersistenceFixture.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapperTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapperTest.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapperTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/people/mapper/PeoplePersistenceMapperTest.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapterTest.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/CountProjectApplicationAdapterTest.java diff --git a/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/CursorPageRequest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/CursorPageRequest.java new file mode 100644 index 00000000..eac95829 --- /dev/null +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/CursorPageRequest.java @@ -0,0 +1,37 @@ +package es.princip.getp.persistence.adapter.project.apply; + +import es.princip.getp.application.support.Cursor; +import es.princip.getp.application.support.CursorPageable; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; + +public class CursorPageRequest implements CursorPageable { + + private final Pageable pageable; + private final T cursor; + + public CursorPageRequest(final Pageable pageable, final T cursor) { + this.pageable = pageable; + this.cursor = cursor; + } + + @Override + public int getPageSize() { + return pageable.getPageSize(); + } + + @Override + public T getCursor() { + return cursor; + } + + @Override + public boolean hasCursor() { + return cursor != null; + } + + @Override + public Sort getSort() { + return pageable.getSort(); + } +} diff --git a/src/test/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapterTest.java similarity index 95% rename from src/test/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapterTest.java index 3e4e231a..4c7f0e62 100644 --- a/src/test/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapterTest.java +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/FindTeammateAdapterTest.java @@ -1,7 +1,6 @@ package es.princip.getp.persistence.adapter.project.apply; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; -import es.princip.getp.api.support.CursorPageRequest; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.support.Cursor; import es.princip.getp.application.support.CursorPageable; import es.princip.getp.domain.project.commission.model.ProjectId; diff --git a/src/test/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/ProjectApplicationDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapterTest.java similarity index 95% rename from src/test/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapterTest.java index 9f8fff14..1fbedbc8 100644 --- a/src/test/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapterTest.java +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/apply/SerializeTeammateCursorAdapterTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; +import es.princip.getp.application.project.apply.dto.response.SearchTeammateResponse; import es.princip.getp.application.support.Cursor; import org.junit.jupiter.api.Test; import org.springframework.data.domain.PageRequest; diff --git a/src/test/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapterTest.java similarity index 93% rename from src/test/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapterTest.java index 32148414..4797a7e8 100644 --- a/src/test/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapterTest.java +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/commission/FindProjectAdapterTest.java @@ -1,8 +1,8 @@ package es.princip.getp.persistence.adapter.project.commission; -import es.princip.getp.api.controller.project.query.dto.ProjectCardResponse; -import es.princip.getp.api.controller.project.query.dto.ProjectDetailResponse; -import es.princip.getp.application.project.commission.command.ProjectSearchFilter; +import es.princip.getp.application.project.commission.dto.response.ProjectCardResponse; +import es.princip.getp.application.project.commission.dto.response.ProjectDetailResponse; +import es.princip.getp.application.project.commission.dto.command.ProjectSearchFilter; import es.princip.getp.domain.member.model.Member; import es.princip.getp.domain.member.model.MemberId; import es.princip.getp.domain.member.model.MemberType; diff --git a/src/test/java/es/princip/getp/persistence/adapter/project/commission/ProjectDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/commission/ProjectDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/project/commission/ProjectDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/project/commission/ProjectDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermDataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermDataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermDataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermDataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapterTest.java similarity index 95% rename from src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapterTest.java index 9df85db2..c191284f 100644 --- a/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapterTest.java +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/adapter/serviceTerm/ServiceTermPersistenceAdapterTest.java @@ -1,5 +1,6 @@ package es.princip.getp.persistence.adapter.serviceTerm; +import es.princip.getp.application.serviceTerm.exception.NotFoundServiceTermException; import es.princip.getp.domain.serviceTerm.model.ServiceTermTag; import es.princip.getp.persistence.support.PersistenceAdapterTest; import jakarta.persistence.EntityManager; diff --git a/get-p-persistence/src/test/java/es/princip/getp/persistence/config/ObjectMapperConfig.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/config/ObjectMapperConfig.java new file mode 100644 index 00000000..31acb4b2 --- /dev/null +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/config/ObjectMapperConfig.java @@ -0,0 +1,15 @@ +package es.princip.getp.persistence.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; + +@TestConfiguration +public class ObjectMapperConfig { + + @Bean + public ObjectMapper objectMapper() { + return new ObjectMapper().registerModule(new JavaTimeModule()); + } +} diff --git a/src/test/java/es/princip/getp/persistence/config/PersistenceMapperTestConfig.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/config/PersistenceMapperTestConfig.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/config/PersistenceMapperTestConfig.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/config/PersistenceMapperTestConfig.java diff --git a/src/test/java/es/princip/getp/persistence/support/DataLoader.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/support/DataLoader.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/support/DataLoader.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/support/DataLoader.java diff --git a/src/test/java/es/princip/getp/persistence/support/PersistenceAdapterTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/support/PersistenceAdapterTest.java similarity index 68% rename from src/test/java/es/princip/getp/persistence/support/PersistenceAdapterTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/support/PersistenceAdapterTest.java index e5578000..d5769603 100644 --- a/src/test/java/es/princip/getp/persistence/support/PersistenceAdapterTest.java +++ b/get-p-persistence/src/test/java/es/princip/getp/persistence/support/PersistenceAdapterTest.java @@ -1,6 +1,6 @@ package es.princip.getp.persistence.support; -import es.princip.getp.config.ObjectMapperConfig; +import es.princip.getp.persistence.config.ObjectMapperConfig; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.parallel.Execution; @@ -8,18 +8,23 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.ActiveProfiles; @Slf4j @DataJpaTest -@ActiveProfiles("test") @Import(ObjectMapperConfig.class) @Execution(ExecutionMode.SAME_THREAD) @TestInstance(TestInstance.Lifecycle.PER_CLASS) -@ComponentScan(basePackages = { - "es.princip.getp.persistence.adapter" -}) +@ComponentScan( + basePackages = { + "es.princip.getp.persistence.adapter" + }, + excludeFilters = @ComponentScan.Filter( + type = FilterType.REGEX, + pattern = "es.princip.getp.persistence.adapter.auth.*" + ) +) @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) public abstract class PersistenceAdapterTest { } diff --git a/src/test/java/es/princip/getp/persistence/support/PersistenceMapperTest.java b/get-p-persistence/src/test/java/es/princip/getp/persistence/support/PersistenceMapperTest.java similarity index 100% rename from src/test/java/es/princip/getp/persistence/support/PersistenceMapperTest.java rename to get-p-persistence/src/test/java/es/princip/getp/persistence/support/PersistenceMapperTest.java diff --git a/get-p-persistence/src/test/resources/application.yml b/get-p-persistence/src/test/resources/application.yml new file mode 100644 index 00000000..ca442424 --- /dev/null +++ b/get-p-persistence/src/test/resources/application.yml @@ -0,0 +1,31 @@ +spring: + datasource: + url: ${DB_TEST_URL} + driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver + + flyway: + enabled: true + baseline-on-migrate: true + + jpa: + hibernate: + ddl-auto: validate + properties: + hibernate: + show_sql: true + format_sql: true + highlight_sql: true + use_sql_comments: true + jdbc: + time_zone: Asia/Seoul + batch_size: 100 + default_batch_fetch_size: 20 + dialect: org.hibernate.dialect.MySQLDialect + +logging: + level: + org: + type: + descriptor: + sql: + BasicBinder: TRACE \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index a44e72bd..172df1db 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'get-p-server' + +include( + "get-p-api", + "get-p-domain", + "get-p-application", + "get-p-persistence", + "get-p-infrastructure" +) \ No newline at end of file diff --git a/src/main/java/es/princip/getp/api/controller/client/command/dto/response/RegisterMyClientResponse.java b/src/main/java/es/princip/getp/api/controller/client/command/dto/response/RegisterMyClientResponse.java deleted file mode 100644 index 29b5afbf..00000000 --- a/src/main/java/es/princip/getp/api/controller/client/command/dto/response/RegisterMyClientResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package es.princip.getp.api.controller.client.command.dto.response; - -public record RegisterMyClientResponse( - Long clientId -) { -} diff --git a/src/main/java/es/princip/getp/api/controller/member/command/dto/response/ProfileImageResponse.java b/src/main/java/es/princip/getp/api/controller/member/command/dto/response/ProfileImageResponse.java deleted file mode 100644 index 2ff502d9..00000000 --- a/src/main/java/es/princip/getp/api/controller/member/command/dto/response/ProfileImageResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package es.princip.getp.api.controller.member.command.dto.response; - -public record ProfileImageResponse(String profileImageUri) { -} diff --git a/src/main/java/es/princip/getp/api/controller/people/command/dto/response/RegisterPeopleResponse.java b/src/main/java/es/princip/getp/api/controller/people/command/dto/response/RegisterPeopleResponse.java deleted file mode 100644 index 2a7616c9..00000000 --- a/src/main/java/es/princip/getp/api/controller/people/command/dto/response/RegisterPeopleResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package es.princip.getp.api.controller.people.command.dto.response; - -public record RegisterPeopleResponse(Long peopleId) { -} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/response/ApplyProjectResponse.java b/src/main/java/es/princip/getp/api/controller/project/command/dto/response/ApplyProjectResponse.java deleted file mode 100644 index 34522e5a..00000000 --- a/src/main/java/es/princip/getp/api/controller/project/command/dto/response/ApplyProjectResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package es.princip.getp.api.controller.project.command.dto.response; - -public record ApplyProjectResponse( - Long applicationId -) { -} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/api/controller/project/command/dto/response/ScheduleMeetingResponse.java b/src/main/java/es/princip/getp/api/controller/project/command/dto/response/ScheduleMeetingResponse.java deleted file mode 100644 index 081eb15a..00000000 --- a/src/main/java/es/princip/getp/api/controller/project/command/dto/response/ScheduleMeetingResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package es.princip.getp.api.controller.project.command.dto.response; - -public record ScheduleMeetingResponse( - Long meetingId -) { -} diff --git a/src/main/java/es/princip/getp/api/controller/storage/dto/FileUploadResponse.java b/src/main/java/es/princip/getp/api/controller/storage/dto/FileUploadResponse.java deleted file mode 100644 index 157e83f6..00000000 --- a/src/main/java/es/princip/getp/api/controller/storage/dto/FileUploadResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package es.princip.getp.api.controller.storage.dto; - -import java.net.URI; - -public record FileUploadResponse(URI fileUri) { -} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/application/auth/service/EmailVerificationRepository.java b/src/main/java/es/princip/getp/application/auth/service/EmailVerificationRepository.java deleted file mode 100644 index 839a8d69..00000000 --- a/src/main/java/es/princip/getp/application/auth/service/EmailVerificationRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package es.princip.getp.application.auth.service; - -import org.springframework.data.keyvalue.repository.KeyValueRepository; - -public interface EmailVerificationRepository extends KeyValueRepository { - -} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/application/auth/service/RefreshTokenRepository.java b/src/main/java/es/princip/getp/application/auth/service/RefreshTokenRepository.java deleted file mode 100644 index d851ceec..00000000 --- a/src/main/java/es/princip/getp/application/auth/service/RefreshTokenRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package es.princip.getp.application.auth.service; - -import org.springframework.data.keyvalue.repository.KeyValueRepository; - -public interface RefreshTokenRepository extends KeyValueRepository { - boolean existsByRefreshToken(String refreshToken); -} \ No newline at end of file diff --git a/src/main/java/es/princip/getp/application/project/apply/port/in/SearchTeammateQuery.java b/src/main/java/es/princip/getp/application/project/apply/port/in/SearchTeammateQuery.java deleted file mode 100644 index ed44a5d9..00000000 --- a/src/main/java/es/princip/getp/application/project/apply/port/in/SearchTeammateQuery.java +++ /dev/null @@ -1,10 +0,0 @@ -package es.princip.getp.application.project.apply.port.in; - -import es.princip.getp.api.controller.project.query.dto.SearchTeammateResponse; -import es.princip.getp.api.support.dto.SliceResponse; -import es.princip.getp.application.people.command.SearchTeammateCommand; - -public interface SearchTeammateQuery { - - SliceResponse search(SearchTeammateCommand command); -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml deleted file mode 100644 index 58e06735..00000000 --- a/src/main/resources/application-dev.yml +++ /dev/null @@ -1,114 +0,0 @@ -server: - port: ${SPRING_PORT} - servlet: - context-path: ${BASE_PATH} - -spring: - servlet: - multipart: - max-file-size: 5MB - - storage: - local: - path: ${STORAGE_PATH} - base-uri: ${STORAGE_BASE_URI} - - datasource: - url: ${DB_URL} - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - - flyway: - enabled: true - baseline-on-migrate: true - - jpa: - hibernate: - ddl-auto: validate - properties: - hibernate: - show_sql: true - format_sql: true - highlight_sql: true - use_sql_comments: true - jdbc: - time_zone: Asia/Seoul - default_batch_fetch_size: 20 - dialect: org.hibernate.dialect.MySQLDialect - - mail: - host: smtp.gmail.com - port: ${GMAIL_PORT} - username: ${GMAIL_USERNAME} - password: ${GMAIL_PASSWORD} - properties: - mail: - smtp: - auth: true - starttls: - enable: true - required: true - connectiontimeout: 5000 - timeout: 5000 - writetimeout: 5000 - templates: - logo: classpath:/static/logo.png - - verification-code: - length: ${VERIFICATION_CODE_LENGTH} - expire-time: ${VERIFICATION_CODE_EXPIRE_TIME} - - jwt: - secret: ${JWT_SECRET} - access-token: - expire-time: ${JWT_ACCESS_TOKEN_EXPIRE_TIME} - refresh-token: - expire-time: ${JWT_REFRESH_TOKEN_EXPIRE_TIME} - teammate-approval-token: - expire-time: ${JWT_TEAMMATE_APPROVAL_TOKEN_EXPIRE_TIME} - - data: - redis: - host: ${REDIS_HOST} - port: ${REDIS_PORT} - password: ${REDIS_PASSWORD} - - messages: - basename: messages/validation, messages/messages - -logging: - level: - es.princip.getp: DEBUG - org: - springframework: - security: DEBUG - type: - descriptor: - sql: - BasicBinder: TRACE - -springdoc: - api-docs: - enabled: false - swagger-ui: - path: ${SWAGGER_PATH} - url: /oas/openapi3.yaml - -management: - endpoints: - web: - exposure: - include: prometheus - base-path: ${MONITORING_URL} - enabled-by-default: false - jmx: - exposure: - exclude: '*' - include: info, health - endpoint: - prometheus: - enabled: true - info: - enabled: true - health: - enabled: true \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml deleted file mode 100644 index e580ef73..00000000 --- a/src/main/resources/application-local.yml +++ /dev/null @@ -1,99 +0,0 @@ -server: - port: ${SPRING_PORT} - servlet: - context-path: ${BASE_PATH} - -spring: - servlet: - multipart: - max-file-size: 5MB - - storage: - local: - path: ${STORAGE_PATH} - base-uri: ${STORAGE_BASE_URI} - - datasource: - url: ${DB_URL} - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - - flyway: - enabled: true - baseline-on-migrate: true - - jpa: - hibernate: - ddl-auto: validate - properties: - hibernate: - show_sql: true - format_sql: true - highlight_sql: true - use_sql_comments: true - jdbc: - time_zone: Asia/Seoul - default_batch_fetch_size: 20 - dialect: org.hibernate.dialect.MySQLDialect - - mail: - host: smtp.gmail.com - port: ${GMAIL_PORT} - username: ${GMAIL_USERNAME} - password: ${GMAIL_PASSWORD} - properties: - mail: - smtp: - auth: true - starttls: - enable: true - required: true - connectiontimeout: 5000 - timeout: 5000 - writetimeout: 5000 - templates: - logo: classpath:/static/logo.png - - verification-code: - length: ${VERIFICATION_CODE_LENGTH} - expire-time: ${VERIFICATION_CODE_EXPIRE_TIME} - - jwt: - secret: ${JWT_SECRET} - access-token: - expire-time: ${JWT_ACCESS_TOKEN_EXPIRE_TIME} - refresh-token: - expire-time: ${JWT_REFRESH_TOKEN_EXPIRE_TIME} - teammate-approval-token: - expire-time: ${JWT_TEAMMATE_APPROVAL_TOKEN_EXPIRE_TIME} - - data: - redis: - host: ${REDIS_HOST} - port: ${REDIS_PORT} - password: ${REDIS_PASSWORD} - - org: - gradle: - caching: true - - messages: - basename: messages/validation, messages/messages - -logging: - level: - es.princip.getp: DEBUG - org: - springframework: - security: DEBUG - type: - descriptor: - sql: - BasicBinder: TRACE - -springdoc: - api-docs: - enabled: false - swagger-ui: - path: ${SWAGGER_PATH} - url: /oas/openapi3.yaml \ No newline at end of file diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml deleted file mode 100644 index 5f8a6497..00000000 --- a/src/test/resources/application-test.yml +++ /dev/null @@ -1,76 +0,0 @@ -server: - servlet: - context-path: ${BASE_PATH} - -spring: - storage: - local: - path: ${STORAGE_PATH} - base-uri: ${STORAGE_BASE_URI} - - datasource: - url: ${DB_TEST_URL} - driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver - - flyway: - enabled: true - baseline-on-migrate: true - - jpa: - hibernate: - ddl-auto: validate - properties: - hibernate: - show_sql: true - format_sql: true - highlight_sql: true - use_sql_comments: true - jdbc: - time_zone: Asia/Seoul - batch_size: 100 - default_batch_fetch_size: 20 - dialect: org.hibernate.dialect.MySQLDialect - - mail: - host: smtp.gmail.com - port: ${GMAIL_PORT} - username: ${GMAIL_USERNAME} - password: ${GMAIL_PASSWORD} - properties: - mail: - smtp: - auth: true - starttls: - enable: true - required: true - connectiontimeout: 5000 - timeout: 5000 - writetimeout: 5000 - templates: - logo: classpath:/static/logo.png - - verification-code: - length: ${VERIFICATION_CODE_LENGTH} - expire-time: ${VERIFICATION_CODE_EXPIRE_TIME} - - jwt: - secret: ${JWT_SECRET} - access-token: - expire-time: ${JWT_ACCESS_TOKEN_EXPIRE_TIME} - refresh-token: - expire-time: ${JWT_REFRESH_TOKEN_EXPIRE_TIME} - teammate-approval-token: - expire-time: ${JWT_TEAMMATE_APPROVAL_TOKEN_EXPIRE_TIME} - - messages: - basename: messages/validation, messages/error - -logging: - level: - org: - springframework: - security: DEBUG - type: - descriptor: - sql: - BasicBinder: TRACE \ No newline at end of file