#3527 Refactor skill order calculation

Author: dwalizer

dashboard/src/components/skills/SkillPage.vue

@@ -174,7 +174,7 @@ const nextButtonClicked = () => {
 
 <template>
   <div class="mt-2">
-    <Card class="p-2" :pt="{ body: { class: 'p-0!' } }">
+    <Card class="p-2" :pt="{ body: { class: 'p-0!' } }" v-if="skillsState.skill && (skillsState.skill.prevSkillId || skillsState.skill.nextSkillId)" >
       <template #content>
         <skill-navigation @prevButtonClicked="prevButtonClicked" @nextButtonClicked="nextButtonClicked" :skill="skillsState.skill" buttonSeverity="info" />
       </template>

service/src/main/java/skills/services/admin/SkillsAdminService.groovy

@@ -701,26 +701,6 @@ class SkillsAdminService {
         return res
     }
 
-    int sortByDisplayOrder(DisplayOrderRes a, DisplayOrderRes b) {
-        if( a.groupId != null || b.groupId != null ) {
-            if( a.groupId != null && b.groupId != null) {
-                if( a.groupId != b.groupId ) {
-                    return a.skillGroupDisplayOrder <=> b.skillGroupDisplayOrder
-                }
-            }
-            else {
-                if( a.groupId != null && b.groupId == null ) {
-                    return a.skillGroupDisplayOrder <=> b.displayOrder
-                }
-                else {
-                    return a.displayOrder <=> b.skillGroupDisplayOrder
-                }
-            }
-        }
-
-        return a.displayOrder <=> b.displayOrder
-    }
-
     @Transactional(readOnly = true)
     SkillDefRes getSkill(String projectId, String subjectId, String skillId) {
         SkillDefWithExtra res = skillDefWithExtraRepo.findByProjectIdAndSkillIdIgnoreCaseAndTypeIn(projectId, skillId, [SkillDef.ContainerType.Skill, SkillDef.ContainerType.SkillsGroup])

service/src/main/java/skills/skillLoading/SkillsLoader.groovy

@@ -540,26 +540,6 @@ class SkillsLoader {
         Integer points
     }
 
-    int sortByDisplayOrder(DisplayOrderRes a, DisplayOrderRes b) {
-        if( a.groupId != null || b.groupId != null ) {
-            if( a.groupId != null && b.groupId != null) {
-                if( a.groupId != b.groupId ) {
-                    return a.skillGroupDisplayOrder <=> b.skillGroupDisplayOrder
-                }
-            }
-            else {
-                if( a.groupId != null && b.groupId == null ) {
-                    return a.skillGroupDisplayOrder <=> b.displayOrder
-                }
-                else {
-                    return a.displayOrder <=> b.skillGroupDisplayOrder
-                }
-            }
-        }
-
-        return a.displayOrder <=> b.displayOrder
-    }
-
     class SkillOrderInfo {
         String nextSkillId = null;
         String prevSkillId = null;
@@ -569,21 +549,14 @@ class SkillsLoader {
 
     SkillOrderInfo getSkillOrderStats(String projectId, String subjectId, String skillId) {
         SkillOrderInfo orderInfo = new SkillOrderInfo()
-        List<DisplayOrderRes> skillOrder = skillDefRepo.findDisplayOrderByProjectIdAndSubjectId(projectId, subjectId)?.sort({a, b -> sortByDisplayOrder(a, b)})
-        DisplayOrderRes currentSkill = skillOrder.find({ it -> it.getSkillId() == skillId })
-
-        if (currentSkill) {
-            List<DisplayOrderRes> orderedGroup = skillOrder?.sort({a, b -> sortByDisplayOrder(a, b)});
-            orderInfo.orderInGroup = orderedGroup.findIndexOf({it -> it.skillId == currentSkill.skillId}) + 1;
-            orderInfo.totalSkills = orderedGroup.size();
-
-            int currentIndex = skillOrder.findIndexOf{ it -> it.skillId == currentSkill.skillId }
-            if(currentIndex > 0) {
-                orderInfo.prevSkillId = skillOrder[currentIndex - 1]?.skillId
-            }
-            if(currentIndex < orderInfo.totalSkills - 1) {
-                orderInfo.nextSkillId = skillOrder[currentIndex + 1]?.skillId
-            }
+        DisplayOrderRes skill = skillDefRepo.findDisplayOrderByProjectIdAndSubjectIdAndSkillId(projectId, subjectId, skillId)
+        Integer totalSkills = skillDefRepo.countSkillChildren(projectId, subjectId)
+
+        if (skill) {
+            orderInfo.prevSkillId = skill.previousSkillId
+            orderInfo.nextSkillId = skill.nextSkillId
+            orderInfo.orderInGroup = skill.overallOrder
+            orderInfo.totalSkills = totalSkills
         }
 
         return orderInfo

service/src/main/java/skills/storage/model/DisplayOrderRes.groovy

@@ -17,8 +17,7 @@ package skills.storage.model
 
 interface DisplayOrderRes {
     String getSkillId();
-    Integer getDisplayOrder();
-    Integer getSkillGroupDisplayOrder();
-    String getGroupId();
-    String getType();
+    String getPreviousSkillId();
+    String getNextSkillId();
+    Integer getOverallOrder();
 }

service/src/main/java/skills/storage/repos/SkillDefRepo.groovy

@@ -231,17 +231,34 @@ interface SkillDefRepo extends CrudRepository<SkillDef, Integer>, PagingAndSorti
     List<SkillDef> findPreviousSkillDefs(String projectId, String skillId, int beforeDisplayOrder, List<RelationshipType> relationshipType, Pageable pageable)
 
     @Nullable
-    @Query(value='''select child.skill_id as skillId, child.display_order as displayOrder, skillGroup.display_order as skillGroupDisplayOrder, child.group_id as groupId, child.type as type
-                from skill_definition subj,
-                     skill_relationship_definition rel,
-                     skill_definition child left join skill_definition skillGroup on (child.group_id = skillGroup.skill_id and skillGroup.project_id = child.project_id)
-                where subj.project_id = ?1
-                  and subj.skill_id = ?2
-                  and child.type = 'Skill'
-                  and child.enabled = 'true'
-                  and subj.id = rel.parent_ref_id
-                  and child.id = rel.child_ref_id''', nativeQuery=true)
-    List<DisplayOrderRes> findDisplayOrderByProjectIdAndSubjectId(String projectId, String subjectId)
+    @Query(value='''select * from (
+                        select skillId,
+                               lag(skillId, 1) over ( order by displayOrder, skillGroupDisplayOrder ) as previousSkillId,
+                               lead(skillId, 1) over (order by displayOrder, skillGroupDisplayOrder)  as nextSkillId,
+                               row_number() over () as overallOrder
+                        from (
+                            select child.skill_id           as skillId,
+                                   (case when skillGroup.display_order is null then child.display_order else skillGroup.display_order end) as displayOrder,
+                                   (case when skillGroup.display_order is not null then child.display_order else skillGroup.display_order end) as skillGroupDisplayOrder,
+                                   child.group_id           as groupId,
+                                   child.type               as type
+                            from skill_definition subj,
+                                 skill_relationship_definition rel,
+                                 skill_definition child
+                            left join skill_definition skillGroup
+                                 on (
+                                     child.group_id = skillGroup.skill_id
+                                     and skillGroup.project_id = child.project_id
+                                 )
+                            where subj.project_id = ?1
+                              and subj.skill_id = ?2
+                              and child.type = 'Skill\'
+                              and child.enabled = 'true\'
+                              and subj.id = rel.parent_ref_id
+                              and child.id = rel.child_ref_id
+                        )
+                    ) where skillId = ?3''', nativeQuery=true)
+    DisplayOrderRes findDisplayOrderByProjectIdAndSubjectIdAndSkillId(String projectId, String subjectId, String skillId)
 
     int countByProjectIdAndType(@Nullable String projectId, SkillDef.ContainerType type)