Real-Dev-Squad · surajmaity1 · May 12, 2025 · May 12, 2025 · May 12, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           distribution: "temurin"
 
       - name: Build with Maven
-        run: mvn verify --file skill-tree/pom.xml -P git-build-profile -Dskip-tests=true
+        run: mvn verify -P git-build-profile -Dskip-tests=true
 
   unit-test:
     name: Unit Tests
@@ -33,7 +33,7 @@ jobs:
           distribution: "temurin"
 
       - name: Unit Test
-        run: mvn test --file skill-tree/pom.xml
+        run: mvn test
 
   integration-test:
     name: Integration Tests
@@ -48,4 +48,4 @@ jobs:
           distribution: "temurin"
 
       - name: Integration Test
-        run: mvn verify --file skill-tree/pom.xml -Dskip-ut=true
+        run: mvn verify -Dskip-ut=true
diff --git a/.github/workflows/deploy-to-ec2.yml b/.github/workflows/deploy-to-ec2.yml
@@ -29,7 +29,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: skill-tree/Dockerfile
+          file: Dockerfile
           platforms: linux/arm64
           push: true
           tags: |

diff --git a/...ree/.mvn/wrapper/maven-wrapper.properties → .mvn/wrapper/maven-wrapper.properties b/...ree/.mvn/wrapper/maven-wrapper.properties → .mvn/wrapper/maven-wrapper.properties
diff --git a/skill-tree/Dockerfile → Dockerfile b/skill-tree/Dockerfile → Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:17-jdk as build
 WORKDIR /app
-COPY skill-tree .
+COPY . .
 RUN ./mvnw --version
 RUN ./mvnw clean install -DskipTests
 

diff --git a/skill-tree/docker-compose.yml → docker-compose.yml b/skill-tree/docker-compose.yml → docker-compose.yml
diff --git a/skill-tree/mvnw → mvnw b/skill-tree/mvnw → mvnw
diff --git a/skill-tree/mvnw.cmd → mvnw.cmd b/skill-tree/mvnw.cmd → mvnw.cmd
diff --git a/skill-tree/pom.xml → pom.xml b/skill-tree/pom.xml → pom.xml
diff --git a/skill-tree/.mvn/wrapper/maven-wrapper.jar b/skill-tree/.mvn/wrapper/maven-wrapper.jar
diff --git a/...lltree/Authentication/AuthEntryPoint.java → ...lltree/Authentication/AuthEntryPoint.java b/...lltree/Authentication/AuthEntryPoint.java → ...lltree/Authentication/AuthEntryPoint.java
diff --git a/...entication/CustomAccessDeniedHandler.java → ...entication/CustomAccessDeniedHandler.java b/...entication/CustomAccessDeniedHandler.java → ...entication/CustomAccessDeniedHandler.java
diff --git a/...thentication/UserAuthenticationToken.java → ...thentication/UserAuthenticationToken.java b/...thentication/UserAuthenticationToken.java → ...thentication/UserAuthenticationToken.java
diff --git a/...m/RDS/skilltree/SkillTreeApplication.java → ...m/RDS/skilltree/SkillTreeApplication.java b/...m/RDS/skilltree/SkillTreeApplication.java → ...m/RDS/skilltree/SkillTreeApplication.java
diff --git a/...killtree/annotations/AuthorizedRoles.java → ...killtree/annotations/AuthorizedRoles.java b/...killtree/annotations/AuthorizedRoles.java → ...killtree/annotations/AuthorizedRoles.java
diff --git a/...m/RDS/skilltree/apis/EndorsementsApi.java → ...m/RDS/skilltree/apis/EndorsementsApi.java b/...m/RDS/skilltree/apis/EndorsementsApi.java → ...m/RDS/skilltree/apis/EndorsementsApi.java
diff --git a/...ava/com/RDS/skilltree/apis/HealthApi.java → ...ava/com/RDS/skilltree/apis/HealthApi.java b/...ava/com/RDS/skilltree/apis/HealthApi.java → ...ava/com/RDS/skilltree/apis/HealthApi.java
diff --git a/...ava/com/RDS/skilltree/apis/SkillsApi.java → ...ava/com/RDS/skilltree/apis/SkillsApi.java b/...ava/com/RDS/skilltree/apis/SkillsApi.java → ...ava/com/RDS/skilltree/apis/SkillsApi.java
diff --git a/...lltree/aspects/AuthorizedRolesAspect.java → ...lltree/aspects/AuthorizedRolesAspect.java b/...lltree/aspects/AuthorizedRolesAspect.java → ...lltree/aspects/AuthorizedRolesAspect.java
diff --git a/...a/com/RDS/skilltree/config/AppConfig.java → ...a/com/RDS/skilltree/config/AppConfig.java b/...a/com/RDS/skilltree/config/AppConfig.java → ...a/com/RDS/skilltree/config/AppConfig.java
diff --git a/.../RDS/skilltree/config/SecurityConfig.java → .../RDS/skilltree/config/SecurityConfig.java b/.../RDS/skilltree/config/SecurityConfig.java → .../RDS/skilltree/config/SecurityConfig.java
diff --git a/...om/RDS/skilltree/config/WebMvcConfig.java → ...om/RDS/skilltree/config/WebMvcConfig.java b/...om/RDS/skilltree/config/WebMvcConfig.java → ...om/RDS/skilltree/config/WebMvcConfig.java
diff --git a/...ree/dtos/CreateEndorsementRequestDto.java → ...ree/dtos/CreateEndorsementRequestDto.java b/...ree/dtos/CreateEndorsementRequestDto.java → ...ree/dtos/CreateEndorsementRequestDto.java
diff --git a/...illtree/dtos/RdsGetUserDetailsResDto.java → ...illtree/dtos/RdsGetUserDetailsResDto.java b/...illtree/dtos/RdsGetUserDetailsResDto.java → ...illtree/dtos/RdsGetUserDetailsResDto.java
diff --git a/...ee/dtos/SkillRequestActionRequestDto.java → ...ee/dtos/SkillRequestActionRequestDto.java b/...ee/dtos/SkillRequestActionRequestDto.java → ...ee/dtos/SkillRequestActionRequestDto.java
diff --git a/.../RDS/skilltree/dtos/SkillRequestsDto.java → .../RDS/skilltree/dtos/SkillRequestsDto.java b/.../RDS/skilltree/dtos/SkillRequestsDto.java → .../RDS/skilltree/dtos/SkillRequestsDto.java
diff --git a/...om/RDS/skilltree/enums/SkillTypeEnum.java → ...om/RDS/skilltree/enums/SkillTypeEnum.java b/...om/RDS/skilltree/enums/SkillTypeEnum.java → ...om/RDS/skilltree/enums/SkillTypeEnum.java
diff --git a/...com/RDS/skilltree/enums/UserRoleEnum.java → ...com/RDS/skilltree/enums/UserRoleEnum.java b/...com/RDS/skilltree/enums/UserRoleEnum.java → ...com/RDS/skilltree/enums/UserRoleEnum.java
diff --git a/.../skilltree/enums/UserSkillStatusEnum.java → .../skilltree/enums/UserSkillStatusEnum.java b/.../skilltree/enums/UserSkillStatusEnum.java → .../skilltree/enums/UserSkillStatusEnum.java
diff --git a/...eptions/EndorsementNotFoundException.java → ...eptions/EndorsementNotFoundException.java b/...eptions/EndorsementNotFoundException.java → ...eptions/EndorsementNotFoundException.java
diff --git a/...eptions/EntityAlreadyExistsException.java → ...eptions/EntityAlreadyExistsException.java b/...eptions/EntityAlreadyExistsException.java → ...eptions/EntityAlreadyExistsException.java
diff --git a/...lltree/exceptions/ForbiddenException.java → ...lltree/exceptions/ForbiddenException.java b/...lltree/exceptions/ForbiddenException.java → ...lltree/exceptions/ForbiddenException.java
diff --git a/...ee/exceptions/GlobalExceptionHandler.java → ...ee/exceptions/GlobalExceptionHandler.java b/...ee/exceptions/GlobalExceptionHandler.java → ...ee/exceptions/GlobalExceptionHandler.java
diff --git a/...eptions/InternalServerErrorException.java → ...eptions/InternalServerErrorException.java b/...eptions/InternalServerErrorException.java → ...eptions/InternalServerErrorException.java
diff --git a/...exceptions/InvalidParameterException.java → ...exceptions/InvalidParameterException.java b/...exceptions/InvalidParameterException.java → ...exceptions/InvalidParameterException.java
diff --git a/...illtree/exceptions/NoEntityException.java → ...illtree/exceptions/NoEntityException.java b/...illtree/exceptions/NoEntityException.java → ...illtree/exceptions/NoEntityException.java
diff --git a/...s/SelfEndorsementNotAllowedException.java → ...s/SelfEndorsementNotAllowedException.java b/...s/SelfEndorsementNotAllowedException.java → ...s/SelfEndorsementNotAllowedException.java
diff --git a/...ceptions/SkillAlreadyExistsException.java → ...ceptions/SkillAlreadyExistsException.java b/...ceptions/SkillAlreadyExistsException.java → ...ceptions/SkillAlreadyExistsException.java
diff --git a/...ee/exceptions/SkillNotFoundException.java → ...ee/exceptions/SkillNotFoundException.java b/...ee/exceptions/SkillNotFoundException.java → ...ee/exceptions/SkillNotFoundException.java
diff --git a/...ree/exceptions/UserNotFoundException.java → ...ree/exceptions/UserNotFoundException.java b/...ree/exceptions/UserNotFoundException.java → ...ree/exceptions/UserNotFoundException.java
diff --git a/...com/RDS/skilltree/models/Endorsement.java → ...com/RDS/skilltree/models/Endorsement.java b/...com/RDS/skilltree/models/Endorsement.java → ...com/RDS/skilltree/models/Endorsement.java
diff --git a/...ava/com/RDS/skilltree/models/JwtUser.java → ...ava/com/RDS/skilltree/models/JwtUser.java b/...ava/com/RDS/skilltree/models/JwtUser.java → ...ava/com/RDS/skilltree/models/JwtUser.java
diff --git a/.../java/com/RDS/skilltree/models/Skill.java → .../java/com/RDS/skilltree/models/Skill.java b/.../java/com/RDS/skilltree/models/Skill.java → .../java/com/RDS/skilltree/models/Skill.java
diff --git a/.../com/RDS/skilltree/models/UserSkills.java → .../com/RDS/skilltree/models/UserSkills.java b/.../com/RDS/skilltree/models/UserSkills.java → .../com/RDS/skilltree/models/UserSkills.java
diff --git a/...e/repositories/EndorsementRepository.java → ...e/repositories/EndorsementRepository.java b/...e/repositories/EndorsementRepository.java → ...e/repositories/EndorsementRepository.java
diff --git a/...illtree/repositories/SkillRepository.java → ...illtree/repositories/SkillRepository.java b/...illtree/repositories/SkillRepository.java → ...illtree/repositories/SkillRepository.java
diff --git a/...ree/repositories/UserSkillRepository.java → ...ree/repositories/UserSkillRepository.java b/...ree/repositories/UserSkillRepository.java → ...ree/repositories/UserSkillRepository.java
diff --git a/...killtree/services/EndorsementService.java → ...killtree/services/EndorsementService.java b/...killtree/services/EndorsementService.java → ...killtree/services/EndorsementService.java
diff --git a/...ces/EndorsementServiceImplementation.java → ...ces/EndorsementServiceImplementation.java b/...ces/EndorsementServiceImplementation.java → ...ces/EndorsementServiceImplementation.java
diff --git a/...RDS/skilltree/services/MetricService.java → ...RDS/skilltree/services/MetricService.java b/...RDS/skilltree/services/MetricService.java → ...RDS/skilltree/services/MetricService.java
diff --git a/...services/MetricServiceImplementation.java → ...services/MetricServiceImplementation.java b/...services/MetricServiceImplementation.java → ...services/MetricServiceImplementation.java
diff --git a/.../RDS/skilltree/services/SkillService.java → .../RDS/skilltree/services/SkillService.java b/.../RDS/skilltree/services/SkillService.java → .../RDS/skilltree/services/SkillService.java
diff --git a/.../services/SkillServiceImplementation.java → .../services/SkillServiceImplementation.java b/.../services/SkillServiceImplementation.java → .../services/SkillServiceImplementation.java
diff --git a/...illtree/services/external/RdsService.java → ...illtree/services/external/RdsService.java b/...illtree/services/external/RdsService.java → ...illtree/services/external/RdsService.java
diff --git a/...es/external/RdsServiceImplementation.java → ...es/external/RdsServiceImplementation.java b/...es/external/RdsServiceImplementation.java → ...es/external/RdsServiceImplementation.java
diff --git a/.../com/RDS/skilltree/utils/CommonUtils.java → .../com/RDS/skilltree/utils/CommonUtils.java b/.../com/RDS/skilltree/utils/CommonUtils.java → .../com/RDS/skilltree/utils/CommonUtils.java
diff --git a/.../RDS/skilltree/utils/GenericResponse.java → .../RDS/skilltree/utils/GenericResponse.java b/.../RDS/skilltree/utils/GenericResponse.java → .../RDS/skilltree/utils/GenericResponse.java
diff --git a/...lltree/utils/JWTAuthenticationFilter.java → ...lltree/utils/JWTAuthenticationFilter.java b/...lltree/utils/JWTAuthenticationFilter.java → ...lltree/utils/JWTAuthenticationFilter.java
diff --git a/...ava/com/RDS/skilltree/utils/JWTUtils.java → ...ava/com/RDS/skilltree/utils/JWTUtils.java b/...ava/com/RDS/skilltree/utils/JWTUtils.java → ...ava/com/RDS/skilltree/utils/JWTUtils.java
diff --git a/.../RDS/skilltree/utils/MessageResponse.java → .../RDS/skilltree/utils/MessageResponse.java b/.../RDS/skilltree/utils/MessageResponse.java → .../RDS/skilltree/utils/MessageResponse.java
diff --git a/...DS/skilltree/utils/TrackedProperties.java → ...DS/skilltree/utils/TrackedProperties.java b/...DS/skilltree/utils/TrackedProperties.java → ...DS/skilltree/utils/TrackedProperties.java
diff --git a/...tree/utils/UUIDValidationInterceptor.java → ...tree/utils/UUIDValidationInterceptor.java b/...tree/utils/UUIDValidationInterceptor.java → ...tree/utils/UUIDValidationInterceptor.java
diff --git a/...tree/viewmodels/AuthSuccessViewModel.java → ...tree/viewmodels/AuthSuccessViewModel.java b/...tree/viewmodels/AuthSuccessViewModel.java → ...tree/viewmodels/AuthSuccessViewModel.java
diff --git a/...iewmodels/CreateEndorsementViewModel.java → ...iewmodels/CreateEndorsementViewModel.java b/...iewmodels/CreateEndorsementViewModel.java → ...iewmodels/CreateEndorsementViewModel.java
diff --git a/...tree/viewmodels/CreateSkillViewModel.java → ...tree/viewmodels/CreateSkillViewModel.java b/...tree/viewmodels/CreateSkillViewModel.java → ...tree/viewmodels/CreateSkillViewModel.java
diff --git a/...tree/viewmodels/EndorsementViewModel.java → ...tree/viewmodels/EndorsementViewModel.java b/...tree/viewmodels/EndorsementViewModel.java → ...tree/viewmodels/EndorsementViewModel.java
diff --git a/...ewmodels/MinimalEndorsementViewModel.java → ...ewmodels/MinimalEndorsementViewModel.java b/...ewmodels/MinimalEndorsementViewModel.java → ...ewmodels/MinimalEndorsementViewModel.java
diff --git a/...killtree/viewmodels/RdsUserViewModel.java → ...killtree/viewmodels/RdsUserViewModel.java b/...killtree/viewmodels/RdsUserViewModel.java → ...killtree/viewmodels/RdsUserViewModel.java
diff --git a/...ree/viewmodels/SkillRequestViewModel.java → ...ree/viewmodels/SkillRequestViewModel.java b/...ree/viewmodels/SkillRequestViewModel.java → ...ree/viewmodels/SkillRequestViewModel.java
diff --git a/...killRequestsWithUserDetailsViewModel.java → ...killRequestsWithUserDetailsViewModel.java b/...killRequestsWithUserDetailsViewModel.java → ...killRequestsWithUserDetailsViewModel.java
diff --git a/.../skilltree/viewmodels/SkillViewModel.java → .../skilltree/viewmodels/SkillViewModel.java b/.../skilltree/viewmodels/SkillViewModel.java → .../skilltree/viewmodels/SkillViewModel.java
diff --git a/...iewmodels/UpdateEndorsementViewModel.java → ...iewmodels/UpdateEndorsementViewModel.java b/...iewmodels/UpdateEndorsementViewModel.java → ...iewmodels/UpdateEndorsementViewModel.java
diff --git a/...S/skilltree/viewmodels/UserViewModel.java → ...S/skilltree/viewmodels/UserViewModel.java b/...S/skilltree/viewmodels/UserViewModel.java → ...S/skilltree/viewmodels/UserViewModel.java
diff --git a/...main/resources/application-dev.properties → ...main/resources/application-dev.properties b/...main/resources/application-dev.properties → ...main/resources/application-dev.properties
diff --git a/...sources/application-production.properties → ...sources/application-production.properties b/...sources/application-production.properties → ...sources/application-production.properties
diff --git a/.../resources/application-staging.properties → .../resources/application-staging.properties b/.../resources/application-staging.properties → .../resources/application-staging.properties
diff --git a/...ain/resources/application-test.properties → ...ain/resources/application-test.properties b/...ain/resources/application-test.properties → ...ain/resources/application-test.properties
diff --git a/...src/main/resources/application.properties → src/main/resources/application.properties b/...src/main/resources/application.properties → src/main/resources/application.properties
diff --git a/...urces/db/migrations/V1__initial_setup.sql → ...urces/db/migrations/V1__initial_setup.sql b/...urces/db/migrations/V1__initial_setup.sql → ...urces/db/migrations/V1__initial_setup.sql
diff --git a/...-tree/src/main/resources/logback-test.xml → src/main/resources/logback-test.xml b/...-tree/src/main/resources/logback-test.xml → src/main/resources/logback-test.xml
diff --git a/.../skilltree/SkillTreeApplicationTests.java → .../skilltree/SkillTreeApplicationTests.java b/.../skilltree/SkillTreeApplicationTests.java → .../skilltree/SkillTreeApplicationTests.java
diff --git a/...m/RDS/skilltree/TestContainerManager.java → ...m/RDS/skilltree/TestContainerManager.java b/...m/RDS/skilltree/TestContainerManager.java → ...m/RDS/skilltree/TestContainerManager.java
diff --git a/...on/skills/CreateSkillIntegrationTest.java → ...on/skills/CreateSkillIntegrationTest.java b/...on/skills/CreateSkillIntegrationTest.java → ...on/skills/CreateSkillIntegrationTest.java
diff --git a/...ls/GetAllSkillRequestIntegrationTest.java → ...ls/GetAllSkillRequestIntegrationTest.java b/...ls/GetAllSkillRequestIntegrationTest.java → ...ls/GetAllSkillRequestIntegrationTest.java
diff --git a/...n/skills/GetAllSkillsIntegrationTest.java → ...n/skills/GetAllSkillsIntegrationTest.java b/...n/skills/GetAllSkillsIntegrationTest.java → ...n/skills/GetAllSkillsIntegrationTest.java
diff --git a/...EndorsementsBySkillIdIntegrationTest.java → ...EndorsementsBySkillIdIntegrationTest.java b/...EndorsementsBySkillIdIntegrationTest.java → ...EndorsementsBySkillIdIntegrationTest.java
diff --git a/...ls/SkillRequestActionIntegrationTest.java → ...ls/SkillRequestActionIntegrationTest.java b/...ls/SkillRequestActionIntegrationTest.java → ...ls/SkillRequestActionIntegrationTest.java
diff --git a/.../utils/UUIDValidationInterceptorTest.java → .../utils/UUIDValidationInterceptorTest.java b/.../utils/UUIDValidationInterceptorTest.java → .../utils/UUIDValidationInterceptorTest.java
diff --git a/...test/java/utils/CustomResultMatchers.java → ...test/java/utils/CustomResultMatchers.java b/...test/java/utils/CustomResultMatchers.java → ...test/java/utils/CustomResultMatchers.java
diff --git a/...a/utils/CustomSecurityContextFactory.java → ...a/utils/CustomSecurityContextFactory.java b/...a/utils/CustomSecurityContextFactory.java → ...a/utils/CustomSecurityContextFactory.java
diff --git a/...ee/src/test/java/utils/RestAPIHelper.java → src/test/java/utils/RestAPIHelper.java b/...ee/src/test/java/utils/RestAPIHelper.java → src/test/java/utils/RestAPIHelper.java
diff --git a/...e/src/test/java/utils/TestDataHelper.java → src/test/java/utils/TestDataHelper.java b/...e/src/test/java/utils/TestDataHelper.java → src/test/java/utils/TestDataHelper.java
diff --git a/...c/test/java/utils/WithCustomMockUser.java → src/test/java/utils/WithCustomMockUser.java b/...c/test/java/utils/WithCustomMockUser.java → src/test/java/utils/WithCustomMockUser.java