Skip to content

Commit

Permalink
Merge pull request #14288 from transcom/B-21667-MAIN
Browse files Browse the repository at this point in the history 
B-21667 & B-21487 MAIN
  • Loading branch information
@cameroncaci
cameroncaci authored Dec 11, 2024
2 parents 006493a + 207c24f commit 00d36bd
Show file tree
Hide file tree
Showing 37 changed files with 205 additions and 47 deletions.
4 changes: 2 additions & 2 deletions pkg/gen/ghcapi/embedded_spec.go
View file

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

2 changes: 1 addition & 1 deletion pkg/gen/ghcmessages/entitlements.go
View file

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/primeapi/embedded_spec.go
View file

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

2 changes: 1 addition & 1 deletion pkg/gen/primemessages/entitlements.go
View file

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/primev2api/embedded_spec.go
View file

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

2 changes: 1 addition & 1 deletion pkg/gen/primev2messages/entitlements.go
View file

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/primev3api/embedded_spec.go
View file

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

2 changes: 1 addition & 1 deletion pkg/gen/primev3messages/entitlements.go
View file

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/supportapi/embedded_spec.go
View file

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

4 changes: 4 additions & 0 deletions pkg/gen/supportmessages/entitlement.go
View file

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

2 changes: 1 addition & 1 deletion pkg/handlers/ghcapi/internal/payloads/model_to_payload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ func Entitlement(entitlement *models.Entitlement) *ghcmessages.Entitlements {
DependentsUnderTwelve: dependentsUnderTwelve,
DependentsTwelveAndOver: dependentsTwelveAndOver,
AccompaniedTour: accompaniedTour,
UbAllowance: ubAllowance,
UnaccompaniedBaggageAllowance: ubAllowance,
OrganizationalClothingAndIndividualEquipment: entitlement.OrganizationalClothingAndIndividualEquipment,
GunSafe: gunSafe,
ETag: etag.GenerateEtag(entitlement.UpdatedAt),
Expand Down
2 changes: 1 addition & 1 deletion pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.Equal(entitlement.DependentsAuthorized, returnedEntitlement.DependentsAuthorized)
suite.Equal(entitlement.NonTemporaryStorage, returnedEntitlement.NonTemporaryStorage)
suite.Equal(entitlement.PrivatelyOwnedVehicle, returnedEntitlement.PrivatelyOwnedVehicle)
suite.Equal(int(*returnedUBAllowance), int(*returnedEntitlement.UbAllowance))
suite.Equal(int(*returnedUBAllowance), int(*returnedEntitlement.UnaccompaniedBaggageAllowance))
suite.Equal(int64(proGearWeight), returnedEntitlement.ProGearWeight)
suite.Equal(int64(proGearWeightSpouse), returnedEntitlement.ProGearWeightSpouse)
suite.Equal(storageInTransit, int(*returnedEntitlement.StorageInTransit))
Expand Down
5 changes: 5 additions & 0 deletions pkg/handlers/primeapi/payloads/model_to_payload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,14 @@ func Entitlement(entitlement *models.Entitlement) *primemessages.Entitlements {
if entitlement.TotalDependents != nil {
totalDependents = int64(*entitlement.TotalDependents)
}
var ubAllowance int64
if entitlement.UBAllowance != nil {
ubAllowance = int64(*entitlement.UBAllowance)
}
return &primemessages.Entitlements{
ID: strfmt.UUID(entitlement.ID.String()),
AuthorizedWeight: authorizedWeight,
UnaccompaniedBaggageAllowance: &ubAllowance,
DependentsAuthorized: entitlement.DependentsAuthorized,
GunSafe: entitlement.GunSafe,
NonTemporaryStorage: entitlement.NonTemporaryStorage,
Expand Down
6 changes: 6 additions & 0 deletions pkg/handlers/primeapi/payloads/model_to_payload_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: nil,
PrivatelyOwnedVehicle: nil,
DBAuthorizedWeight: nil,
UBAllowance: nil,
StorageInTransit: nil,
RequiredMedicalEquipmentWeight: 0,
OrganizationalClothingAndIndividualEquipment: false,
Expand Down Expand Up @@ -306,6 +307,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.Equal(int64(0), payload.StorageInTransit)
suite.Equal(int64(0), payload.TotalDependents)
suite.Equal(int64(0), payload.TotalWeight)
suite.Equal(int64(0), *payload.UnaccompaniedBaggageAllowance)
})

suite.Run("Success - Returns the entitlement payload with all optional fields populated", func() {
Expand All @@ -316,6 +318,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: handlers.FmtBool(true),
PrivatelyOwnedVehicle: handlers.FmtBool(true),
DBAuthorizedWeight: handlers.FmtInt(10000),
UBAllowance: handlers.FmtInt(400),
StorageInTransit: handlers.FmtInt(45),
RequiredMedicalEquipmentWeight: 500,
OrganizationalClothingAndIndividualEquipment: true,
Expand All @@ -337,6 +340,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.True(*payload.NonTemporaryStorage)
suite.True(*payload.PrivatelyOwnedVehicle)
suite.Equal(int64(10000), *payload.AuthorizedWeight)
suite.Equal(int64(400), *payload.UnaccompaniedBaggageAllowance)
suite.Equal(int64(9000), payload.TotalWeight)
suite.Equal(int64(45), payload.StorageInTransit)
suite.Equal(int64(500), payload.RequiredMedicalEquipmentWeight)
Expand All @@ -355,6 +359,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: handlers.FmtBool(true),
PrivatelyOwnedVehicle: handlers.FmtBool(true),
DBAuthorizedWeight: handlers.FmtInt(10000),
UBAllowance: handlers.FmtInt(400),
StorageInTransit: handlers.FmtInt(45),
RequiredMedicalEquipmentWeight: 500,
OrganizationalClothingAndIndividualEquipment: true,
Expand All @@ -376,6 +381,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.True(*payload.NonTemporaryStorage)
suite.True(*payload.PrivatelyOwnedVehicle)
suite.Equal(int64(10000), *payload.AuthorizedWeight)
suite.Equal(int64(400), *payload.UnaccompaniedBaggageAllowance)
suite.Equal(int64(7000), payload.TotalWeight)
suite.Equal(int64(45), payload.StorageInTransit)
suite.Equal(int64(500), payload.RequiredMedicalEquipmentWeight)
Expand Down
5 changes: 5 additions & 0 deletions pkg/handlers/primeapiv2/payloads/model_to_payload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,14 @@ func Entitlement(entitlement *models.Entitlement) *primev2messages.Entitlements
if entitlement.TotalDependents != nil {
totalDependents = int64(*entitlement.TotalDependents)
}
var ubAllowance int64
if entitlement.UBAllowance != nil {
ubAllowance = int64(*entitlement.UBAllowance)
}
return &primev2messages.Entitlements{
ID: strfmt.UUID(entitlement.ID.String()),
AuthorizedWeight: authorizedWeight,
UnaccompaniedBaggageAllowance: &ubAllowance,
DependentsAuthorized: entitlement.DependentsAuthorized,
GunSafe: entitlement.GunSafe,
NonTemporaryStorage: entitlement.NonTemporaryStorage,
Expand Down
6 changes: 6 additions & 0 deletions pkg/handlers/primeapiv2/payloads/model_to_payload_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: nil,
PrivatelyOwnedVehicle: nil,
DBAuthorizedWeight: nil,
UBAllowance: nil,
StorageInTransit: nil,
RequiredMedicalEquipmentWeight: 0,
OrganizationalClothingAndIndividualEquipment: false,
Expand Down Expand Up @@ -252,6 +253,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.Equal(int64(0), payload.StorageInTransit)
suite.Equal(int64(0), payload.TotalDependents)
suite.Equal(int64(0), payload.TotalWeight)
suite.Equal(int64(0), *payload.UnaccompaniedBaggageAllowance)
})

suite.Run("Success - Returns the entitlement payload with all optional fields populated", func() {
Expand All @@ -262,6 +264,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: handlers.FmtBool(true),
PrivatelyOwnedVehicle: handlers.FmtBool(true),
DBAuthorizedWeight: handlers.FmtInt(10000),
UBAllowance: handlers.FmtInt(400),
StorageInTransit: handlers.FmtInt(45),
RequiredMedicalEquipmentWeight: 500,
OrganizationalClothingAndIndividualEquipment: true,
Expand All @@ -283,6 +286,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.True(*payload.NonTemporaryStorage)
suite.True(*payload.PrivatelyOwnedVehicle)
suite.Equal(int64(10000), *payload.AuthorizedWeight)
suite.Equal(int64(400), *payload.UnaccompaniedBaggageAllowance)
suite.Equal(int64(9000), payload.TotalWeight)
suite.Equal(int64(45), payload.StorageInTransit)
suite.Equal(int64(500), payload.RequiredMedicalEquipmentWeight)
Expand All @@ -301,6 +305,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: handlers.FmtBool(true),
PrivatelyOwnedVehicle: handlers.FmtBool(true),
DBAuthorizedWeight: handlers.FmtInt(10000),
UBAllowance: handlers.FmtInt(400),
StorageInTransit: handlers.FmtInt(45),
RequiredMedicalEquipmentWeight: 500,
OrganizationalClothingAndIndividualEquipment: true,
Expand All @@ -322,6 +327,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.True(*payload.NonTemporaryStorage)
suite.True(*payload.PrivatelyOwnedVehicle)
suite.Equal(int64(10000), *payload.AuthorizedWeight)
suite.Equal(int64(400), *payload.UnaccompaniedBaggageAllowance)
suite.Equal(int64(7000), payload.TotalWeight)
suite.Equal(int64(45), payload.StorageInTransit)
suite.Equal(int64(500), payload.RequiredMedicalEquipmentWeight)
Expand Down
5 changes: 5 additions & 0 deletions pkg/handlers/primeapiv3/payloads/model_to_payload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,14 @@ func Entitlement(entitlement *models.Entitlement) *primev3messages.Entitlements
if entitlement.TotalDependents != nil {
totalDependents = int64(*entitlement.TotalDependents)
}
var ubAllowance int64
if entitlement.UBAllowance != nil {
ubAllowance = int64(*entitlement.UBAllowance)
}
return &primev3messages.Entitlements{
ID: strfmt.UUID(entitlement.ID.String()),
AuthorizedWeight: authorizedWeight,
UnaccompaniedBaggageAllowance: &ubAllowance,
DependentsAuthorized: entitlement.DependentsAuthorized,
NonTemporaryStorage: entitlement.NonTemporaryStorage,
PrivatelyOwnedVehicle: entitlement.PrivatelyOwnedVehicle,
Expand Down
7 changes: 7 additions & 0 deletions pkg/handlers/primeapiv3/payloads/model_to_payload_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: nil,
PrivatelyOwnedVehicle: nil,
DBAuthorizedWeight: nil,
UBAllowance: nil,
StorageInTransit: nil,
RequiredMedicalEquipmentWeight: 0,
OrganizationalClothingAndIndividualEquipment: false,
Expand Down Expand Up @@ -268,6 +269,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.Equal(int64(0), payload.StorageInTransit)
suite.Equal(int64(0), payload.TotalDependents)
suite.Equal(int64(0), payload.TotalWeight)
suite.Equal(int64(0), *payload.UnaccompaniedBaggageAllowance)
})

suite.Run("Success - Returns the entitlement payload with all optional fields populated", func() {
Expand All @@ -278,6 +280,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: handlers.FmtBool(true),
PrivatelyOwnedVehicle: handlers.FmtBool(true),
DBAuthorizedWeight: handlers.FmtInt(10000),
UBAllowance: handlers.FmtInt(400),
StorageInTransit: handlers.FmtInt(45),
RequiredMedicalEquipmentWeight: 500,
OrganizationalClothingAndIndividualEquipment: true,
Expand All @@ -299,6 +302,8 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.True(*payload.NonTemporaryStorage)
suite.True(*payload.PrivatelyOwnedVehicle)
suite.Equal(int64(10000), *payload.AuthorizedWeight)
suite.Equal(int64(400), *payload.UnaccompaniedBaggageAllowance)

suite.Equal(int64(9000), payload.TotalWeight)
suite.Equal(int64(45), payload.StorageInTransit)
suite.Equal(int64(500), payload.RequiredMedicalEquipmentWeight)
Expand All @@ -317,6 +322,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
NonTemporaryStorage: handlers.FmtBool(true),
PrivatelyOwnedVehicle: handlers.FmtBool(true),
DBAuthorizedWeight: handlers.FmtInt(10000),
UBAllowance: handlers.FmtInt(400),
StorageInTransit: handlers.FmtInt(45),
RequiredMedicalEquipmentWeight: 500,
OrganizationalClothingAndIndividualEquipment: true,
Expand All @@ -338,6 +344,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
suite.True(*payload.NonTemporaryStorage)
suite.True(*payload.PrivatelyOwnedVehicle)
suite.Equal(int64(10000), *payload.AuthorizedWeight)
suite.Equal(int64(400), *payload.UnaccompaniedBaggageAllowance)
suite.Equal(int64(7000), payload.TotalWeight)
suite.Equal(int64(45), payload.StorageInTransit)
suite.Equal(int64(500), payload.RequiredMedicalEquipmentWeight)
Expand Down
5 changes: 5 additions & 0 deletions pkg/handlers/supportapi/internal/payloads/model_to_payload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,14 @@ func Entitlement(entitlement *models.Entitlement) *supportmessages.Entitlement {
if entitlement.TotalDependents != nil {
totalDependents = int64(*entitlement.TotalDependents)
}
var ubAllowance int64
if entitlement.UBAllowance != nil {
ubAllowance = int64(*entitlement.UBAllowance)
}
return &supportmessages.Entitlement{
ID: strfmt.UUID(entitlement.ID.String()),
AuthorizedWeight: authorizedWeight,
UnaccompaniedBaggageAllowance: &ubAllowance,
DependentsAuthorized: entitlement.DependentsAuthorized,
NonTemporaryStorage: entitlement.NonTemporaryStorage,
PrivatelyOwnedVehicle: entitlement.PrivatelyOwnedVehicle,
Expand Down
Loading

0 comments on commit 00d36bd

Please sign in to comment.