B 21410 int

go.mod

@@ -95,7 +95,7 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.28.0
 	go.opentelemetry.io/otel/trace v1.31.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.31.0
+	golang.org/x/crypto v0.27.0
 	golang.org/x/net v0.29.0
 	golang.org/x/oauth2 v0.23.0
 	golang.org/x/text v0.21.0
@@ -262,8 +262,8 @@ require (
 	golang.org/x/image v0.23.0 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
 	google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect

go.sum

@@ -723,8 +723,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
@@ -831,8 +831,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -849,8 +849,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

migrations/app/migrations_manifest.txt

@@ -1071,13 +1071,15 @@
 20241230150644_student_travel_weight_limit_param.up.sql
 20241230190638_remove_AK_zips_from_zip3.up.sql
 20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
+20241231155337_add_payment_params_for_international_shuttle.up.sql
 20250103130619_revert_data_change_for_gbloc_for_ak.up.sql
 20250103142533_update_postal_codes_and_gblocs_for_ak.up.sql
 20250103180420_update_pricing_proc_to_use_local_price_variable.up.sql
 20250110001339_update_nts_release_enum_name.up.sql
 20250110153428_add_shipment_address_updates_to_move_history.up.sql
-20250110214012_homesafeconnect_cert.up.sql
 20250113152050_rename_ubp.up.sql
+20250113160816_updating_create_accessorial_service_item_proc.up.sql
 20250113201232_update_estimated_pricing_procs_add_is_peak_func.up.sql
 20250116200912_disable_homesafe_stg_cert.up.sql
 20250120144247_update_pricing_proc_to_use_110_percent_weight.up.sql
+20250121153007_update_pricing_proc_to_handle_international_shuttle.up.sql

migrations/app/schema/20241231155337_add_payment_params_for_international_shuttle.up.sql

@@ -0,0 +1,15 @@
+INSERT INTO service_params
+(id,service_id,service_item_param_key_id,created_at,updated_at)
+VALUES
+('379c6d36-56ed-4469-8d17-cc5060b02fa3', (SELECT id FROM re_services WHERE code='IOSHUT'), (SELECT id FROM service_item_param_keys WHERE key='ContractCode'), now(), now()),
+('1925f884-e66a-4c5b-91b5-f953072dadfc', (SELECT id FROM re_services WHERE code='IOSHUT'), (SELECT id FROM service_item_param_keys WHERE key='ContractYearName'), now(), now()),
+('590786bd-c608-429b-9382-bcb12e165512', (SELECT id FROM re_services WHERE code='IOSHUT'), (SELECT id FROM service_item_param_keys WHERE key='EscalationCompounded'), now(), now()),
+('8c2d6c08-2521-40d5-bb8b-4998d6c43ceb', (SELECT id FROM re_services WHERE code='IOSHUT'), (SELECT id FROM service_item_param_keys WHERE key='PriceRateOrFactor'), now(), now());
+
+INSERT INTO service_params
+(id,service_id,service_item_param_key_id,created_at,updated_at)
+VALUES
+('b2588961-21af-416d-bb89-fcff62230991', (SELECT id FROM re_services WHERE code='IDSHUT'), (SELECT id FROM service_item_param_keys WHERE key='ContractCode'), now(), now()),
+('1ee015d0-ae1a-4f0f-b228-de2537816a4b', (SELECT id FROM re_services WHERE code='IDSHUT'), (SELECT id FROM service_item_param_keys WHERE key='ContractYearName'), now(), now()),
+('4eab020b-7df0-42db-b285-2ad2fc0c213c', (SELECT id FROM re_services WHERE code='IDSHUT'), (SELECT id FROM service_item_param_keys WHERE key='EscalationCompounded'), now(), now()),
+('4bb8cc94-b2e2-417e-a512-a361bcadd9ba', (SELECT id FROM re_services WHERE code='IDSHUT'), (SELECT id FROM service_item_param_keys WHERE key='PriceRateOrFactor'), now(), now());

migrations/app/schema/20250113160816_updating_create_accessorial_service_item_proc.up.sql

@@ -0,0 +1,121 @@
+DO '
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_type WHERE typname = ''mto_service_item_type'') THEN
+        ALTER TYPE mto_service_item_type DROP ATTRIBUTE "re_service_id";
+        ALTER TYPE mto_service_item_type ADD ATTRIBUTE "re_service_code" text;
+    END IF;
+END
+';
+
+DROP PROCEDURE create_accessorial_service_items_for_shipment(uuid,mto_service_item_type[]);
+CREATE OR REPLACE PROCEDURE create_accessorial_service_items_for_shipment (
+    IN shipment_id UUID,
+    IN service_items mto_service_item_type[],
+	INOUT created_service_item_ids text[]
+) AS '
+DECLARE
+    s_type mto_shipment_type;
+    m_code market_code_enum;
+    move_id UUID;
+    service_item RECORD;
+    item mto_service_item_type;
+    new_service_id text;
+BEGIN
+    -- get the shipment type, market code, and move_id based on shipment_id
+    SELECT ms.shipment_type, ms.market_code, ms.move_id
+    INTO s_type, m_code, move_id
+    FROM mto_shipments ms
+    WHERE ms.id = shipment_id;
+
+    IF s_type IS NULL OR m_code IS NULL THEN
+        RAISE EXCEPTION ''Shipment with ID % not found or missing required details.'', shipment_id;
+    END IF;
+
+    -- loop through each provided service item  object
+    FOREACH item IN ARRAY service_items
+    LOOP
+        FOR service_item IN
+            SELECT rsi.id,
+                   rs.id AS re_service_id,
+                   rs.service_location,
+                   rsi.is_auto_approved,
+                   rs.code AS service_code
+            FROM re_service_items rsi
+            JOIN re_services rs ON rsi.service_id = rs.id
+            WHERE rsi.shipment_type = s_type
+              AND rsi.market_code = m_code
+              AND rs.code = (item.re_service_code)
+              AND rsi.is_auto_approved = false
+        LOOP
+            BEGIN
+            IF NOT does_service_item_exist(service_item.re_service_id, shipment_id) THEN
+                INSERT INTO mto_service_items (
+                    mto_shipment_id,
+                    move_id,
+                    re_service_id,
+                    service_location,
+                    status,
+                    created_at,
+                    updated_at,
+                    sit_postal_code,
+                    sit_entry_date,
+                    sit_customer_contacted,
+                    reason,
+                    estimated_weight,
+                    actual_weight,
+                    pickup_postal_code,
+                    description,
+                    sit_destination_original_address_id,
+                    sit_destination_final_address_id,
+                    sit_requested_delivery,
+                    sit_departure_date,
+                    sit_origin_hhg_original_address_id,
+                    sit_origin_hhg_actual_address_id,
+                    customer_expense,
+                    customer_expense_reason,
+                    sit_delivery_miles,
+                    standalone_crate
+                )
+                VALUES (
+                    shipment_id,
+                    move_id,
+                    service_item.re_service_id,
+                    service_item.service_location,
+                    ''SUBMITTED''::service_item_status,
+                    NOW(),
+                    NOW(),
+                    (item).sit_postal_code,
+                    (item).sit_entry_date,
+                    (item).sit_customer_contacted,
+                    (item).reason,
+                    (item).estimated_weight,
+                    (item).actual_weight,
+                    (item).pickup_postal_code,
+                    (item).description,
+                    (item).sit_destination_original_address_id,
+                    (item).sit_destination_final_address_id,
+                    (item).sit_requested_delivery,
+                    (item).sit_departure_date,
+                    (item).sit_origin_hhg_original_address_id,
+                    (item).sit_origin_hhg_actual_address_id,
+                    (item).customer_expense,
+                    (item).customer_expense_reason,
+                    (item).sit_delivery_miles,
+                    (item).standalone_crate
+                ) RETURNING id INTO new_service_id;
+
+                created_service_item_ids := array_append(created_service_item_ids, new_service_id);
+
+                END IF;
+            EXCEPTION
+                WHEN OTHERS THEN
+                    RAISE EXCEPTION ''Error creating accessorial service item with code % for shipment %: %'',
+                                service_item.service_code, shipment_id, SQLERRM;
+            END;
+        END LOOP;
+    END LOOP;
+
+    UPDATE moves SET status = ''APPROVALS REQUESTED'' WHERE id = move_id;
+END;
+'
+LANGUAGE plpgsql;