67 add control strategy recommendations

src/main/java/uk/ac/soton/itinnovation/security/model/system/RiskLevelCount.java

@@ -24,14 +24,15 @@
 /////////////////////////////////////////////////////////////////////////
 package uk.ac.soton.itinnovation.security.model.system;
 
+import java.util.Objects;
 import uk.ac.soton.itinnovation.security.model.Level;
 
-public class RiskLevelCount {
-	
+public class RiskLevelCount implements Comparable<RiskLevelCount> {
+
 	private Level level;
-			
+
 	private int count;
-	
+
 	public RiskLevelCount() {
 	}
 
@@ -50,6 +51,30 @@ public int getCount() {
 	public void setCount(int count) {
 		this.count = count;
 	}
-
-
+
+    @Override
+    public int compareTo(RiskLevelCount other) {
+        // Compare levels first
+        int levelComparison = this.level.compareTo(other.level);
+        if (levelComparison != 0) {
+            return levelComparison;
+        }
+
+        // If levels are equal, compare counts
+        return Integer.compare(this.count, other.count);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        RiskLevelCount that = (RiskLevelCount) obj;
+        return count == that.count && Objects.equals(level, that.level);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(level, count);
+    }
+
 }

src/main/java/uk/ac/soton/itinnovation/security/model/system/RiskVector.java

@@ -25,55 +25,127 @@
 package uk.ac.soton.itinnovation.security.model.system;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+
 import uk.ac.soton.itinnovation.security.model.Level;
 
-public class RiskVector {
-
-	private Map<String, RiskLevelCount> riskVector;
-
-	public RiskVector(Collection<Level> riskLevels, Map<String, Integer> riskLevelCounts) {
-		riskVector = new HashMap<>();
-
-		//For each defined risk level, get the count of misbehaviours at this level
-		for (Level riskLevel : riskLevels) {
-			RiskLevelCount riskLevelCount = new RiskLevelCount();
-			riskLevelCount.setLevel(riskLevel);
-			Integer count = riskLevelCounts.get(riskLevel.getUri());
-			riskLevelCount.setCount(count);
-			riskVector.put(riskLevel.getUri(), riskLevelCount);
-		}
-	}
-
-	public Map<String, RiskLevelCount> getRiskVector() {
-		return riskVector;
-	}
-
-	public void setRiskVector(Map<String, RiskLevelCount> riskVector) {
-		this.riskVector = riskVector;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-
-		sb.append("(");
-
-		Collection<RiskLevelCount> riskLevelCounts = riskVector.values();
-
-		for (RiskLevelCount riskLevelCount : riskLevelCounts) {
-			sb.append(riskLevelCount.getLevel().getLabel());
-			sb.append(": ");
-			sb.append(riskLevelCount.getCount());
-			sb.append(", ");
-		}
-
-		sb.setLength(sb.length() -2); //remove last comma
-
-		sb.append(")");
-
-		return sb.toString();
-	}
+public class RiskVector implements Comparable<RiskVector> {
+
+    private Map<String, RiskLevelCount> riskV;
+    private Map<Integer, String> levelValueMap;  // aux map for comparison
+
+    public RiskVector(Collection<Level> riskLevels, Map<String, Integer> riskLevelCounts) {
+        this.riskV = new HashMap<>();
+        this.levelValueMap = new HashMap<>();
+
+        //For each defined risk level, get the count of misbehaviours at this level
+        for (Level riskLevel : riskLevels) {
+            RiskLevelCount riskLevelCount = new RiskLevelCount();
+            riskLevelCount.setLevel(riskLevel);
+            Integer count = riskLevelCounts.get(riskLevel.getUri());
+            riskLevelCount.setCount(count);
+            riskV.put(riskLevel.getUri(), riskLevelCount);
+            levelValueMap.put(riskLevel.getValue(), riskLevel.getUri());
+        }
+    }
+
+    public Map<String, RiskLevelCount> getRiskVector() {
+        return riskV;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("(");
+
+        // put the items from riskLevelCounts in a list
+        List<RiskLevelCount> riskLevelCounts = new ArrayList<>(riskV.values());
+
+        // sort the riskLevelCounts entries by the RiskLevelCount object's default sort
+        Collections.sort(riskLevelCounts);
+
+        for (RiskLevelCount riskLevelCount : riskLevelCounts) {
+            sb.append(riskLevelCount.getLevel().getLabel());
+            sb.append(": ");
+            sb.append(riskLevelCount.getCount());
+            sb.append(", ");
+        }
+
+        sb.setLength(sb.length() - 2); //remove last comma
+
+        sb.append(")");
+
+        return sb.toString();
+    }
+
+    public String getOverall() {
+        int overall = 0;
+        String uri = "";
+        for (Map.Entry<String, RiskLevelCount> entry : riskV.entrySet()) {
+            String riskLevelUri = entry.getValue().getLevel().getUri();
+            int riskLevelValue = entry.getValue().getLevel().getValue();
+            int riskCount = entry.getValue().getCount();
+            if (riskCount > 0 && riskLevelValue >= overall) {
+                overall = riskLevelValue;
+                uri = riskLevelUri;
+            }
+        }
+        return uri;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        RiskVector other = (RiskVector) obj;
+        return Objects.equals(riskV, other.riskV);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(riskV);
+    }
+
+    @Override
+    public int compareTo(RiskVector other) {
+
+        List<Integer> sortedKeys = new ArrayList<>(levelValueMap.keySet());
+        Collections.sort(sortedKeys, Collections.reverseOrder());
+
+        // iterate based on the sorted keys
+        for (Integer key : sortedKeys) {
+            String riskLevelUri = levelValueMap.get(key);
+            RiskLevelCount thisRiskLevelCount = riskV.get(riskLevelUri);
+            RiskLevelCount otherRiskLevelCount = other.riskV.get(riskLevelUri);
+
+            if (thisRiskLevelCount == null && otherRiskLevelCount == null) {
+                continue; // Both are missing
+            }
+            if (thisRiskLevelCount == null) {
+                return -1; // This object is considered "less"
+            }
+            if (otherRiskLevelCount == null) {
+                return 1;  // This object is considered "greater"
+            }
+
+            // Compare RiskLevelCount objects
+            int result = thisRiskLevelCount.compareTo(otherRiskLevelCount);
+            if (result != 0) {
+                return result;
+            }
+        }
 
+        // If all compared RiskLevelCount objects are equal, consider the RiskVectors equal
+        return 0;
+    }
 }

src/main/java/uk/ac/soton/itinnovation/security/modelquerier/IQuerierDB.java

@@ -217,8 +217,11 @@ public interface IQuerierDB {
      */
     void repairAssertedAssetPopulations();
     void repairCardinalityConstraints();
+    boolean updateAssertedLevel(LevelDB level, String twasURI, String model);
     boolean updateAssertedLevel(LevelDB level, TrustworthinessAttributeSetDB twas, String model);
+    boolean updateCoverageLevel(LevelDB level, String csURI, String model);
     boolean updateCoverageLevel(LevelDB level, ControlSetDB cs, String model);
+    boolean updateProposedStatus(Boolean status, String csURI, String model);
     boolean updateProposedStatus(Boolean status, ControlSetDB cs, String model);
 
     /**