Allow rating scheme items to mandate comments

- updated model and dao #CTCTOWALTZ-2827 finos#6708
deutschebank · Jan 17, 2024 · a92d8b7 · a92d8b7
1 parent 3dc030c
commit a92d8b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/rating_scheme/RatingSchemeDAO.java b/waltz-data/src/main/java/org/finos/waltz/data/rating_scheme/RatingSchemeDAO.java
@@ -71,7 +71,8 @@ public class RatingSchemeDAO {
 
         RatingSchemeItemRecord r = record.into(RATING_SCHEME_ITEM);
 
-        ImmutableRatingSchemeItem.Builder builder = ImmutableRatingSchemeItem.builder()
+        ImmutableRatingSchemeItem.Builder builder = ImmutableRatingSchemeItem
+                .builder()
                 .id(r.getId())
                 .ratingSchemeId(r.getSchemeId())
                 .name(r.getName())
@@ -81,7 +82,8 @@ public class RatingSchemeDAO {
                 .position(r.getPosition())
                 .description(r.getDescription())
                 .externalId(ofNullable(r.getExternalId()))
-                .ratingGroup(r.getRatingGroup());
+                .ratingGroup(r.getRatingGroup())
+                .requiresComment(r.getRequiresComment());
 
 
         if (record.field(IS_RESTRICTED_FIELD) != null){
@@ -237,6 +239,7 @@ public Long saveRatingItem(long schemeId,
         r.setPosition(item.position());
         r.setUserSelectable(item.userSelectable());
         r.setRatingGroup(item.ratingGroup());
+        r.setRequiresComment(item.requiresComment());
 
         item.externalId().ifPresent(r::setExternalId);
 
@@ -324,5 +327,4 @@ public List<RatingSchemeItemUsageCount> calcRatingUsageStats() {
                         .build());
     }
 
-
 }
diff --git a/waltz-model/src/main/java/org/finos/waltz/model/rating/RatingSchemeItem.java b/waltz-model/src/main/java/org/finos/waltz/model/rating/RatingSchemeItem.java
@@ -51,4 +51,9 @@ public boolean userSelectable() {
     @Nullable
     public abstract String ratingGroup();
 
+    @Value.Default
+    public boolean requiresComment() {
+        return false;
+    }
+
 }