Merge branch 'main' into B-20492-Download-Files

Dockerfile.e2e

@@ -1,4 +1,4 @@
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

Dockerfile.migrations

@@ -1,4 +1,4 @@
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

Dockerfile.migrations_local

@@ -18,7 +18,7 @@ RUN rm -f bin/milmove && make bin/milmove
 # FINAL #
 #########
 
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

Dockerfile.reviewapp

@@ -45,7 +45,7 @@ RUN set -x \
   && make bin/generate-test-data
 
 # define migrations before client build since it doesn't need client
-FROM alpine:3.20.2 as migrate
+FROM alpine:3.20.3 as migrate
 
 COPY --from=server_builder /build/bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem
 COPY --from=server_builder /build/bin/milmove /bin/milmove

Dockerfile.tools

@@ -1,4 +1,4 @@
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

Dockerfile.tools_local

@@ -18,7 +18,7 @@ RUN rm -f bin/prime-api-client && make bin/prime-api-client
 # FINAL #
 #########
 
-FROM alpine:3.20.2
+FROM alpine:3.20.3
 
 # hadolint ignore=DL3017
 RUN apk upgrade --no-cache busybox

migrations/app/migrations_manifest.txt

@@ -994,3 +994,6 @@
 20240819164156_update_pws_violations_pt3.up.sql
 20240820125856_allow_pptas_migration.up.sql
 20240820151043_add_gsr_role.up.sql
+20240822180409_adding_locked_price_cents_service_param.up.sql
+20240909194514_pricing_unpriced_ms_cs_service_items.up.sql
+20240910021542_populating_locked_price_cents_from_pricing_estimate_for_ms_and_cs_service_items.up.sql

migrations/app/schema/20240822180409_adding_locked_price_cents_service_param.up.sql

@@ -0,0 +1,26 @@
+INSERT INTO service_item_param_keys
+(id,key,description,type,origin,created_at,updated_at)
+SELECT '7ec5cf87-a446-4dd6-89d3-50bbc0d2c206','LockedPriceCents', 'Locked price when move was made available to prime', 'INTEGER', 'SYSTEM', now(), now()
+WHERE NOT EXISTS
+        (SELECT  1
+             FROM service_item_param_keys s
+             WHERE s.id = '7ec5cf87-a446-4dd6-89d3-50bbc0d2c206'
+        );
+
+INSERT INTO service_params
+(id,service_id,service_item_param_key_id,created_at,updated_at,is_optional)
+SELECT '22056106-bbde-4ae7-b5bd-e7d2f103ab7d',(SELECT id FROM re_services WHERE code='MS'),(SELECT id FROM service_item_param_keys where key='LockedPriceCents'), now(), now(), 'false'
+WHERE NOT EXISTS
+        ( SELECT  1
+             FROM service_params s
+             WHERE s.id = '22056106-bbde-4ae7-b5bd-e7d2f103ab7d'
+        );
+
+INSERT INTO service_params
+(id,service_id,service_item_param_key_id,created_at,updated_at,is_optional)
+SELECT '86f8c20c-071e-4715-b0c1-608f540b3be3',(SELECT id FROM re_services WHERE code='CS'),(SELECT id FROM service_item_param_keys where key='LockedPriceCents'), now(), now(), 'false'
+WHERE NOT EXISTS
+        ( SELECT  1
+             FROM service_params s
+             WHERE s.id = '86f8c20c-071e-4715-b0c1-608f540b3be3'
+        );

migrations/app/schema/20240909194514_pricing_unpriced_ms_cs_service_items.up.sql

@@ -0,0 +1,29 @@
+-- Filling in pricing_estimates for unprices services code MS and CS service items. Service items should not be able to reach this state
+-- but some older data exists where unpriced MS and CS items exist
+SET statement_timeout = 300000;
+SET lock_timeout = 300000;
+SET idle_in_transaction_session_timeout = 300000;
+
+UPDATE mto_service_items AS ms
+SET locked_price_cents =
+        CASE
+            when price_cents > 0 AND (s.code = 'MS' OR s.code = 'CS') AND ms.re_service_id = s.id  then price_cents
+            when price_cents = 0 AND (s.code = 'MS' OR s.code = 'CS') AND ms.re_service_id = s.id  then 0
+        END,
+    pricing_estimate =
+        CASE
+            when price_cents > 0 AND (s.code = 'MS' OR s.code = 'CS') AND ms.re_service_id = s.id then price_cents
+            when price_cents = 0 AND (s.code = 'MS' OR s.code = 'CS') AND ms.re_service_id = s.id  then 0
+        END
+FROM re_task_order_fees AS tf
+JOIN re_services AS s
+ON tf.service_id = s.id
+JOIN re_contract_years AS cy
+ON tf.contract_year_id = cy.id
+JOIN re_contracts AS ct
+ON cy.contract_id = ct.id
+JOIN mto_service_items AS msi
+ON s.id = msi.re_service_id
+JOIN moves AS mo
+ON mo.id = msi.move_id
+WHERE (s.code = 'MS' OR s.code = 'CS') AND (mo.available_to_prime_at BETWEEN cy.start_date AND cy.end_date) AND ms.re_service_id = s.id AND ms.locked_price_cents is null AND ms.pricing_estimate is null;

migrations/app/schema/20240910021542_populating_locked_price_cents_from_pricing_estimate_for_ms_and_cs_service_items.up.sql

@@ -0,0 +1,9 @@
+-- Customer directed that  the current pricing_estimate should be saved as the locked_price for MS and CS
+SET statement_timeout = 300000;
+SET lock_timeout = 300000;
+SET idle_in_transaction_session_timeout = 300000;
+
+UPDATE mto_service_items AS ms
+SET locked_price_cents = pricing_estimate
+FROM re_services AS r
+WHERE ms.re_service_id = r.id AND (r.code = 'MS' OR r.code = 'CS')

pkg/factory/mto_service_item_factory.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/transcom/mymove/pkg/models"
 	"github.com/transcom/mymove/pkg/testdatagen"
+	"github.com/transcom/mymove/pkg/unit"
 )
 
 type mtoServiceItemBuildType byte
@@ -56,6 +57,8 @@ func buildMTOServiceItemWithBuildType(db *pop.Connection, customs []Customizatio
 
 	requestedApprovalsRequestedStatus := false
 
+	var lockedPriceCents = unit.Cents(12303)
+
 	// Create default MTOServiceItem
 	mtoServiceItem := models.MTOServiceItem{
 		MoveTaskOrder:                     move,
@@ -67,6 +70,7 @@ func buildMTOServiceItemWithBuildType(db *pop.Connection, customs []Customizatio
 		Status:                            models.MTOServiceItemStatusSubmitted,
 		RequestedApprovalsRequestedStatus: &requestedApprovalsRequestedStatus,
 		CustomerExpense:                   isCustomerExpense,
+		LockedPriceCents:                  &lockedPriceCents,
 	}
 
 	// only set SITOriginHHGOriginalAddress if a customization is provided
@@ -341,15 +345,23 @@ var (
 		Type:        models.ServiceItemParamTypeString,
 		Origin:      models.ServiceItemParamOriginPrime,
 	}
+	paramLockedPriceCents = models.ServiceItemParamKey{
+		Key:         models.ServiceItemParamNameLockedPriceCents,
+		Description: "locked price cents",
+		Type:        models.ServiceItemParamTypeInteger,
+		Origin:      models.ServiceItemParamOriginSystem,
+	}
 	fixtureServiceItemParamsMap = map[models.ReServiceCode]models.ServiceItemParamKeys{
 		models.ReServiceCodeCS: {
-			paramContractCode,
 			paramMTOAvailableAToPrimeAt,
+			paramContractCode,
+			paramLockedPriceCents,
 			paramPriceRateOrFactor,
 		},
 		models.ReServiceCodeMS: {
-			paramContractCode,
 			paramMTOAvailableAToPrimeAt,
+			paramContractCode,
+			paramLockedPriceCents,
 			paramPriceRateOrFactor,
 		},
 		models.ReServiceCodeDLH: {