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.

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

INT B-21983 - Display Counseling Office in Move Details (Review After B-21977) #14538

Merged
merged 103 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
fa4e830
add test
deandreJones Dec 16, 2024
1dda9fe
Merge remote-tracking branch 'origin/main' into B-21983
ajlusk Dec 18, 2024
c4c1438
Merge branch 'proxyMiddlewareFix' into B-21983
ajlusk Dec 18, 2024
d308a38
Added counseling office to move payload
ajlusk Dec 20, 2024
6bce710
Merge remote-tracking branch 'origin/main' into B-21983
ajlusk Dec 20, 2024
fde528b
Merge branch 'main' into MAIN-B-22138-defect-duty-location-po-box-zip…
taeJungCaci Dec 27, 2024
3c6ecf3
Merge remote-tracking branch 'origin/main' into B-21773-main
deandreJones Dec 30, 2024
3d0f4bc
hide emplid
deandreJones Dec 11, 2024
85fa79d
updates
deandreJones Dec 13, 2024
03958ad
fix test
deandreJones Dec 13, 2024
f03251b
remove what was removed
deandreJones Dec 13, 2024
a7529c1
add timeout
deandreJones Dec 16, 2024
e0847f1
move to lower
deandreJones Dec 16, 2024
d069b1c
dont be a flake
deandreJones Dec 16, 2024
beaf6f4
add safety type test
deandreJones Dec 16, 2024
28c8181
special moves section
deandreJones Dec 17, 2024
cce3db9
lowercase
deandreJones Dec 17, 2024
fc4e17e
fix capturing the order type in adding orders detail info
deandreJones Dec 21, 2024
3e1e8aa
use contant values
deandreJones Dec 26, 2024
7174bd1
fix test
deandreJones Dec 26, 2024
df5f8fc
caps
deandreJones Jan 2, 2025
b8c9e1f
put back
deandreJones Jan 2, 2025
cea9ade
put test order type back to caps
deandreJones Jan 2, 2025
b57afab
caps on the const
deandreJones Jan 2, 2025
cc69631
no cap on the move details header
deandreJones Jan 2, 2025
f23c0d1
trash basket
deandreJones Jan 2, 2025
70e658e
Merge branch 'main' into B-21773-main
danieljordan-caci Jan 6, 2025
d3a7800
brought in changes done on PR 14127
WeatherfordAaron Jan 6, 2025
09d855d
Merge branch 'B-21977' into B-21983
ajlusk Jan 7, 2025
27a01a9
Merge branch 'main' into B-21581-MAIN
WeatherfordAaron Jan 7, 2025
1c27b18
corrected for bad automatic conflict resolution
WeatherfordAaron Jan 7, 2025
9ffdd19
added the rest of the changes in the errors file
WeatherfordAaron Jan 7, 2025
3c50b44
Merge branch 'main' into B-21581-MAIN
WeatherfordAaron Jan 7, 2025
6a76715
Add counseling office to orders list component
ajlusk Jan 7, 2025
ef9c3b2
Merge branch 'B-21983' into B-21983-INT
ajlusk Jan 7, 2025
a9755ee
brought in all changes from B-21581
WeatherfordAaron Jan 7, 2025
5c34ae0
Merge remote-tracking branch 'origin/main' into B-21170
ajlusk Jan 8, 2025
40a60b9
Merge branch 'main' into MAIN-B-21675-final
WeatherfordAaron Jan 8, 2025
53a5f41
Merge branch 'MAIN-B-21675-final' of https://github.com/transcom/mymo…
WeatherfordAaron Jan 8, 2025
b870130
reverting changes erroneously brought in from B-21581
WeatherfordAaron Jan 8, 2025
9dfc76c
counseling office in orders card test fix
ajlusk Jan 8, 2025
561469f
Merge branch 'B-21983' into B-21983-INT
ajlusk Jan 8, 2025
24c39d9
Merge branch 'integrationTesting' into B-21983-INT
ajlusk Jan 8, 2025
a40ccf4
changes requested on PR
WeatherfordAaron Jan 8, 2025
03b723f
let swagger regen scripts
WeatherfordAaron Jan 8, 2025
91d2eba
changes to swagger-def requested
WeatherfordAaron Jan 8, 2025
dcfec82
some gen needed
WeatherfordAaron Jan 8, 2025
5882528
Merge branch 'main' into B-21170
ajlusk Jan 8, 2025
acf9fe3
Merge branch 'main' into MAIN-B-21675-final
WeatherfordAaron Jan 8, 2025
4221cc2
initial commit, added pricers, waiting on ordering issue regarding pa…
danieljordan-caci Dec 26, 2024
834cd2b
pack and unpack done, need tests
danieljordan-caci Jan 2, 2025
fdafbd3
POEFSC and PODFSC should be good, onto linehaul, still need tests
danieljordan-caci Jan 2, 2025
1a0073e
linehaul done, now it is time for tests and refinement please save me…
danieljordan-caci Jan 2, 2025
d43303f
test for rate area id
danieljordan-caci Jan 2, 2025
776f730
added tests for service param value lookups folder
danieljordan-caci Jan 2, 2025
440003f
mocks
danieljordan-caci Jan 2, 2025
88cba28
tests on tests on tests
danieljordan-caci Jan 2, 2025
c82e97c
updating address facotry to handle bogus postal code values when gett…
danieljordan-caci Jan 2, 2025
5c81091
fixing some issues with tests and address factory
danieljordan-caci Jan 3, 2025
f39bfa3
PR fix feedback
danieljordan-caci Jan 3, 2025
5f31615
mocks again
danieljordan-caci Jan 3, 2025
114ee8e
updating prime docs
danieljordan-caci Jan 3, 2025
4890576
adding logic to use port ZIP for international shipments and ZIP lookups
danieljordan-caci Jan 6, 2025
24cf971
initial commit, functonality added, tests added
danieljordan-caci Dec 20, 2024
509f3fc
comments
danieljordan-caci Dec 20, 2024
f6408b9
added usmc test
danieljordan-caci Dec 20, 2024
55c8629
updated db func to include USMC check, added test
danieljordan-caci Dec 26, 2024
1ac32cd
if it broke, ya gotta fix
danieljordan-caci Dec 20, 2024
72178bd
Merge branch 'main' into MAIN-B-21675-final
WeatherfordAaron Jan 8, 2025
4b8d46a
Merge branch 'main' into B-21170
ajlusk Jan 8, 2025
85ba1a0
Merge branch 'main' into MAIN-B-22138-defect-duty-location-po-box-zip…
taeJungCaci Jan 8, 2025
54d6e9d
Merge branch 'main' into B-21773-main
deandreJones Jan 8, 2025
d60eb89
Merge pull request #14542 from transcom/MAIN-B-21707
deandreJones Jan 8, 2025
574ffd9
Merge branch 'main' into MAIN-B-21942
danieljordan-caci Jan 8, 2025
e8b6bb8
Merge branch 'main' into MAIN-B-22138-defect-duty-location-po-box-zip…
taeJungCaci Jan 8, 2025
bce4f53
Merge pull request #14544 from transcom/MAIN-B-21942
deandreJones Jan 8, 2025
28a5f0b
Merge branch 'main' into MAIN-B-22138-defect-duty-location-po-box-zip…
taeJungCaci Jan 8, 2025
f669f3f
Merge branch 'integrationTesting' into B-21983-INT
ajlusk Jan 8, 2025
e59da8f
Merge branch 'main' into B-21773-main
deandreJones Jan 9, 2025
9196182
Merge pull request #14373 from transcom/B-21773-main
deandreJones Jan 9, 2025
6b2af6b
Merge remote-tracking branch 'origin/main' into B-21170
ajlusk Jan 9, 2025
9fd6c4c
Merge branch 'main' into MAIN-B-22146-defect-incorrect-mileage-destin…
taeJungCaci Jan 9, 2025
88890c1
Merge pull request #14529 from transcom/B-21170
r-mettler Jan 9, 2025
8464810
Merge branch 'main' into MAIN-B-22138-defect-duty-location-po-box-zip…
WeatherfordAaron Jan 9, 2025
34fa5ca
Merge pull request #14481 from transcom/MAIN-B-22138-defect-duty-loca…
WeatherfordAaron Jan 9, 2025
1778db7
Merge branch 'main' into MAIN-B-22146-defect-incorrect-mileage-destin…
taeJungCaci Jan 9, 2025
d45a6a6
Merge pull request #14514 from transcom/MAIN-B-22146-defect-incorrect…
WeatherfordAaron Jan 9, 2025
5854709
Merge branch 'main' into MAIN-B-21675-final
WeatherfordAaron Jan 9, 2025
62dfb22
Merge pull request #14537 from transcom/MAIN-B-21675-final
WeatherfordAaron Jan 9, 2025
93b4fbb
brought in changes again since an auto-merge issue happened
WeatherfordAaron Jan 9, 2025
5083c0f
Merge pull request #14555 from transcom/B-21581-MAIN-final
WeatherfordAaron Jan 9, 2025
b9cfd42
Merge branch 'B-21977' into B-21983
ajlusk Jan 9, 2025
1602d72
Merge branch 'integrationTesting' into B-21983-INT
ajlusk Jan 9, 2025
8a74e1f
Merge remote-tracking branch 'origin/main' into B-21983
ajlusk Jan 10, 2025
51524e3
Merge remote-tracking branch 'origin/integrationTesting' into B-21983…
ajlusk Jan 10, 2025
8dea664
Merge branch 'B-21983' into B-21983-INT
ajlusk Jan 10, 2025
cdb5dbe
update gen files
ajlusk Jan 10, 2025
62f4260
Merge branch 'integrationTesting' into B-21983-INT
ajlusk Jan 10, 2025
3123707
peer review suggestions
ajlusk Jan 10, 2025
c1a2d6d
Merge branch 'B-21983' into B-21983-INT
ajlusk Jan 10, 2025
c650909
Merge branch 'integrationTesting' into B-21983-INT
ajlusk Jan 10, 2025
626de83
Merge branch 'integrationTesting' into B-21983-INT
ajlusk Jan 13, 2025
8ebfbee
Merge branch 'integrationTesting' into B-21983-INT
ajlusk Jan 13, 2025
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
5 changes: 5 additions & 0 deletions pkg/gen/ghcapi/configure_mymove.go
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler {
return middleware.NotImplemented("operation ppm.ShowAOAPacket has not yet been implemented")
})
}
if api.TransportationOfficeShowCounselingOfficesHandler == nil {
api.TransportationOfficeShowCounselingOfficesHandler = transportation_office.ShowCounselingOfficesHandlerFunc(func(params transportation_office.ShowCounselingOfficesParams) middleware.Responder {
return middleware.NotImplemented("operation transportation_office.ShowCounselingOffices has not yet been implemented")
})
}
if api.PpmShowPaymentPacketHandler == nil {
api.PpmShowPaymentPacketHandler = ppm.ShowPaymentPacketHandlerFunc(func(params ppm.ShowPaymentPacketParams) middleware.Responder {
return middleware.NotImplemented("operation ppm.ShowPaymentPacket has not yet been implemented")
Expand Down
150 changes: 148 additions & 2 deletions pkg/gen/ghcapi/embedded_spec.go

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

12 changes: 12 additions & 0 deletions pkg/gen/ghcapi/ghcoperations/mymove_api.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.

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

Loading
Loading