Merge branch 'main' into B-18181

transcom · Feb 7, 2024 · f7a2117 · f7a2117
2 parents cd59ba8 + e4dc0af
commit f7a2117
Show file tree

Hide file tree

Showing 29 changed files with 716 additions and 1,010 deletions.
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -892,3 +892,4 @@
 20240124155759_20240124-homesafeconnect-cert.up.sql
 20240129153006_20240129-homesafeconnect-cert.up.sql
 20240201174442_20240201_homesafe_prd_cert.up.sql
+20240206173201_update_shipment_address_update_table_sit_and_distance_columns.up.sql
diff --git a/...chema/20240206173201_update_shipment_address_update_table_sit_and_distance_columns.up.sql b/...chema/20240206173201_update_shipment_address_update_table_sit_and_distance_columns.up.sql
@@ -0,0 +1,15 @@
+-- Adds new columns to shipment address update table
+ALTER TABLE shipment_address_updates
+ADD COLUMN sit_original_address_id uuid DEFAULT NULL,
+ADD COLUMN old_sit_distance_between INTEGER DEFAULT NULL,
+ADD COLUMN new_sit_distance_between INTEGER DEFAULT NULL;
+
+-- Add foreign key constraint
+ALTER TABLE shipment_address_updates
+ADD CONSTRAINT fk_sit_original_address
+FOREIGN KEY (sit_original_address_id) REFERENCES addresses(id);
+
+-- Comments on new columns
+COMMENT on COLUMN shipment_address_updates.sit_original_address_id IS 'SIT address at the original time of SIT approval';
+COMMENT on COLUMN shipment_address_updates.old_sit_distance_between IS 'Distance between original SIT address and previous shipment destination address';
+COMMENT on COLUMN shipment_address_updates.new_sit_distance_between IS 'Distance between original SIT address and new shipment destination address';
diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go
diff --git a/pkg/gen/ghcmessages/shipment_address_update.go b/pkg/gen/ghcmessages/shipment_address_update.go
diff --git a/pkg/gen/internalapi/configure_mymove.go b/pkg/gen/internalapi/configure_mymove.go
@@ -307,11 +307,6 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler {
 			return middleware.NotImplemented("operation ppm.ShowPPMEstimate has not yet been implemented")
 		})
 	}
-	if api.PpmShowPPMIncentiveHandler == nil {
-		api.PpmShowPPMIncentiveHandler = ppm.ShowPPMIncentiveHandlerFunc(func(params ppm.ShowPPMIncentiveParams) middleware.Responder {
-			return middleware.NotImplemented("operation ppm.ShowPPMIncentive has not yet been implemented")
-		})
-	}
 	if api.PpmShowPPMSitEstimateHandler == nil {
 		api.PpmShowPPMSitEstimateHandler = ppm.ShowPPMSitEstimateHandlerFunc(func(params ppm.ShowPPMSitEstimateParams) middleware.Responder {
 			return middleware.NotImplemented("operation ppm.ShowPPMSitEstimate has not yet been implemented")