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-21490 Office users can switch to their secondary duty locations (Review after B-21492) #14070

Merged
merged 60 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ff25c0c
add transportation office assignments to logged in user payload
ajlusk Oct 31, 2024
884e3a2
Merge branch 'B-21490' into B-21490-INT
ajlusk Oct 31, 2024
a20af04
Merge branch 'B-21492' into B-21490
ajlusk Nov 1, 2024
37b5d09
Merge remote-tracking branch 'origin/B-21627-MAIN' into B-21490
ajlusk Nov 1, 2024
653dfcd
fix typo causing time stamp to always be sent to the client as 0001-0…
ajlusk Nov 4, 2024
c324214
add missing condition to ListAllOrderLocations, resolve resulting que…
ajlusk Nov 5, 2024
257f0fd
office user secondary gbloc switching fully functional
ajlusk Nov 6, 2024
a78da15
Merge remote-tracking branch 'origin/main' into B-21490
ajlusk Nov 6, 2024
8646710
Merge remote-tracking branch 'origin/integrationTesting' into B-21490…
ajlusk Nov 6, 2024
46e9b99
Merge branch 'B-21492' into B-21490
ajlusk Nov 6, 2024
a8f82a8
Merge remote-tracking branch 'origin/main' into B-21490
ajlusk Nov 6, 2024
61e0f69
Merge remote-tracking branch 'origin/integrationTesting' into B-21490…
ajlusk Nov 6, 2024
33a3c51
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 6, 2024
c90f0cd
Merge remote-tracking branch 'origin/integrationTesting' into B-21490…
ajlusk Nov 7, 2024
3a1ea54
Merge branch 'B-21492' into B-21490
ajlusk Nov 12, 2024
d376861
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 12, 2024
0830721
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 12, 2024
bf6f19d
Merge branch 'B-21492' into B-21490
ajlusk Nov 12, 2024
60dd9b3
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 12, 2024
b610174
Merge branch 'B-21492' into B-21490
ajlusk Nov 12, 2024
d7b9c26
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 12, 2024
84a6c71
Merge branch 'B-21492' into B-21490
ajlusk Nov 19, 2024
43ecdca
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 19, 2024
64e2e42
Merge remote-tracking branch 'origin/integrationTesting' into B-21490…
ajlusk Nov 19, 2024
a8ebb90
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 20, 2024
0e3a755
generate office user fetcher mock
ajlusk Nov 20, 2024
55e4881
remove unneccessary else statement in order fetcher service
ajlusk Nov 20, 2024
9c5371d
generate transportation office assignment fetcher mock
ajlusk Nov 20, 2024
9cbaa65
remove commented code, add ariaLabel to GBLOC Switcher
ajlusk Nov 20, 2024
8689459
21490 client test fixes
ajlusk Nov 20, 2024
2e91dca
more 21490 client test fixes
ajlusk Nov 20, 2024
f551fa3
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 20, 2024
a5fdc33
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 20, 2024
8a69048
Merge branch 'main' into MAIN-B-21412-B-21413-Prime-sim-create-intern…
taeJungCaci Nov 21, 2024
3d71bb3
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 21, 2024
64bd6e6
Merge remote-tracking branch 'origin/main' into B-21490
ajlusk Nov 21, 2024
a0051fa
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 21, 2024
b3628a7
Merge remote-tracking branch 'origin/integrationTesting' into B-21490…
ajlusk Nov 21, 2024
bbbfc30
potential test fixes for 21490
ajlusk Nov 22, 2024
5a3d1e1
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 22, 2024
aa2afbf
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 22, 2024
088336c
Merge branch 'main' into MAIN-B-21412-B-21413-Prime-sim-create-intern…
taeJungCaci Nov 25, 2024
27dc8a1
Merge remote-tracking branch 'origin/main' into B-19531-Prime-Error
antgmann Nov 25, 2024
e609ef0
Merge pull request #14220 from transcom/MAIN-B-21412-B-21413-Prime-si…
WeatherfordAaron Nov 25, 2024
c5e51ce
apparently := narrows scope
ajlusk Nov 25, 2024
d4fe2f1
replacing more misused := with =
ajlusk Nov 25, 2024
1a72ff7
testing test failing remotely but passing locally
ajlusk Nov 26, 2024
5b168ee
uncomment tests and narrow scope of test that was added in the ticket…
ajlusk Nov 26, 2024
df47ad3
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 26, 2024
6bd6055
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 26, 2024
8508b99
Resolve differences between int and main
antgmann Nov 26, 2024
63b9ca1
Merge branch 'integrationTesting' into B-21490-INT
r-mettler Nov 26, 2024
672e497
Merge branch 'main' into B-19531-Prime-Error
antgmann Nov 26, 2024
06d0331
Merge branch 'integrationTesting' into B-21490-INT
r-mettler Nov 26, 2024
ea6139e
Merge pull request #14280 from transcom/B-19531-Prime-Error
r-mettler Nov 26, 2024
50ad5f0
remove testing comment from TableQueue.jsx
ajlusk Nov 26, 2024
300cc93
Merge remote-tracking branch 'origin/main' into B-21490
ajlusk Nov 26, 2024
54418d2
Merge branch 'B-21490' into B-21490-INT
ajlusk Nov 26, 2024
b800846
Merge branch 'integrationTesting' into B-21490-INT
ajlusk Nov 26, 2024
9cd2dc3
Merge branch 'integrationTesting' into B-21490-INT
antgmann Nov 26, 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
4 changes: 2 additions & 2 deletions pkg/factory/transportation_office_assignment_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func BuildPrimaryTransportationOfficeAssignment(db *pop.Connection, customs []Cu
ID: officeUser.ID,
TransportationOfficeID: transportationOffice.ID,
TransportationOffice: transportationOffice,
PrimaryOffice: true,
PrimaryOffice: models.BoolPointer(true),
}

// Overwrite values with those from customizations
Expand Down Expand Up @@ -80,7 +80,7 @@ func BuildAlternateTransportationOfficeAssignment(db *pop.Connection, customs []
ID: officeUser.ID,
TransportationOfficeID: transportationOffice.ID,
TransportationOffice: transportationOffice,
PrimaryOffice: false,
PrimaryOffice: models.BoolPointer(false),
}

// Overwrite values with those from customizations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (suite *FactorySuite) TestBuildPrimaryTransportationOfficeAssignment() {
primaryTransportationOfficeAssignment := BuildPrimaryTransportationOfficeAssignment(suite.DB(), nil, nil)

// VALIDATE RESULTS
suite.Equal(true, primaryTransportationOfficeAssignment.PrimaryOffice)
suite.Equal(models.BoolPointer(true), primaryTransportationOfficeAssignment.PrimaryOffice)

// Associated Transportation Office is the default transportation office
suite.Equal(defaultOffice.Name, primaryTransportationOfficeAssignment.TransportationOffice.Name)
Expand Down Expand Up @@ -82,7 +82,7 @@ func (suite *FactorySuite) TestBuildPrimaryTransportationOfficeAssignment() {
primaryTransportationOfficeAssignment := BuildAlternateTransportationOfficeAssignment(suite.DB(), nil, nil)

// VALIDATE RESULTS
suite.Equal(false, primaryTransportationOfficeAssignment.PrimaryOffice)
suite.Equal(models.BoolPointer(false), primaryTransportationOfficeAssignment.PrimaryOffice)

// Associated Transportation Office is the default transportation office
suite.Equal(defaultOffice.Name, primaryTransportationOfficeAssignment.TransportationOffice.Name)
Expand Down Expand Up @@ -159,13 +159,13 @@ func (suite *FactorySuite) TestBuildPrimaryTransportationOfficeAssignment() {
suite.Equal(customOffice.Name, transportationOfficeAssignment.TransportationOffice.Name)
suite.Equal(customOffice.Gbloc, transportationOfficeAssignment.TransportationOffice.Gbloc)
suite.Equal(customOfficeUser.ID, transportationOfficeAssignment.ID)
suite.Equal(true, transportationOfficeAssignment.PrimaryOffice)
suite.Equal(models.BoolPointer(true), transportationOfficeAssignment.PrimaryOffice)

suite.Equal(secondaryCustomOffice.ID, secondaryTransportationOfficeAssignment.TransportationOffice.ID)
suite.Equal(secondaryCustomOffice.Name, secondaryTransportationOfficeAssignment.TransportationOffice.Name)
suite.Equal(secondaryCustomOffice.Gbloc, secondaryTransportationOfficeAssignment.TransportationOffice.Gbloc)
suite.Equal(customOfficeUser.ID, secondaryTransportationOfficeAssignment.ID)
suite.Equal(false, secondaryTransportationOfficeAssignment.PrimaryOffice)
suite.Equal(models.BoolPointer(false), secondaryTransportationOfficeAssignment.PrimaryOffice)

})
}
24 changes: 18 additions & 6 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.

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.

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

86 changes: 86 additions & 0 deletions pkg/gen/internalapi/embedded_spec.go

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

Loading