PR Amendments

ministryofjustice · Apr 3, 2024 · 78e48e3 · 78e48e3
1 parent fec6ea2
commit 78e48e3
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 28 deletions.
diff --git a/assessment-api/open-api-specification.yml b/assessment-api/open-api-specification.yml
@@ -10,7 +10,7 @@ paths:
       summary: 'get assessments'
       operationId: 'getAssessments'
       parameters:
-        - $ref: '#/components/parameters/assessmentParameter'
+        - $ref: '#/components/parameters/assessmentType'
         - name: 'provider-id'
           in: 'query'
           schema:
@@ -73,7 +73,7 @@ paths:
 
 components:
   parameters:
-    assessmentParameter:
+    assessmentType:
       name: name
       in: query
       schema:
@@ -131,6 +131,21 @@ components:
           format: 'date'
         last_saved_by:
           type: 'string'
+    assessmentEntityTypeDetail:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        entities:
+          type: array
+          items:
+            $ref: '#/components/schemas/assessmentEntityDetail'
+      required:
+        - id
+        - entityType
+        - entities
     assessmentEntityDetail:
       type: object
       properties:
@@ -154,21 +169,6 @@ components:
         - id
         - entityId
         - prepopulated
-    assessmentEntityTypeDetail:
-      type: object
-      properties:
-        id:
-          type: string
-        name:
-          type: string
-        entities:
-          type: array
-          items:
-            $ref: '#/components/schemas/assessmentEntityDetail'
-      required:
-        - id
-        - entityType
-        - entities
     assessmentAttributeDetail:
       type: object
       properties:

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAttribute.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaAttribute.java
@@ -1,6 +1,7 @@
 package uk.gov.laa.ccms.caab.assessment.entity;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -10,6 +11,7 @@
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.type.NumericBooleanConverter;
 
 /**
  * Represents an attribute of an Oracle Intelligence Advisor entity.
@@ -74,13 +76,15 @@ public class OpaAttribute {
    * Indicates if the attribute is prepopulated.
    */
   @Column(name = "PREPOPULATED", nullable = false)
-  private boolean prepopulated;
+  @Convert(converter = NumericBooleanConverter.class)
+  private Boolean prepopulated;
 
   /**
    * Indicates if the attribute was asked in the session.
    */
   @Column(name = "ASKED")
-  private boolean asked = false;
+  @Convert(converter = NumericBooleanConverter.class)
+  private Boolean asked;
 
 
 }
diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaEntity.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaEntity.java
@@ -2,6 +2,7 @@
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
@@ -13,6 +14,7 @@
 import jakarta.persistence.Table;
 import java.util.List;
 import lombok.Data;
+import org.hibernate.type.NumericBooleanConverter;
 
 /**
  * Represents an Oracle Intelligence Advisor entity.
@@ -60,7 +62,7 @@ public class OpaEntity {
   private String entityId;
 
   /**
-   * The type of the entity.
+   * The attributes of the entity.
    */
   @OneToMany(
       mappedBy = "opaEntity",
@@ -83,7 +85,8 @@ public class OpaEntity {
    * Indicates if the entity is prepopulated.
    */
   @Column(name = "PREPOPULATED")
-  private boolean prepopulated;
+  @Convert(converter = NumericBooleanConverter.class)
+  private Boolean prepopulated;
 
 
 }
diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationship.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/entity/OpaRelationship.java
@@ -2,6 +2,7 @@
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
@@ -14,6 +15,7 @@
 import jakarta.persistence.Table;
 import java.util.Set;
 import lombok.Data;
+import org.hibernate.type.NumericBooleanConverter;
 
 /**
  * Represents an Oracle Intelligence Advisor relationship.
@@ -69,5 +71,6 @@ public class OpaRelationship {
    * Indicates if the relationship is prepopulated.
    */
   @Column(name = "PREPOPULATED")
-  private boolean prepopulated;
+  @Convert(converter = NumericBooleanConverter.class)
+  private Boolean prepopulated;
 }
diff --git a/...ssment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/mapper/AssessmentMapper.java b/...ssment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/mapper/AssessmentMapper.java
@@ -17,7 +17,8 @@
 /**
  * Mapper for mapping between assessment entities and models.
  */
-@Mapper(componentModel = "spring")
+@Mapper(componentModel = "spring",
+    uses = CommonMapper.class)
 public interface AssessmentMapper {
 
   @Mapping(target = "assessment", source = "name")

diff --git a/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/mapper/CommonMapper.java b/assessment-service/src/main/java/uk/gov/laa/ccms/caab/assessment/mapper/CommonMapper.java
@@ -0,0 +1,21 @@
+package uk.gov.laa.ccms.caab.assessment.mapper;
+
+import org.mapstruct.Mapper;
+
+/**
+ * Common mappings which can be used by other mappers.
+ */
+@Mapper(componentModel = "spring")
+public interface CommonMapper {
+
+  /**
+   * Global mapper to default Booleans to FALSE in the case of a null source value.
+   *
+   * @param flag - the source value
+   * @return the source value, or FALSE.
+   */
+  default Boolean toBoolean(Boolean flag) {
+    return flag != null ? flag : Boolean.FALSE;
+  }
+}
+
diff --git a/...nt-service/src/test/java/uk/gov/laa/ccms/caab/assessment/mapper/AssessmentMapperTest.java b/...nt-service/src/test/java/uk/gov/laa/ccms/caab/assessment/mapper/AssessmentMapperTest.java
@@ -12,6 +12,11 @@
 import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import uk.gov.laa.ccms.caab.assessment.entity.OpaAttribute;
 import uk.gov.laa.ccms.caab.assessment.entity.OpaEntity;
 import uk.gov.laa.ccms.caab.assessment.entity.OpaListEntity;
@@ -27,14 +32,14 @@
 import uk.gov.laa.ccms.caab.assessment.model.AssessmentRelationshipTargetDetail;
 import uk.gov.laa.ccms.caab.assessment.model.AuditDetail;
 
+@ExtendWith(MockitoExtension.class)
 class AssessmentMapperTest {
 
-  private AssessmentMapperImpl assessmentMapper;
+  @InjectMocks
+  private AssessmentMapperImpl assessmentMapper = new AssessmentMapperImpl();
 
-  @BeforeEach
-  void setUp() {
-    assessmentMapper = new AssessmentMapperImpl();
-  }
+  @Mock(answer = Answers.CALLS_REAL_METHODS)
+  private CommonMapper commonMapper;
 
   @Test
   void testToAssessmentDetailsWithNonNullSessions() {