Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/integrationTesting' into b-20631…
Browse files Browse the repository at this point in the history
…-upgrade-go-1.23.0-nodejs-18.20.4-int
  • Loading branch information
cameroncaci committed Sep 19, 2024
2 parents 9bb9d86 + d7edb16 commit 3723a2d
Show file tree
Hide file tree
Showing 106 changed files with 2,886 additions and 468 deletions.
2 changes: 2 additions & 0 deletions migrations/app/migrations_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1000,3 +1000,5 @@
20240822180409_adding_locked_price_cents_service_param.up.sql
20240909194514_pricing_unpriced_ms_cs_service_items.up.sql
20240910021542_populating_locked_price_cents_from_pricing_estimate_for_ms_and_cs_service_items.up.sql
20240917132411_update_provides_ppm_closeout_transportation_offices.up.sql
20240917165710_update_duty_locations_provides_services_counseling.up.sql
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
INSERT INTO service_item_param_keys
(id,key,description,type,origin,created_at,updated_at)
VALUES
('7ec5cf87-a446-4dd6-89d3-50bbc0d2c206','LockedPriceCents', 'Locked price when move was made available to prime', 'INTEGER', 'SYSTEM', now(), now());
SELECT '7ec5cf87-a446-4dd6-89d3-50bbc0d2c206','LockedPriceCents', 'Locked price when move was made available to prime', 'INTEGER', 'SYSTEM', now(), now()
WHERE NOT EXISTS
(SELECT 1
FROM service_item_param_keys s
WHERE s.id = '7ec5cf87-a446-4dd6-89d3-50bbc0d2c206'
);

INSERT INTO service_params
(id,service_id,service_item_param_key_id,created_at,updated_at,is_optional)
VALUES
('22056106-bbde-4ae7-b5bd-e7d2f103ab7d',(SELECT id FROM re_services WHERE code='MS'),(SELECT id FROM service_item_param_keys where key='LockedPriceCents'), now(), now(), 'false');
SELECT '22056106-bbde-4ae7-b5bd-e7d2f103ab7d',(SELECT id FROM re_services WHERE code='MS'),(SELECT id FROM service_item_param_keys where key='LockedPriceCents'), now(), now(), 'false'
WHERE NOT EXISTS
( SELECT 1
FROM service_params s
WHERE s.id = '22056106-bbde-4ae7-b5bd-e7d2f103ab7d'
);

INSERT INTO service_params
(id,service_id,service_item_param_key_id,created_at,updated_at,is_optional)
VALUES
('86f8c20c-071e-4715-b0c1-608f540b3be3',(SELECT id FROM re_services WHERE code='CS'),(SELECT id FROM service_item_param_keys where key='LockedPriceCents'), now(), now(), 'false');
SELECT '86f8c20c-071e-4715-b0c1-608f540b3be3',(SELECT id FROM re_services WHERE code='CS'),(SELECT id FROM service_item_param_keys where key='LockedPriceCents'), now(), now(), 'false'
WHERE NOT EXISTS
( SELECT 1
FROM service_params s
WHERE s.id = '86f8c20c-071e-4715-b0c1-608f540b3be3'
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-- PPPO Fort Belvoir - USA
UPDATE transportation_offices SET provides_ppm_closeout = true WHERE id = 'a877a317-be5f-482b-a126-c91a34be9290';

-- Personal Property Activity HQ (PPA HQ) - USAF
UPDATE transportation_offices SET provides_ppm_closeout = false WHERE id = 'ebdacf64-353a-4014-91db-0d04d88320f0';

-- PPPO Base Miami - USCG
UPDATE transportation_offices SET provides_ppm_closeout = true WHERE id = '1b3e7496-efa7-48aa-ba22-b630d6fea98b';

-- JPPSO - North West (JEAT) - USA
UPDATE transportation_offices SET provides_ppm_closeout = false WHERE id = '5a3388e1-6d46-4639-ac8f-a8937dc26938';

-- PPPO NSWC Panama City Division - USN
UPDATE transportation_offices SET provides_ppm_closeout = true WHERE id = '57cf1e81-8113-4a52-bc50-3cb8902c2efd';

-- JPPSO - Mid Atlantic (BGAC) - USA
UPDATE transportation_offices SET provides_ppm_closeout = false WHERE id = '8e25ccc1-7891-4146-a9d0-cd0d48b59a50';

-- JPPSO - South West (LKNQ) - USN
UPDATE transportation_offices SET provides_ppm_closeout = false WHERE id = '27002d34-e9ea-4ef5-a086-f23d07c4088c';
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
-- transportation office PPPO Base Miami; duty location Miami, FL 33177
UPDATE duty_locations SET transportation_office_id = '1b3e7496-efa7-48aa-ba22-b630d6fea98b' WHERE id = '38e4c7b0-f204-4c2f-af99-dcb99edba227';

-- transportation office = PPPO Fairchild AFB; duty location = Fairchild AFB, WA 99011
UPDATE duty_locations SET transportation_office_id = '972c238d-89a0-4b50-a0cf-79995c3ed1e7' WHERE id = '87468748-59f1-4a79-bc0d-bbe319939dc9';

-- transportation office = PPPO FE Warren AFB; duty location = F.E. Warren AFB, WY 82005
UPDATE duty_locations SET transportation_office_id = '485ab35a-79e0-4db4-9f13-09f57532deee' WHERE id = '520b7015-3f81-4a33-9996-032f056c684e';

-- transportation office = PPPO Fort Belvoir; duty location = Fort Belvoir, VA 22060
UPDATE duty_locations SET transportation_office_id = 'a877a317-be5f-482b-a126-c91a34be9290' WHERE id = 'e2d6897c-4c18-43da-a693-ecc2d996d8e7';

-- transportation office = PPPO Luke AFB - USAF; duty location = Luke AFB, AZ 85309
UPDATE duty_locations SET transportation_office_id = '3210a533-19b8-4805-a564-7eb452afce10' WHERE id = '450ce4e6-7ee7-4e24-aa15-d2fefa6cd7d8';

-- transportation office = PPPO NAS JRB Fort Worth; duty location = NAS Fort Worth, TX 76127
UPDATE duty_locations SET transportation_office_id = 'f69f315c-942a-4ef3-9427-7fee7883ce73' WHERE id = '4836b832-7329-4900-a4cf-d279e8426b41';

-- transportation office = PPPO NAS Lemoore; duty location = NAS Lemoore, CA 93246
UPDATE duty_locations SET transportation_office_id = '1039d189-39ba-47d4-8ed7-c96304576862' WHERE id = '3e60ffbe-a87a-431f-a0d8-0e400a7df0a1';

-- transportation office = PPPO NAVSUP FLC San Diego; duty location = NAVSUP FLC San Diego, CA 92136
UPDATE duty_locations SET transportation_office_id = 'e4a02d40-2ad9-44c5-a357-202d4ff0b51d' WHERE id = '1909123e-5914-43d4-8cb5-d03121e45750';

-- transportation office = PPPO NSWC Panama City Division; duty location = Panama City Beach, FL 32407
UPDATE duty_locations SET transportation_office_id = '57cf1e81-8113-4a52-bc50-3cb8902c2efd' WHERE id = '436cbcff-9df3-44cb-8bdc-4191ffb4b501';
8 changes: 4 additions & 4 deletions pkg/gen/ghcapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

118 changes: 116 additions & 2 deletions pkg/gen/primev2api/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/gen/primev2messages/create_boat_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3723a2d

Please sign in to comment.