From 3283e591c10d17f53dd6632e43d4e637b8e96f84 Mon Sep 17 00:00:00 2001 From: krishna-patel-ch Date: Wed, 20 Mar 2024 16:47:57 +0000 Subject: [PATCH] Fixed issues with enums --- ...AccountsAssociationServiceApplication.java | 4 --- .../configuration/InterceptorConfig.java | 7 ++-- .../AssociationsListForCompanyController.java | 7 ++-- .../controller/ControllerAdvice.java | 7 ++-- .../controller/UserCompanyAssociations.java | 7 ++-- .../interceptor/LoggingInterceptor.java | 7 ++-- .../association/mapper/BaseMapper.java | 2 ++ .../association/models/AssociationDao.java | 6 ++-- .../association/service/CompanyService.java | 7 ++-- .../association/service/UsersService.java | 7 ++-- ...ociationsListForCompanyControllerTest.java | 34 +++++++++---------- .../AssociationsRepositoryTest.java | 26 +++++++------- .../integration/AssociationsServiceTest.java | 32 ++++++++--------- .../mapper/AssociationMapperTest.java | 3 +- .../AssociationsListCompanyMapperTest.java | 8 +++-- .../AssociationsListUserMapperTest.java | 8 +++-- .../service/AssociationsServiceTest.java | 32 ++++++++--------- 17 files changed, 114 insertions(+), 90 deletions(-) diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/AccountsAssociationServiceApplication.java b/src/main/java/uk/gov/companieshouse/accounts/association/AccountsAssociationServiceApplication.java index 46ea69aa..2f5fe256 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/AccountsAssociationServiceApplication.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/AccountsAssociationServiceApplication.java @@ -1,15 +1,11 @@ package uk.gov.companieshouse.accounts.association; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class AccountsAssociationServiceApplication { - @Value("${spring.application.name}") - public static String applicationNameSpace; - public static void main(String[] args) { SpringApplication.run(AccountsAssociationServiceApplication.class, args); } diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/configuration/InterceptorConfig.java b/src/main/java/uk/gov/companieshouse/accounts/association/configuration/InterceptorConfig.java index 6dc200e4..2f6d1a5f 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/configuration/InterceptorConfig.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/configuration/InterceptorConfig.java @@ -4,11 +4,11 @@ import java.util.Collections; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.lang.NonNull; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import uk.gov.companieshouse.accounts.association.AccountsAssociationServiceApplication; import uk.gov.companieshouse.accounts.association.interceptor.LoggingInterceptor; import uk.gov.companieshouse.api.interceptor.InternalUserInterceptor; import uk.gov.companieshouse.api.interceptor.UserAuthenticationInterceptor; @@ -16,6 +16,8 @@ @Configuration public class InterceptorConfig implements WebMvcConfigurer { + @Value("${spring.application.name}") + public static String applicationNameSpace; private final LoggingInterceptor loggingInterceptor; @@ -50,8 +52,7 @@ private void addEricInterceptors( final InterceptorRegistry registry){ new UserAuthenticationInterceptor( new ArrayList<>(), Collections.singletonList("oauth2"), - new InternalUserInterceptor( - AccountsAssociationServiceApplication.applicationNameSpace) + new InternalUserInterceptor(applicationNameSpace) ) ).excludePathPatterns("/*/healthcheck"); } diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/controller/AssociationsListForCompanyController.java b/src/main/java/uk/gov/companieshouse/accounts/association/controller/AssociationsListForCompanyController.java index dcb1cd49..e9824789 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/controller/AssociationsListForCompanyController.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/controller/AssociationsListForCompanyController.java @@ -1,9 +1,9 @@ package uk.gov.companieshouse.accounts.association.controller; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; -import uk.gov.companieshouse.accounts.association.AccountsAssociationServiceApplication; import uk.gov.companieshouse.accounts.association.exceptions.BadRequestRuntimeException; import uk.gov.companieshouse.accounts.association.service.AssociationsService; import uk.gov.companieshouse.accounts.association.service.CompanyService; @@ -15,10 +15,13 @@ @RestController public class AssociationsListForCompanyController implements AssociationsListForCompanyInterface { + @Value("${spring.application.name}") + public static String applicationNameSpace; + private final AssociationsService associationsService; private final CompanyService companyService; - private static final Logger LOG = LoggerFactory.getLogger( AccountsAssociationServiceApplication.applicationNameSpace ); + private static final Logger LOG = LoggerFactory.getLogger( applicationNameSpace ); public AssociationsListForCompanyController(AssociationsService associationsService, CompanyService companyService) { this.associationsService = associationsService; diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/controller/ControllerAdvice.java b/src/main/java/uk/gov/companieshouse/accounts/association/controller/ControllerAdvice.java index f67583c5..a35221a9 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/controller/ControllerAdvice.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/controller/ControllerAdvice.java @@ -7,12 +7,12 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import uk.gov.companieshouse.accounts.association.AccountsAssociationServiceApplication; import uk.gov.companieshouse.accounts.association.exceptions.BadRequestRuntimeException; import uk.gov.companieshouse.accounts.association.exceptions.InternalServerErrorRuntimeException; import uk.gov.companieshouse.accounts.association.exceptions.NotFoundRuntimeException; @@ -24,7 +24,10 @@ @org.springframework.web.bind.annotation.ControllerAdvice public class ControllerAdvice extends ResponseEntityExceptionHandler { - private static final Logger LOG = LoggerFactory.getLogger(AccountsAssociationServiceApplication.applicationNameSpace); + @Value("${spring.application.name}") + public static String applicationNameSpace; + + private static final Logger LOG = LoggerFactory.getLogger(applicationNameSpace); public static final String X_REQUEST_ID = "X-Request-Id"; public static final String ACCOUNTS_ASSOCIATION_API = "accounts_association_api"; diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/controller/UserCompanyAssociations.java b/src/main/java/uk/gov/companieshouse/accounts/association/controller/UserCompanyAssociations.java index 7578ca40..4a6319f0 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/controller/UserCompanyAssociations.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/controller/UserCompanyAssociations.java @@ -4,10 +4,10 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; -import uk.gov.companieshouse.accounts.association.AccountsAssociationServiceApplication; import uk.gov.companieshouse.accounts.association.exceptions.BadRequestRuntimeException; import uk.gov.companieshouse.accounts.association.service.AssociationsService; import uk.gov.companieshouse.accounts.association.service.UsersService; @@ -22,7 +22,10 @@ @RestController public class UserCompanyAssociations implements UserCompanyAssociationsInterface { - private static final Logger LOG = LoggerFactory.getLogger(AccountsAssociationServiceApplication.applicationNameSpace); + @Value("${spring.application.name}") + public static String applicationNameSpace; + + private static final Logger LOG = LoggerFactory.getLogger(applicationNameSpace); private final UsersService usersService; diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/interceptor/LoggingInterceptor.java b/src/main/java/uk/gov/companieshouse/accounts/association/interceptor/LoggingInterceptor.java index a9a398af..ad7536fa 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/interceptor/LoggingInterceptor.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/interceptor/LoggingInterceptor.java @@ -1,11 +1,11 @@ package uk.gov.companieshouse.accounts.association.interceptor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.HandlerInterceptor; -import uk.gov.companieshouse.accounts.association.AccountsAssociationServiceApplication; import uk.gov.companieshouse.logging.Logger; import uk.gov.companieshouse.logging.LoggerFactory; import uk.gov.companieshouse.logging.util.RequestLogger; @@ -16,8 +16,9 @@ @Component public class LoggingInterceptor implements HandlerInterceptor, RequestLogger { - private static final Logger LOGGER = LoggerFactory.getLogger( - AccountsAssociationServiceApplication.applicationNameSpace); + @Value("${spring.application.name}") + public static String applicationNameSpace; + private static final Logger LOGGER = LoggerFactory.getLogger(applicationNameSpace); @Override public boolean preHandle(HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull Object handler) { diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/mapper/BaseMapper.java b/src/main/java/uk/gov/companieshouse/accounts/association/mapper/BaseMapper.java index 8575fd2d..dec77b56 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/mapper/BaseMapper.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/mapper/BaseMapper.java @@ -27,6 +27,8 @@ protected void enrichAssociation(@MappingTarget Association association) { @Mapping(target = "status", expression = "java(Association.StatusEnum.fromValue(associationDao.getStatus()))") + @Mapping(target = "approvalRoute", + expression = "java(Association.ApprovalRouteEnum.fromValue(associationDao.getApprovalRoute()))") public abstract Association daoToDto(final AssociationDao associationDao); public OffsetDateTime localDateTimeToOffsetDateTime(LocalDateTime localDateTime) { diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/models/AssociationDao.java b/src/main/java/uk/gov/companieshouse/accounts/association/models/AssociationDao.java index 32292e10..05533549 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/models/AssociationDao.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/models/AssociationDao.java @@ -39,7 +39,7 @@ public class AssociationDao { private LocalDateTime removedAt; @NotNull @Field("approval_route") - private ApprovalRouteEnum approvalRoute; + private String approvalRoute; @Indexed @Field("user_email") private String userEmail; @@ -94,11 +94,11 @@ public LocalDateTime getCreatedAt() { return createdAt; } - public ApprovalRouteEnum getApprovalRoute() { + public String getApprovalRoute() { return approvalRoute; } - public void setApprovalRoute(ApprovalRouteEnum approvalRoute) { + public void setApprovalRoute(String approvalRoute) { this.approvalRoute = approvalRoute; } diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/service/CompanyService.java b/src/main/java/uk/gov/companieshouse/accounts/association/service/CompanyService.java index 4e6869fc..c76eb046 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/service/CompanyService.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/service/CompanyService.java @@ -1,8 +1,8 @@ package uk.gov.companieshouse.accounts.association.service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import uk.gov.companieshouse.accounts.association.AccountsAssociationServiceApplication; import uk.gov.companieshouse.accounts.association.exceptions.InternalServerErrorRuntimeException; import uk.gov.companieshouse.accounts.association.exceptions.NotFoundRuntimeException; import uk.gov.companieshouse.accounts.association.rest.CompanyProfileEndpoint; @@ -15,9 +15,12 @@ @Service public class CompanyService { + @Value("${spring.application.name}") + public static String applicationNameSpace; + private final CompanyProfileEndpoint companyProfileEndpoint; - private static final Logger LOG = LoggerFactory.getLogger(AccountsAssociationServiceApplication.applicationNameSpace); + private static final Logger LOG = LoggerFactory.getLogger(applicationNameSpace); @Autowired public CompanyService(CompanyProfileEndpoint companyProfileEndpoint) { diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/service/UsersService.java b/src/main/java/uk/gov/companieshouse/accounts/association/service/UsersService.java index 526fc67a..f608bc09 100644 --- a/src/main/java/uk/gov/companieshouse/accounts/association/service/UsersService.java +++ b/src/main/java/uk/gov/companieshouse/accounts/association/service/UsersService.java @@ -1,7 +1,7 @@ package uk.gov.companieshouse.accounts.association.service; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import uk.gov.companieshouse.accounts.association.AccountsAssociationServiceApplication; import uk.gov.companieshouse.accounts.association.exceptions.InternalServerErrorRuntimeException; import uk.gov.companieshouse.accounts.association.exceptions.NotFoundRuntimeException; import uk.gov.companieshouse.accounts.association.rest.AccountsUserEndpoint; @@ -14,9 +14,12 @@ @Service public class UsersService { + @Value("${spring.application.name}") + public static String applicationNameSpace; + private final AccountsUserEndpoint accountsUserEndpoint; - private static final Logger LOG = LoggerFactory.getLogger(AccountsAssociationServiceApplication.applicationNameSpace); + private static final Logger LOG = LoggerFactory.getLogger(applicationNameSpace); public UsersService(AccountsUserEndpoint accountsUserEndpoint) { this.accountsUserEndpoint = accountsUserEndpoint; diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsListForCompanyControllerTest.java b/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsListForCompanyControllerTest.java index 953bfd35..de4db2e2 100644 --- a/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsListForCompanyControllerTest.java +++ b/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsListForCompanyControllerTest.java @@ -118,7 +118,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationOne.setId("1"); associationOne.setApprovedAt(now.plusDays(1)); associationOne.setRemovedAt(now.plusDays(2)); - associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationOne.setApprovalExpiryAt(now.plusDays(3)); associationOne.setInvitations( List.of( invitationOne ) ); associationOne.setEtag( "a" ); @@ -135,7 +135,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationTwo.setId("2"); associationTwo.setApprovedAt( now.plusDays(5) ); associationTwo.setRemovedAt( now.plusDays(6) ); - associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationTwo.setApprovalExpiryAt( now.plusDays(7) ); associationTwo.setInvitations( List.of( invitationTwo ) ); associationTwo.setEtag("b"); @@ -152,7 +152,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationThree.setId("3"); associationThree.setApprovedAt( now.plusDays(9) ); associationThree.setRemovedAt( now.plusDays(10) ); - associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationThree.setApprovalExpiryAt( now.plusDays(11) ); associationThree.setInvitations( List.of( invitationThree ) ); associationThree.setEtag("c"); @@ -169,7 +169,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationFour.setId("4"); associationFour.setApprovedAt( now.plusDays(13) ); associationFour.setRemovedAt( now.plusDays(14) ); - associationFour.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationFour.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationFour.setApprovalExpiryAt( now.plusDays(15) ); associationFour.setInvitations( List.of( invitationFour ) ); associationFour.setEtag("d"); @@ -186,7 +186,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationFive.setId("5"); associationFive.setApprovedAt( now.plusDays(17) ); associationFive.setRemovedAt( now.plusDays(18) ); - associationFive.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFive.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFive.setApprovalExpiryAt( now.plusDays(19) ); associationFive.setInvitations( List.of( invitationFive ) ); associationFive.setEtag("e"); @@ -203,7 +203,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationSix.setId("6"); associationSix.setApprovedAt( now.plusDays(21) ); associationSix.setRemovedAt( now.plusDays(22) ); - associationSix.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSix.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSix.setApprovalExpiryAt( now.plusDays(23) ); associationSix.setInvitations( List.of( invitationSix ) ); associationSix.setEtag("f"); @@ -220,7 +220,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationSeven.setId("7"); associationSeven.setApprovedAt( now.plusDays(25) ); associationSeven.setRemovedAt( now.plusDays(26) ); - associationSeven.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSeven.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSeven.setApprovalExpiryAt( now.plusDays(27) ); associationSeven.setInvitations( List.of( invitationSeven ) ); associationSeven.setEtag("g"); @@ -237,7 +237,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationEight.setId("8"); associationEight.setApprovedAt( now.plusDays(29) ); associationEight.setRemovedAt( now.plusDays(30) ); - associationEight.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationEight.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationEight.setApprovalExpiryAt( now.plusDays(31) ); associationEight.setInvitations( List.of( invitationEight ) ); associationEight.setEtag("h"); @@ -254,7 +254,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationNine.setId("9"); associationNine.setApprovedAt( now.plusDays(33) ); associationNine.setRemovedAt( now.plusDays(34) ); - associationNine.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationNine.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationNine.setApprovalExpiryAt( now.plusDays(35) ); associationNine.setInvitations( List.of( invitationNine ) ); associationNine.setEtag("i"); @@ -271,7 +271,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationTen.setId("10"); associationTen.setApprovedAt( now.plusDays(37) ); associationTen.setRemovedAt( now.plusDays(38) ); - associationTen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationTen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationTen.setApprovalExpiryAt( now.plusDays(39) ); associationTen.setInvitations( List.of( invitationTen ) ); associationTen.setEtag("j"); @@ -288,7 +288,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationEleven.setId("11"); associationEleven.setApprovedAt( now.plusDays(41) ); associationEleven.setRemovedAt( now.plusDays(42) ); - associationEleven.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationEleven.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationEleven.setApprovalExpiryAt( now.plusDays(43) ); associationEleven.setInvitations( List.of( invitationEleven ) ); associationEleven.setEtag("k"); @@ -305,7 +305,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationTwelve.setId("12"); associationTwelve.setApprovedAt( now.plusDays(45) ); associationTwelve.setRemovedAt( now.plusDays(46) ); - associationTwelve.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationTwelve.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationTwelve.setApprovalExpiryAt( now.plusDays(47) ); associationTwelve.setInvitations( List.of( invitationTwelve ) ); associationTwelve.setEtag("l"); @@ -322,7 +322,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationThirteen.setId("13"); associationThirteen.setApprovedAt( now.plusDays(49) ); associationThirteen.setRemovedAt( now.plusDays(50) ); - associationThirteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationThirteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationThirteen.setApprovalExpiryAt( now.plusDays(51) ); associationThirteen.setInvitations( List.of( invitationThirteen ) ); associationThirteen.setEtag("m"); @@ -339,7 +339,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationFourteen.setId("14"); associationFourteen.setApprovedAt( now.plusDays(53) ); associationFourteen.setRemovedAt( now.plusDays(54) ); - associationFourteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFourteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFourteen.setApprovalExpiryAt( now.plusDays(55) ); associationFourteen.setInvitations( List.of( invitationFourteen ) ); associationFourteen.setEtag("n"); @@ -356,7 +356,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationFifteen.setId("15"); associationFifteen.setApprovedAt( now.plusDays(57) ); associationFifteen.setRemovedAt( now.plusDays(58) ); - associationFifteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFifteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFifteen.setApprovalExpiryAt( now.plusDays(59) ); associationFifteen.setInvitations( List.of( invitationFifteen ) ); associationFifteen.setEtag("o"); @@ -373,7 +373,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationSixteen.setId("16"); associationSixteen.setApprovedAt( now.plusDays(61) ); associationSixteen.setRemovedAt( now.plusDays(62) ); - associationSixteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSixteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSixteen.setApprovalExpiryAt( now.plusDays(63) ); associationSixteen.setInvitations( List.of( invitationSixteen ) ); associationSixteen.setEtag("p"); @@ -390,7 +390,7 @@ public void setup() throws ApiErrorResponseException, URIValidationException { associationSeventeen.setId("17"); associationSeventeen.setApprovedAt( now.plusDays(65) ); associationSeventeen.setRemovedAt( now.plusDays(66) ); - associationSeventeen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSeventeen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSeventeen.setApprovalExpiryAt( now.plusDays(67) ); associationSeventeen.setInvitations( List.of( invitationSeventeen ) ); associationSeventeen.setEtag("q"); diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsRepositoryTest.java b/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsRepositoryTest.java index 9d502738..d090da3a 100644 --- a/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsRepositoryTest.java +++ b/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsRepositoryTest.java @@ -55,7 +55,7 @@ public void setup() { associationOne.setCompanyNumber("12345"); associationOne.setUserId("555"); associationOne.setStatus(StatusEnum.CONFIRMED.getValue()); - associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationOne.setUserEmail("abc@abc.com"); associationOne.setApprovalExpiryAt(LocalDateTime.now().plusDays(10)); associationOne.setInvitations(new ArrayList<>()); @@ -72,7 +72,7 @@ public void setup() { associationTwo.setCompanyNumber("12345"); associationTwo.setUserId("666"); associationTwo.setStatus(StatusEnum.CONFIRMED.getValue()); - associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationTwo.setUserEmail("abc@abc.com"); associationTwo.setApprovalExpiryAt(LocalDateTime.now().plusDays(10)); associationTwo.setInvitations(new ArrayList<>()); @@ -89,7 +89,7 @@ public void setup() { associationThree.setCompanyNumber("10345"); associationThree.setUserId("777"); associationThree.setStatus(StatusEnum.CONFIRMED.getValue()); - associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationThree.setUserEmail(" "); associationThree.setEtag("OCRS7"); associationThree.setApprovalExpiryAt(LocalDateTime.now().plusDays(10)); @@ -106,56 +106,56 @@ public void setup() { associationFour.setUserId("111"); associationFour.setStatus(StatusEnum.CONFIRMED.getValue()); associationFour.setEtag("x"); - associationFour.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationFour.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); final var associationFive = new AssociationDao(); associationFive.setCompanyNumber("222222"); associationFive.setUserId("111"); associationFive.setStatus(StatusEnum.CONFIRMED.getValue()); associationFive.setEtag("x"); - associationFive.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationFive.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); final var associationSix = new AssociationDao(); associationSix.setCompanyNumber("111111"); associationSix.setUserId("222"); associationSix.setStatus(StatusEnum.CONFIRMED.getValue()); associationSix.setEtag("x"); - associationSix.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationSix.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue()); final var associationSeven = new AssociationDao(); associationSeven.setCompanyNumber("333333"); associationSeven.setUserId("333"); associationSeven.setStatus(StatusEnum.CONFIRMED.getValue()); associationSeven.setEtag("x"); - associationSeven.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationSeven.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); final var associationEight = new AssociationDao(); associationEight.setCompanyNumber("333333"); associationEight.setUserId("444"); associationEight.setStatus(StatusEnum.CONFIRMED.getValue()); associationEight.setEtag("x"); - associationEight.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationEight.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); final var associationNine = new AssociationDao(); associationNine.setCompanyNumber("333333"); associationNine.setUserId("888"); associationNine.setStatus(StatusEnum.REMOVED.getValue()); associationNine.setEtag("x"); - associationNine.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationNine.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); final var associationTen = new AssociationDao(); associationTen.setCompanyNumber("333333"); associationTen.setUserId("101010"); associationTen.setStatus(StatusEnum.AWAITING_APPROVAL.getValue()); associationTen.setEtag("x"); - associationTen.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationTen.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); final var associationEleven = new AssociationDao(); associationEleven.setCompanyNumber("333333"); associationEleven.setUserId("111111"); associationEleven.setStatus(StatusEnum.AWAITING_APPROVAL.getValue()); associationEleven.setEtag("x"); - associationEleven.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE ); + associationEleven.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); associationDaos = associationsRepository.saveAll( List.of( associationOne, associationTwo, associationThree, associationFour, @@ -171,7 +171,7 @@ void testInsertAssociation() { associationUser.setCompanyNumber("1114422"); associationUser.setUserId("9999"); associationUser.setStatus(StatusEnum.CONFIRMED.getValue()); - associationUser.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationUser.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationUser.setUserEmail("abc@abc.com"); associationUser.setEtag("OCRS7"); associationUser.setApprovalExpiryAt(LocalDateTime.now().plusDays(10)); @@ -303,7 +303,7 @@ void updateVersionFieldIncrementsVersion() { associationDao.setCompanyNumber("1114422"); associationDao.setUserId("9999"); associationDao.setStatus(StatusEnum.CONFIRMED.getValue()); - associationDao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationDao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationDao.setUserEmail("abc@abc.com"); associationDao.setEtag("OCRS7"); associationDao = associationsRepository.save(associationDao); diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsServiceTest.java b/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsServiceTest.java index c5df4649..b1ecd214 100644 --- a/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsServiceTest.java +++ b/src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsServiceTest.java @@ -78,7 +78,7 @@ public void setup() { associationOne.setId("1"); associationOne.setApprovedAt(now.plusDays(1)); associationOne.setRemovedAt(now.plusDays(2)); - associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationOne.setApprovalExpiryAt(now.plusDays(3)); associationOne.setInvitations( List.of( invitationOne ) ); associationOne.setEtag( "a" ); @@ -97,7 +97,7 @@ public void setup() { associationTwo.setId("2"); associationTwo.setApprovedAt( now.plusDays(5) ); associationTwo.setRemovedAt( now.plusDays(6) ); - associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationTwo.setApprovalExpiryAt( now.plusDays(7) ); associationTwo.setInvitations( List.of( invitationTwo ) ); associationTwo.setEtag("b"); @@ -115,7 +115,7 @@ public void setup() { associationThree.setId("3"); associationThree.setApprovedAt( now.plusDays(9) ); associationThree.setRemovedAt( now.plusDays(10) ); - associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationThree.setApprovalExpiryAt( now.plusDays(11) ); associationThree.setInvitations( List.of( invitationThree ) ); associationThree.setEtag("c"); @@ -132,7 +132,7 @@ public void setup() { associationFour.setId("4"); associationFour.setApprovedAt( now.plusDays(13) ); associationFour.setRemovedAt( now.plusDays(14) ); - associationFour.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationFour.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationFour.setApprovalExpiryAt( now.plusDays(15) ); associationFour.setInvitations( List.of( invitationFour ) ); associationFour.setEtag("d"); @@ -149,7 +149,7 @@ public void setup() { associationFive.setId("5"); associationFive.setApprovedAt( now.plusDays(17) ); associationFive.setRemovedAt( now.plusDays(18) ); - associationFive.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFive.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFive.setApprovalExpiryAt( now.plusDays(19) ); associationFive.setInvitations( List.of( invitationFive ) ); associationFive.setEtag("e"); @@ -166,7 +166,7 @@ public void setup() { associationSix.setId("6"); associationSix.setApprovedAt( now.plusDays(21) ); associationSix.setRemovedAt( now.plusDays(22) ); - associationSix.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSix.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSix.setApprovalExpiryAt( now.plusDays(23) ); associationSix.setInvitations( List.of( invitationSix ) ); associationSix.setEtag("f"); @@ -183,7 +183,7 @@ public void setup() { associationSeven.setId("7"); associationSeven.setApprovedAt( now.plusDays(25) ); associationSeven.setRemovedAt( now.plusDays(26) ); - associationSeven.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSeven.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSeven.setApprovalExpiryAt( now.plusDays(27) ); associationSeven.setInvitations( List.of( invitationSeven ) ); associationSeven.setEtag("g"); @@ -200,7 +200,7 @@ public void setup() { associationEight.setId("8"); associationEight.setApprovedAt( now.plusDays(29) ); associationEight.setRemovedAt( now.plusDays(30) ); - associationEight.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationEight.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationEight.setApprovalExpiryAt( now.plusDays(31) ); associationEight.setInvitations( List.of( invitationEight ) ); associationEight.setEtag("h"); @@ -217,7 +217,7 @@ public void setup() { associationNine.setId("9"); associationNine.setApprovedAt( now.plusDays(33) ); associationNine.setRemovedAt( now.plusDays(34) ); - associationNine.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationNine.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationNine.setApprovalExpiryAt( now.plusDays(35) ); associationNine.setInvitations( List.of( invitationNine ) ); associationNine.setEtag("i"); @@ -234,7 +234,7 @@ public void setup() { associationTen.setId("10"); associationTen.setApprovedAt( now.plusDays(37) ); associationTen.setRemovedAt( now.plusDays(38) ); - associationTen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationTen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationTen.setApprovalExpiryAt( now.plusDays(39) ); associationTen.setInvitations( List.of( invitationTen ) ); associationTen.setEtag("j"); @@ -251,7 +251,7 @@ public void setup() { associationEleven.setId("11"); associationEleven.setApprovedAt( now.plusDays(41) ); associationEleven.setRemovedAt( now.plusDays(42) ); - associationEleven.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationEleven.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationEleven.setApprovalExpiryAt( now.plusDays(43) ); associationEleven.setInvitations( List.of( invitationEleven ) ); associationEleven.setEtag("k"); @@ -268,7 +268,7 @@ public void setup() { associationTwelve.setId("12"); associationTwelve.setApprovedAt( now.plusDays(45) ); associationTwelve.setRemovedAt( now.plusDays(46) ); - associationTwelve.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationTwelve.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationTwelve.setApprovalExpiryAt( now.plusDays(47) ); associationTwelve.setInvitations( List.of( invitationTwelve ) ); associationTwelve.setEtag("l"); @@ -285,7 +285,7 @@ public void setup() { associationThirteen.setId("13"); associationThirteen.setApprovedAt( now.plusDays(49) ); associationThirteen.setRemovedAt( now.plusDays(50) ); - associationThirteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationThirteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationThirteen.setApprovalExpiryAt( now.plusDays(51) ); associationThirteen.setInvitations( List.of( invitationThirteen ) ); associationThirteen.setEtag("m"); @@ -302,7 +302,7 @@ public void setup() { associationFourteen.setId("14"); associationFourteen.setApprovedAt( now.plusDays(53) ); associationFourteen.setRemovedAt( now.plusDays(54) ); - associationFourteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFourteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFourteen.setApprovalExpiryAt( now.plusDays(55) ); associationFourteen.setInvitations( List.of( invitationFourteen ) ); associationFourteen.setEtag("n"); @@ -319,7 +319,7 @@ public void setup() { associationFifteen.setId("15"); associationFifteen.setApprovedAt( now.plusDays(57) ); associationFifteen.setRemovedAt( now.plusDays(58) ); - associationFifteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFifteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFifteen.setApprovalExpiryAt( now.plusDays(59) ); associationFifteen.setInvitations( List.of( invitationFifteen ) ); associationFifteen.setEtag("o"); @@ -336,7 +336,7 @@ public void setup() { associationSixteen.setId("16"); associationSixteen.setApprovedAt( now.plusDays(61) ); associationSixteen.setRemovedAt( now.plusDays(62) ); - associationSixteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSixteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSixteen.setApprovalExpiryAt( now.plusDays(63) ); associationSixteen.setInvitations( List.of( invitationSixteen ) ); associationSixteen.setEtag("p"); diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationMapperTest.java b/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationMapperTest.java index 889c8cee..5d4f365d 100644 --- a/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationMapperTest.java +++ b/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationMapperTest.java @@ -99,6 +99,7 @@ void daoToDtoWithOnlyMandatoryFieldsSuccessfullyPerformsMapping() { dao.setUserId("111"); dao.setCompanyNumber("111111"); dao.setStatus(StatusEnum.CONFIRMED.getValue()); + dao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); final var company = new CompanyDetails(); company.setCompanyNumber("111111"); company.setCompanyName("Hogwarts"); @@ -150,7 +151,7 @@ void daoToDtoWithAllFieldsSuccessfullyPerformsMapping() { dao.setUserId("111"); dao.setUserEmail("bruce.wayne@gotham.city"); dao.setCompanyNumber("111111"); - dao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + dao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); dao.setStatus(StatusEnum.REMOVED.getValue()); dao.setRemovedAt(now); dao.setInvitations(List.of(invitationDao)); diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListCompanyMapperTest.java b/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListCompanyMapperTest.java index 5017ab5e..04dc44a7 100644 --- a/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListCompanyMapperTest.java +++ b/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListCompanyMapperTest.java @@ -15,6 +15,8 @@ import uk.gov.companieshouse.accounts.association.service.CompanyService; import uk.gov.companieshouse.accounts.association.service.UsersService; import uk.gov.companieshouse.accounts.association.utils.MapperUtil; +import uk.gov.companieshouse.api.accounts.associations.model.Association.ApprovalRouteEnum; +import uk.gov.companieshouse.api.accounts.associations.model.Association.StatusEnum; import uk.gov.companieshouse.api.accounts.user.model.User; import uk.gov.companieshouse.api.company.CompanyDetails; @@ -53,12 +55,14 @@ void setup() { associationBatmanDao = new AssociationDao(); associationBatmanDao.setUserId("111"); associationBatmanDao.setCompanyNumber("111111"); - associationBatmanDao.setStatus("confirmed"); + associationBatmanDao.setStatus(StatusEnum.CONFIRMED.getValue()); + associationBatmanDao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationAlfieDao = new AssociationDao(); associationAlfieDao.setUserEmail("batman@gotham.city"); associationAlfieDao.setCompanyNumber("111111"); - associationAlfieDao.setStatus("awaiting-approval"); + associationAlfieDao.setStatus(StatusEnum.AWAITING_APPROVAL.getValue()); + associationAlfieDao.setApprovalRoute( ApprovalRouteEnum.AUTH_CODE.getValue() ); } diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListUserMapperTest.java b/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListUserMapperTest.java index f49c8a52..a65f299b 100644 --- a/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListUserMapperTest.java +++ b/src/test/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListUserMapperTest.java @@ -15,6 +15,8 @@ import uk.gov.companieshouse.accounts.association.service.CompanyService; import uk.gov.companieshouse.accounts.association.service.UsersService; import uk.gov.companieshouse.accounts.association.utils.MapperUtil; +import uk.gov.companieshouse.api.accounts.associations.model.Association.ApprovalRouteEnum; +import uk.gov.companieshouse.api.accounts.associations.model.Association.StatusEnum; import uk.gov.companieshouse.api.accounts.user.model.User; import uk.gov.companieshouse.api.company.CompanyDetails; @@ -54,12 +56,14 @@ void setup() { associationBatmanDao = new AssociationDao(); associationBatmanDao.setUserId("111"); associationBatmanDao.setCompanyNumber("111111"); - associationBatmanDao.setStatus("confirmed"); + associationBatmanDao.setStatus(StatusEnum.CONFIRMED.getValue()); + associationBatmanDao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationAlfieDao = new AssociationDao(); associationAlfieDao.setUserEmail("111"); associationAlfieDao.setCompanyNumber("222222"); - associationAlfieDao.setStatus("awaiting-approval"); + associationAlfieDao.setStatus(StatusEnum.AWAITING_APPROVAL.getValue()); + associationAlfieDao.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); } diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/service/AssociationsServiceTest.java b/src/test/java/uk/gov/companieshouse/accounts/association/service/AssociationsServiceTest.java index b37957cc..10db1710 100644 --- a/src/test/java/uk/gov/companieshouse/accounts/association/service/AssociationsServiceTest.java +++ b/src/test/java/uk/gov/companieshouse/accounts/association/service/AssociationsServiceTest.java @@ -93,7 +93,7 @@ public void setup() { associationOne.setId("1"); associationOne.setApprovedAt(now.plusDays(1)); associationOne.setRemovedAt(now.plusDays(2)); - associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationOne.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationOne.setApprovalExpiryAt(now.plusDays(3)); associationOne.setInvitations( List.of( invitationOne ) ); associationOne.setEtag( "a" ); @@ -110,7 +110,7 @@ public void setup() { associationTwo.setId("2"); associationTwo.setApprovedAt( now.plusDays(5) ); associationTwo.setRemovedAt( now.plusDays(6) ); - associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationTwo.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationTwo.setApprovalExpiryAt( now.plusDays(7) ); associationTwo.setInvitations( List.of( invitationTwo ) ); associationTwo.setEtag("b"); @@ -127,7 +127,7 @@ public void setup() { associationThree.setId("3"); associationThree.setApprovedAt( now.plusDays(9) ); associationThree.setRemovedAt( now.plusDays(10) ); - associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationThree.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationThree.setApprovalExpiryAt( now.plusDays(11) ); associationThree.setInvitations( List.of( invitationThree ) ); associationThree.setEtag("c"); @@ -144,7 +144,7 @@ public void setup() { associationFour.setId("4"); associationFour.setApprovedAt( now.plusDays(13) ); associationFour.setRemovedAt( now.plusDays(14) ); - associationFour.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE); + associationFour.setApprovalRoute(ApprovalRouteEnum.AUTH_CODE.getValue()); associationFour.setApprovalExpiryAt( now.plusDays(15) ); associationFour.setInvitations( List.of( invitationFour ) ); associationFour.setEtag("d"); @@ -161,7 +161,7 @@ public void setup() { associationFive.setId("5"); associationFive.setApprovedAt( now.plusDays(17) ); associationFive.setRemovedAt( now.plusDays(18) ); - associationFive.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFive.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFive.setApprovalExpiryAt( now.plusDays(19) ); associationFive.setInvitations( List.of( invitationFive ) ); associationFive.setEtag("e"); @@ -178,7 +178,7 @@ public void setup() { associationSix.setId("6"); associationSix.setApprovedAt( now.plusDays(21) ); associationSix.setRemovedAt( now.plusDays(22) ); - associationSix.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSix.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSix.setApprovalExpiryAt( now.plusDays(23) ); associationSix.setInvitations( List.of( invitationSix ) ); associationSix.setEtag("f"); @@ -195,7 +195,7 @@ public void setup() { associationSeven.setId("7"); associationSeven.setApprovedAt( now.plusDays(25) ); associationSeven.setRemovedAt( now.plusDays(26) ); - associationSeven.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSeven.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSeven.setApprovalExpiryAt( now.plusDays(27) ); associationSeven.setInvitations( List.of( invitationSeven ) ); associationSeven.setEtag("g"); @@ -212,7 +212,7 @@ public void setup() { associationEight.setId("8"); associationEight.setApprovedAt( now.plusDays(29) ); associationEight.setRemovedAt( now.plusDays(30) ); - associationEight.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationEight.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationEight.setApprovalExpiryAt( now.plusDays(31) ); associationEight.setInvitations( List.of( invitationEight ) ); associationEight.setEtag("h"); @@ -229,7 +229,7 @@ public void setup() { associationNine.setId("9"); associationNine.setApprovedAt( now.plusDays(33) ); associationNine.setRemovedAt( now.plusDays(34) ); - associationNine.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationNine.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationNine.setApprovalExpiryAt( now.plusDays(35) ); associationNine.setInvitations( List.of( invitationNine ) ); associationNine.setEtag("i"); @@ -246,7 +246,7 @@ public void setup() { associationTen.setId("10"); associationTen.setApprovedAt( now.plusDays(37) ); associationTen.setRemovedAt( now.plusDays(38) ); - associationTen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationTen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationTen.setApprovalExpiryAt( now.plusDays(39) ); associationTen.setInvitations( List.of( invitationTen ) ); associationTen.setEtag("j"); @@ -263,7 +263,7 @@ public void setup() { associationEleven.setId("11"); associationEleven.setApprovedAt( now.plusDays(41) ); associationEleven.setRemovedAt( now.plusDays(42) ); - associationEleven.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationEleven.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationEleven.setApprovalExpiryAt( now.plusDays(43) ); associationEleven.setInvitations( List.of( invitationEleven ) ); associationEleven.setEtag("k"); @@ -280,7 +280,7 @@ public void setup() { associationTwelve.setId("12"); associationTwelve.setApprovedAt( now.plusDays(45) ); associationTwelve.setRemovedAt( now.plusDays(46) ); - associationTwelve.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationTwelve.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationTwelve.setApprovalExpiryAt( now.plusDays(47) ); associationTwelve.setInvitations( List.of( invitationTwelve ) ); associationTwelve.setEtag("l"); @@ -297,7 +297,7 @@ public void setup() { associationThirteen.setId("13"); associationThirteen.setApprovedAt( now.plusDays(49) ); associationThirteen.setRemovedAt( now.plusDays(50) ); - associationThirteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationThirteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationThirteen.setApprovalExpiryAt( now.plusDays(51) ); associationThirteen.setInvitations( List.of( invitationThirteen ) ); associationThirteen.setEtag("m"); @@ -314,7 +314,7 @@ public void setup() { associationFourteen.setId("14"); associationFourteen.setApprovedAt( now.plusDays(53) ); associationFourteen.setRemovedAt( now.plusDays(54) ); - associationFourteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFourteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFourteen.setApprovalExpiryAt( now.plusDays(55) ); associationFourteen.setInvitations( List.of( invitationFourteen ) ); associationFourteen.setEtag("n"); @@ -331,7 +331,7 @@ public void setup() { associationFifteen.setId("15"); associationFifteen.setApprovedAt( now.plusDays(57) ); associationFifteen.setRemovedAt( now.plusDays(58) ); - associationFifteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationFifteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationFifteen.setApprovalExpiryAt( now.plusDays(59) ); associationFifteen.setInvitations( List.of( invitationFifteen ) ); associationFifteen.setEtag("o"); @@ -348,7 +348,7 @@ public void setup() { associationSixteen.setId("16"); associationSixteen.setApprovedAt( now.plusDays(61) ); associationSixteen.setRemovedAt( now.plusDays(62) ); - associationSixteen.setApprovalRoute(ApprovalRouteEnum.INVITATION); + associationSixteen.setApprovalRoute(ApprovalRouteEnum.INVITATION.getValue()); associationSixteen.setApprovalExpiryAt( now.plusDays(63) ); associationSixteen.setInvitations( List.of( invitationSixteen ) ); associationSixteen.setEtag("p");