Merge pull request #14889 from transcom/MAIN-B-22653

.circleci/config.yml

@@ -883,6 +883,7 @@ commands:
             export ENVIRONMENT=test
             export FEATURE_FLAG_MULTI_MOVE=true
             export FEATURE_FLAG_PPM=true
+            export FEATURE_FLAG_PPM_SPR=false
             export FEATURE_FLAG_NTS=true
             export FEATURE_FLAG_NTSR=true
             export FEATURE_FLAG_BOAT=true

.envrc

@@ -166,6 +166,7 @@ export FEATURE_FLAG_QUEUE_MANAGEMENT=true
 
 # Feature flags to disable certain shipment types
 export FEATURE_FLAG_PPM=true
+export FEATURE_FLAG_PPM_SPR=false
 export FEATURE_FLAG_NTS=true
 export FEATURE_FLAG_NTSR=true
 export FEATURE_FLAG_BOAT=true

config/env/demo.app-client-tls.env

@@ -32,6 +32,7 @@ TELEMETRY_USE_XRAY_ID=true
 TLS_ENABLED=true
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/env/demo.app.env

@@ -37,6 +37,7 @@ SERVE_API_SUPPORT=true
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_COUNSELOR_MOVE_CREATE=false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/env/exp.app-client-tls.env

@@ -32,6 +32,7 @@ TELEMETRY_ENDPOINT=localhost:4317
 TELEMETRY_USE_XRAY_ID=false
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/env/exp.app.env

@@ -37,6 +37,7 @@ TELEMETRY_USE_XRAY_ID=true
 FEATURE_FLAG_MULTI_MOVE=true
 FEATURE_FLAG_COUNSELOR_MOVE_CREATE=false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/env/loadtest.app-client-tls.env

@@ -30,6 +30,7 @@ TELEMETRY_USE_XRAY_ID=true
 TLS_ENABLED=true
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/env/loadtest.app.env

@@ -35,6 +35,7 @@ SERVE_API_SUPPORT=true
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_COUNSELOR_MOVE_CREATE=false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/env/prd.app-client-tls.env

@@ -29,6 +29,7 @@ TELEMETRY_USE_XRAY_ID=true
 TLS_ENABLED=true
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_PPM=false
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=false
 FEATURE_FLAG_NTSR=false
 FEATURE_FLAG_BOAT=false

config/env/prd.app.env

@@ -36,6 +36,7 @@ SERVE_API_SUPPORT=false
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_COUNSELOR_MOVE_CREATE=false
 FEATURE_FLAG_PPM=false
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=false
 FEATURE_FLAG_NTSR=false
 FEATURE_FLAG_BOAT=false

config/env/stg.app-client-tls.env

@@ -31,6 +31,7 @@ TELEMETRY_USE_XRAY_ID=true
 TLS_ENABLED=true
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/env/stg.app.env

@@ -37,6 +37,7 @@ SERVE_API_SUPPORT=true
 FEATURE_FLAG_MULTI_MOVE=false
 FEATURE_FLAG_COUNSELOR_MOVE_CREATE =false
 FEATURE_FLAG_PPM=true
+FEATURE_FLAG_PPM_SPR=false
 FEATURE_FLAG_NTS=true
 FEATURE_FLAG_NTSR=true
 FEATURE_FLAG_BOAT=false

config/flipt/storage/development.features.yaml

@@ -73,6 +73,14 @@ flags:
       - segment:
           key: mil-app
           value: false
+  - key: enable_hawaii
+    name: Enable Hawaii feature flag
+    type: BOOLEAN_FLAG_TYPE
+    enabled: false
+    rollouts:
+      - segment:
+          key: mil-app
+          value: false
   - key: okta_dodid_input
     name: Customer DODID input being pulled from Okta and disabling text input
     type: BOOLEAN_FLAG_TYPE
@@ -89,6 +97,14 @@ flags:
       - segment:
           key: mil-app
           value: true
+  - key: ppm_spr
+    name: Enable PPM Small Package Reimbursement flag
+    type: BOOLEAN_FLAG_TYPE
+    enabled: false
+    rollouts:
+      - segment:
+          key: mil-app
+          value: false
   - key: nts
     name: NTS feature flag
     type: BOOLEAN_FLAG_TYPE

migrations/app/ddl_migrations/ddl_tables/20250224200700_tbl_ppm_shipments.up.sql

@@ -0,0 +1,3 @@
+-- B-22653 Daniel Jordan add ppm_type column to ppm_shipments
+ALTER TABLE ppm_shipments
+ADD COLUMN IF NOT EXISTS ppm_type ppm_shipment_type NOT NULL DEFAULT 'INCENTIVE_BASED';

migrations/app/ddl_migrations/ddl_types/20250224202726_ty_ppm_shipment_type.up.sql

@@ -0,0 +1,11 @@
+-- B-22653 Daniel Jordan add ppm_shipment_type
+DO $$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'ppm_shipment_type') THEN
+        CREATE TYPE ppm_shipment_type AS ENUM (
+            'INCENTIVE_BASED',
+            'ACTUAL_EXPENSE',
+            'SMALL_PACKAGE'
+        );
+    END IF;
+END $$;

migrations/app/ddl_migrations/ddl_types/20250224202738_ty_moving_expenses_type.up.sql

@@ -0,0 +1,2 @@
+-- B-22653 Daniel Jordan update moving_expense_type to include SMALL_PACKAGE
+ALTER TYPE moving_expense_type ADD VALUE IF NOT EXISTS 'SMALL_PACKAGE';

migrations/app/ddl_tables_manifest.txt

@@ -1,3 +1,4 @@
 # This is the tables migrations manifest.
 # If a migration is not recorded here, then it will error.
 # Naming convention: tbl_some_table.up.sql  running <generate-ddl-migration some_table tables> will create this file.
+20250224200700_tbl_ppm_shipments.up.sql

migrations/app/ddl_types_manifest.txt

@@ -1,3 +1,5 @@
 # This is the types migrations manifest.
 # If a migration is not recorded here, then it will error.
 # Naming convention: ty_some_type.up.sql  running <generate-ddl-migration some_type types> will create this file.
+20250224202726_ty_ppm_shipment_type.up.sql
+20250224202738_ty_moving_expenses_type.up.sql

pkg/factory/ppm_shipment_factory.go

@@ -57,6 +57,7 @@ func buildPPMShipmentWithBuildType(db *pop.Connection, customs []Customization,
 	}
 
 	ppmShipment := models.PPMShipment{
+		PPMType:               models.PPMType(models.PPMTypeIncentiveBased),
 		ShipmentID:            shipment.ID,
 		Shipment:              shipment,
 		Status:                models.PPMShipmentStatusDraft,