Merge branch 'waltz-6602-report-grid' of github.com:judofosu/waltz into waltz-6602-report-grid

Author: judithofosu

waltz-data/src/main/java/org/finos/waltz/data/application/ApplicationIdSelectorFactory.java

@@ -36,8 +36,6 @@
 import org.jooq.SelectOrderByStep;
 import org.jooq.SelectWhereStep;
 import org.jooq.impl.DSL;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.function.Function;
@@ -61,8 +59,6 @@
 @Service
 public class ApplicationIdSelectorFactory implements Function<IdSelectionOptions, Select<Record1<Long>>> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ApplicationIdSelectorFactory.class);
-
     private static final DataTypeIdSelectorFactory dataTypeIdSelectorFactory = new DataTypeIdSelectorFactory();
     private static final MeasurableIdSelectorFactory measurableIdSelectorFactory = new MeasurableIdSelectorFactory();
     private static final OrganisationalUnitIdSelectorFactory orgUnitIdSelectorFactory = new OrganisationalUnitIdSelectorFactory();
@@ -80,6 +76,8 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         checkNotNull(options, "options cannot be null");
         EntityReference ref = options.entityReference();
         switch (ref.kind()) {
+            case ALL:
+                return mkForAll(options);
             case ACTOR:
                 return mkForActor(options);
             case APP_GROUP:
@@ -129,6 +127,16 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         }
     }
 
+
+    private Select<Record1<Long>> mkForAll(IdSelectionOptions options) {
+        Condition applicationConditions = SelectorUtilities.mkApplicationConditions(options);
+
+        return DSL
+                .select(APPLICATION.ID)
+                .from(APPLICATION)
+                .where(applicationConditions);
+    }
+
     private Select<Record1<Long>> mkForLegalEntity(IdSelectionOptions options) {
         return DSL
                 .select(LEGAL_ENTITY_RELATIONSHIP.TARGET_ID)

waltz-data/src/main/java/org/finos/waltz/data/change_initiative/ChangeInitiativeIdSelectorFactory.java

@@ -22,6 +22,7 @@
 import org.finos.waltz.data.entity_hierarchy.AbstractIdSelectorFactory;
 import org.finos.waltz.data.orgunit.OrganisationalUnitIdSelectorFactory;
 import org.finos.waltz.model.*;
+import org.finos.waltz.model.application.LifecyclePhase;
 import org.finos.waltz.schema.tables.EntityHierarchy;
 import org.jooq.Record1;
 import org.jooq.Select;
@@ -48,6 +49,8 @@ public ChangeInitiativeIdSelectorFactory() {
     @Override
     protected Select<Record1<Long>> mkForOptions(IdSelectionOptions options) {
         switch (options.entityReference().kind()) {
+            case ALL:
+                return mkForAll(options);
             case ACTOR:
             case APPLICATION:
             case MEASURABLE:
@@ -124,6 +127,14 @@ private Select<Record1<Long>> mkForChangeInitiative(IdSelectionOptions options)
     }
 
 
+    private Select<Record1<Long>> mkForAll(IdSelectionOptions options) {
+        return DSL
+                .select(CHANGE_INITIATIVE.ID)
+                .from(CHANGE_INITIATIVE)
+                .where(CHANGE_INITIATIVE.LIFECYCLE_PHASE.ne(LifecyclePhase.RETIRED.name()));
+    }
+
+
     private Select<Record1<Long>> mkForRef(IdSelectionOptions options) {
         EntityReference ref = options.entityReference();
 

waltz-data/src/main/java/org/finos/waltz/data/change_set/ChangeSetIdSelectorFactory.java

@@ -44,6 +44,7 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
             case CHANGE_INITIATIVE:
                 // all physical flows where the app is a source or target
                 return mkForChangeInitiative(options);
+            case ALL:
             case APPLICATION:
             case APP_GROUP:
             case FLOW_DIAGRAM:

waltz-data/src/main/java/org/finos/waltz/data/change_unit/ChangeUnitIdSelectorFactory.java

@@ -48,6 +48,7 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
             case APPLICATION:
                 // all physical flows where the app is a source or target
                 return mkForFlowEndpoint(options);
+            case ALL:
             case APP_GROUP:
             case FLOW_DIAGRAM:
             case MEASURABLE:

waltz-data/src/main/java/org/finos/waltz/data/end_user_app/EndUserAppDao.java

@@ -19,12 +19,13 @@
 package org.finos.waltz.data.end_user_app;
 
 import org.finos.waltz.data.JooqUtilities;
-import org.finos.waltz.model.Criticality;
 import org.finos.waltz.model.application.LifecyclePhase;
 import org.finos.waltz.model.enduserapp.EndUserApplication;
 import org.finos.waltz.model.enduserapp.ImmutableEndUserApplication;
+import org.finos.waltz.model.physical_flow.CriticalityValue;
 import org.finos.waltz.model.tally.Tally;
 import org.finos.waltz.schema.tables.records.EndUserApplicationRecord;
+import org.jooq.Condition;
 import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record1;
@@ -42,8 +43,11 @@
 @Repository
 public class EndUserAppDao {
 
-
     private final DSLContext dsl;
+    private static final Condition COMMON_CONDITION = END_USER_APPLICATION.IS_PROMOTED.isFalse()
+            .and(END_USER_APPLICATION.LIFECYCLE_PHASE.in(
+                    LifecyclePhase.PRODUCTION.name(),
+                    LifecyclePhase.DEVELOPMENT.name()));
 
     public static final RecordMapper<Record, EndUserApplication> TO_DOMAIN_MAPPER = r -> {
         EndUserApplicationRecord record = r.into(END_USER_APPLICATION);
@@ -55,7 +59,7 @@ public class EndUserAppDao {
                 .id(record.getId())
                 .organisationalUnitId(record.getOrganisationalUnitId())
                 .lifecyclePhase(LifecyclePhase.valueOf(record.getLifecyclePhase()))
-                .riskRating(Criticality.valueOf(record.getRiskRating()))
+                .riskRating(CriticalityValue.of(record.getRiskRating()))
                 .provenance(record.getProvenance())
                 .isPromoted(record.getIsPromoted())
                 .build();
@@ -72,15 +76,16 @@ public List<Tally<Long>> countByOrganisationalUnit() {
                 dsl,
                 END_USER_APPLICATION,
                 END_USER_APPLICATION.ORGANISATIONAL_UNIT_ID,
-                END_USER_APPLICATION.IS_PROMOTED.isFalse());
+                COMMON_CONDITION
+                );
     }
 
     @Deprecated
     public List<EndUserApplication> findByOrganisationalUnitSelector(Select<Record1<Long>> selector) {
         return dsl.select(END_USER_APPLICATION.fields())
                 .from(END_USER_APPLICATION)
                 .where(END_USER_APPLICATION.ORGANISATIONAL_UNIT_ID.in(selector)
-                        .and(END_USER_APPLICATION.IS_PROMOTED.isFalse()))
+                        .and(COMMON_CONDITION))
                 .fetch(TO_DOMAIN_MAPPER);
     }
 
@@ -89,7 +94,7 @@ public List<EndUserApplication> findBySelector(Select<Record1<Long>> selector) {
         return dsl.select(END_USER_APPLICATION.fields())
                 .from(END_USER_APPLICATION)
                 .where(END_USER_APPLICATION.ID.in(selector)
-                        .and(END_USER_APPLICATION.IS_PROMOTED.isFalse()))
+                        .and(COMMON_CONDITION))
                 .fetch(TO_DOMAIN_MAPPER);
     }
 
@@ -115,7 +120,7 @@ public List<EndUserApplication> findAll() {
         return dsl
                 .select(END_USER_APPLICATION.fields())
                 .from(END_USER_APPLICATION)
-                .where(END_USER_APPLICATION.IS_PROMOTED.isFalse())
+                .where(COMMON_CONDITION)
                 .fetch(TO_DOMAIN_MAPPER);
     }
 }

waltz-data/src/main/java/org/finos/waltz/data/end_user_app/EndUserAppIdSelectorFactory.java

@@ -18,6 +18,8 @@
 
 package org.finos.waltz.data.end_user_app;
 
+import org.finos.waltz.common.SetUtilities;
+import org.finos.waltz.model.application.LifecyclePhase;
 import org.finos.waltz.schema.tables.EndUserApplication;
 import org.finos.waltz.schema.tables.Involvement;
 import org.finos.waltz.schema.tables.Person;
@@ -35,6 +37,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.Set;
 import java.util.function.Function;
 
 import static org.finos.waltz.schema.tables.EndUserApplication.END_USER_APPLICATION;
@@ -52,7 +56,9 @@ public class EndUserAppIdSelectorFactory implements Function<IdSelectionOptions,
     private final OrganisationalUnitIdSelectorFactory orgUnitIdSelectorFactory = new OrganisationalUnitIdSelectorFactory();
     private final Person person = PERSON.as("per");
     private final PersonHierarchy personHierarchy = PERSON_HIERARCHY.as("phier");
-
+    private final Set<String> validLifecyclePhases = SetUtilities.asSet(
+            LifecyclePhase.PRODUCTION.name(),
+            LifecyclePhase.DEVELOPMENT.name());
 
 
     @Override
@@ -81,7 +87,8 @@ private Select<Record1<Long>> mkForOrgUnit(IdSelectionOptions options) {
         return DSL
                 .selectDistinct(eua.ID)
                 .from(eua)
-                .where(eua.ORGANISATIONAL_UNIT_ID.in(ouSelector));
+                .where(eua.ORGANISATIONAL_UNIT_ID.in(ouSelector)
+                        .and(eua.LIFECYCLE_PHASE.in(validLifecyclePhases)));
     }
 
 
@@ -114,7 +121,8 @@ private Select<Record1<Long>> mkForSinglePerson(IdSelectionOptions options) {
                 .innerJoin(eua)
                 .on(eua.ID.eq(involvement.ENTITY_ID))
                 .where(involvement.ENTITY_KIND.eq(EntityKind.END_USER_APPLICATION.name()))
-                .and(involvement.EMPLOYEE_ID.eq(employeeId));
+                .and(involvement.EMPLOYEE_ID.eq(employeeId))
+                .and(eua.LIFECYCLE_PHASE.in(validLifecyclePhases));
     }
 
 
@@ -138,7 +146,8 @@ private Select<Record1<Long>> mkForPersonReportees(IdSelectionOptions options) {
                 .from(involvement)
                 .innerJoin(eua)
                 .on(eua.ID.eq(involvement.ENTITY_ID))
-                .where(condition);
+                .where(condition)
+                .and(eua.LIFECYCLE_PHASE.in(validLifecyclePhases));
     }
 
 

waltz-data/src/main/java/org/finos/waltz/data/legal_entity/LegalEntityRelationshipIdSelectorFactory.java

@@ -43,6 +43,7 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         switch (options.entityReference().kind()) {
             case ACTOR:
                 return mkForActor(options);
+            case ALL:
             case APPLICATION:
             case APP_GROUP:
             case MEASURABLE:

waltz-data/src/main/java/org/finos/waltz/data/licence/LicenceIdSelectorFactory.java

@@ -55,6 +55,7 @@ protected Select<Record1<Long>> mkForOptions(IdSelectionOptions options) {
             case LICENCE:
                 return mkForLicence(options);
             case ACTOR:
+            case ALL:
             case APP_GROUP:
             case CHANGE_INITIATIVE:
             case FLOW_DIAGRAM:

waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowIdSelectorFactory.java

@@ -63,6 +63,7 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         switch (options.entityReference().kind()) {
             case ACTOR:
                 return mkForActor(options);
+            case ALL:
             case APPLICATION:
             case APP_GROUP:
             case CHANGE_INITIATIVE:

waltz-data/src/main/java/org/finos/waltz/data/measurable/MeasurableIdSelectorFactory.java

@@ -76,6 +76,7 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
                 return mkForMeasurable(options);
             case APP_GROUP:
             case PROCESS_DIAGRAM:
+            case ALL:
                 return mkViaAppSelector(options);
             case AGGREGATE_OVERLAY_DIAGRAM:
                 return mkForAggregatedEntityDiagram(options);