Merge branch 'main' into MAIN-B-20603-backend-boat-office-api

transcom · Aug 29, 2024 · 73de8bf · 73de8bf
2 parents 49bc245 + 3d59604
commit 73de8bf
Show file tree

Hide file tree

Showing 38 changed files with 548 additions and 15 deletions.
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -977,6 +977,7 @@
 20240801135811_create_mobile_home.up.sql
 20240801135833_alter_mto_shipment_type_motorhome.up.sql
 20240806151051_update_pws_violations.up.sql
+20240807140736_add_locked_price_cents_to_mto_service_items.up.sql
 20240807212737_add_counseling_transportation_office_id_to_moves.up.sql
 20240812183447_add_gsr_appeals_table.up.sql
 20240813153431_change_mobile_home_shipment_deleted_at_type.up.sql

diff --git a/migrations/app/schema/20240807140736_add_locked_price_cents_to_mto_service_items.up.sql b/migrations/app/schema/20240807140736_add_locked_price_cents_to_mto_service_items.up.sql
@@ -0,0 +1,5 @@
+-- Adding locked_price_cents to mto_service_items
+ALTER TABLE mto_service_items
+ADD COLUMN IF NOT EXISTS locked_price_cents integer;
+
+COMMENT ON COLUMN mto_service_items.locked_price_cents IS 'Locked price for some service items that should never be updated';
diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go
diff --git a/pkg/gen/ghcmessages/m_t_o_service_item.go b/pkg/gen/ghcmessages/m_t_o_service_item.go
diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go
diff --git a/pkg/gen/primemessages/m_t_o_service_item.go b/pkg/gen/primemessages/m_t_o_service_item.go
diff --git a/pkg/gen/primemessages/m_t_o_service_item_basic.go b/pkg/gen/primemessages/m_t_o_service_item_basic.go
diff --git a/pkg/gen/primemessages/m_t_o_service_item_dest_s_i_t.go b/pkg/gen/primemessages/m_t_o_service_item_dest_s_i_t.go
diff --git a/pkg/gen/primemessages/m_t_o_service_item_domestic_crating.go b/pkg/gen/primemessages/m_t_o_service_item_domestic_crating.go
diff --git a/pkg/gen/primemessages/m_t_o_service_item_origin_s_i_t.go b/pkg/gen/primemessages/m_t_o_service_item_origin_s_i_t.go