Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MAIN - B-21022 - Include/Exclude specific offices #13746

Merged
merged 5 commits into from
Sep 23, 2024
Merged

MAIN - B-21022 - Include/Exclude specific offices #13746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c1dd98
add migration file to update 7 records to transportation_offices tabl…
MInthavongsay Sep 17, 2024
b11e817
update swagger description and summary for API to align with change r…
MInthavongsay Sep 18, 2024
8090e4b
MAIN merge
MInthavongsay Sep 20, 2024
12f12cf
Merge branch 'main' into B-21022-not-include-JPPSOs
r-mettler Sep 20, 2024
3b9c2e3
Merge branch 'main' into B-21022-not-include-JPPSOs
antgmann Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions migrations/app/migrations_manifest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,3 +997,4 @@
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
20 changes: 20 additions & 0 deletions ...ions/app/schema/20240917132411_update_provides_ppm_closeout_transportation_offices.up.sql
View file
Open in desktop
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';
8 changes: 4 additions & 4 deletions pkg/gen/ghcapi/embedded_spec.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions pkg/gen/ghcapi/ghcoperations/transportation_office/get_transportation_offices.go
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion pkg/handlers/ghcapi/tranportation_offices.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ func (h GetTransportationOfficesHandler) Handle(params transportationofficeop.Ge
return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest,
func(appCtx appcontext.AppContext) (middleware.Responder, error) {

transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search, false)
// B-21022: forPpm param is set true. This is used by PPM closeout widget. Need to ensure certain offices are included/excluded
// if location has ppm closedout enabled.
transportationOffices, err := h.TransportationOfficesFetcher.GetTransportationOffices(appCtx, params.Search, true)

if err != nil {
appCtx.Logger().Error("Error searching for Transportation Offices: ", zap.Error(err))
return transportationofficeop.NewGetTransportationOfficesInternalServerError(), err
Expand Down
4 changes: 2 additions & 2 deletions swagger-def/ghc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3827,8 +3827,8 @@ paths:
get:
produces:
- application/json
summary: Returns the transportation offices matching the search query
description: Returns the transportation offices matching the search query
summary: Returns the transportation offices matching the search query that is enabled for PPM closeout
description: Returns the transportation offices matching the search query that is enabled for PPM closeout
operationId: getTransportationOffices
tags:
- transportationOffice
Expand Down
8 changes: 6 additions & 2 deletions swagger/ghc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4003,8 +4003,12 @@ paths:
get:
produces:
- application/json
summary: Returns the transportation offices matching the search query
description: Returns the transportation offices matching the search query
summary: >-
Returns the transportation offices matching the search query that is
enabled for PPM closeout
description: >-
Returns the transportation offices matching the search query that is
enabled for PPM closeout
operationId: getTransportationOffices
tags:
- transportationOffice
Expand Down