create api to get all skill requests

skill-tree/src/main/java/com/RDS/skilltree/User/UserSkillsModel.java

@@ -16,7 +16,7 @@
 public class UserSkillsModel {
     @Id
     @GeneratedValue
-    @Column(name = "id", columnDefinition = "BINARY(16)")
+    @Column(name = "id")
     private UUID id;
 
     @JsonBackReference

skill-tree/src/main/java/com/RDS/skilltree/apis/SkillsApi.java

@@ -2,18 +2,16 @@
 
 import com.RDS.skilltree.User.UserRoleEnum;
 import com.RDS.skilltree.annotations.AuthorizedRoles;
+import com.RDS.skilltree.dtos.SkillRequestsDto;
 import com.RDS.skilltree.services.EndorsementService;
 import com.RDS.skilltree.services.SkillService;
 import com.RDS.skilltree.viewmodels.CreateSkillViewModel;
 import com.RDS.skilltree.viewmodels.EndorsementViewModel;
 import com.RDS.skilltree.viewmodels.SkillViewModel;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.Min;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,18 +29,21 @@ public ResponseEntity<List<SkillViewModel>> getAll() {
         return ResponseEntity.ok(skillService.getAll());
     }
 
+    @GetMapping("/requests")
+    @AuthorizedRoles({UserRoleEnum.SUPERUSER})
+    public ResponseEntity<SkillRequestsDto> getAllRequests() {
+        return ResponseEntity.ok(skillService.getAllRequests());
+    }
+
     @PostMapping
     @AuthorizedRoles({UserRoleEnum.SUPERUSER})
     public ResponseEntity<SkillViewModel> create(@Valid @RequestBody CreateSkillViewModel skill) {
         return ResponseEntity.ok(skillService.create(skill));
     }
 
     @GetMapping("/{id}/endorsements")
-    public ResponseEntity<Page<EndorsementViewModel>> getEndorsementsBySkillId(
-            @RequestParam(name = "offset", defaultValue = "0", required = false) @Min(0) int offset,
-            @RequestParam(name = "limit", defaultValue = "10", required = false) @Min(1) int limit,
+    public ResponseEntity<List<EndorsementViewModel>> getEndorsementsBySkillId(
             @PathVariable(value = "id") Integer skillID) {
-        PageRequest pageRequest = PageRequest.of(offset, limit);
-        return ResponseEntity.ok(endorsementService.getAllEndorsementsBySkillId(skillID, pageRequest));
+        return ResponseEntity.ok(endorsementService.getAllEndorsementsBySkillId(skillID));
     }
 }

skill-tree/src/main/java/com/RDS/skilltree/dtos/SkillRequestsDto.java

@@ -0,0 +1,23 @@
+package com.RDS.skilltree.dtos;
+
+import com.RDS.skilltree.viewmodels.SkillRequestViewModel;
+import com.RDS.skilltree.viewmodels.UserViewModel;
+import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class SkillRequestsDto {
+    private List<SkillRequestViewModel> data;
+    private List<UserViewModel> users;
+
+    public static SkillRequestsDto toDto(
+            List<SkillRequestViewModel> skillRequests, List<UserViewModel> users) {
+        SkillRequestsDto skillRequestsDto = new SkillRequestsDto();
+        skillRequestsDto.setData(skillRequests);
+        skillRequestsDto.setUsers(users);
+
+        return skillRequestsDto;
+    }
+}

skill-tree/src/main/java/com/RDS/skilltree/repositories/EndorsementRepository.java

@@ -1,10 +1,9 @@
 package com.RDS.skilltree.repositories;
 
 import com.RDS.skilltree.models.Endorsement;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface EndorsementRepository extends JpaRepository<Endorsement, Integer> {
-    Page<Endorsement> findBySkillId(Integer skillId, Pageable pageable);
+    List<Endorsement> findBySkillId(Integer skillId);
 }

skill-tree/src/main/java/com/RDS/skilltree/repositories/UserSkillRepository.java

@@ -0,0 +1,12 @@
+package com.RDS.skilltree.repositories;
+
+import com.RDS.skilltree.User.UserSkillStatusEnum;
+import com.RDS.skilltree.User.UserSkillsModel;
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserSkillRepository extends JpaRepository<UserSkillsModel, Integer> {
+    List<UserSkillsModel> findByStatus(UserSkillStatusEnum status);
+
+    List<UserSkillsModel> findByUserIdAndSkillId(String userId, Integer skillId);
+}

skill-tree/src/main/java/com/RDS/skilltree/services/EndorsementService.java

@@ -3,11 +3,10 @@
 import com.RDS.skilltree.viewmodels.CreateEndorsementViewModel;
 import com.RDS.skilltree.viewmodels.EndorsementViewModel;
 import com.RDS.skilltree.viewmodels.UpdateEndorsementViewModel;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+import java.util.List;
 
 public interface EndorsementService {
-    Page<EndorsementViewModel> getAllEndorsementsBySkillId(Integer skillId, Pageable pageable);
+    List<EndorsementViewModel> getAllEndorsementsBySkillId(Integer skillId);
 
     EndorsementViewModel create(CreateEndorsementViewModel endorsement);
 

skill-tree/src/main/java/com/RDS/skilltree/services/EndorsementServiceImplementation.java

@@ -2,6 +2,8 @@
 
 import com.RDS.skilltree.User.UserModel;
 import com.RDS.skilltree.User.UserRepository;
+import com.RDS.skilltree.User.UserSkillStatusEnum;
+import com.RDS.skilltree.User.UserSkillsModel;
 import com.RDS.skilltree.exceptions.EndorsementNotFoundException;
 import com.RDS.skilltree.exceptions.SelfEndorsementNotAllowedException;
 import com.RDS.skilltree.exceptions.SkillNotFoundException;
@@ -10,14 +12,14 @@
 import com.RDS.skilltree.models.Skill;
 import com.RDS.skilltree.repositories.EndorsementRepository;
 import com.RDS.skilltree.repositories.SkillRepository;
+import com.RDS.skilltree.repositories.UserSkillRepository;
 import com.RDS.skilltree.viewmodels.CreateEndorsementViewModel;
 import com.RDS.skilltree.viewmodels.EndorsementViewModel;
 import com.RDS.skilltree.viewmodels.UpdateEndorsementViewModel;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -26,12 +28,12 @@ public class EndorsementServiceImplementation implements EndorsementService {
     private final UserRepository userRepository;
     private final SkillRepository skillRepository;
     private final EndorsementRepository endorsementRepository;
+    private final UserSkillRepository userSkillRepository;
 
     @Override
-    public Page<EndorsementViewModel> getAllEndorsementsBySkillId(
-            Integer skillId, Pageable pageable) {
-        Page<Endorsement> endorsementPage = endorsementRepository.findBySkillId(skillId, pageable);
-        return endorsementPage.map(EndorsementViewModel::toViewModel);
+    public List<EndorsementViewModel> getAllEndorsementsBySkillId(Integer skillId) {
+        List<Endorsement> endorsements = endorsementRepository.findBySkillId(skillId);
+        return endorsements.stream().map(EndorsementViewModel::toViewModel).toList();
     }
 
     @Override
@@ -64,14 +66,27 @@ public EndorsementViewModel create(CreateEndorsementViewModel endorsementViewMod
             throw new SkillNotFoundException(String.format("Skill id: %s not found", skillId));
         }
 
+        List<UserSkillsModel> userSkillEntry =
+                userSkillRepository.findByUserIdAndSkillId(endorseId, skillId);
         Endorsement endorsement = new Endorsement();
 
         endorsement.setMessage(message);
         endorsement.setSkill(skillDetails.get());
         endorsement.setEndorse(endorseDetails.get());
         endorsement.setEndorser(endorserDetails.get());
 
-        return EndorsementViewModel.toViewModel(endorsementRepository.save(endorsement));
+        if (userSkillEntry.isEmpty()) {
+            UserSkillsModel userSkillsModel = new UserSkillsModel();
+            userSkillsModel.setUser(endorseDetails.get());
+            userSkillsModel.setSkill(skillDetails.get());
+            userSkillsModel.setStatus(UserSkillStatusEnum.PENDING);
+
+            userSkillRepository.save(userSkillsModel);
+        }
+
+        Endorsement newEndorsement = endorsementRepository.save(endorsement);
+
+        return EndorsementViewModel.toViewModel(newEndorsement);
     }
 
     @Override

skill-tree/src/main/java/com/RDS/skilltree/services/SkillService.java

@@ -1,5 +1,6 @@
 package com.RDS.skilltree.services;
 
+import com.RDS.skilltree.dtos.SkillRequestsDto;
 import com.RDS.skilltree.viewmodels.CreateSkillViewModel;
 import com.RDS.skilltree.viewmodels.SkillViewModel;
 import java.util.List;
@@ -8,4 +9,6 @@ public interface SkillService {
     List<SkillViewModel> getAll();
 
     SkillViewModel create(CreateSkillViewModel skill);
+
+    SkillRequestsDto getAllRequests();
 }

skill-tree/src/main/java/com/RDS/skilltree/services/SkillServiceImplementation.java

@@ -1,16 +1,19 @@
 package com.RDS.skilltree.services;
 
-import com.RDS.skilltree.User.JwtUserModel;
-import com.RDS.skilltree.User.UserModel;
-import com.RDS.skilltree.User.UserRepository;
+import com.RDS.skilltree.User.*;
+import com.RDS.skilltree.dtos.SkillRequestsDto;
 import com.RDS.skilltree.exceptions.SkillAlreadyExistsException;
 import com.RDS.skilltree.exceptions.UserNotFoundException;
+import com.RDS.skilltree.models.Endorsement;
 import com.RDS.skilltree.models.Skill;
+import com.RDS.skilltree.repositories.EndorsementRepository;
 import com.RDS.skilltree.repositories.SkillRepository;
+import com.RDS.skilltree.repositories.UserSkillRepository;
 import com.RDS.skilltree.viewmodels.CreateSkillViewModel;
+import com.RDS.skilltree.viewmodels.SkillRequestViewModel;
 import com.RDS.skilltree.viewmodels.SkillViewModel;
-import java.util.List;
-import java.util.Optional;
+import com.RDS.skilltree.viewmodels.UserViewModel;
+import java.util.*;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -22,6 +25,8 @@
 public class SkillServiceImplementation implements SkillService {
     private final SkillRepository skillRepository;
     private final UserRepository userRepository;
+    private final UserSkillRepository userSkillRepository;
+    private final EndorsementRepository endorsementRepository;
 
     @Override
     public List<SkillViewModel> getAll() {
@@ -30,6 +35,38 @@ public List<SkillViewModel> getAll() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public SkillRequestsDto getAllRequests() {
+        List<UserSkillsModel> pendingSkills =
+                userSkillRepository.findByStatus(UserSkillStatusEnum.PENDING);
+        Set<UserViewModel> uniqueUsers = new HashSet<>();
+
+        List<SkillRequestViewModel> skillRequests =
+                pendingSkills.stream()
+                        .map(
+                                pendingSkill -> {
+                                    List<Endorsement> endorsements =
+                                            endorsementRepository.findBySkillId(pendingSkill.getSkill().getId());
+
+                                    uniqueUsers.add(
+                                            // TODO : call rds backend to get user details
+                                            UserViewModel.toViewModel(new UserModel(pendingSkill.getUser().getId(), "")));
+
+                                    endorsements.forEach(
+                                            endorsement -> {
+                                                UserModel endorser = endorsement.getEndorser();
+                                                // TODO : call rds backend to get user details
+                                                uniqueUsers.add(
+                                                        UserViewModel.toViewModel(new UserModel(endorser.getId(), "")));
+                                            });
+
+                                    return SkillRequestViewModel.toViewModel(pendingSkill, endorsements);
+                                })
+                        .toList();
+
+        return SkillRequestsDto.toDto(skillRequests, new ArrayList<>(uniqueUsers));
+    }
+
     @Override
     public SkillViewModel create(CreateSkillViewModel skill) {
         if (skillRepository.existsByName(skill.getName())) {

skill-tree/src/main/java/com/RDS/skilltree/viewmodels/MinimalEndorsementViewModel.java

@@ -0,0 +1,25 @@
+package com.RDS.skilltree.viewmodels;
+
+import com.RDS.skilltree.models.Endorsement;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class MinimalEndorsementViewModel {
+    private Integer id;
+    private String endorserId;
+    private String endorsementDate;
+    private String message;
+
+    public static MinimalEndorsementViewModel toViewModel(Endorsement endorsement) {
+        MinimalEndorsementViewModel endorsementViewModel = new MinimalEndorsementViewModel();
+
+        endorsementViewModel.setId(endorsement.getId());
+        endorsementViewModel.setMessage(endorsement.getMessage());
+        endorsementViewModel.setEndorsementDate(endorsement.getCreatedAt().toString());
+        endorsementViewModel.setEndorserId(endorsement.getEndorser().getId());
+
+        return endorsementViewModel;
+    }
+}

skill-tree/src/main/java/com/RDS/skilltree/viewmodels/SkillRequestViewModel.java

@@ -0,0 +1,37 @@
+package com.RDS.skilltree.viewmodels;
+
+import com.RDS.skilltree.User.UserModel;
+import com.RDS.skilltree.User.UserSkillsModel;
+import com.RDS.skilltree.models.Endorsement;
+import com.RDS.skilltree.models.Skill;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class SkillRequestViewModel {
+    private Integer id;
+    private String name;
+    private String endorseId;
+    private List<MinimalEndorsementViewModel> endorsements;
+
+    public static SkillRequestViewModel toViewModel(
+            UserSkillsModel userSkillsModel, List<Endorsement> endorsements) {
+        SkillRequestViewModel skillRequestViewModel = new SkillRequestViewModel();
+
+        Skill skill = userSkillsModel.getSkill();
+        UserModel user = userSkillsModel.getUser();
+
+        skillRequestViewModel.setId(skill.getId());
+        skillRequestViewModel.setName(skill.getName());
+        skillRequestViewModel.setEndorseId(user.getId());
+        skillRequestViewModel.setEndorsements(
+                endorsements.stream()
+                        .map(MinimalEndorsementViewModel::toViewModel)
+                        .collect(Collectors.toList()));
+
+        return skillRequestViewModel;
+    }
+}

skill-tree/src/main/java/com/RDS/skilltree/viewmodels/UserViewModel.java

@@ -8,6 +8,7 @@
 @Getter
 @Setter
 public class UserViewModel {
+    private String id;
     private String name;
 
     public static UserViewModel toViewModel(UserModel user) {