Merge pull request finos#4978 from deutschebank/db-contrib/waltz-4965…

…_audit_logs_change_rating_display_old_rating Db contrib/waltz 4965 audit logs change rating display old rating
natwestmarkets · Jul 2, 2020 · c80bc93 · c80bc93
2 parents 2856dd7 + 2760406
commit c80bc93
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/waltz-common/src/main/java/com/khartec/waltz/common/StringUtilities.java b/waltz-common/src/main/java/com/khartec/waltz/common/StringUtilities.java
@@ -165,6 +165,12 @@ public static char firstChar(String str, char dflt) {
                 : dflt;
     }
 
+    public static Optional<Character> firstChar(String str) {
+        return mkSafe(str).length() > 0
+                ? Optional.of(str.charAt(0))
+                : Optional.empty();
+    }
+
 
     public static Optional<String> toOptional(String str) {
         return isEmpty(str)

diff --git a/.../src/main/java/com/khartec/waltz/model/measurable_rating/SaveMeasurableRatingCommand.java b/.../src/main/java/com/khartec/waltz/model/measurable_rating/SaveMeasurableRatingCommand.java
@@ -33,6 +33,7 @@
 public abstract class SaveMeasurableRatingCommand extends MeasurableRatingCommand implements DescriptionProvider, ProvenanceProvider {
 
     public abstract char rating();
+    public abstract Optional<Character> previousRating();
 
 }
 
diff --git a/waltz-ng/client/measurable-rating/components/edit-panel/measurable-rating-edit-panel.js b/waltz-ng/client/measurable-rating/components/edit-panel/measurable-rating-edit-panel.js
@@ -111,10 +111,11 @@ function controller($q,
         ["rating", "rating"]);
 
     const doRatingSave = (rating, description) => {
+        const currentRating = !_.isEmpty(vm.selected.rating) ? vm.selected.rating.rating : null;
         return serviceBroker
             .execute(
                 CORE_API.MeasurableRatingStore.save,
-                [vm.parentEntityRef, vm.selected.measurable.id, rating, description])
+                [vm.parentEntityRef, vm.selected.measurable.id, rating, currentRating, description])
             .then(r => { vm.ratings = r.data })
             .then(() => recalcTabs())
             .then(() => {

diff --git a/waltz-ng/client/measurable-rating/services/measurable-rating-store.js b/waltz-ng/client/measurable-rating/services/measurable-rating-store.js
@@ -69,10 +69,10 @@ function store($http, baseApiUrl) {
             .then(d => d.data);
     };
 
-    const save = (ref, measurableId, rating = "Z", description = "") => {
+    const save = (ref, measurableId, rating = "Z", previousRating, description = "") => {
         checkIsEntityRef(ref);
         return $http
-            .post(`${baseUrl}/entity/${ref.kind}/${ref.id}/measurable/${measurableId}`, { rating, description })
+            .post(`${baseUrl}/entity/${ref.kind}/${ref.id}/measurable/${measurableId}`, { rating, previousRating, description })
             .then(d => d.data);
     };
 

diff --git a/...ce/src/main/java/com/khartec/waltz/service/measurable_rating/MeasurableRatingService.java b/...ce/src/main/java/com/khartec/waltz/service/measurable_rating/MeasurableRatingService.java
@@ -113,16 +113,21 @@ public Collection<MeasurableRating> save(SaveMeasurableRatingCommand command) {
 
         String entityName = getEntityName(command);
 
+        String previousRatingMessage = command.previousRating().isPresent()
+                ? "from " + command.previousRating().get() : "";
+
         writeChangeLogEntry(
                 command,
-                format("Saved: %s with a rating of: %s for %s",
+                format("Saved: %s with a rating of: %s %s for %s",
                         measurable.name(),
                         command.rating(),
+                        previousRatingMessage,
                         entityName),
-                format("Saved: %s has assigned %s with a rating of: %s",
+                format("Saved: %s has assigned %s with a rating of: %s %s",
                         entityName,
                         measurable.name(),
-                        command.rating()),
+                        command.rating(),
+                        previousRatingMessage),
                 operationThatWasPerformed);
 
         return findForEntity(command.entityReference());

diff --git a/waltz-web/src/main/java/com/khartec/waltz/web/endpoints/api/MeasurableRatingEndpoint.java b/waltz-web/src/main/java/com/khartec/waltz/web/endpoints/api/MeasurableRatingEndpoint.java
@@ -157,6 +157,7 @@ private SaveMeasurableRatingCommand mkCommand(Request request) throws IOExceptio
                 .entityReference(getEntityReference(request))
                 .measurableId(getLong(request, "measurableId"))
                 .rating(firstChar(body.getOrDefault("rating", "Z"), 'Z'))
+                .previousRating(firstChar(body.getOrDefault("previousRating", "")))
                 .description(body.getOrDefault("description", ""))
                 .lastUpdate(UserTimestamp.mkForUser(username))
                 .provenance("waltz")