CCMSPUI-530 Added evidence allowed to NotificationInfo and Notificati…

…onMapper

Signed-off-by: Jamie Briggs <jamie.briggs@digital.justice.gov.uk>

data-api/open-api-specification.yml

@@ -1901,6 +1901,9 @@ components:
           type: 'string'
         notification_open_indicator:
           type: 'boolean'
+        evidence_allowed:
+          type: 'boolean'
+
     notification:
       allOf:
         - $ref: "#/components/schemas/notificationInfo"

data-service/src/integrationTest/resources/sql/get_notif_info_create_schema.sql

@@ -15,7 +15,8 @@ CREATE TABLE XXCCMS.XXCCMS_GET_NOTIF_INFO_V (
     PERSON_LAST_NAME VARCHAR2(150),
     FEE_EARNER_PARTY_ID NUMBER,
     ACTION_NOTIFICATION_IND VARCHAR2(150),
-    IS_OPEN VARCHAR2(5));
+    IS_OPEN VARCHAR2(5),
+    EVIDENCE_ALLOWED_IND VARCHAR2(5));
 
 
 INSERT INTO XXCCMS.XXCCMS_GET_NOTIF_INFO_V (NOTIFICATION_ID,
@@ -34,7 +35,8 @@ INSERT INTO XXCCMS.XXCCMS_GET_NOTIF_INFO_V (NOTIFICATION_ID,
                                             PERSON_LAST_NAME,
                                             FEE_EARNER_PARTY_ID,
                                             ACTION_NOTIFICATION_IND,
-                                            IS_OPEN)
+                                            IS_OPEN,
+                                            EVIDENCE_ALLOWED_IND)
 VALUES (1, -- NOTIFICATION_ID
         'test_user', -- USER_ID
         'test_login', -- USER_LOGIN_ID
@@ -51,7 +53,8 @@ VALUES (1, -- NOTIFICATION_ID
         'Briggs', -- PERSON_LAST_NAME
         3001, -- FEE_EARNER_PARTY_ID
         'N', -- ACTION_NOTIFICATION_IND
-        'true' -- IS_OPEN
+        'true', -- IS_OPEN
+        'true' -- EVIDENCE_allowed_ind
 );
 
 INSERT INTO XXCCMS.XXCCMS_GET_NOTIF_INFO_V (NOTIFICATION_ID,
@@ -70,7 +73,8 @@ INSERT INTO XXCCMS.XXCCMS_GET_NOTIF_INFO_V (NOTIFICATION_ID,
                                             PERSON_LAST_NAME,
                                             FEE_EARNER_PARTY_ID,
                                             ACTION_NOTIFICATION_IND,
-                                            IS_OPEN)
+                                            IS_OPEN,
+                                            EVIDENCE_ALLOWED_IND)
 VALUES (2, -- NOTIFICATION_ID
         'test_user', -- USER_ID
         'test_login', -- USER_LOGIN_ID
@@ -87,5 +91,6 @@ VALUES (2, -- NOTIFICATION_ID
         'Bri-Monday', -- PERSON_LAST_NAME
         3002, -- FEE_EARNER_PARTY_ID
         'O', -- ACTION_NOTIFICATION_IND
-        'false' -- IS_OPEN
+        'false', -- IS_OPEN
+        'false' -- EVIDENCE_allowed_ind
        );

data-service/src/main/java/uk/gov/laa/ccms/data/entity/NotificationInfo.java

@@ -115,4 +115,8 @@ public class NotificationInfo {
   @OneToMany(mappedBy = "notificationId", fetch = FetchType.LAZY)
   private List<NotificationAction> actions;
 
+  @Column(name = "EVIDENCE_ALLOWED_IND")
+  @Convert(converter = BooleanStringConverter.class)
+  private Boolean evidenceAllowedIndicator;
+
 }

data-service/src/main/java/uk/gov/laa/ccms/data/mapper/NotificationMapper.java

@@ -42,6 +42,7 @@ public interface NotificationMapper {
   @Mapping(target = "uploadedDocuments", source = "documents")
   @Mapping(target = "attachedDocuments", source = "attachments")
   @Mapping(target = "availableResponses", source = "actions", qualifiedByName = "action")
+  @Mapping(target = "evidenceAllowed", source = "evidenceAllowedIndicator")
   Notification mapToNotification(NotificationInfo notification);
 
   /**

data-service/src/main/java/uk/gov/laa/ccms/data/mapper/NotificationsMapper.java

@@ -43,6 +43,7 @@ public interface NotificationsMapper {
   @Mapping(target = "caseReferenceNumber", source = "lscCaseRefReference")
   @Mapping(target = "notificationType", source = "actionNotificationInd")
   @Mapping(target = "notificationOpenIndicator", source = "isOpen")
+  @Mapping(target = "evidenceAllowed", source = "evidenceAllowedIndicator")
   uk.gov.laa.ccms.data.model.NotificationInfo mapToNotification(NotificationInfo notificationInfo);
 
 

data-service/src/test/java/uk/gov/laa/ccms/data/mapper/NotificationMapperImplTest.java

@@ -53,6 +53,7 @@ void shouldMapBasicDetails(){
         .lscCaseRefReference("LSC Case Ref")
         .providerCaseReference("Provider Case Ref")
         .feeEarnerPartyId(4L)
+        .evidenceAllowedIndicator(true)
         .build();
 
     // When
@@ -72,6 +73,7 @@ void shouldMapBasicDetails(){
     assertEquals(true, notificationResult.getNotificationOpenIndicator());
     assertEquals("Provider Case Ref",notificationResult.getProviderCaseReferenceNumber());
     assertEquals("LSC Case Ref", notificationResult.getCaseReferenceNumber());
+    assertEquals(true, notificationResult.getEvidenceAllowed());
   }
 
   @Test
@@ -129,7 +131,6 @@ void shouldMapDocuments(){
     assertEquals("Status", resultTwo.getStatus());
   }
 
-  // TODO Come back to this one
   @Test
   @DisplayName("Should map two attachments")
   void shouldMapAttachments(){

data-service/src/test/java/uk/gov/laa/ccms/data/mapper/NotificationsMapperImplTest.java

@@ -15,7 +15,7 @@
 import uk.gov.laa.ccms.data.model.Notifications;
 
 @DisplayName("NotificationsMapperImpl Test")
-public class NotificationsMapperImplTest {
+class NotificationsMapperImplTest {
 
   NotificationsMapperImpl mapper = new NotificationsMapperImpl();
 
@@ -54,6 +54,7 @@ void shouldMapSingleNotification(){
         .lscCaseRefReference("LSC Case Ref")
         .providerCaseReference("Provider Case Ref")
         .feeEarnerPartyId(4L)
+        .evidenceAllowedIndicator(true)
         .build();
     Page<NotificationInfo> input = new PageImpl<>(Arrays.asList(notificationInfo),
         PageRequest.of(0, 1), 1);
@@ -75,6 +76,7 @@ void shouldMapSingleNotification(){
     assertEquals(true, notificationResult.getNotificationOpenIndicator());
     assertEquals("Provider Case Ref",notificationResult.getProviderCaseReferenceNumber());
     assertEquals("LSC Case Ref", notificationResult.getCaseReferenceNumber());
+    assertEquals(true, notificationResult.getEvidenceAllowed());
   }
 
 }