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 index b78701ca..a8e47bfc 100644 --- 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 index a728f1b2..b1b47af4 100644 --- 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 index cb6ca469..45e7f74f 100644 --- 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/src/test/java/gov/cabinetoffice/gap/applybackend/generators/GetGrantBeneficiaryDTOGenerator.java b/src/test/java/gov/cabinetoffice/gap/applybackend/generators/GetGrantBeneficiaryDTOGenerator.java index 73ab2c11..0c16a492 100644 --- a/src/test/java/gov/cabinetoffice/gap/applybackend/generators/GetGrantBeneficiaryDTOGenerator.java +++ b/src/test/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)