Merge branch 'main' into MAIN-B-22661

transcom · Feb 26, 2025 · f7f5d5d · f7f5d5d
2 parents 2a9501a + 88dfaef
commit f7f5d5d
Show file tree

Hide file tree

Showing 32 changed files with 125 additions and 133 deletions.
diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go
diff --git a/pkg/gen/ghcmessages/counseling_update_allowance_payload.go b/pkg/gen/ghcmessages/counseling_update_allowance_payload.go
diff --git a/pkg/gen/ghcmessages/counseling_update_order_payload.go b/pkg/gen/ghcmessages/counseling_update_order_payload.go
diff --git a/pkg/gen/ghcmessages/update_allowance_payload.go b/pkg/gen/ghcmessages/update_allowance_payload.go
diff --git a/pkg/gen/ghcmessages/update_order_payload.go b/pkg/gen/ghcmessages/update_order_payload.go
diff --git a/pkg/handlers/ghcapi/orders_test.go b/pkg/handlers/ghcapi/orders_test.go
@@ -758,6 +758,7 @@ func (suite *HandlerSuite) makeUpdateOrderHandlerSubtestData() (subtestData *upd
 		Sac:                  nullable.NewString("987654321"),
 		NtsTac:               nullable.NewString("E19A"),
 		NtsSac:               nullable.NewString("987654321"),
+		DependentsAuthorized: models.BoolPointer(true),
 	}
 
 	return subtestData
@@ -816,6 +817,7 @@ func (suite *HandlerSuite) TestUpdateOrderHandler() {
 		suite.Equal(body.Sac.Value, ordersPayload.Sac)
 		suite.Equal(body.NtsTac.Value, ordersPayload.NtsTac)
 		suite.Equal(body.NtsSac.Value, ordersPayload.NtsSac)
+		suite.Equal(body.DependentsAuthorized, ordersPayload.Entitlement.DependentsAuthorized)
 	})
 
 	// We need to confirm whether a user who only has the TIO role should indeed
@@ -1051,6 +1053,7 @@ func (suite *HandlerSuite) makeCounselingUpdateOrderHandlerSubtestData() (subtes
 		Sac:                  nullable.NewString("987654321"),
 		NtsTac:               nullable.NewString("E19A"),
 		NtsSac:               nullable.NewString("987654321"),
+		DependentsAuthorized: models.BoolPointer(true),
 	}
 
 	return subtestData
@@ -1104,6 +1107,7 @@ func (suite *HandlerSuite) TestCounselingUpdateOrderHandler() {
 		suite.Equal(body.Sac.Value, ordersPayload.Sac)
 		suite.Equal(body.NtsTac.Value, ordersPayload.NtsTac)
 		suite.Equal(body.NtsSac.Value, ordersPayload.NtsSac)
+		suite.Equal(body.DependentsAuthorized, ordersPayload.Entitlement.DependentsAuthorized)
 	})
 
 	suite.Run("Returns 404 when updater returns NotFoundError", func() {
@@ -1250,9 +1254,8 @@ func (suite *HandlerSuite) makeUpdateAllowanceHandlerSubtestData() (subtestData
 	rmeWeight := models.Int64Pointer(10000)
 
 	subtestData.body = &ghcmessages.UpdateAllowancePayload{
-		Agency:               &affiliation,
-		DependentsAuthorized: models.BoolPointer(true),
-		Grade:                &grade,
+		Agency: &affiliation,
+		Grade:  &grade,
 		OrganizationalClothingAndIndividualEquipment: &ocie,
 		ProGearWeight:                  proGearWeight,
 		ProGearWeightSpouse:            proGearWeightSpouse,
@@ -1345,7 +1348,6 @@ func (suite *HandlerSuite) TestUpdateAllowanceHandler() {
 		suite.Equal(order.ID.String(), ordersPayload.ID.String())
 		suite.Equal(body.Grade, ordersPayload.Grade)
 		suite.Equal(body.Agency, ordersPayload.Agency)
-		suite.Equal(body.DependentsAuthorized, ordersPayload.Entitlement.DependentsAuthorized)
 		suite.Equal(*body.OrganizationalClothingAndIndividualEquipment, ordersPayload.Entitlement.OrganizationalClothingAndIndividualEquipment)
 		suite.Equal(*body.ProGearWeight, ordersPayload.Entitlement.ProGearWeight)
 		suite.Equal(*body.ProGearWeightSpouse, ordersPayload.Entitlement.ProGearWeightSpouse)
@@ -1524,9 +1526,8 @@ func (suite *HandlerSuite) TestCounselingUpdateAllowanceHandler() {
 	rmeWeight := models.Int64Pointer(10000)
 
 	body := &ghcmessages.CounselingUpdateAllowancePayload{
-		Agency:               &affiliation,
-		DependentsAuthorized: models.BoolPointer(true),
-		Grade:                &grade,
+		Agency: &affiliation,
+		Grade:  &grade,
 		OrganizationalClothingAndIndividualEquipment: &ocie,
 		ProGearWeight:                  proGearWeight,
 		ProGearWeightSpouse:            proGearWeightSpouse,
@@ -1574,7 +1575,6 @@ func (suite *HandlerSuite) TestCounselingUpdateAllowanceHandler() {
 		suite.Equal(order.ID.String(), ordersPayload.ID.String())
 		suite.Equal(body.Grade, ordersPayload.Grade)
 		suite.Equal(body.Agency, ordersPayload.Agency)
-		suite.Equal(body.DependentsAuthorized, ordersPayload.Entitlement.DependentsAuthorized)
 		suite.Equal(*body.OrganizationalClothingAndIndividualEquipment, ordersPayload.Entitlement.OrganizationalClothingAndIndividualEquipment)
 		suite.Equal(*body.ProGearWeight, ordersPayload.Entitlement.ProGearWeight)
 		suite.Equal(*body.ProGearWeightSpouse, ordersPayload.Entitlement.ProGearWeightSpouse)

diff --git a/pkg/services/order/order_updater.go b/pkg/services/order/order_updater.go
@@ -268,6 +268,10 @@ func orderFromTOOPayload(appCtx appcontext.AppContext, existingOrder models.Orde
 		order.AmendedOrdersAcknowledgedAt = &acknowledgedAt
 	}
 
+	if payload.DependentsAuthorized != nil {
+		order.Entitlement.DependentsAuthorized = payload.DependentsAuthorized
+	}
+
 	if payload.Grade != nil {
 		order.Grade = (*internalmessages.OrderPayGrade)(payload.Grade)
 		// Calculate new DBWeightAuthorized based on the new grade
@@ -405,6 +409,10 @@ func orderFromCounselingPayload(appCtx appcontext.AppContext, existingOrder mode
 		order.OrdersType = internalmessages.OrdersType(*payload.OrdersType)
 	}
 
+	if payload.DependentsAuthorized != nil {
+		order.Entitlement.DependentsAuthorized = payload.DependentsAuthorized
+	}
+
 	if payload.Grade != nil {
 		order.Grade = (*internalmessages.OrderPayGrade)(payload.Grade)
 		// Calculate new DBWeightAuthorized based on the new grade
@@ -462,7 +470,7 @@ func allowanceFromTOOPayload(appCtx appcontext.AppContext, existingOrder models.
 	}
 	weight := weightAllotment.TotalWeightSelf
 	// Payload does not have this information, retrieve dependents from the existing order
-	if existingOrder.HasDependents && *payload.DependentsAuthorized {
+	if existingOrder.HasDependents && *order.Entitlement.DependentsAuthorized {
 		// Only utilize dependent weight authorized if dependents are both present and authorized
 		weight = weightAllotment.TotalWeightSelfPlusDependents
 	}
@@ -472,10 +480,6 @@ func allowanceFromTOOPayload(appCtx appcontext.AppContext, existingOrder models.
 		order.Entitlement.OrganizationalClothingAndIndividualEquipment = *payload.OrganizationalClothingAndIndividualEquipment
 	}
 
-	if payload.DependentsAuthorized != nil {
-		order.Entitlement.DependentsAuthorized = payload.DependentsAuthorized
-	}
-
 	if payload.StorageInTransit != nil {
 		newSITAllowance := int(*payload.StorageInTransit)
 		order.Entitlement.StorageInTransit = &newSITAllowance
@@ -572,7 +576,7 @@ func allowanceFromCounselingPayload(appCtx appcontext.AppContext, existingOrder
 	}
 	weight := weightAllotment.TotalWeightSelf
 	// Payload does not have this information, retrieve dependents from the existing order
-	if existingOrder.HasDependents && *payload.DependentsAuthorized {
+	if existingOrder.HasDependents && *order.Entitlement.DependentsAuthorized {
 		// Only utilize dependent weight authorized if dependents are both present and authorized
 		weight = weightAllotment.TotalWeightSelfPlusDependents
 	}
@@ -582,10 +586,6 @@ func allowanceFromCounselingPayload(appCtx appcontext.AppContext, existingOrder
 		order.Entitlement.OrganizationalClothingAndIndividualEquipment = *payload.OrganizationalClothingAndIndividualEquipment
 	}
 
-	if payload.DependentsAuthorized != nil {
-		order.Entitlement.DependentsAuthorized = payload.DependentsAuthorized
-	}
-
 	if payload.StorageInTransit != nil {
 		newSITAllowance := int(*payload.StorageInTransit)
 		order.Entitlement.StorageInTransit = &newSITAllowance
@@ -635,7 +635,7 @@ func allowanceFromCounselingPayload(appCtx appcontext.AppContext, existingOrder
 
 	// Recalculate UB allowance of order entitlement
 	if order.Entitlement != nil {
-		unaccompaniedBaggageAllowance, err := models.GetUBWeightAllowance(appCtx, order.OriginDutyLocation.Address.IsOconus, order.NewDutyLocation.Address.IsOconus, order.ServiceMember.Affiliation, order.Grade, &order.OrdersType, payload.DependentsAuthorized, order.Entitlement.AccompaniedTour, order.Entitlement.DependentsUnderTwelve, order.Entitlement.DependentsTwelveAndOver)
+		unaccompaniedBaggageAllowance, err := models.GetUBWeightAllowance(appCtx, order.OriginDutyLocation.Address.IsOconus, order.NewDutyLocation.Address.IsOconus, order.ServiceMember.Affiliation, order.Grade, &order.OrdersType, order.Entitlement.DependentsAuthorized, order.Entitlement.AccompaniedTour, order.Entitlement.DependentsUnderTwelve, order.Entitlement.DependentsTwelveAndOver)
 		if err != nil {
 			return models.Order{}, err
 		}