Added a custom query to the MemberSkillRepository to filter out skills from terminated members.

Author: ocielliottc

server/src/main/java/com/objectcomputing/checkins/services/member_skill/MemberSkillRepository.java

@@ -1,5 +1,6 @@
 package com.objectcomputing.checkins.services.member_skill;
 
+import io.micronaut.data.annotation.Query;
 import io.micronaut.data.jdbc.annotation.JdbcRepository;
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.repository.CrudRepository;
@@ -19,6 +20,13 @@ public interface MemberSkillRepository extends CrudRepository<MemberSkill, UUID>
 
     List<MemberSkill> findBySkillid(UUID skillid);
 
-    Optional<MemberSkill> findByMemberidAndSkillid(UUID memberId,UUID skillid );
+    Optional<MemberSkill> findByMemberidAndSkillid(UUID memberId, UUID skillid);
 
+    @Query(value = "SELECT member_skills.* FROM member_skills " +
+           "INNER JOIN member_profile " +
+           "ON member_skills.memberid = member_profile.id " +
+           "WHERE :targetSkillId = member_skills.skillid " +
+           "AND member_profile.terminationdate IS NULL",
+           nativeQuery = true)
+    List<MemberSkill> activeMemberSkills(String targetSkillId);
 }

server/src/main/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportServicesImpl.java

@@ -92,7 +92,8 @@ private List<TeamMemberSkillDTO> getPotentialQualifyingMembers(List<SkillLevelDT
                 throw new BadArgException("Invalid requested skill ID");
             }
 
-            final List<MemberSkill> temp = memberSkillRepo.findBySkillid(skill.getId());
+            final List<MemberSkill> temp =
+                memberSkillRepo.activeMemberSkills(skill.getId().toString());
             if (skill.getLevel() != null && !temp.isEmpty()) {
                 for (MemberSkill memSkill : temp) {
                     if (memSkill.getSkilllevel() != null && isSkillLevelSatisfied(memSkill.getSkilllevel(), skill.getLevel())) {

web-ui/src/pages/SkillReportPage.jsx

@@ -67,10 +67,6 @@ const SkillReportPage = props => {
               ? res.payload.data.teamMembers
               : [];
         }
-        // Filter out skills of terminated members
-        memberSkillsFound = memberSkillsFound.filter(memberSkill =>
-          memberIds?.includes(memberSkill.id)
-        );
         memberSkillsFound = sortMembersBySkill(memberSkillsFound);
       }
 

web-ui/src/pages/TeamSkillReportPage.jsx

@@ -85,11 +85,6 @@ const TeamSkillReportPage = () => {
               : [];
         }
 
-        // Filter the member skill down to only members that are not terminated.
-        memberSkillsFound = memberSkillsFound.filter(
-          mSkill => memberProfiles.find(member => member.id == mSkill.id)
-        );
-
         setAllSearchResults(memberSkillsFound);
         const membersSelected = memberSkillsFound.filter(mSkill =>
           selectedMembers.some(member => member.id === mSkill.id)