Release/3.4.0

.github/workflows/openshift-deploy.yml

@@ -74,7 +74,7 @@ jobs:
           TAG: ${{ inputs.TAG }}
           SID: ${{ github.run_id }}
           LOG_LEVEL: ${{ vars.LOG_LEVEL }}
-          MAX_APP_COUNT: ${{ vars.MAX_APP_COUNT }}
+
 
           WEBADE_CHECK_TOKEN_URL: ${{ vars.WEBADE_CHECK_TOKEN_URL }}
           WEBADE_GET_TOKEN_URL: ${{ vars.WEBADE_GET_TOKEN_URL }}
@@ -83,6 +83,12 @@ jobs:
 
 
           #API variables
+          API_CPU_REQUEST: ${{ vars.API_CPU_REQUEST }}
+          API_CPU_LIMIT: ${{ vars.API_CPU_LIMIT }}
+          API_MEMORY_REQUEST: ${{ vars.API_MEMORY_REQUEST }}
+          API_MEMORY_LIMIT: ${{ vars.API_MEMORY_LIMIT }}
+          MAX_API_COUNT: ${{ vars.MAX_APP_COUNT }}
+
           POSTGRES_RESOURCE_NAME: ${{ vars.POSTGRES_RESOURCE_NAME }}
 
           MAX_THREADS: ${{ vars.MAX_THREADS }}
@@ -108,6 +114,7 @@ jobs:
 
 
           #Frontend variables
+          MAX_UI_COUNT: ${{ vars.MAX_UI_COUNT }}
           BASE_URL: https://cirras-underwriting-ui-route-${{ inputs.ENVIRONMENT_NAME }}-${{inputs.NAMESPACE}}.apps.silver.devops.gov.bc.ca/pub/cirras-underwriting/
           CIRRAS_UNDERWRITING_REST_URI: https://cirras-underwriting-api-route-${{ inputs.ENVIRONMENT_NAME }}-${{inputs.NAMESPACE}}.apps.silver.devops.gov.bc.ca/cirras-underwriting-api/v1
           WEBADE_CIRRAS_UNDERWRITING_UI_SECRET: ${{secrets.WEBADE_CIRRAS_UNDERWRITING_UI_SECRET}}

.github/workflows/underwriting-api-ci.yml

@@ -4,7 +4,6 @@ on:
   pull_request_target:
     branches:
       - main
-      - release/*
     paths:
       - cirras-underwriting-api/**
 

.gitignore

@@ -4,3 +4,4 @@ compose.yaml
 local-config
 cirras-underwriting-api/cirras-underwriting-api-rest-endpoints/src/test/resources/static.properties
 cirras-underwriting-api/cirras-underwriting-persistence/src/test/resources/static.properties
+cirras-underwriting-war/cirras-underwriting-war/src/main/angular/package-lock.json

cirras-underwriting-api/Dockerfile

@@ -1,6 +1,6 @@
 FROM tomcat:9.0.86-jre17
 
-COPY ./cirras-underwriting-api-rest-endpoints/target/cirras-underwriting-api-rest-endpoints-3.4.0-SNAPSHOT.war .
+COPY ./cirras-underwriting-api-rest-endpoints/target/cirras-underwriting-api-rest-endpoints-3.4.0.war .
 COPY ./deploy-tools ./deploy-tools
 
 RUN ls

cirras-underwriting-api/cirras-underwriting-api-rest-client/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
 		<artifactId>cirras-underwriting-api-parent</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

cirras-underwriting-api/cirras-underwriting-api-rest-common/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
 		<artifactId>cirras-underwriting-api-parent</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

cirras-underwriting-api/cirras-underwriting-api-rest-ear/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
 		<artifactId>cirras-underwriting-api-parent</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

cirras-underwriting-api/cirras-underwriting-api-rest-endpoints/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ca.bc.gov.mal.cirras.underwriting</groupId>
 		<artifactId>cirras-underwriting-api-parent</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.0</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

cirras-underwriting-api/cirras-underwriting-api-rest-endpoints/src/main/java/ca/bc/gov/mal/cirras/underwriting/api/rest/v1/resource/factory/InventoryContractRsrcFactory.java

@@ -526,7 +526,7 @@ public AnnualFieldRsrc addRolloverAnnualField(Integer insurancePlanId, Contracte
 //		
 //		//return model;
 //	}		
-	
+
 	private void populateDefaultResource(InventoryContractRsrc resource, PolicyDto dto) {
 
 		resource.setContractId(dto.getContractId());
@@ -593,15 +593,21 @@ private InventoryField createRolloverInventoryField(Integer insurancePlanId, Con
 		if (insurancePlanId.equals(InventoryServiceEnums.InsurancePlans.GRAIN.getInsurancePlanId())) {
 			model.setInventoryUnseeded(createRolloverInventoryUnseeded(ifDto.getAcresToBeSeeded(), ifDto.getLastYearCropVarietyId(), ifDto.getIsGrainUnseededDefaultInd()));
 		}
-		
+
 		//Inventory seeded Forage
 		if (insurancePlanId.equals(InventoryServiceEnums.InsurancePlans.FORAGE.getInsurancePlanId())) {
+
 			List<InventorySeededForage> inventorySeededForageList = new ArrayList<InventorySeededForage>();
-			inventorySeededForageList.add(createRolloverInventorySeedeForage());
+			if ( ifDto.getInventorySeededForages() != null && ifDto.getInventorySeededForages().size() > 0 ) {
+				InventorySeededForageDto isfDto = ifDto.getInventorySeededForages().get(0);
+				inventorySeededForageList.add(createRolloverInventorySeededForage(isfDto));
+			} else {
+				inventorySeededForageList.add(createDefaultInventorySeededForage());
+			}
+
 			model.setInventorySeededForages(inventorySeededForageList);
 		}
 
-
 		return model;
 	}
 
@@ -631,14 +637,65 @@ private InventoryField createDefaultInventoryField(Integer insurancePlanId, Cont
 		//Inventory seeded Forage
 		if (insurancePlanId.equals(InventoryServiceEnums.InsurancePlans.FORAGE.getInsurancePlanId())) {
 			List<InventorySeededForage> inventorySeededForageList = new ArrayList<InventorySeededForage>();
-			inventorySeededForageList.add(createRolloverInventorySeedeForage());
+			inventorySeededForageList.add(createDefaultInventorySeededForage());
 			model.setInventorySeededForages(inventorySeededForageList);
 		}
 
 		return model;
 	}
 
-	private InventorySeededForage createRolloverInventorySeedeForage() {
+	private InventorySeededForage createRolloverInventorySeededForage(InventorySeededForageDto dto) {
+		InventorySeededForage model = new InventorySeededForage();
+
+		if ( "PERENNIAL".equals(dto.getCommodityTypeCode()) || "Pasture".equals(dto.getCommodityTypeCode()) || "Native Wetland".equals(dto.getCommodityTypeCode()) || "Forage Seed".equals(dto.getCommodityTypeCode())) {
+			model.setCropCommodityId(dto.getCropCommodityId());
+			model.setCropVarietyId(dto.getCropVarietyId());
+			model.setCropVarietyName(dto.getCropVarietyName());
+			model.setCommodityTypeCode(dto.getCommodityTypeCode());
+			model.setSeedingYear(dto.getSeedingYear());
+			model.setIsQuantityInsurableInd(dto.getIsQuantityInsurableInd());
+
+			// Calculate new Plant Insurability
+			String prevPlanIns = dto.getPlantInsurabilityTypeCode();
+			String rolloverPlantIns = null;
+
+			if ("E1".equals(prevPlanIns) ) {
+				rolloverPlantIns = "E2";
+			}
+			else if ("E2".equals(prevPlanIns) ) {
+				rolloverPlantIns = null;
+			}
+			else if ("W1".equals(prevPlanIns) ) {
+				rolloverPlantIns = "W2";
+			}
+			else if ("W2".equals(prevPlanIns) ) {
+				rolloverPlantIns = "W3";
+			}
+			else if ("W3".equals(prevPlanIns) ) {
+				rolloverPlantIns = null;
+			}
+
+			model.setPlantInsurabilityTypeCode(rolloverPlantIns);		
+
+		} else {
+			model.setCropCommodityId(null);
+			model.setCropVarietyId(null);
+			model.setCropVarietyName(null);
+			model.setCommodityTypeCode(null);
+			model.setSeedingYear(null);
+			model.setIsQuantityInsurableInd(false);
+			model.setPlantInsurabilityTypeCode(null);
+		}
+
+		model.setFieldAcres(dto.getFieldAcres());
+		model.setSeedingDate(null);                                   // Does not rollover.
+		model.setIsIrrigatedInd(dto.getIsIrrigatedInd());
+		model.setIsAwpEligibleInd(dto.getIsAwpEligibleInd());
+
+		return model;
+	}
+
+	private InventorySeededForage createDefaultInventorySeededForage() {
 		InventorySeededForage model = new InventorySeededForage();
 
 		model.setCropCommodityId(null);
@@ -651,11 +708,12 @@ private InventorySeededForage createRolloverInventorySeedeForage() {
 		model.setIsIrrigatedInd(null);
 		model.setIsQuantityInsurableInd(null);
 		model.setPlantInsurabilityTypeCode(null);
-		model.setIsAwpEligibleInd(true); //Default = true
+		model.setIsAwpEligibleInd(true);             // Default true.
 
 		return model;
 	}
-
+
+
 	private InventoryUnseeded createRolloverInventoryUnseeded(Double acresToBeSeeded, Integer lastYearVarietyId, Boolean isGrainUnseededDefault) {
 		InventoryUnseeded model = new InventoryUnseeded();
 

cirras-underwriting-api/cirras-underwriting-api-rest-endpoints/src/test/java/ca/bc/gov/mal/cirras/underwriting/api/rest/v1/endpoints/AnnualFieldRolloverInvEndpointTest.java

@@ -35,8 +35,6 @@ public class AnnualFieldRolloverInvEndpointTest extends EndpointsTest {
 	};
 
 
-
-
 	@Test
 	public void testAnnualFieldsRolloverInventoryFromPreviousYear() throws CirrasUnderwritingServiceException, Oauth2ClientException {
 		logger.debug("<testAnnualFieldsRolloverInventoryFromPreviousYear");