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

set to deploy to loatest #13768

Draft
wants to merge 4,196 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4196 commits
Select commit Hold shift + click to select a range
cd687f4
Merge branch 'integrationTesting' into INT-B-21519
danieljordan-caci Jan 23, 2025
d888629
using correct market code
CoryKleinjanCACI Jan 23, 2025
c0bd052
Merge branch 'B-21410' into B-21410-INT
CoryKleinjanCACI Jan 23, 2025
829b29c
Merge branch 'integrationTesting' into B-21557-INT-Estimated-Price
joeydoyecaci Jan 23, 2025
4830186
Merge branch 'integrationTesting' into B-21410-INT
CoryKleinjanCACI Jan 23, 2025
f05a546
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 23, 2025
deab95a
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 24, 2025
bcbbd0a
Adding test coverage
TevinAdams Jan 24, 2025
9f01040
Additional Test Coverage
TevinAdams Jan 24, 2025
edb5500
Admin Requested Office Users Filtering
TevinAdams Jan 24, 2025
fc8b80f
Merge branch 'B-21961-Add-Roles-To-Requested-Office-Users-List-Sortin…
TevinAdams Jan 24, 2025
4e5922c
Merge remote-tracking branch 'origin/main' into MAIN-B-22239
brianmanley-caci Jan 24, 2025
5dda619
Merge B-22239 into INT-B-22239
brianmanley-caci Jan 24, 2025
f6d2c41
Merge branch 'MAIN-B-21659' into branch INT-B-21659
msaki-caci Jan 24, 2025
abafe05
Use constant variables instead of strings
brooklyn-welsh Jan 24, 2025
0efebf9
Use constant variables instead of strings
brooklyn-welsh Jan 24, 2025
2637f06
add validation for MARINES and update tests
pambecker Jan 24, 2025
a1b042c
Merge branch 'main' into B-21557-Estimated-Price
joeydoyecaci Jan 24, 2025
96d2de3
Updating procedure to return created service ids
CoryKleinjanCACI Jan 24, 2025
0ef837e
Merge branch 'main' into B-21410
CoryKleinjanCACI Jan 24, 2025
bd4fc51
Merge branch 'B-21557-Estimated-Price' into B-21557-INT-Estimated-Price
joeydoyecaci Jan 24, 2025
a3da27f
Merge branch 'B-21410' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
0d9f98e
Updating proc param from OUT to INOUT
CoryKleinjanCACI Jan 24, 2025
24746d9
Merge branch 'B-21410' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
42ce655
Merge pull request #14631 from transcom/B-20536-INT
paulstonebraker Jan 24, 2025
094d873
Merge branch 'B-21659' into MAIN-B-21659
msaki-caci Jan 24, 2025
d9abfd0
Merge branch 'MAIN-B-21659' into INT-B-21659
msaki-caci Jan 24, 2025
bcd2386
Merge branch 'integrationTesting' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
4df3462
Merge branch 'integrationTesting' into INT-B-21698-PPM-Clouseout-Calc…
brianmanley-caci Jan 24, 2025
36b077d
Merge branch 'integrationTesting' into INT-B-21659_Display_estimated_…
msaki-caci Jan 24, 2025
8b885a5
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 24, 2025
69188a7
Merge branch 'integrationTesting' into B-21557-INT-Estimated-Price
joeydoyecaci Jan 24, 2025
6c69f1c
Merge pull request #14653 from transcom/INT-B-22239-Show-Deleted-Agen…
brianmanley-caci Jan 24, 2025
64af740
Merge branch 'integrationTesting' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
696bf7e
cleanup logic
pambecker Jan 24, 2025
a79af19
Merge branch 'integrationTesting' into B-21557-INT-Estimated-Price
joeydoyecaci Jan 24, 2025
e3ecb66
add extra days for shipments to or from alaska
paulstonebraker Jan 24, 2025
121667f
Merge branch B-21473-MAIN into B-21473-INT
paulstonebraker Jan 24, 2025
5768f00
Merge branch 'main' into B-21446-TIO-bulk-assignment-be
pambecker Jan 24, 2025
36cd071
Merge pull request #14579 from transcom/B-21557-INT-Estimated-Price
joeydoyecaci Jan 24, 2025
2695238
Updating proc for pricing international service shuttle
CoryKleinjanCACI Jan 24, 2025
21ee12c
Merge branch 'B-21410' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
4034f1a
Merge branch 'integrationTesting' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
5e13c49
updating pricing proc
CoryKleinjanCACI Jan 24, 2025
eae2b0e
Merge branch 'B-21410' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
a8e8746
Merge branch 'B-21410-INT' of https://github.com/transcom/mymove into…
CoryKleinjanCACI Jan 24, 2025
b31bad5
fix test
pambecker Jan 24, 2025
5ce244b
Merge branch 'integrationTesting' into B-21473-INT
paulstonebraker Jan 24, 2025
e25ba35
MAIN-B-21659 Add UB to ShipmentFormRemarks
msaki-caci Jan 24, 2025
157d8a7
Merge branch 'MAIN-B-21659_Display_estimated_prices_UB' into INT-B-21…
msaki-caci Jan 24, 2025
f071af9
Merge pull request #14643 from transcom/INT-B-21519
danieljordan-caci Jan 24, 2025
f7087ef
Merge branch 'integrationTesting' into INT-B-21838-payment-request-re…
danieljordan-caci Jan 24, 2025
fd747b6
Merge branch 'integrationTesting' into B-21410-INT
CoryKleinjanCACI Jan 24, 2025
67f3102
Merge branch 'integrationTesting' into INT-B-21659_Display_estimated_…
msaki-caci Jan 24, 2025
7489d7d
Merge branch 'B-21446-TIO-bulk-assignment-be' into B-21446-INT
pambecker Jan 24, 2025
d891220
Merge pull request #14652 from transcom/INT-B-21659_Display_estimated…
msaki-caci Jan 24, 2025
2bf389b
Merge pull request #14627 from transcom/INT-B-21698-PPM-Clouseout-Cal…
brianmanley-caci Jan 24, 2025
3f19dee
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 24, 2025
2614b71
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 27, 2025
ac230af
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 27, 2025
9f574de
add IsAddressAlaska helper
paulstonebraker Jan 27, 2025
10520a2
Merge branch 'integrationTesting' into B-21410-INT
CoryKleinjanCACI Jan 27, 2025
b58faf0
Merge branch B-21473-MAIN into B-21473-INT
paulstonebraker Jan 27, 2025
c5d5bd1
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 27, 2025
91b885b
make the function more better
paulstonebraker Jan 27, 2025
b9ba321
Merge branch 'B-21473-MAIN' into B-21473-INT
paulstonebraker Jan 27, 2025
7e43490
Merge branch 'integrationTesting' into B-21473-INT
paulstonebraker Jan 27, 2025
f87d4e0
Merge branch 'main' into MAIN-21838-service-item-rejection-TIO
brooklyn-welsh Jan 27, 2025
1dfdc8b
Merge pull request #14483 from transcom/B-21410-INT
CoryKleinjanCACI Jan 27, 2025
727bce5
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 27, 2025
ef194e4
Adjusting Role display impl
TevinAdams Jan 27, 2025
8120482
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 27, 2025
93170d6
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 27, 2025
696c55b
Merge branch 'integrationTesting' into B-21473-INT
paulstonebraker Jan 27, 2025
5b51035
Edited to include MS and CS items (any item with a rejection reason)
brooklyn-welsh Jan 27, 2025
8cc073b
Merge branch 'MAIN-21838-service-item-rejection-TIO' into INT-21838-s…
brooklyn-welsh Jan 27, 2025
3bf5db9
Error handling adjustments
TevinAdams Jan 27, 2025
a2dc099
Merge branch 'B-21961-Add-Roles-To-Requested-Office-Users-List-Sortin…
TevinAdams Jan 27, 2025
9038658
pass serviceMemberId to office app's get counseling offices handler a…
ajlusk Jan 27, 2025
a47a096
slightly expand tests for counseling offices handlers
ajlusk Jan 27, 2025
4c75262
Merge remote-tracking branch 'origin/main' into B-21977
ajlusk Jan 27, 2025
4c270f8
Merge pull request #14637 from transcom/INT-B-21978
danieljordan-caci Jan 27, 2025
a246685
Merge branch 'B-21977' into B-21977-INT4
ajlusk Jan 27, 2025
472762a
initial commit, need to add tests to backend
danieljordan-caci Jan 27, 2025
53e7cdb
Merge branch 'integrationTesting' into INT-21838-service-item-rejecti…
brooklyn-welsh Jan 27, 2025
e09a711
Revert "Merge pull request #14637 from transcom/INT-B-21978"
danieljordan-caci Jan 27, 2025
e03cf03
Merge branch 'integrationTesting' into B-21977-INT4
ajlusk Jan 27, 2025
5d1dfef
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 27, 2025
af317d2
fix rendering
deandreJones Jan 27, 2025
aea7de7
Merge remote-tracking branch 'origin/B-21934-main' into I-13787--B-21…
deandreJones Jan 27, 2025
3377f7e
Merge pull request #14666 from transcom/revert-INT-B-21978
danieljordan-caci Jan 27, 2025
e5e67dc
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 27, 2025
ced382e
Merge remote-tracking branch 'origin/integrationTesting' into B-21977…
ajlusk Jan 27, 2025
8ddefde
Merge branch 'integrationTesting' into I-13787--B-21934-fix
deandreJones Jan 27, 2025
9e1b2bd
Fix for bg color
brooklyn-welsh Jan 27, 2025
098f757
Merge branch 'MAIN-21838-service-item-rejection-TIO' into INT-21838-s…
brooklyn-welsh Jan 27, 2025
1a053e3
tests added
danieljordan-caci Jan 27, 2025
6cdd0c7
Merge remote-tracking branch 'origin/MAIN-B-21963' into INT-B-21963
danieljordan-caci Jan 27, 2025
17e6976
fixing the issue
danieljordan-caci Jan 27, 2025
c26b407
Merge branch 'integrationTesting' into INT-B-21978-revert-the-revert
danieljordan-caci Jan 27, 2025
c5657f0
Revert "fixing the issue"
danieljordan-caci Jan 27, 2025
3c34d77
Reapply "fixing the issue"
danieljordan-caci Jan 27, 2025
6a28f8c
Merge remote-tracking branch 'origin/integrationTesting' into INT-B-2…
danieljordan-caci Jan 27, 2025
e7b677f
Revert "Merge pull request #14666 from transcom/revert-INT-B-21978"
danieljordan-caci Jan 27, 2025
0e6a15b
removing param from ZipTransitDistance
danieljordan-caci Jan 27, 2025
7b886e3
Merge remote-tracking branch 'refs/remotes/origin/INT-B-21978-revert-…
danieljordan-caci Jan 27, 2025
481f30f
removal of file, ignoring js files from test coverage
danieljordan-caci Jan 27, 2025
3c4cacc
Merge branch 'integrationTesting' into B-21473-INT
paulstonebraker Jan 28, 2025
c76b932
updating mock test params
danieljordan-caci Jan 28, 2025
c4ef419
removing unused code, updating some things
danieljordan-caci Jan 28, 2025
ff83d59
bug fixes for assignment
paulstonebraker Jan 28, 2025
26fb6ef
Merge remote-tracking branch 'origin/MAIN-B-21963' into INT-B-21963
danieljordan-caci Jan 28, 2025
c374e49
Merge branch 'integrationTesting' into INT-21838-service-item-rejecti…
brooklyn-welsh Jan 28, 2025
b1b878e
Merge branch B-22247-MAIN into B-22247-INT
paulstonebraker Jan 28, 2025
2575028
Merge branch 'integrationTesting' into INT-B-21838-payment-request-re…
brooklyn-welsh Jan 28, 2025
8255fdb
add path and params to clients tests for AddOrdersForm which now uses…
ajlusk Jan 28, 2025
392d106
Merge branch 'B-21977' into B-21977-INT4
ajlusk Jan 28, 2025
e017fac
Added unit test
brooklyn-welsh Jan 28, 2025
e430b3b
Merge branch 'MAIN-21838-service-item-rejection-TIO' into INT-21838-s…
brooklyn-welsh Jan 28, 2025
c0a3c96
Removed unneeded conditional
brooklyn-welsh Jan 28, 2025
9b073f2
refactor using formik set feild value
deandreJones Jan 28, 2025
2ed5a82
Merge pull request #14671 from transcom/INT-B-21978-revert-the-revert
danieljordan-caci Jan 28, 2025
857b275
Merge remote-tracking branch 'origin/B-21934-main' into I-13787--B-21…
deandreJones Jan 28, 2025
031a336
changing to office users endpoint so we can use in future features
danieljordan-caci Jan 28, 2025
fa87355
Merge branch 'integrationTesting' into B-21473-INT
paulstonebraker Jan 28, 2025
131a6fc
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 28, 2025
b5738db
Merge remote-tracking branch 'origin/MAIN-B-21963' into INT-B-21963
danieljordan-caci Jan 28, 2025
7b389f7
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 28, 2025
45c6efd
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 28, 2025
21fc582
Fix merge issue and remove duplicate tests
brianmanley-caci Jan 28, 2025
a464150
Merge pull request #14664 from transcom/INT-21838-service-item-reject…
brooklyn-welsh Jan 28, 2025
9691a2f
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 28, 2025
fc1222c
Put test back on the line it was on
brianmanley-caci Jan 28, 2025
f148ebe
Adjust role filtering logic
TevinAdams Jan 28, 2025
64c71cd
Merge branch 'B-21961-Add-Roles-To-Requested-Office-Users-List-Sortin…
TevinAdams Jan 28, 2025
da88ec4
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 28, 2025
cffa712
Merge pull request #14667 from transcom/I-13787--B-21934-fix
deandreJones Jan 28, 2025
45850c9
change logic to use moves not payment requests for assignment
pambecker Jan 28, 2025
615a0dd
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 28, 2025
63d539f
Merge branch 'main' into B-21446-TIO-bulk-assignment-be
pambecker Jan 28, 2025
429c940
Merge branch 'integrationTesting' into B-21446-INT
pambecker Jan 28, 2025
2ffd15f
removing unused code and test
danieljordan-caci Jan 28, 2025
097b851
Merge branch 'integrationTesting' into B-21473-INT
paulstonebraker Jan 28, 2025
45a0dc5
Merge branch 'main' into B-20536-MAIN
paulstonebraker Jan 28, 2025
6307f9a
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 28, 2025
bc01c5d
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 28, 2025
7f67a88
Merge branch 'integrationTesting' into B-21977-INT4
ajlusk Jan 28, 2025
a8fcc88
Revert "Merge pull request #14625 from transcom/e-06167-av-polling-int"
cameroncaci Jan 28, 2025
9b0bd9a
Merge branch 'integrationTesting' into revert-e-06167-b-21802-b-21907…
cameroncaci Jan 28, 2025
741b18d
updates
pambecker Jan 28, 2025
3ee0987
Merge pull request #14656 from transcom/B-21473-INT
paulstonebraker Jan 28, 2025
93741d8
Merge branch 'B-21446-TIO-bulk-assignment-be' into B-21446-INT
pambecker Jan 28, 2025
40e86e2
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 28, 2025
a0b85f7
add ppm closeout unassign counselor to move history
paulstonebraker Jan 28, 2025
7928305
Merge branch 'integrationTesting' into INT-B-21838-payment-request-re…
danieljordan-caci Jan 28, 2025
115d4c5
Fixed missing ignored col in migration
brooklyn-welsh Jan 28, 2025
5325488
Merge branch 'MAIN-B-21838-payment-request-rejection-reason' into INT…
brooklyn-welsh Jan 28, 2025
b6a8f25
Merge branch B-20536-MAIN into B-20536-INT
paulstonebraker Jan 28, 2025
bbe062b
adding roles to db-truncate to get rid of timeout issues with db tran…
danieljordan-caci Jan 28, 2025
bcac7ad
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 29, 2025
7544b9c
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 29, 2025
e6b7c20
additional role test fixes
danieljordan-caci Jan 29, 2025
7a71ba1
Merge remote-tracking branch 'origin/main' into MAIN-B-21963
danieljordan-caci Jan 29, 2025
8ff1134
bugfix for TIO assigned
paulstonebraker Jan 29, 2025
126ed0e
Merge branch 'B-22247-MAIN' into B-22247-INT
paulstonebraker Jan 29, 2025
7b80e47
Merge remote-tracking branch 'origin/MAIN-B-21963' into INT-B-21963
danieljordan-caci Jan 29, 2025
83d3ac8
Merge pull request #14681 from transcom/revert-e-06167-b-21802-b-2190…
cameroncaci Jan 29, 2025
78d36c9
Merge branch 'integrationTesting' into INT-B-21963
danieljordan-caci Jan 29, 2025
c9491aa
temporarily replace pdfcpu repo with shoehorn fork fix
cameroncaci Jan 29, 2025
c0bca8b
Merge branch 'integrationTesting' into mmhdt-2036-hotfix-int
cameroncaci Jan 29, 2025
f09b742
Fixing tests for Intl transit RDD
TevinAdams Jan 29, 2025
9f73020
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 29, 2025
2685423
Revert "temporarily replace pdfcpu repo with shoehorn fork fix"
cameroncaci Jan 29, 2025
2be90d7
switch pdfcpu to transcom fork
cameroncaci Jan 29, 2025
e771533
Merge branch 'mmhdt-2036-hotfix-int' of github.com:transcom/mymove in…
cameroncaci Jan 29, 2025
191d7ea
Merge branch 'integrationTesting' into B-21977-INT4
ajlusk Jan 29, 2025
ffa1ac8
Merge branch 'integrationTesting' into B-20536-INT
paulstonebraker Jan 29, 2025
f4fee9a
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 29, 2025
bab5e3b
adding POEFSC and PODFSC to weight billed lookup and picking minimum
danieljordan-caci Jan 29, 2025
bac1c90
Merge remote-tracking branch 'origin/MAIN-B-22264' into INT-B-22264
danieljordan-caci Jan 29, 2025
a585d92
Merge branch 'integrationTesting' into INT-B-21985-Counseling-Fee-Fin…
brianmanley-caci Jan 29, 2025
4e4a58d
updating responses & tests
danieljordan-caci Jan 29, 2025
75dc7f1
Merge remote-tracking branch 'origin/MAIN-B-21963' into INT-B-21963
danieljordan-caci Jan 29, 2025
3e98761
Merge remote-tracking branch 'refs/remotes/origin/INT-B-21963' into I…
danieljordan-caci Jan 29, 2025
59252cc
Revert "switch pdfcpu to transcom fork"
cameroncaci Jan 29, 2025
b3e7051
rebased the fork to be off the current milmove stamp
cameroncaci Jan 29, 2025
0cb1beb
change the fork again, this time optimization defaults set to false
cameroncaci Jan 29, 2025
fcb7da0
Merge pull request #14686 from transcom/mmhdt-2036-hotfix-int
cameroncaci Jan 29, 2025
b3208b5
Merge branch 'integrationTesting' into B-20536-INT
paulstonebraker Jan 29, 2025
6ee116e
Merge pull request #14670 from transcom/INT-B-21963
danieljordan-caci Jan 29, 2025
6d4046c
Merge pull request #14665 from transcom/B-21977-INT4
ajlusk Jan 29, 2025
eafe4d8
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 29, 2025
72c9765
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 29, 2025
dc001c6
Merge branch 'integrationTesting' into B-20536-INT
paulstonebraker Jan 29, 2025
9e4624b
Merge pull request #14626 from transcom/INT-B-21985-Counseling-Fee-Fi…
brianmanley-caci Jan 29, 2025
cffcec2
Merge branch integrationTesting into B-22247-INT
paulstonebraker Jan 29, 2025
6eca36d
strings matter
deandreJones Jan 29, 2025
6d85a9e
Merge remote-tracking branch 'origin/B-21934-main' into I-13787--B-21…
deandreJones Jan 29, 2025
c7b23b6
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 29, 2025
212b7eb
Merge pull request #14693 from transcom/I-13787--B-21934-fix
deandreJones Jan 29, 2025
61c33c3
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 29, 2025
e7fba34
Merge branch main into B-22247-MAIN
paulstonebraker Jan 30, 2025
57dd691
add tests for supervisors available office users for assignment
paulstonebraker Jan 30, 2025
b880295
Merge branch 'integrationTesting' into B-22247-INT
paulstonebraker Jan 30, 2025
20b69f0
Merge branch B-22247-MAIN into B-22247-INT
paulstonebraker Jan 30, 2025
1d87448
bugfix for hq role not seeing any assigned data
paulstonebraker Jan 30, 2025
b1ad59c
Merge branch 'B-22247-MAIN' into B-22247-INT
paulstonebraker Jan 30, 2025
5e52255
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 30, 2025
16c86f0
change pdfcpu to nil bookmark fork fix
cameroncaci Jan 30, 2025
7dafc75
test adjustment
TevinAdams Jan 30, 2025
ff22e47
Merge branch 'B-21961-Add-Roles-To-Requested-Office-Users-List-Sortin…
TevinAdams Jan 30, 2025
0ef2c6a
Merge pull request #14695 from transcom/mmhdt-2036-hotfix-int-v2
cameroncaci Jan 30, 2025
8038b07
Merge branch 'main' into B-21446-TIO-bulk-assignment-be
pambecker Jan 30, 2025
fdd32ae
Merge branch 'integrationTesting' into B-21446-INT
pambecker Jan 30, 2025
1ca36b8
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 30, 2025
9fcb0e7
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 30, 2025
62d9afa
Merge branch 'integrationTesting' into B-22247-INT
pambecker Jan 30, 2025
83a24d1
Merge pull request #14590 from transcom/INT-B-21838-payment-request-r…
brooklyn-welsh Jan 30, 2025
9a7cbed
Merge branch 'main' into B-20536-MAIN
paulstonebraker Jan 30, 2025
2a04382
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 30, 2025
7e6460b
update FinishDocumentReviewMove test
paulstonebraker Jan 30, 2025
a3deb48
Merge branch integrationTesting into B-20536-INT
paulstonebraker Jan 30, 2025
5b4ef3b
Merge branch B-20536-MAIN into B-20536-INT
paulstonebraker Jan 30, 2025
9d7348d
Merge branch 'integrationTesting' into B-22247-INT
paulstonebraker Jan 30, 2025
a895361
Merge pull request #14658 from transcom/B-21446-INT
pambecker Jan 30, 2025
951fb52
Test Adjustment
TevinAdams Jan 30, 2025
a9927e3
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 30, 2025
2e1f83a
Merge branch 'integrationTesting' into B-21378-iUB-RDD-Transit-Calcul…
TevinAdams Jan 30, 2025
4b2de63
Merge branch 'integrationTesting' into B-22247-INT
paulstonebraker Jan 30, 2025
62b38e5
Merge branch 'integrationTesting' into B-20536-INT
paulstonebraker Jan 30, 2025
5a501f2
Merge pull request #14563 from transcom/B-21378-iUB-RDD-Transit-Calcu…
TevinAdams Jan 30, 2025
12c0720
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 30, 2025
2b2fe50
Merge branch 'integrationTesting' into B-20536-INT
paulstonebraker Jan 30, 2025
baec330
Merge branch 'integrationTesting' into B-22247-INT
paulstonebraker Jan 30, 2025
0c9fde6
fix issue with multiple rows coming back for moves with more than 1 p…
pambecker Jan 30, 2025
498f932
Merge branch 'B-21446-TIO-bulk-assignment-be' into B-21446-INT2
pambecker Jan 30, 2025
5367f44
Merge pull request #14684 from transcom/B-20536-INT
paulstonebraker Jan 30, 2025
0c38433
Merge branch 'integrationTesting' into B-21446-INT2
pambecker Jan 30, 2025
ed0896d
Merge branch 'integrationTesting' into B-22247-INT
paulstonebraker Jan 30, 2025
96119b1
Merge branch 'integrationTesting' into B-21961-Add-Roles-To-Requested…
TevinAdams Jan 30, 2025
44764c3
Merge pull request #14651 from transcom/B-21961-Add-Roles-To-Requeste…
TevinAdams Jan 30, 2025
8f08631
Merge branch 'integrationTesting' into B-22247-INT
paulstonebraker Jan 31, 2025
5b882c0
Removing Duplicate
CoryKleinjanCACI Jan 31, 2025
e0249f4
Merge branch 'B-21464-MAIN' into B-21464-INT-V2
CoryKleinjanCACI Jan 31, 2025
3d1bfde
Merge pull request #14715 from transcom/B-21464-INT-V2
CoryKleinjanCACI Jan 31, 2025
7ab3651
Merge branch 'integrationTesting' into B-21446-INT2
pambecker Jan 31, 2025
94d096b
Merge pull request #14710 from transcom/B-21446-INT2
pambecker Jan 31, 2025
f386470
Merge branch 'integrationTesting' into B-22247-INT
paulstonebraker Jan 31, 2025
1617baa
Merge pull request #14675 from transcom/B-22247-INT
paulstonebraker Jan 31, 2025
3d7961f
Merge pull request #14689 from transcom/INT-B-22264
danieljordan-caci Jan 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 16 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ references:
# set integration-mtls-ignore-branch to the branch if you want to
# IGNORE mtls integration tests, or `placeholder_branch_name` if you
# do want to run them
integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name
integration-mtls-ignore-branch: &integration-mtls-ignore-branch integrationTesting

# set client-ignore-branch to the branch if you want to IGNORE
# client tests, or `placeholder_branch_name` if you do want to run
Expand Down Expand Up @@ -897,8 +897,8 @@ commands:
export FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
export FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
export FEATURE_FLAG_QUEUE_MANAGEMENT=false
export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
export FEATURE_FLAG_ENABLE_ALASKA=false
export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
export FEATURE_FLAG_ENABLE_HAWAII=false
export FEATURE_FLAG_BULK_ASSIGNMENT=false

Expand Down Expand Up @@ -1546,7 +1546,7 @@ jobs:
#
# The trailing hyphen in restore_cache seems important
# according to the page linked above
- v11-server-tests-coverage-
- v1-server-tests-coverage-integration
- run:
name: Ensure Test Coverage Increasing
command: |
Expand Down Expand Up @@ -1585,7 +1585,7 @@ jobs:
- when:
condition:
and:
- equal: [main, << pipeline.git.branch >>]
- equal: [integrationTesting, << pipeline.git.branch >>]
- when: always
steps:
- run:
Expand All @@ -1602,7 +1602,7 @@ jobs:
# Use the BuildNum to update the cache key so that the
# coverage cache is always updated
- save_cache:
key: v11-server-tests-coverage-{{ .BuildNum }}
key: v1-server-tests-coverage-integration{{ .BuildNum }}
paths:
- ~/transcom/mymove/tmp/baseline-go-coverage
when: always
Expand Down Expand Up @@ -1664,8 +1664,12 @@ jobs:
- checkout
- attach_workspace:
at: .
- restore_cache:
#
- when:
condition:
equal: [integrationTesting, << pipeline.git.branch >>]
steps:
- restore_cache:
#
# https://circleci.com/docs/caching/#restoring-cache
#
# restore the latest version of the test coverage in the
Expand All @@ -1682,8 +1686,8 @@ jobs:
#
# The trailing hyphen in restore_cache seems important
# according to the page linked above
keys:
- v8-client-tests-coverage-
keys:
- v1-client-tests-coverage-integration
- run:
name: Ensure Test Coverage Increasing
command: |
Expand Down Expand Up @@ -1720,7 +1724,7 @@ jobs:
- when:
condition:
and:
- equal: [main, << pipeline.git.branch >>]
- equal: [integrationTesting, << pipeline.git.branch >>]
steps:
- run:
name: 'Copy coverage to baseline'
Expand All @@ -1735,7 +1739,7 @@ jobs:
# Use the BuildNum to update the cache key so that the
# coverage cache is always updated
- save_cache:
key: v8-client-tests-coverage-{{ .BuildNum }}
key: v1-client-tests-coverage-integration{{ .BuildNum }}
paths:
- ~/transcom/mymove/tmp/baseline-jest-coverage
when: always
Expand All @@ -1752,7 +1756,6 @@ jobs:
--value "${coverage}" \
--timestamp "${timestamp}"
when: always

# Compile the server side of the app once and persist the relevant
# build artifacts to the workspace.
# This way we don't have to re-run the build and since all necessary
Expand Down Expand Up @@ -2777,4 +2780,4 @@ experimental:
notify:
branches:
only:
- main
- main
6 changes: 3 additions & 3 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ export DEVLOCAL_AUTH=true
export DOD_CA_PACKAGE="${MYMOVE_DIR}/config/tls/milmove-cert-bundle.p7b"

# MyMove client certificate
# All of our DoD-signed certs are currently signed by DOD SW CA-75
# All of our DoD-signed certs are currently signed by DOD SW CA-66
# This cannot be changed unless our certs are all resigned
MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-75.pem)
MOVE_MIL_DOD_CA_CERT=$(cat "${MYMOVE_DIR}"/config/tls/dod-sw-ca-66.pem)
require MOVE_MIL_DOD_TLS_CERT "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_cert'"
require MOVE_MIL_DOD_TLS_KEY "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws-vault exec transcom-gov-dev -- chamber read app-devlocal move_mil_dod_tls_key'"
export MOVE_MIL_DOD_CA_CERT
Expand Down Expand Up @@ -444,4 +444,4 @@ then
fi

# Check that all required environment variables are set
check_required_variables
check_required_variables
37 changes: 36 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,39 @@
# owners will be requested for a review.
# Add language specific code owners if it becomes relevant

* @transcom/codeowners
# database team
/migrations/ @transcom/cacidatabaseteam
/pkg/assets/sql_scripts/ @transcom/cacidatabaseteam

# backend team
/pkg/ @transcom/cacibackendteam
/swagger-def/ @transcom/cacibackendteam
*.go @transcom/cacibackendteam


# frontend team
/src/ @transcom/cacifrontendteam
/playwright/tests/ @transcom/cacifrontendteam


## not required for team specific review as prime UI is not deployed to production app
src/components/PrimeUI/
src/pages/PrimeUI/


# Require tech lead review for changes to the following files
.golangci.yml @transcom/codeowners
.pre-commit-config.yaml @transcom/codeowners
.eslintrc.js @transcom/codeowners
/eslint-plugin-ato/ @transcom/codeowners
/pkg/ato-linter/ @transcom/codeowners
/scripts/ @transcom/codeowners
/.circleci/config.yml @transcom/codeowners
/config/ @transcom/codeowners
Dockerfile* @transcom/codeowners
Brewfile* @transcom/codeowners
/Makefile @transcom/codeowners
package.json @transcom/codeowners
go.mod @transcom/codeowners
/github/ @transcom/codeowners
docker-compose* @transcom/codeowners
2 changes: 1 addition & 1 deletion .github/workflows/happo-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Happo CI

on:
pull_request:
branches: [main]
branches: [main,integrationTesting]

jobs:
changes:
Expand Down
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ variables:
GOLANGCI_LINT_VERBOSE: "-v"

# Specify the environment: loadtest, demo, exp
DP3_ENV: &dp3_env placeholder_env
DP3_ENV: &dp3_env loadtest

# Specify the branch to deploy TODO: this might be not needed. So far useless
DP3_BRANCH: &dp3_branch placeholder_branch_name
DP3_BRANCH: &dp3_branch integrationTesting

# Ignore branches for integration tests
INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch placeholder_branch_name
INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch placeholder_branch_name
CLIENT_IGNORE_BRANCH: &client_ignore_branch placeholder_branch_name
SERVER_IGNORE_BRANCH: &server_ignore_branch placeholder_branch_name
INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch integrationTesting
INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch integrationTesting
CLIENT_IGNORE_BRANCH: &client_ignore_branch integrationTesting
SERVER_IGNORE_BRANCH: &server_ignore_branch integrationTesting

RUNNER_TAG: &runner_tag milmove
DOCKER_RUNNER_TAG: &docker_runner_tag eks_cluster_runner
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ COPY bin/milmove /bin/milmove

COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem

COPY swagger/* /swagger/
COPY build /build
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile.dp3
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ COPY config/tls/api.loadtest.dp3.us.crt /config/tls/api.loadtest.dp3.us.crt
COPY config/tls/api.exp.dp3.us.chain.der.p7b /config/tls/api.exp.dp3.us.chain.der.p7b
COPY config/tls/api.exp.dp3.us.crt /config/tls/api.exp.dp3.us.crt

#copy dod certs
COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem

COPY swagger/* /swagger/
COPY build /build
COPY public/static/react-file-viewer /public/static/react-file-viewer
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-roo
COPY --from=builder --chown=root:root /home/circleci/project/bin/milmove /bin/milmove

COPY config/tls/milmove-cert-bundle.p7b /config/tls/milmove-cert-bundle.p7b
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-75.pem /config/tls/dod-sw-ca-75.pem
COPY config/tls/dod-sw-ca-66.pem /config/tls/dod-sw-ca-66.pem

# While it's ok to have these certs copied locally, they should never be copied into Dockerfile.
COPY config/tls/devlocal-ca.key /config/tls/devlocal-ca.key
Expand Down
Loading
Loading