Key Involvement section showing removed people

- fixed view service endpoint logic
- simplified existing multi-call logic to the single view-service call

#6838

Author: davidwatkins73

waltz-ng/client/involvement/components/sub-section/key-people-sub-section.html

@@ -36,8 +36,8 @@
                             <td>
                                 <div>
                                     <span ng-repeat="p in item.persons">
-                                        <waltz-entity-link entity-ref="p.person"></waltz-entity-link> -
-                                        <a ng-href="mailto:{{p.person.email}}">
+                                        <waltz-entity-link entity-ref="p"></waltz-entity-link> -
+                                        <a ng-href="mailto:{{p.email}}">
                                             <waltz-icon name="envelope-o"></waltz-icon>
                                         </a>
                                         <span ng-show="!$last">, </span>

waltz-ng/client/involvement/components/sub-section/key-people-sub-section.js

@@ -20,7 +20,6 @@ import { initialiseData } from "../../../common";
 
 import template from "./key-people-sub-section.html";
 import { CORE_API } from "../../../common/services/core-api-utils";
-import { aggregatePeopleByKeyInvolvementKind } from "../../involvement-utils";
 
 const bindings = {
     parentEntityRef: "<",
@@ -35,28 +34,17 @@ function controller($q, serviceBroker) {
     const vm = initialiseData(this, initialState);
 
     const refresh = () => {
-        const involvementPromise = serviceBroker
-            .loadViewData(
-                CORE_API.InvolvementStore.findByEntityReference,
-                [ vm.parentEntityRef ])
-            .then(r => r.data);
-
-        const peoplePromise = serviceBroker
-            .loadViewData(
-                CORE_API.InvolvementStore.findPeopleByEntityReference,
-                [ vm.parentEntityRef ])
-            .then(r => r.data);
-
-        const keyInvolvementsPromise = serviceBroker
-            .loadViewData(
-                CORE_API.InvolvementKindStore.findKeyInvolvementKindsByEntityKind,
-                [ vm.parentEntityRef.kind ])
-            .then(r => r.data);
-
-        $q.all([involvementPromise, peoplePromise, keyInvolvementsPromise])
-            .then(([involvements = [], people = [], keyInvolvementKinds = []]) => {
-                vm.keyPeople = aggregatePeopleByKeyInvolvementKind(involvements, people, keyInvolvementKinds);
-            });
+        return serviceBroker
+            .loadViewData(CORE_API.InvolvementViewService.findKeyInvolvementsForEntity, [vm.parentEntityRef])
+            .then(r => r.data)
+            .then(keyInvolvements => vm.keyPeople = _
+                .chain(keyInvolvements)
+                .groupBy(d => d.involvementKind.name)
+                .map((v, k) => ({
+                    roleName: k,
+                    persons: _.map(v, d => d.person)
+                }))
+                .value());
     };
 
     vm.$onChanges = () => {

waltz-ng/client/involvement/involvement-utils.js

@@ -16,54 +16,8 @@
  *
  */
 
-import _ from "lodash";
 
 
-export function aggregatePeopleInvolvements(involvements = [], people = []) {
-    const involvementsByPerson = _
-        .chain(involvements)
-        .groupBy('employeeId')
-        .mapValues(xs => _  // dedupe involvement kinds for person
-            .chain(xs)
-            .map(x => ({
-                kindId: x.kindId,
-                provenance: x.provenance,
-                isReadOnly: x.isReadOnly
-            }))
-            .uniqBy(d => d.kindId)
-            .value()
-        )
-        .value();
-
-    return _
-        .chain(people)
-        .map(person => ({person, involvements: involvementsByPerson[person.employeeId]}))
-        .uniqBy(i => i.person.id)
-        .value();
-}
-
-
-export function aggregatePeopleByKeyInvolvementKind(involvements, people, keyInvolvementKinds = []) {
-    const peopleById = _.keyBy(people, "employeeId");
-
-    const aggregatePeopleByInvolvementKind = _
-        .chain(involvements)
-        .map(inv => ({
-            person: peopleById[inv.employeeId],
-            involvement: ({kindId: inv.kindId})
-        }))
-        .groupBy(inv => inv.involvement.kindId)
-        .value();
-
-    return _.chain(keyInvolvementKinds)
-        .map(kind => ({
-            roleName: kind.name,
-            persons: aggregatePeopleByInvolvementKind[kind.id]
-        }))
-        .sortBy("roleName")
-        .value();
-}
-
 export function mkChangeCommand(operation, personEntityRef, involvementKindId) {
     return {
         operation,

waltz-ng/client/involvement/services/involvement-view-service.js

@@ -10,9 +10,14 @@ export function store($http, BaseApiUrl) {
         .get(`${BASE}/entity/kind/${ref.kind}/id/${ref.id}/all-by-direction`)
         .then(result => result.data);
 
+    const findKeyInvolvementsForEntity = (ref) => $http
+        .get(`${BASE}/entity/kind/${ref.kind}/id/${ref.id}/key`)
+        .then(result => result.data);
+
     return {
         findAllInvolvementsByEmployeeId,
-        findAllInvolvementsForEntityByDirection
+        findAllInvolvementsForEntityByDirection,
+        findKeyInvolvementsForEntity
     };
 }
 
@@ -35,6 +40,11 @@ export const InvolvementViewService_API = {
         serviceName,
         serviceFnName: "findAllInvolvementsForEntityByDirection",
         description: "find all direct, ancestor and descendent involvements for an entity"
+    },
+    findKeyInvolvementsForEntity: {
+        serviceName,
+        serviceFnName: "findKeyInvolvementsForEntity",
+        description: "find all key involvements for an entity"
     }
 };
 

waltz-service/src/main/java/org/finos/waltz/service/involvement/InvolvementViewService.java

@@ -5,6 +5,7 @@
 import org.finos.waltz.data.involvement.InvolvementViewDao;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.HierarchyDirection;
+import org.finos.waltz.model.utils.IdUtilities;
 import org.finos.waltz.service.involvement_kind.InvolvementKindService;
 import org.finos.waltz.service.person.PersonService;
 import org.finos.waltz.model.EntityReference;
@@ -69,7 +70,7 @@ public Set<InvolvementViewItem> findAllByEmployeeId(String employeeId) {
     public Set<InvolvementDetail> findKeyInvolvementsForEntity(EntityReference ref) {
 
         List<InvolvementKind> keyInvolvements = involvementKindService.findKeyInvolvementKindsByEntityKind(ref.kind());
-        Map<Long, InvolvementKind> keyInvKindsById = indexBy(keyInvolvements, d -> d.id().get());
+        Map<Long, InvolvementKind> keyInvKindsById = IdUtilities.indexByOptionalId(keyInvolvements);
 
         List<Involvement> involvements = involvementService.findByEntityReference(ref);
         List<Person> people = involvementService.findPeopleByEntityReference(ref);
@@ -83,6 +84,7 @@ public Set<InvolvementDetail> findKeyInvolvementsForEntity(EntityReference ref)
                         .involvementKind(keyInvKindsById.get(d.kindId()))
                         .person(peopleByEmployeeId.get(d.employeeId()))
                         .build())
+                .filter(d -> ! d.person().isRemoved())
                 .collect(Collectors.toSet());
     }