Merge pull request #8 from cabinetoffice/feature/grant-beneficiary-fi…

…elds add org fields to grant beneficiary
cabinetoffice · Jun 22, 2023 · ed2bdb5 · ed2bdb5
2 parents e230c50 + ec4e518
commit ed2bdb5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/dto/api/CreateGrantBeneficiaryDto.java b/src/main/java/gov/cabinetoffice/gap/applybackend/dto/api/CreateGrantBeneficiaryDto.java
@@ -37,6 +37,9 @@ public class CreateGrantBeneficiaryDto {
     private Boolean ethnicGroup4;
     private Boolean ethnicGroup5;
     private Boolean ethnicGroupOther;
+    private Boolean organisationGroup1;
+    private Boolean organisationGroup2;
+    private Boolean organisationGroup3;
 
     @Size(max = 100, message = "Other ethnic group details can not be longer than 100 characters")
     private String ethnicOtherDetails;

diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/dto/api/GetGrantBeneficiaryDto.java b/src/main/java/gov/cabinetoffice/gap/applybackend/dto/api/GetGrantBeneficiaryDto.java
@@ -37,6 +37,9 @@ public class GetGrantBeneficiaryDto {
     private Boolean ethnicGroupOther;
     private String ethnicOtherDetails;
     private Boolean ethnicGroupAll;
+    private Boolean organisationGroup1;
+    private Boolean organisationGroup2;
+    private Boolean organisationGroup3;
     private Boolean supportingDisabilities;
     private Boolean sexualOrientationGroup1;
     private Boolean sexualOrientationGroup2;

diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/model/GrantBeneficiary.java b/src/main/java/gov/cabinetoffice/gap/applybackend/model/GrantBeneficiary.java
@@ -118,6 +118,15 @@ public class GrantBeneficiary {
     @Column
     private Boolean ethnicGroupAll;
 
+    @Column
+    private Boolean organisationGroup1;
+
+    @Column
+    private Boolean organisationGroup2;
+
+    @Column
+    private Boolean organisationGroup3;
+
     @Column
     private Boolean supportingDisabilities;
 

diff --git a/...t/java/gov/cabinetoffice/gap/applybackend/generators/GetGrantBeneficiaryDTOGenerator.java b/...t/java/gov/cabinetoffice/gap/applybackend/generators/GetGrantBeneficiaryDTOGenerator.java
@@ -32,6 +32,9 @@ public static GetGrantBeneficiaryDto.GetGrantBeneficiaryDtoBuilder generateRando
                 .ethnicGroupOther(true)
                 .ethnicOtherDetails("Other ethnic datils")
                 .ethnicGroupAll(true)
+                .organisationGroup1(true)
+                .organisationGroup2(true)
+                .organisationGroup3(true)
                 .supportingDisabilities(true)
                 .sexualOrientationGroup1(true)
                 .sexualOrientationGroup2(true)