AMP-31091: The disaggregation order doesnt match

Author: brianbrix

amp/src/main/java/org/digijava/kernel/ampapi/endpoints/indicator/manager/MEIndicatorDTO.java

@@ -92,7 +92,7 @@ public class MEIndicatorDTO {
     private String dataSource;
 
     @JsonProperty("disaggregation")
-    private Set<Long> disaggregation = new HashSet<>();
+    private List<Long> disaggregation = new ArrayList<>();
 
     @JsonProperty("unitOfMeasure")
     private Long unitOfMeasure;
@@ -131,7 +131,7 @@ public MEIndicatorDTO(final AmpIndicator indicator) {
         this.logframeLinks = indicator.getLogframeLinks();
         this.data = indicator.getData();
         this.dataSource = indicator.getDataSource();
-        this.disaggregation = indicator.getDisaggregation()!=null ? indicator.getDisaggregation().stream().map(AmpCategoryValue::getId).collect(Collectors.toSet()) : null;
+        this.disaggregation = indicator.getDisaggregation()!=null ? indicator.getDisaggregation().stream().map(AmpCategoryValue::getId).collect(Collectors.toList()) : null;
         this.unitOfMeasure = indicator.getUnitOfMeasure()!=null ? indicator.getUnitOfMeasure().getId() : null;
         this.calculationMethod = indicator.getCalculationMethod();
         this.responsibleOrganizations = indicator.getResponsibleOrganizations()!=null ? indicator.getResponsibleOrganizations().stream().map(AmpOrganisation::getAmpOrgId).collect(Collectors.toSet()) : null;
@@ -288,8 +288,8 @@ public void setOutcomeId(Long outcomeId) {
     public String getDataSource() { return dataSource; }
     public void setDataSource(String dataSource) { this.dataSource = dataSource; }
 
-    public Set<Long> getDisaggregation() { return disaggregation; }
-    public void setDisaggregation(Set<Long> disaggregation) { this.disaggregation = disaggregation; }
+    public List<Long> getDisaggregation() { return disaggregation; }
+    public void setDisaggregation(List<Long> disaggregation) { this.disaggregation = disaggregation; }
 
     public Long getUnitOfMeasure() { return unitOfMeasure; }
     public void setUnitOfMeasure(Long unitOfMeasure) { this.unitOfMeasure = unitOfMeasure; }

amp/src/main/java/org/digijava/module/aim/dbentity/AmpIndicator.java

@@ -8,8 +8,10 @@
 import org.digijava.module.categorymanager.dbentity.AmpCategoryValue;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 @TranslatableClass (displayName = "Indicator")
@@ -83,7 +85,7 @@ public class AmpIndicator implements Serializable, Identifiable
     private Set<Long> logframeLinks;
     private String data;
     private String dataSource;
-    private Set<AmpCategoryValue> disaggregation;
+    private List<AmpCategoryValue> disaggregation = new ArrayList<>();
     private AmpCategoryValue unitOfMeasure;
     private String calculationMethod;
     private Set<AmpOrganisation> responsibleOrganizations;
@@ -274,10 +276,10 @@ public String getDataSource() {
     public void setDataSource(String dataSource) {
         this.dataSource = dataSource;
     }
-    public Set<AmpCategoryValue> getDisaggregation() {
+    public List<AmpCategoryValue> getDisaggregation() {
         return disaggregation;
     }
-    public void setDisaggregation(Set<AmpCategoryValue> disaggregation) {
+    public void setDisaggregation(List<AmpCategoryValue> disaggregation) {
         this.disaggregation = disaggregation;
     }
     public AmpCategoryValue getUnitOfMeasure() {

amp/src/main/resources/org/digijava/module/aim/dbentity/AmpIndicator.hbm.xml

@@ -55,11 +55,12 @@
 		<many-to-one name="indicatorType" column="indicator_type_id" class="org.digijava.module.categorymanager.dbentity.AmpCategoryValue" cascade="none" />
 		<property name="data" column="data" type="java.lang.String" />
 		<property name="dataSource" column="data_source" type="java.lang.String" />
-		<set name="disaggregation" table="AMP_INDICATOR_DISAGGREGATION" lazy="true" cascade="none">
+		<list name="disaggregation" table="AMP_INDICATOR_DISAGGREGATION" lazy="true" cascade="none">
             <cache usage="read-write" />
             <key column="indicator_id" />
+            <list-index column="order_index" />
             <many-to-many class="org.digijava.module.categorymanager.dbentity.AmpCategoryValue" column="category_value_id" />
-        </set>
+        </list>
         <many-to-one name="unitOfMeasure" column="unit_of_measure_id" class="org.digijava.module.categorymanager.dbentity.AmpCategoryValue" cascade="none" />
         <property name="calculationMethod" column="calculation_method" type="java.lang.String" />
         <set name="responsibleOrganizations" table="AMP_INDICATOR_ORGANIZATION" lazy="true" cascade="none">

amp/src/main/resources/xmlpatches/4.0/AMP-31091-add-disaggregation-order-index.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:patch closeOnSuccess="true" retryOnFail="true"
+           xmlns:tns="http://docs.ampdev.net/schemas/xmlpatcher" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://docs.ampdev.net/schemas/xmlpatcher ../doc/xmlpatcher.xsd ">
+    <jira>AMP-31091</jira>
+    <author>bmokandu</author>
+    <description>Add order_index column to AMP_INDICATOR_DISAGGREGATION table to preserve user-selected disaggregation order. Existing rows get order_index assigned based on category_value_id order.</description>
+    <apply>
+        <script>
+            <lang delimiter=";" type="postgres"><![CDATA[
+
+                ALTER TABLE AMP_INDICATOR_DISAGGREGATION
+                ADD COLUMN IF NOT EXISTS order_index INTEGER;
+
+                UPDATE AMP_INDICATOR_DISAGGREGATION aid
+                SET order_index = sub.rn
+                FROM (
+                    SELECT indicator_id, category_value_id,
+                           ROW_NUMBER() OVER (PARTITION BY indicator_id ORDER BY category_value_id) - 1 AS rn
+                    FROM AMP_INDICATOR_DISAGGREGATION
+                ) sub
+                WHERE aid.indicator_id = sub.indicator_id
+                  AND aid.category_value_id = sub.category_value_id
+                  AND aid.order_index IS NULL
+
+            ]]></lang>
+        </script>
+    </apply>
+</tns:patch>