Geeks-Academy · jwieckow · Mar 15, 2021
diff --git 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
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.programmersonly</groupId>
+        <groupId>com.geeksacagemy</groupId>
         <artifactId>app</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.programmersonly</groupId>
+            <groupId>com.geeksacagemy</groupId>
             <artifactId>domain</artifactId>
         </dependency>
 

diff --git a/...rect/template/ConfirmTemplateRequest.java → ...rect/template/ConfirmTemplateRequest.java b/...rect/template/ConfirmTemplateRequest.java → ...rect/template/ConfirmTemplateRequest.java
@@ -1,4 +1,4 @@
-package com.programmersonly.mentorship.direct.template;
+package com.geeksacagemy.mentorship.direct.template;
 
 import lombok.*;
 

diff --git a/...irect/template/CreateTemplateRequest.java → ...irect/template/CreateTemplateRequest.java b/...irect/template/CreateTemplateRequest.java → ...irect/template/CreateTemplateRequest.java
@@ -1,4 +1,4 @@
-package com.programmersonly.mentorship.direct.template;
+package com.geeksacagemy.mentorship.direct.template;
 
 import lombok.*;
 

diff --git a/...irect/template/RemoveTemplateRequest.java → ...irect/template/RemoveTemplateRequest.java b/...irect/template/RemoveTemplateRequest.java → ...irect/template/RemoveTemplateRequest.java
@@ -1,4 +1,4 @@
-package com.programmersonly.mentorship.direct.template;
+package com.geeksacagemy.mentorship.direct.template;
 
 import lombok.*;
 

diff --git a/...p/direct/template/TemplateController.java → ...p/direct/template/TemplateController.java b/...p/direct/template/TemplateController.java → ...p/direct/template/TemplateController.java
@@ -1,16 +1,20 @@
-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.*;
 
 @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<Void> createMentorTemplate(@RequestBody CreateTemplateRequ
 
     @PutMapping("/confirm")
     public ResponseEntity<Void> confirmMentorTemplate(@RequestBody ConfirmTemplateRequest request){
+        logger.info("confirmation method");
         templateService.confirm(request.getTemplateId());
         return new ResponseEntity<>(HttpStatus.OK);
     }

diff --git a/...ip/direct/web/GlobalExceptionHandler.java → ...ip/direct/web/GlobalExceptionHandler.java b/...ip/direct/web/GlobalExceptionHandler.java → ...ip/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
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.programmersonly</groupId>
+        <groupId>com.geeksacagemy</groupId>
         <artifactId>app</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.programmersonly</groupId>
+            <groupId>com.geeksacagemy</groupId>
             <artifactId>domain</artifactId>
         </dependency>
 

diff --git a/app/application/pom.xml b/app/application/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.programmersonly</groupId>
+        <groupId>com.geeksacagemy</groupId>
         <artifactId>app</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -15,19 +15,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.programmersonly</groupId>
+            <groupId>com.geeksacagemy</groupId>
             <artifactId>domain</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.programmersonly</groupId>
+            <groupId>com.geeksacagemy</groupId>
             <artifactId>api-direct</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.programmersonly</groupId>
+            <groupId>com.geeksacagemy</groupId>
             <artifactId>api-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.programmersonly</groupId>
+            <groupId>com.geeksacagemy</groupId>
             <artifactId>infrastructure</artifactId>
         </dependency>
 
@@ -69,6 +69,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jacoco</groupId>
             <artifactId>org.jacoco.core</artifactId>
@@ -82,11 +86,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <layers>
-                        <enabled>true</enabled>
-                    </layers>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>

diff --git a/...nly/mentorship/MentorshipApplication.java → ...emy/mentorship/MentorshipApplication.java b/...nly/mentorship/MentorshipApplication.java → ...emy/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/...ct/template/TemplateControllerTest.groovy → ...ct/template/TemplateControllerTest.groovy b/...ct/template/TemplateControllerTest.groovy → ...ct/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/...ect/template/TemplateRequestProvider.java → ...ect/template/TemplateRequestProvider.java b/...ect/template/TemplateRequestProvider.java → ...ect/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
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.programmersonly</groupId>
+        <groupId>com.geeksacagemy</groupId>
         <artifactId>app</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

diff --git a/...ntorship/exception/BusinessException.java → ...ntorship/exception/BusinessException.java b/...ntorship/exception/BusinessException.java → ...ntorship/exception/BusinessException.java
@@ -1,4 +1,4 @@
-package com.programmersonly.mentorship.exception;
+package com.geeksacagemy.mentorship.exception;
 
 import lombok.AllArgsConstructor;
 

diff --git a/...eption/ConfirmationConflictException.java → ...eption/ConfirmationConflictException.java b/...eption/ConfirmationConflictException.java → ...eption/ConfirmationConflictException.java
@@ -1,4 +1,4 @@
-package com.programmersonly.mentorship.exception;
+package com.geeksacagemy.mentorship.exception;
 
 public class ConfirmationConflictException extends BusinessException {
 

diff --git a/...sonly/mentorship/exception/ErrorCode.java → ...agemy/mentorship/exception/ErrorCode.java b/...sonly/mentorship/exception/ErrorCode.java → ...agemy/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/...y/mentorship/exception/ErrorResponse.java → ...y/mentorship/exception/ErrorResponse.java b/...y/mentorship/exception/ErrorResponse.java → ...y/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/.../exception/TemplateNotFoundException.java → .../exception/TemplateNotFoundException.java b/.../exception/TemplateNotFoundException.java → .../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/...ammersonly/mentorship/notifications/.keep → ...eksacagemy/mentorship/notifications/.keep b/...ammersonly/mentorship/notifications/.keep → ...eksacagemy/mentorship/notifications/.keep
diff --git a/...m/programmersonly/mentorship/offers/.keep → .../com/geeksacagemy/mentorship/offers/.keep b/...m/programmersonly/mentorship/offers/.keep → .../com/geeksacagemy/mentorship/offers/.keep
diff --git a/...ersonly/mentorship/template/Template.java → ...acagemy/mentorship/template/Template.java b/...ersonly/mentorship/template/Template.java → ...acagemy/mentorship/template/Template.java
@@ -1,4 +1,4 @@
-package com.programmersonly.mentorship.template;
+package com.geeksacagemy.mentorship.template;
 
 import lombok.*;
 

diff --git a/...ntorship/template/TemplateRepository.java → ...ntorship/template/TemplateRepository.java b/...ntorship/template/TemplateRepository.java → ...ntorship/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/.../mentorship/template/TemplateService.java → .../mentorship/template/TemplateService.java b/.../mentorship/template/TemplateService.java → .../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/...torship/template/TemplateServiceImpl.java → ...torship/template/TemplateServiceImpl.java b/...torship/template/TemplateServiceImpl.java → ...torship/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
@@ -0,0 +1,5 @@
+package com.geeksacagemy.mentorship.template;
+
+enum TemplateStatus {
+    CREATED, CONFIRMED
+}
diff --git a/...rship/template/dto/CreateTemplateDto.java → ...rship/template/dto/CreateTemplateDto.java b/...rship/template/dto/CreateTemplateDto.java → ...rship/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
diff --git a/app/infrastructure/pom.xml b/app/infrastructure/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.programmersonly</groupId>
+        <groupId>com.geeksacagemy</groupId>
         <artifactId>app</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.programmersonly</groupId>
+            <groupId>com.geeksacagemy</groupId>
             <artifactId>domain</artifactId>
         </dependency>
 

diff --git a/...only/mentorship/template/TemplateDao.java → ...gemy/mentorship/template/TemplateDao.java b/...only/mentorship/template/TemplateDao.java → ...gemy/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/...y/mentorship/template/TemplateEntity.java → ...y/mentorship/template/TemplateEntity.java b/...y/mentorship/template/TemplateEntity.java → ...y/mentorship/template/TemplateEntity.java
@@ -1,4 +1,4 @@
-package com.programmersonly.mentorship.template;
+package com.geeksacagemy.mentorship.template;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;