From c5456eb4c0cfef4ca6e15fd8f4d9ddcd20519942 Mon Sep 17 00:00:00 2001 From: Beth Grohmann Date: Fri, 27 Dec 2024 14:29:41 -0600 Subject: [PATCH 1/5] Add Camp Pendelton transportation office --- migrations/app/migrations_manifest.txt | 1 + ...sert_transportation_offices_camp_pendelton.up.sql | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt index ce1d2a281d2..6dc31cb265a 100644 --- a/migrations/app/migrations_manifest.txt +++ b/migrations/app/migrations_manifest.txt @@ -1050,3 +1050,4 @@ 20241203024453_add_ppm_max_incentive_column.up.sql 20241204155919_update_ordering_proc.up.sql 20241204210208_retroactive_update_of_ppm_max_and_estimated_incentives_prd.up.sql +20241227202424_insert_transportation_offices_camp_pendelton.up.sql diff --git a/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql b/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql new file mode 100644 index 00000000000..a479d4d4d48 --- /dev/null +++ b/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql @@ -0,0 +1,12 @@ +--add address for Camp Pendelton transportation office +INSERT INTO public.addresses +(id, street_address_1, street_address_2, city, state, postal_code, created_at, updated_at, street_address_3, county, is_oconus, country_id, us_post_region_cities_id) +VALUES('da815bc4-2b66-41ba-83de-7abd161ac74b', 'Vandergrift Blvd', 'Bldg 2263', 'Camp Pendelton', 'CA', '92054', now(), now(), null, 'SAN DIEGO', false, '791899e6-cd77-46f2-981b-176ecb8d7098','d0c818dc-1e6c-416a-bfa9-2762efebaed1' ); + +--add Camp Pendelton transportation office +INSERT INTO public.transportation_offices +(id, shipping_office_id, "name", address_id, latitude, longitude, hours, services, note, created_at, updated_at, gbloc, provides_ppm_closeout) +VALUES('9cd498c6-8ccb-48c4-9d1f-64338de132c2', '27002d34-e9ea-4ef5-a086-f23d07c4088c', 'PPPO DMO Camp Pendelton', 'da815bc4-2b66-41ba-83de-7abd161ac74b', 33.295425, -117.3541, null, null, null, now(), now(), 'LKNQ', false); + +--associate duty location to Camp Pendelton transportation office +update duty_locations set transportation_office_id = '9cd498c6-8ccb-48c4-9d1f-64338de132c2' where id = '6e320acb-47b6-45e0-80f4-9d8dc1e20812'; \ No newline at end of file From faa4cde5ebfc11309932486d1facef345d4443d1 Mon Sep 17 00:00:00 2001 From: Beth Grohmann Date: Mon, 30 Dec 2024 12:12:34 -0600 Subject: [PATCH 2/5] Update 20241227202424_insert_transportation_offices_camp_pendelton.up.sql --- ..._transportation_offices_camp_pendelton.up.sql | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql b/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql index a479d4d4d48..3e74d735152 100644 --- a/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql +++ b/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql @@ -1,12 +1,8 @@ ---add address for Camp Pendelton transportation office -INSERT INTO public.addresses -(id, street_address_1, street_address_2, city, state, postal_code, created_at, updated_at, street_address_3, county, is_oconus, country_id, us_post_region_cities_id) -VALUES('da815bc4-2b66-41ba-83de-7abd161ac74b', 'Vandergrift Blvd', 'Bldg 2263', 'Camp Pendelton', 'CA', '92054', now(), now(), null, 'SAN DIEGO', false, '791899e6-cd77-46f2-981b-176ecb8d7098','d0c818dc-1e6c-416a-bfa9-2762efebaed1' ); +--update address for Camp Pendelton transportation office +update addresses set postal_code = '92054', us_post_region_cities_id = 'd0c818dc-1e6c-416a-bfa9-2762efebaed1' where id = 'af2ebb73-54fe-46e0-9525-a4568ceb9e0e'; ---add Camp Pendelton transportation office -INSERT INTO public.transportation_offices -(id, shipping_office_id, "name", address_id, latitude, longitude, hours, services, note, created_at, updated_at, gbloc, provides_ppm_closeout) -VALUES('9cd498c6-8ccb-48c4-9d1f-64338de132c2', '27002d34-e9ea-4ef5-a086-f23d07c4088c', 'PPPO DMO Camp Pendelton', 'da815bc4-2b66-41ba-83de-7abd161ac74b', 33.295425, -117.3541, null, null, null, now(), now(), 'LKNQ', false); +--fix Camp Pendelton transportation office spelling +update transportation_offices set name = 'PPPO DMO Camp Pendelton' where id = 'f50eb7f5-960a-46e8-aa64-6025b44132ab'; ---associate duty location to Camp Pendelton transportation office -update duty_locations set transportation_office_id = '9cd498c6-8ccb-48c4-9d1f-64338de132c2' where id = '6e320acb-47b6-45e0-80f4-9d8dc1e20812'; \ No newline at end of file +--associate duty location to Camp Pendleton transportation office +update duty_locations set transportation_office_id = 'f50eb7f5-960a-46e8-aa64-6025b44132ab' where id = '6e320acb-47b6-45e0-80f4-9d8dc1e20812'; From fc61b201d979e09c8f9f3fec91a7470389270eac Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 2 Jan 2025 11:07:59 -0600 Subject: [PATCH 3/5] spelling matters --- playwright/tests/my/mymove/orders.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playwright/tests/my/mymove/orders.spec.js b/playwright/tests/my/mymove/orders.spec.js index fd3a0cab544..67893b39d53 100644 --- a/playwright/tests/my/mymove/orders.spec.js +++ b/playwright/tests/my/mymove/orders.spec.js @@ -110,7 +110,7 @@ test.describe('(MultiMove) Orders', () => { await page.getByRole('combobox', { name: 'Pay grade' }).selectOption({ label: 'E-7' }); await page .getByRole('combobox', { name: 'Counseling Office' }) - .selectOption({ label: 'PPPO DMO Camp Pendleton - USMC' }); + .selectOption({ label: 'PPPO DMO Camp Pendelton - USMC' }); await customerPage.navigateForward(); await customerPage.waitForPage.ordersUpload(); From caa49076f0e73a0ef4e02598968d3c8ad784ecb8 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 2 Jan 2025 11:54:29 -0600 Subject: [PATCH 4/5] fix playwright --- playwright/tests/my/mymove/orders.spec.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/playwright/tests/my/mymove/orders.spec.js b/playwright/tests/my/mymove/orders.spec.js index 67893b39d53..95f723c4a38 100644 --- a/playwright/tests/my/mymove/orders.spec.js +++ b/playwright/tests/my/mymove/orders.spec.js @@ -107,10 +107,8 @@ test.describe('(MultiMove) Orders', () => { await expect(page.getByLabel('Current duty location')).toBeEmpty(); await customerPage.selectDutyLocation('Marine Corps AS Yuma, AZ 85369', 'origin_duty_location'); + await page.getByRole('combobox', { name: 'Counseling Office' }).selectOption({ label: 'PPPO DMO Camp Pendelton' }); await page.getByRole('combobox', { name: 'Pay grade' }).selectOption({ label: 'E-7' }); - await page - .getByRole('combobox', { name: 'Counseling Office' }) - .selectOption({ label: 'PPPO DMO Camp Pendelton - USMC' }); await customerPage.navigateForward(); await customerPage.waitForPage.ordersUpload(); From d64def65f8650a0a7a61cc2982d453a59c1f1925 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 2 Jan 2025 12:05:04 -0600 Subject: [PATCH 5/5] i blame beth --- ...27202424_insert_transportation_offices_camp_pendelton.up.sql | 2 +- playwright/tests/my/mymove/orders.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql b/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql index 3e74d735152..dfe3c278ed9 100644 --- a/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql +++ b/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql @@ -2,7 +2,7 @@ update addresses set postal_code = '92054', us_post_region_cities_id = 'd0c818dc-1e6c-416a-bfa9-2762efebaed1' where id = 'af2ebb73-54fe-46e0-9525-a4568ceb9e0e'; --fix Camp Pendelton transportation office spelling -update transportation_offices set name = 'PPPO DMO Camp Pendelton' where id = 'f50eb7f5-960a-46e8-aa64-6025b44132ab'; +update transportation_offices set name = 'PPPO DMO Camp Pendleton' where id = 'f50eb7f5-960a-46e8-aa64-6025b44132ab'; --associate duty location to Camp Pendleton transportation office update duty_locations set transportation_office_id = 'f50eb7f5-960a-46e8-aa64-6025b44132ab' where id = '6e320acb-47b6-45e0-80f4-9d8dc1e20812'; diff --git a/playwright/tests/my/mymove/orders.spec.js b/playwright/tests/my/mymove/orders.spec.js index 95f723c4a38..7c418ee006d 100644 --- a/playwright/tests/my/mymove/orders.spec.js +++ b/playwright/tests/my/mymove/orders.spec.js @@ -107,7 +107,7 @@ test.describe('(MultiMove) Orders', () => { await expect(page.getByLabel('Current duty location')).toBeEmpty(); await customerPage.selectDutyLocation('Marine Corps AS Yuma, AZ 85369', 'origin_duty_location'); - await page.getByRole('combobox', { name: 'Counseling Office' }).selectOption({ label: 'PPPO DMO Camp Pendelton' }); + await page.getByRole('combobox', { name: 'Counseling Office' }).selectOption({ label: 'PPPO DMO Camp Pendleton' }); await page.getByRole('combobox', { name: 'Pay grade' }).selectOption({ label: 'E-7' }); await customerPage.navigateForward();