ensure rendered view saved in event history

hmcts · Nov 7, 2024 · 99c146c · 99c146c
1 parent 0489e5a
commit 99c146c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/cftlib/nfdiv/src/cftlibTest/java/uk/gov/hmcts/divorce/cftlib/TestWithCCD.java b/cftlib/nfdiv/src/cftlibTest/java/uk/gov/hmcts/divorce/cftlib/TestWithCCD.java
@@ -125,6 +125,9 @@ public void getEventHistory() throws Exception {
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
         var auditEvents = (List) result.get("auditEvents");
         assertThat(auditEvents.size(), equalTo(3));
+        var eventData = ((Map)auditEvents.get(0)).get("data");
+        var caseData = mapper.readValue(mapper.writeValueAsString(eventData), CaseData.class);
+        assertThat(caseData.getNotes().size(), equalTo(2));
     }
 
     private void addNote() throws Exception {
@@ -157,9 +160,6 @@ private void addNote() throws Exception {
         var response = HttpClientBuilder.create().build().execute(e);
         assertThat(response.getStatusLine().getStatusCode(), equalTo(201));
     }
-    HttpGet buildGet(String user, String url) {
-        return buildRequest(user, url, HttpGet::new);
-    }
 
     private String getAuthorisation(String user) {
         return idam.getAccessToken(user, "");

diff --git a/cftlib/nfdiv/src/main/java/uk/gov/hmcts/divorce/sow014/CaseController.java b/cftlib/nfdiv/src/main/java/uk/gov/hmcts/divorce/sow014/CaseController.java
@@ -147,7 +147,8 @@ select jsonb_agg(to_jsonb(e) - 'case_reference' - 'event_id'
     @SneakyThrows
     private void saveAuditRecord(POCCaseDetails details, int version) {
         var event = details.getEventDetails();
-        var data = details.getCaseDetails();
+        var caseView = getCase((Long) details.getCaseDetails().get("id"));
+        var currentView = mapper.readValue(caseView, Map.class);
         db.update(
                 """
                         insert into case_event (
@@ -168,21 +169,21 @@ insert into case_event (
                           security_classification)
                         values (?::jsonb,?::jsonb,?,?,?,?,?,?,?,?,?,?,?,?,?::securityclassification)
                         """,
-                mapper.writeValueAsString(data.get("case_data")),
-                mapper.writeValueAsString(data.get("data_classification")),
+                mapper.writeValueAsString(currentView.get("case_data")),
+                mapper.writeValueAsString(currentView.get("data_classification")),
                 event.getEventId(),
                 "user-id",
-                data.get("id"),
+                currentView.get("id"),
                 "NFD",
                 version,
-                data.get("state"),
+                currentView.get("state"),
                 "a-first-name",
                 "a-last-name",
                 event.getEventName(),
                 event.getStateName(),
                 event.getSummary(),
                 event.getDescription(),
-                data.get("security_classification")
+                currentView.get("security_classification")
         );
     }
     @SneakyThrows