Merge pull request #147 from companieshouse/IDVA6-1485-company-status…

…-enum-to-string IDVA6-1485: Change company_status's type from enum to string
companieshouse · Sep 19, 2024 · 782f23f · 782f23f
2 parents 70c7151 + 3e71040
commit 782f23f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
         <common-web-java.version>3.0.0</common-web-java.version>
         <encryption-java-library.version>2.0.3</encryption-java-library.version>
         <rest-service-common-library-version>2.0.2</rest-service-common-library-version>
-        <private-api-sdk-java.version>4.0.190</private-api-sdk-java.version>
+        <private-api-sdk-java.version>4.0.199</private-api-sdk-java.version>
         <api-sdk-manager-java-library.version>3.0.5</api-sdk-manager-java-library.version>
         <api-security-java-version>2.0.6</api-security-java-version>
         <org.mapstruct.version>1.6.0.RC1</org.mapstruct.version>

diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/mapper/AssociationMapper.java b/src/main/java/uk/gov/companieshouse/accounts/association/mapper/AssociationMapper.java
@@ -11,7 +11,6 @@
 import uk.gov.companieshouse.accounts.association.service.CompanyService;
 import uk.gov.companieshouse.accounts.association.service.UsersService;
 import uk.gov.companieshouse.api.accounts.associations.model.Association;
-import uk.gov.companieshouse.api.accounts.associations.model.Association.CompanyStatusEnum;
 import uk.gov.companieshouse.api.accounts.associations.model.AssociationLinks;
 
 import java.time.LocalDateTime;
@@ -55,7 +54,7 @@ protected void enrichWithCompanyDetails( @MappingTarget final Association associ
             companyDetails = companyService.fetchCompanyProfile( association.getCompanyNumber() );
         }
         association.setCompanyName( companyDetails.getCompanyName() );
-        association.setCompanyStatus( CompanyStatusEnum.fromValue( companyDetails.getCompanyStatus() ) );
+        association.setCompanyStatus( companyDetails.getCompanyStatus() );
     }
 
     @AfterMapping

diff --git a/src/test/java/uk/gov/companieshouse/accounts/association/common/TestDataManager.java b/src/test/java/uk/gov/companieshouse/accounts/association/common/TestDataManager.java
@@ -17,7 +17,6 @@
 import uk.gov.companieshouse.accounts.association.models.InvitationDao;
 import uk.gov.companieshouse.api.accounts.associations.model.Association;
 import uk.gov.companieshouse.api.accounts.associations.model.Association.ApprovalRouteEnum;
-import uk.gov.companieshouse.api.accounts.associations.model.Association.CompanyStatusEnum;
 import uk.gov.companieshouse.api.accounts.associations.model.Association.StatusEnum;
 import uk.gov.companieshouse.api.accounts.associations.model.AssociationLinks;
 import uk.gov.companieshouse.api.accounts.associations.model.Invitation;
@@ -956,7 +955,7 @@ public Association fetchAssociationDto( final String id, final User user ){
         associationDto.setDisplayName( Optional.ofNullable( user.getDisplayName() ).orElse( "Not provided" )  );
         associationDto.setCompanyNumber( associationDao.getCompanyNumber() );
         associationDto.setCompanyName( companyDetails.getCompanyName() );
-        associationDto.setCompanyStatus( CompanyStatusEnum.fromValue( companyDetails.getCompanyStatus() ) );
+        associationDto.setCompanyStatus( companyDetails.getCompanyStatus() );
         associationDto.setStatus( StatusEnum.fromValue( associationDao.getStatus() ) );
         associationDto.setApprovalRoute( ApprovalRouteEnum.fromValue( associationDao.getApprovalRoute() ) );
         associationDto.setCreatedAt( localDateTimeToOffsetDateTime( associationDao.getCreatedAt() ) );

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
@@ -24,7 +24,6 @@
 import uk.gov.companieshouse.accounts.association.service.CompanyService;
 import uk.gov.companieshouse.accounts.association.service.UsersService;
 import uk.gov.companieshouse.api.accounts.associations.model.Association;
-import uk.gov.companieshouse.api.accounts.associations.model.Association.CompanyStatusEnum;
 
 import java.util.List;
 import uk.gov.companieshouse.api.accounts.user.model.User;
@@ -116,7 +115,7 @@ void enrichWithCompanyDetailsUsesDataFromInputObject(){
         associationMapper.enrichWithCompanyDetails( associationPreprocessed, company );
 
         Assertions.assertEquals( "Wayne Enterprises", associationPreprocessed.getCompanyName() );
-        Assertions.assertEquals( CompanyStatusEnum.ACTIVE, associationPreprocessed.getCompanyStatus() );
+        Assertions.assertEquals( "active", associationPreprocessed.getCompanyStatus() );
     }
 
     @Test
@@ -129,7 +128,7 @@ void enrichWithCompanyDetailsRetrievesDataIfInputObjectIsNull(){
         associationMapper.enrichWithCompanyDetails( associationPreprocessed, null );
 
         Assertions.assertEquals( "Wayne Enterprises", associationPreprocessed.getCompanyName() );
-        Assertions.assertEquals( CompanyStatusEnum.ACTIVE, associationPreprocessed.getCompanyStatus() );
+        Assertions.assertEquals( "active", associationPreprocessed.getCompanyStatus() );
     }
 
     @Test