Develop release:v0.1 (#140)

* create a model to store user_skill and add remove unused columns in users and skills model * create a model to store user_skill and add/remove unused columns in users and skills model * change id to integer * check if a skill already exists before creating one, make `updated_at` optional in TrackedProperties * remove unit and integration test and remove skill service & skill service implementation * add todo * rename SkillType to SkillTypeEnum * set logging level debug in application-dev instead of application * add todo * remove endorsements list * add reference to user table in skills modal * Build api to create a new endorsement * create api to update an endorsement * remove unused files * remove unused code in endorsement controller * chagne import order * change the skills project structure to match the new one * rename exceptions folder to small case exceptions and create user not found and skill already exists exceptions * create enums folder and move skill type enum to the folder * rename Conifg to config, move generic response and jwtAuthenticationFilter to utils * add api to get all endorsements for a skill using skill id in skillsapi * remove skills package * fix build error * move api to create a endorsement to the new folder structure * add api to update endorsement in apis/endorsements api and remove old Endorsement folder * move health check api to the api folder & metric service inside the services folder * fix formatting * create annotation and aspect to handle authorized roles to an api * add authorizred roles annotation to skillsapi & endorsementsapi class * set authorized role for creating a skill to only superuser * fix formatting * create api to get all skill requests * apply spotless * set endorsement id * run spotlesscheck * remove comments * add super user role check in skills/requests api * build the `skill/requests` api to get all skill requests and their endorsements * fix duplicate data issue when getting all skill requests * improve comment * change data to requests in SkillRequestDto * fix formatting * fix wrong id being set in endorserDetails * fix formatting error * create api to login via rds backend * add permitted paths to security config * fix formatting * change permitted routes to non auth routes * improve the internal server error exception handler by adding time stamp, error message and details * fix formatting * remove user table and use RdsUserViewModel instead * remove auth api and fix logging in update endorsement api * fix formatting * change EndorsementViewModel to use builder pattern * Remove commented code * Change error to info * Refactor: Move post endorsements in skills route (#143) * build api to approve/reject skill request (#144) * build api to approve/reject skill request * fix formatting --------- Co-authored-by: Prakash <[email protected]> Co-authored-by: Prakash Choudhary <[email protected]>
Real-Dev-Squad · Aug 5, 2024 · 23b7af4 · 23b7af4
1 parent ba3cf55
commit 23b7af4
Show file tree

Hide file tree

Showing 40 changed files with 381 additions and 433 deletions.
diff --git a/.env.sample b/.env.sample
@@ -4,6 +4,8 @@ MYSQL_DB_PASSWORD=testpassword
 MYSQL_ROOT_PASSWORD=password
 DB_DDL_POLICY=update
 RDS_BACKEND_BASE_URL=http://localhost:3000
+SKILL_TREE_FRONTEND_BASE_URL=https://localhost
+SKILL_TREE_BACKEND_BASE_URL=http://localhost:8080
 RDS_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----
                 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg5HrGgKFmH485DXLG4fG
                 1mKNXceWthXgAozsUGHxLIM3Fa5wU+tLi7tLDZ6LRKo4ZZV2gJJdDqFSNsvn1Uvr

diff --git a/skill-tree/src/main/java/com/RDS/skilltree/Authentication/UserAuthenticationToken.java b/skill-tree/src/main/java/com/RDS/skilltree/Authentication/UserAuthenticationToken.java
@@ -1,20 +1,20 @@
 package com.RDS.skilltree.Authentication;
 
-import com.RDS.skilltree.User.JwtUserModel;
-import com.RDS.skilltree.User.UserRoleEnum;
+import com.RDS.skilltree.enums.UserRoleEnum;
+import com.RDS.skilltree.models.JwtUser;
 import java.util.List;
 import javax.security.auth.Subject;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 public class UserAuthenticationToken extends AbstractAuthenticationToken {
 
-    private final JwtUserModel user;
+    private final JwtUser user;
 
     public UserAuthenticationToken(String role, String rdsUserId) {
         super(List.of(new SimpleGrantedAuthority(UserRoleEnum.fromString(role).name())));
 
-        this.user = new JwtUserModel(rdsUserId, UserRoleEnum.fromString(role));
+        this.user = new JwtUser(rdsUserId, UserRoleEnum.fromString(role));
         setAuthenticated(true);
     }
 
@@ -24,7 +24,7 @@ public Object getCredentials() {
     }
 
     @Override
-    public JwtUserModel getPrincipal() {
+    public JwtUser getPrincipal() {
         return user;
     }
 

diff --git a/skill-tree/src/main/java/com/RDS/skilltree/User/UserDRO.java b/skill-tree/src/main/java/com/RDS/skilltree/User/UserDRO.java
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/User/UserDTO.java b/skill-tree/src/main/java/com/RDS/skilltree/User/UserDTO.java
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/User/UserModel.java b/skill-tree/src/main/java/com/RDS/skilltree/User/UserModel.java
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/User/UserRepository.java b/skill-tree/src/main/java/com/RDS/skilltree/User/UserRepository.java
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/User/UserService.java b/skill-tree/src/main/java/com/RDS/skilltree/User/UserService.java
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/User/UserServiceImpl.java b/skill-tree/src/main/java/com/RDS/skilltree/User/UserServiceImpl.java
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/annotations/AuthorizedRoles.java b/skill-tree/src/main/java/com/RDS/skilltree/annotations/AuthorizedRoles.java
@@ -1,6 +1,6 @@
 package com.RDS.skilltree.annotations;
 
-import com.RDS.skilltree.User.UserRoleEnum;
+import com.RDS.skilltree.enums.UserRoleEnum;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/skill-tree/src/main/java/com/RDS/skilltree/apis/EndorsementsApi.java b/skill-tree/src/main/java/com/RDS/skilltree/apis/EndorsementsApi.java
@@ -1,9 +1,8 @@
 package com.RDS.skilltree.apis;
 
-import com.RDS.skilltree.User.UserRoleEnum;
 import com.RDS.skilltree.annotations.AuthorizedRoles;
+import com.RDS.skilltree.enums.UserRoleEnum;
 import com.RDS.skilltree.services.EndorsementService;
-import com.RDS.skilltree.viewmodels.CreateEndorsementViewModel;
 import com.RDS.skilltree.viewmodels.EndorsementViewModel;
 import com.RDS.skilltree.viewmodels.UpdateEndorsementViewModel;
 import jakarta.validation.Valid;
@@ -21,12 +20,6 @@
 public class EndorsementsApi {
     private final EndorsementService endorsementService;
 
-    @PostMapping
-    public ResponseEntity<EndorsementViewModel> create(
-            @Valid @RequestBody CreateEndorsementViewModel endorsement) {
-        return new ResponseEntity<>(endorsementService.create(endorsement), HttpStatus.CREATED);
-    }
-
     @PatchMapping("/{id}")
     public ResponseEntity<EndorsementViewModel> update(
             @PathVariable Integer id, @Valid @RequestBody UpdateEndorsementViewModel body) {

diff --git a/skill-tree/src/main/java/com/RDS/skilltree/apis/SkillsApi.java b/skill-tree/src/main/java/com/RDS/skilltree/apis/SkillsApi.java
@@ -1,17 +1,22 @@
 package com.RDS.skilltree.apis;
 
-import com.RDS.skilltree.User.UserRoleEnum;
 import com.RDS.skilltree.annotations.AuthorizedRoles;
+import com.RDS.skilltree.dtos.CreateEndorsementRequestDto;
+import com.RDS.skilltree.dtos.SkillRequestActionRequestDto;
 import com.RDS.skilltree.dtos.SkillRequestsDto;
+import com.RDS.skilltree.enums.UserRoleEnum;
 import com.RDS.skilltree.services.EndorsementService;
 import com.RDS.skilltree.services.SkillService;
+import com.RDS.skilltree.utils.GenericResponse;
+import com.RDS.skilltree.viewmodels.CreateEndorsementViewModel;
 import com.RDS.skilltree.viewmodels.CreateSkillViewModel;
 import com.RDS.skilltree.viewmodels.EndorsementViewModel;
 import com.RDS.skilltree.viewmodels.SkillViewModel;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,6 +40,16 @@ public ResponseEntity<SkillRequestsDto> getAllRequests() {
         return ResponseEntity.ok(skillService.getAllRequests());
     }
 
+    @PostMapping("/requests/{skillId}/action")
+    @AuthorizedRoles({UserRoleEnum.SUPERUSER})
+    public ResponseEntity<GenericResponse<String>> approveRejectSkillRequest(
+            @PathVariable(value = "skillId") Integer skillId,
+            @Valid @RequestBody SkillRequestActionRequestDto skillRequestAction) {
+        return ResponseEntity.ok(
+                skillService.approveRejectSkillRequest(
+                        skillId, skillRequestAction.getEndorseId(), skillRequestAction.getAction()));
+    }
+
     @PostMapping
     @AuthorizedRoles({UserRoleEnum.SUPERUSER})
     public ResponseEntity<SkillViewModel> create(@Valid @RequestBody CreateSkillViewModel skill) {
@@ -46,4 +61,15 @@ public ResponseEntity<List<EndorsementViewModel>> getEndorsementsBySkillId(
             @PathVariable(value = "id") Integer skillID) {
         return ResponseEntity.ok(endorsementService.getAllEndorsementsBySkillId(skillID));
     }
+
+    @PostMapping("/{id}/endorsements")
+    public ResponseEntity<EndorsementViewModel> create(
+            @PathVariable(value = "id") Integer skillID,
+            @Valid @RequestBody CreateEndorsementRequestDto endorsementRequest) {
+        return new ResponseEntity<>(
+                endorsementService.create(
+                        CreateEndorsementViewModel.toViewModel(
+                                skillID, endorsementRequest.getEndorseId(), endorsementRequest.getMessage())),
+                HttpStatus.CREATED);
+    }
 }
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/aspects/AuthorizedRolesAspect.java b/skill-tree/src/main/java/com/RDS/skilltree/aspects/AuthorizedRolesAspect.java
@@ -1,9 +1,9 @@
 package com.RDS.skilltree.aspects;
 
-import com.RDS.skilltree.User.JwtUserModel;
-import com.RDS.skilltree.User.UserRoleEnum;
 import com.RDS.skilltree.annotations.AuthorizedRoles;
+import com.RDS.skilltree.enums.UserRoleEnum;
 import com.RDS.skilltree.exceptions.ForbiddenException;
+import com.RDS.skilltree.models.JwtUser;
 import java.lang.reflect.Method;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -19,8 +19,8 @@ public class AuthorizedRolesAspect {
     @Around("@within(authorizedRoles) || @annotation(authorizedRoles)")
     public Object authorize(ProceedingJoinPoint joinPoint, AuthorizedRoles authorizedRoles)
             throws Throwable {
-        JwtUserModel jwtDetails =
-                (JwtUserModel) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        JwtUser jwtDetails =
+                (JwtUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         UserRoleEnum role = jwtDetails.getRole();
 
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();