From 34fef71154fc0e3f5e4340640bd011f220dd7e5e Mon Sep 17 00:00:00 2001 From: jwieckow Date: Mon, 15 Mar 2021 21:27:04 +0100 Subject: [PATCH] Rename organization and set new (DDD based) based project structure to readme --- README.md | 66 ++++++++++++++----- app/api-direct/pom.xml | 4 +- .../template/ConfirmTemplateRequest.java | 2 +- .../template/CreateTemplateRequest.java | 2 +- .../template/RemoveTemplateRequest.java | 2 +- .../direct/template/TemplateController.java | 13 ++-- .../direct/web/GlobalExceptionHandler.java | 6 +- app/api-service/pom.xml | 4 +- app/application/pom.xml | 19 +++--- .../mentorship/MentorshipApplication.java | 4 +- .../template/TemplateControllerTest.groovy | 10 +-- .../template/TemplateRequestProvider.java | 2 +- app/domain/pom.xml | 2 +- .../exception/BusinessException.java | 2 +- .../ConfirmationConflictException.java | 2 +- .../mentorship/exception/ErrorCode.java | 2 +- .../mentorship/exception/ErrorResponse.java | 2 +- .../exception/TemplateNotFoundException.java | 2 +- .../mentorship/notifications/.keep | 0 .../mentorship/offers/.keep | 0 .../mentorship/template/Template.java | 2 +- .../template/TemplateRepository.java | 2 +- .../mentorship/template/TemplateService.java | 4 +- .../template/TemplateServiceImpl.java | 8 +-- .../mentorship/template/TemplateStatus.java | 5 ++ .../template/dto/CreateTemplateDto.java | 2 +- .../mentorship/template/TemplateStatus.java | 5 -- app/infrastructure/pom.xml | 4 +- .../mentorship/template/TemplateDao.java | 2 +- .../mentorship/template/TemplateEntity.java | 2 +- .../template/TemplateRepositoryImpl.java | 2 +- app/pom.xml | 2 +- pom.xml | 13 ++-- 33 files changed, 120 insertions(+), 79 deletions(-) rename app/api-direct/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/direct/template/ConfirmTemplateRequest.java (79%) rename app/api-direct/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/direct/template/CreateTemplateRequest.java (82%) rename app/api-direct/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/direct/template/RemoveTemplateRequest.java (79%) rename app/api-direct/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/direct/template/TemplateController.java (75%) rename app/api-direct/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/direct/web/GlobalExceptionHandler.java (80%) rename app/application/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/MentorshipApplication.java (70%) rename app/application/src/test/groovy/com/{programmersonly => geeksacagemy}/mentorship/direct/template/TemplateControllerTest.groovy (91%) rename app/application/src/test/groovy/com/{programmersonly => geeksacagemy}/mentorship/direct/template/TemplateRequestProvider.java (94%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/exception/BusinessException.java (91%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/exception/ConfirmationConflictException.java (75%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/exception/ErrorCode.java (83%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/exception/ErrorResponse.java (64%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/exception/TemplateNotFoundException.java (74%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/notifications/.keep (100%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/offers/.keep (100%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/Template.java (87%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/TemplateRepository.java (83%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/TemplateService.java (60%) rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/TemplateServiceImpl.java (83%) create mode 100644 app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateStatus.java rename app/domain/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/dto/CreateTemplateDto.java (83%) delete mode 100644 app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateStatus.java rename app/infrastructure/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/TemplateDao.java (90%) rename app/infrastructure/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/TemplateEntity.java (93%) rename app/infrastructure/src/main/java/com/{programmersonly => geeksacagemy}/mentorship/template/TemplateRepositoryImpl.java (96%) diff --git a/README.md b/README.md index 2cd275f..a098e74 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ## :hammer: Installation ```bash -git clone https://github.com/Programmers-Only-Group/mentorship +git clone https://github.com/Geeks-Academy/mentorship cd mentorship ``` @@ -36,20 +36,56 @@ You can then access application here: http://localhost:8080/ ## :memo: Project structure ```bash -├── pom.xml -├── src -│ ├── main.java -│ │ ├── package (com...) -│ │ │ ├── MentorshipApplication.java -│ │ │ ├── commons -│ │ │ ├── mentors -│ │ │ ├── notification -│ │ │ ├── offers -│ ├── main.resources -│ │ ├── application.yml -│ │ ├── application-prod.yml -├── mvnw -└── mvnw.cmd + +│ lombok.config +│ mvnw +│ mvnw.cmd +│ pom.xml +│ README.md +└───app + │ pom.xml + ├───api-direct + │ │ pom.xml + │ ├───src + │ └───main.java.com.geeksacagemy + │ └───mentorship + │ └───direct + │ ├───mentors + │ └───web + ├───api-service + │ │ pom.xml + │ ├───src + │ └───main.java.com.geeksacagemy + │ └───mentorship + │ └───service + │ ├───mentors + │ └───web + ├───application + │ │ pom.xml + │ ├───src + │ ├───main.java.com.geeksacagemy + │ │ └───mentorship + │ │ MentorshipApplication.java + │ └───resources + │ application-prod.yml + │ application.yml + ├───domain + │ │ pom.xml + │ ├───src + │ └───main.java.com.geeksacagemy + │ └───mentorship + │ ├───exception + │ ├───notifications + │ ├───offers + │ └───mentors + └───infrastructure + │ pom.xml + ├───src + └───main.java.com.geeksacagemy + └───mentorship + └───template + + ``` The project was splitted into three seperated bounded contexts `mentors` , `offers` , `notification` and shared `commons` package. diff --git a/app/api-direct/pom.xml b/app/api-direct/pom.xml index 67818ca..2d78867 100644 --- a/app/api-direct/pom.xml +++ b/app/api-direct/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.programmersonly + com.geeksacagemy app 0.0.1-SNAPSHOT @@ -15,7 +15,7 @@ - com.programmersonly + com.geeksacagemy domain diff --git a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/ConfirmTemplateRequest.java b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/ConfirmTemplateRequest.java similarity index 79% rename from app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/ConfirmTemplateRequest.java rename to app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/ConfirmTemplateRequest.java index a930a05..718d7ac 100644 --- a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/ConfirmTemplateRequest.java +++ b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/ConfirmTemplateRequest.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.direct.template; +package com.geeksacagemy.mentorship.direct.template; import lombok.*; diff --git a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/CreateTemplateRequest.java b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/CreateTemplateRequest.java similarity index 82% rename from app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/CreateTemplateRequest.java rename to app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/CreateTemplateRequest.java index 8d306f8..5703efa 100644 --- a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/CreateTemplateRequest.java +++ b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/CreateTemplateRequest.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.direct.template; +package com.geeksacagemy.mentorship.direct.template; import lombok.*; diff --git a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/RemoveTemplateRequest.java b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/RemoveTemplateRequest.java similarity index 79% rename from app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/RemoveTemplateRequest.java rename to app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/RemoveTemplateRequest.java index 8cdc830..c4836a2 100644 --- a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/RemoveTemplateRequest.java +++ b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/RemoveTemplateRequest.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.direct.template; +package com.geeksacagemy.mentorship.direct.template; import lombok.*; diff --git a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/TemplateController.java b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/TemplateController.java similarity index 75% rename from app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/TemplateController.java rename to app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/TemplateController.java index 276f2c8..71c25d9 100644 --- a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/template/TemplateController.java +++ b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/template/TemplateController.java @@ -1,8 +1,10 @@ -package com.programmersonly.mentorship.direct.template; +package com.geeksacagemy.mentorship.direct.template; -import com.programmersonly.mentorship.template.TemplateService; -import com.programmersonly.mentorship.template.dto.CreateTemplateDto; +import com.geeksacagemy.mentorship.template.TemplateService; +import com.geeksacagemy.mentorship.template.dto.CreateTemplateDto; import lombok.AllArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -10,7 +12,9 @@ @RestController @AllArgsConstructor @RequestMapping(value = "/template") -class TemplateController { +public class TemplateController { + + private static final Logger logger = LoggerFactory.getLogger(TemplateController.class); private TemplateService templateService; @@ -27,6 +31,7 @@ public ResponseEntity createMentorTemplate(@RequestBody CreateTemplateRequ @PutMapping("/confirm") public ResponseEntity confirmMentorTemplate(@RequestBody ConfirmTemplateRequest request){ + logger.info("confirmation method"); templateService.confirm(request.getTemplateId()); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/web/GlobalExceptionHandler.java b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/web/GlobalExceptionHandler.java similarity index 80% rename from app/api-direct/src/main/java/com/programmersonly/mentorship/direct/web/GlobalExceptionHandler.java rename to app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/web/GlobalExceptionHandler.java index a59a066..7d4adbe 100644 --- a/app/api-direct/src/main/java/com/programmersonly/mentorship/direct/web/GlobalExceptionHandler.java +++ b/app/api-direct/src/main/java/com/geeksacagemy/mentorship/direct/web/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package com.programmersonly.mentorship.direct.web; +package com.geeksacagemy.mentorship.direct.web; -import com.programmersonly.mentorship.exception.BusinessException; -import com.programmersonly.mentorship.exception.ConfirmationConflictException; +import com.geeksacagemy.mentorship.exception.BusinessException; +import com.geeksacagemy.mentorship.exception.ConfirmationConflictException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/app/api-service/pom.xml b/app/api-service/pom.xml index f115fa4..70a6f27 100644 --- a/app/api-service/pom.xml +++ b/app/api-service/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.programmersonly + com.geeksacagemy app 0.0.1-SNAPSHOT @@ -15,7 +15,7 @@ - com.programmersonly + com.geeksacagemy domain diff --git a/app/application/pom.xml b/app/application/pom.xml index d264976..c19c139 100644 --- a/app/application/pom.xml +++ b/app/application/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.programmersonly + com.geeksacagemy app 0.0.1-SNAPSHOT @@ -15,19 +15,19 @@ - com.programmersonly + com.geeksacagemy domain - com.programmersonly + com.geeksacagemy api-direct - com.programmersonly + com.geeksacagemy api-service - com.programmersonly + com.geeksacagemy infrastructure @@ -69,6 +69,10 @@ org.springframework.boot spring-boot-starter-test + + org.springframework.boot + spring-boot-starter-web + org.jacoco org.jacoco.core @@ -82,11 +86,6 @@ org.springframework.boot spring-boot-maven-plugin - - - true - - org.codehaus.gmavenplus diff --git a/app/application/src/main/java/com/programmersonly/mentorship/MentorshipApplication.java b/app/application/src/main/java/com/geeksacagemy/mentorship/MentorshipApplication.java similarity index 70% rename from app/application/src/main/java/com/programmersonly/mentorship/MentorshipApplication.java rename to app/application/src/main/java/com/geeksacagemy/mentorship/MentorshipApplication.java index 67dad25..423fd0c 100644 --- a/app/application/src/main/java/com/programmersonly/mentorship/MentorshipApplication.java +++ b/app/application/src/main/java/com/geeksacagemy/mentorship/MentorshipApplication.java @@ -1,9 +1,9 @@ -package com.programmersonly.mentorship; +package com.geeksacagemy.mentorship; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication(scanBasePackageClasses = MentorshipApplication.class) +@SpringBootApplication public class MentorshipApplication { public static void main(String[] args) { diff --git a/app/application/src/test/groovy/com/programmersonly/mentorship/direct/template/TemplateControllerTest.groovy b/app/application/src/test/groovy/com/geeksacagemy/mentorship/direct/template/TemplateControllerTest.groovy similarity index 91% rename from app/application/src/test/groovy/com/programmersonly/mentorship/direct/template/TemplateControllerTest.groovy rename to app/application/src/test/groovy/com/geeksacagemy/mentorship/direct/template/TemplateControllerTest.groovy index a090b78..bf3f9c8 100644 --- a/app/application/src/test/groovy/com/programmersonly/mentorship/direct/template/TemplateControllerTest.groovy +++ b/app/application/src/test/groovy/com/geeksacagemy/mentorship/direct/template/TemplateControllerTest.groovy @@ -1,11 +1,11 @@ -package com.programmersonly.mentorship.direct.template +package com.geeksacagemy.mentorship.direct.template import com.github.springtestdbunit.DbUnitTestExecutionListener import com.github.springtestdbunit.annotation.DatabaseSetup import com.github.springtestdbunit.annotation.DatabaseTearDown import com.github.springtestdbunit.annotation.ExpectedDatabase import com.github.springtestdbunit.assertion.DatabaseAssertionMode -import com.programmersonly.mentorship.MentorshipApplication +import com.geeksacagemy.mentorship.MentorshipApplication import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.web.client.TestRestTemplate import org.springframework.boot.web.server.LocalServerPort @@ -18,9 +18,9 @@ import org.springframework.test.context.TestExecutionListeners import org.springframework.test.context.support.DependencyInjectionTestExecutionListener import spock.lang.Specification -import static com.programmersonly.mentorship.direct.template.TemplateRequestProvider.getConfirmTemplateRequest -import static com.programmersonly.mentorship.direct.template.TemplateRequestProvider.getCreateTemplateRequest -import static com.programmersonly.mentorship.direct.template.TemplateRequestProvider.getRemoveTemplateRequest +import static TemplateRequestProvider.getConfirmTemplateRequest +import static TemplateRequestProvider.getCreateTemplateRequest +import static TemplateRequestProvider.getRemoveTemplateRequest @SpringBootTest(classes = MentorshipApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @TestExecutionListeners([DependencyInjectionTestExecutionListener.class, DbUnitTestExecutionListener.class]) diff --git a/app/application/src/test/groovy/com/programmersonly/mentorship/direct/template/TemplateRequestProvider.java b/app/application/src/test/groovy/com/geeksacagemy/mentorship/direct/template/TemplateRequestProvider.java similarity index 94% rename from app/application/src/test/groovy/com/programmersonly/mentorship/direct/template/TemplateRequestProvider.java rename to app/application/src/test/groovy/com/geeksacagemy/mentorship/direct/template/TemplateRequestProvider.java index fbb2f0e..fd82ea1 100644 --- a/app/application/src/test/groovy/com/programmersonly/mentorship/direct/template/TemplateRequestProvider.java +++ b/app/application/src/test/groovy/com/geeksacagemy/mentorship/direct/template/TemplateRequestProvider.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.direct.template; +package com.geeksacagemy.mentorship.direct.template; import java.util.UUID; diff --git a/app/domain/pom.xml b/app/domain/pom.xml index 7f7d11c..41ed32c 100644 --- a/app/domain/pom.xml +++ b/app/domain/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.programmersonly + com.geeksacagemy app 0.0.1-SNAPSHOT diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/exception/BusinessException.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/BusinessException.java similarity index 91% rename from app/domain/src/main/java/com/programmersonly/mentorship/exception/BusinessException.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/exception/BusinessException.java index ae52c8f..75cd00e 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/exception/BusinessException.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/BusinessException.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.exception; +package com.geeksacagemy.mentorship.exception; import lombok.AllArgsConstructor; diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/exception/ConfirmationConflictException.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ConfirmationConflictException.java similarity index 75% rename from app/domain/src/main/java/com/programmersonly/mentorship/exception/ConfirmationConflictException.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ConfirmationConflictException.java index b262283..8284155 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/exception/ConfirmationConflictException.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ConfirmationConflictException.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.exception; +package com.geeksacagemy.mentorship.exception; public class ConfirmationConflictException extends BusinessException { diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/exception/ErrorCode.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ErrorCode.java similarity index 83% rename from app/domain/src/main/java/com/programmersonly/mentorship/exception/ErrorCode.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ErrorCode.java index 8247ab3..87d5aad 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/exception/ErrorCode.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.exception; +package com.geeksacagemy.mentorship.exception; public enum ErrorCode { MS01("Cannot confirm"), diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/exception/ErrorResponse.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ErrorResponse.java similarity index 64% rename from app/domain/src/main/java/com/programmersonly/mentorship/exception/ErrorResponse.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ErrorResponse.java index 23bee10..51dc06f 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/exception/ErrorResponse.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.exception; +package com.geeksacagemy.mentorship.exception; public interface ErrorResponse { ErrorCode getErrorCode(); diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/exception/TemplateNotFoundException.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/TemplateNotFoundException.java similarity index 74% rename from app/domain/src/main/java/com/programmersonly/mentorship/exception/TemplateNotFoundException.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/exception/TemplateNotFoundException.java index 63234f8..ce3b0df 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/exception/TemplateNotFoundException.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/exception/TemplateNotFoundException.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.exception; +package com.geeksacagemy.mentorship.exception; public class TemplateNotFoundException extends BusinessException { diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/notifications/.keep b/app/domain/src/main/java/com/geeksacagemy/mentorship/notifications/.keep similarity index 100% rename from app/domain/src/main/java/com/programmersonly/mentorship/notifications/.keep rename to app/domain/src/main/java/com/geeksacagemy/mentorship/notifications/.keep diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/offers/.keep b/app/domain/src/main/java/com/geeksacagemy/mentorship/offers/.keep similarity index 100% rename from app/domain/src/main/java/com/programmersonly/mentorship/offers/.keep rename to app/domain/src/main/java/com/geeksacagemy/mentorship/offers/.keep diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/template/Template.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/Template.java similarity index 87% rename from app/domain/src/main/java/com/programmersonly/mentorship/template/Template.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/template/Template.java index 4f06ec7..aa83557 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/template/Template.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/Template.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.template; +package com.geeksacagemy.mentorship.template; import lombok.*; diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateRepository.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateRepository.java similarity index 83% rename from app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateRepository.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateRepository.java index 9bd3c24..4e00a0c 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateRepository.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateRepository.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.template; +package com.geeksacagemy.mentorship.template; import java.util.Optional; import java.util.UUID; diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateService.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateService.java similarity index 60% rename from app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateService.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateService.java index 7a006e7..fbcb8ee 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateService.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateService.java @@ -1,6 +1,6 @@ -package com.programmersonly.mentorship.template; +package com.geeksacagemy.mentorship.template; -import com.programmersonly.mentorship.template.dto.CreateTemplateDto; +import com.geeksacagemy.mentorship.template.dto.CreateTemplateDto; import java.util.UUID; diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateServiceImpl.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateServiceImpl.java similarity index 83% rename from app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateServiceImpl.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateServiceImpl.java index 62cd1c4..f12e4bf 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateServiceImpl.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateServiceImpl.java @@ -1,8 +1,8 @@ -package com.programmersonly.mentorship.template; +package com.geeksacagemy.mentorship.template; -import com.programmersonly.mentorship.exception.ConfirmationConflictException; -import com.programmersonly.mentorship.exception.TemplateNotFoundException; -import com.programmersonly.mentorship.template.dto.CreateTemplateDto; +import com.geeksacagemy.mentorship.exception.ConfirmationConflictException; +import com.geeksacagemy.mentorship.exception.TemplateNotFoundException; +import com.geeksacagemy.mentorship.template.dto.CreateTemplateDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateStatus.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateStatus.java new file mode 100644 index 0000000..9a98d7c --- /dev/null +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/TemplateStatus.java @@ -0,0 +1,5 @@ +package com.geeksacagemy.mentorship.template; + +enum TemplateStatus { + CREATED, CONFIRMED +} diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/template/dto/CreateTemplateDto.java b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/dto/CreateTemplateDto.java similarity index 83% rename from app/domain/src/main/java/com/programmersonly/mentorship/template/dto/CreateTemplateDto.java rename to app/domain/src/main/java/com/geeksacagemy/mentorship/template/dto/CreateTemplateDto.java index 0e8b48b..5a61d87 100644 --- a/app/domain/src/main/java/com/programmersonly/mentorship/template/dto/CreateTemplateDto.java +++ b/app/domain/src/main/java/com/geeksacagemy/mentorship/template/dto/CreateTemplateDto.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.template.dto; +package com.geeksacagemy.mentorship.template.dto; import lombok.*; diff --git a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateStatus.java b/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateStatus.java deleted file mode 100644 index 5ad7954..0000000 --- a/app/domain/src/main/java/com/programmersonly/mentorship/template/TemplateStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.programmersonly.mentorship.template; - -enum TemplateStatus { - CREATED, CONFIRMED -} diff --git a/app/infrastructure/pom.xml b/app/infrastructure/pom.xml index 164758a..ef8071d 100644 --- a/app/infrastructure/pom.xml +++ b/app/infrastructure/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.programmersonly + com.geeksacagemy app 0.0.1-SNAPSHOT @@ -15,7 +15,7 @@ - com.programmersonly + com.geeksacagemy domain diff --git a/app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateDao.java b/app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateDao.java similarity index 90% rename from app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateDao.java rename to app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateDao.java index de49637..919c006 100644 --- a/app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateDao.java +++ b/app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateDao.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.template; +package com.geeksacagemy.mentorship.template; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateEntity.java b/app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateEntity.java similarity index 93% rename from app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateEntity.java rename to app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateEntity.java index 8308f6a..7c8c23d 100644 --- a/app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateEntity.java +++ b/app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateEntity.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.template; +package com.geeksacagemy.mentorship.template; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateRepositoryImpl.java b/app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateRepositoryImpl.java similarity index 96% rename from app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateRepositoryImpl.java rename to app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateRepositoryImpl.java index 2412c9d..5d22fe6 100644 --- a/app/infrastructure/src/main/java/com/programmersonly/mentorship/template/TemplateRepositoryImpl.java +++ b/app/infrastructure/src/main/java/com/geeksacagemy/mentorship/template/TemplateRepositoryImpl.java @@ -1,4 +1,4 @@ -package com.programmersonly.mentorship.template; +package com.geeksacagemy.mentorship.template; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/app/pom.xml b/app/pom.xml index 4356fd3..8dde014 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.programmersonly + com.geeksacagemy mentorship 0.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7110b81..c1ecebc 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ - com.programmersonly + com.geeksacagemy mentorship 0.0.1-SNAPSHOT pom @@ -17,6 +17,7 @@ Mentorship application + Programmers-Only-Group_mentorship ${project.artifactId} jacoco @@ -36,22 +37,22 @@ - com.programmersonly + com.geeksacagemy domain ${project.version} - com.programmersonly + com.geeksacagemy api-direct ${project.version} - com.programmersonly + com.geeksacagemy api-service ${project.version} - com.programmersonly + com.geeksacagemy infrastructure ${project.version} @@ -99,7 +100,7 @@ false - src/main/java/com/programmersonly/mentorship/exception/ + src/main/java/com/geeksacagemy/mentorship/exception/