Skip to content

Commit

Permalink
Merge pull request #13730 from transcom/INT-B-21022-not-include-JPPSOs
Browse files Browse the repository at this point in the history
INT B-21022 - Include/Exclude specific offices
  • Loading branch information
MInthavongsay authored Sep 18, 2024
2 parents 079eec6 + f7ec1d5 commit e92ac40
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 11 deletions.
1 change: 1 addition & 0 deletions migrations/app/migrations_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1000,3 +1000,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
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

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.

5 changes: 4 additions & 1 deletion pkg/handlers/ghcapi/tranportation_offices.go
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
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
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

0 comments on commit e92ac40

Please sign in to comment.