Merge pull request #14124 from transcom/B-21375-MAIN

B-21375 UB Allowance Calculation - MAIN

migrations/app/migrations_manifest.txt

@@ -1029,6 +1029,7 @@
 20241024114748_create_gbloc_aors.up.sql
 20241029125015_add_orders_type_enum.up.sql
 20241029144404_hdt-614-adjust-accomack-county.up.sql
+20241031163018_create_ub_allowances_table.up.sql
 20241107180705_add_alternative_AK_HI_duty_location_names.up.sql
 20241109002854_add_gsr_table_to_move_history.up.sql
 20241111203514_add_external_crate_and_remove_icrtsa.up.sql

pkg/factory/shared.go

@@ -53,6 +53,7 @@ var CustomerSupportRemark CustomType = "CustomerSupportRemark"
 var Document CustomType = "Document"
 var DutyLocation CustomType = "DutyLocation"
 var Entitlement CustomType = "Entitlement"
+var UBAllowance CustomType = "UBAllowances"
 var EvaluationReport CustomType = "EvaluationReport"
 var LineOfAccounting CustomType = "LineOfAccounting"
 var MobileHome CustomType = "MobileHome"
@@ -115,6 +116,7 @@ var defaultTypesMap = map[string]CustomType{
 	"models.Document":                                 Document,
 	"models.DutyLocation":                             DutyLocation,
 	"models.Entitlement":                              Entitlement,
+	"models.UBAllowances":                             UBAllowance,
 	"models.EvaluationReport":                         EvaluationReport,
 	"models.LineOfAccounting":                         LineOfAccounting,
 	"models.MobileHome":                               MobileHome,

pkg/handlers/ghcapi/internal/payloads/model_to_payload.go

@@ -729,6 +729,10 @@ func Entitlement(entitlement *models.Entitlement) *ghcmessages.Entitlements {
 	if entitlement.DependentsTwelveAndOver != nil {
 		dependentsTwelveAndOver = models.Int64Pointer(int64(*entitlement.DependentsTwelveAndOver))
 	}
+	var ubAllowance *int64
+	if entitlement.UBAllowance != nil {
+		ubAllowance = models.Int64Pointer(int64(*entitlement.UBAllowance))
+	}
 	return &ghcmessages.Entitlements{
 		ID:                             strfmt.UUID(entitlement.ID.String()),
 		AuthorizedWeight:               authorizedWeight,
@@ -744,6 +748,7 @@ func Entitlement(entitlement *models.Entitlement) *ghcmessages.Entitlements {
 		DependentsUnderTwelve:          dependentsUnderTwelve,
 		DependentsTwelveAndOver:        dependentsTwelveAndOver,
 		AccompaniedTour:                accompaniedTour,
+		UbAllowance:                    ubAllowance,
 		OrganizationalClothingAndIndividualEquipment: entitlement.OrganizationalClothingAndIndividualEquipment,
 		GunSafe: gunSafe,
 		ETag:    etag.GenerateEtag(entitlement.UpdatedAt),

pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go

@@ -424,6 +424,7 @@ func (suite *PayloadsSuite) TestEntitlement() {
 	dependentsUnderTwelve := 1
 	dependentsTwelveAndOver := 1
 	authorizedWeight := 8000
+	ubAllowance := 300
 
 	entitlement := &models.Entitlement{
 		ID:                             entitlementID,
@@ -440,9 +441,11 @@ func (suite *PayloadsSuite) TestEntitlement() {
 		DependentsUnderTwelve:          &dependentsUnderTwelve,
 		DependentsTwelveAndOver:        &dependentsTwelveAndOver,
 		UpdatedAt:                      time.Now(),
+		UBAllowance:                    &ubAllowance,
 	}
 
 	returnedEntitlement := Entitlement(entitlement)
+	returnedUBAllowance := entitlement.UBAllowance
 
 	suite.IsType(&ghcmessages.Entitlements{}, returnedEntitlement)
 
@@ -451,6 +454,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(int64(proGearWeight), returnedEntitlement.ProGearWeight)
 	suite.Equal(int64(proGearWeightSpouse), returnedEntitlement.ProGearWeightSpouse)
 	suite.Equal(storageInTransit, int(*returnedEntitlement.StorageInTransit))

pkg/handlers/ghcapi/orders.go

@@ -237,7 +237,6 @@ func (h CreateOrderHandler) Handle(params orderop.CreateOrderParams) middleware.
 
 			grade := (internalmessages.OrderPayGrade)(*payload.Grade)
 			weightAllotment := models.GetWeightAllotment(grade)
-
 			weight := weightAllotment.TotalWeightSelf
 			if *payload.HasDependents {
 				weight = weightAllotment.TotalWeightSelfPlusDependents
@@ -253,6 +252,11 @@ func (h CreateOrderHandler) Handle(params orderop.CreateOrderParams) middleware.
 			if payload.DependentsUnderTwelve != nil {
 				dependentsUnderTwelve = models.IntPointer(int(*payload.DependentsUnderTwelve))
 			}
+			// Calculate UB allowance for the order entitlement
+			unaccompaniedBaggageAllowance, err := models.GetUBWeightAllowance(appCtx, originDutyLocation.Address.IsOconus, newDutyLocation.Address.IsOconus, serviceMember.Affiliation, &grade, (*internalmessages.OrdersType)(payload.OrdersType), payload.HasDependents, payload.AccompaniedTour, dependentsUnderTwelve, dependentsTwelveAndOver)
+			if err == nil {
+				weightAllotment.UnaccompaniedBaggageAllowance = unaccompaniedBaggageAllowance
+			}
 
 			entitlement := models.Entitlement{
 				DependentsAuthorized:    payload.HasDependents,
@@ -263,6 +267,7 @@ func (h CreateOrderHandler) Handle(params orderop.CreateOrderParams) middleware.
 				AccompaniedTour:         payload.AccompaniedTour,
 				DependentsUnderTwelve:   dependentsUnderTwelve,
 				DependentsTwelveAndOver: dependentsTwelveAndOver,
+				UBAllowance:             &weightAllotment.UnaccompaniedBaggageAllowance,
 			}
 
 			if saveEntitlementErr := appCtx.DB().Save(&entitlement); saveEntitlementErr != nil {

pkg/handlers/internalapi/orders.go

@@ -81,6 +81,9 @@ func payloadForOrdersModel(storer storage.FileStorer, order models.Order) (*inte
 		if order.Entitlement.DependentsTwelveAndOver != nil {
 			entitlement.DependentsTwelveAndOver = models.Int64Pointer(int64(*order.Entitlement.DependentsTwelveAndOver))
 		}
+		if order.Entitlement.UBAllowance != nil {
+			entitlement.UbAllowance = models.Int64Pointer(int64(*order.Entitlement.UBAllowance))
+		}
 	}
 	var originDutyLocation models.DutyLocation
 	originDutyLocation = models.DutyLocation{}
@@ -191,12 +194,18 @@ func (h CreateOrdersHandler) Handle(params ordersop.CreateOrdersParams) middlewa
 			}
 
 			grade := payload.Grade
-			weightAllotment := models.GetWeightAllotment(*grade)
 
+			// Calculate the entitlement for the order
+			weightAllotment := models.GetWeightAllotment(*grade)
 			weight := weightAllotment.TotalWeightSelf
 			if *payload.HasDependents {
 				weight = weightAllotment.TotalWeightSelfPlusDependents
 			}
+			// Calculate UB allowance for the order entitlement
+			unaccompaniedBaggageAllowance, err := models.GetUBWeightAllowance(appCtx, originDutyLocation.Address.IsOconus, newDutyLocation.Address.IsOconus, serviceMember.Affiliation, grade, payload.OrdersType, payload.HasDependents, payload.AccompaniedTour, dependentsUnderTwelve, dependentsTwelveAndOver)
+			if err == nil {
+				weightAllotment.UnaccompaniedBaggageAllowance = unaccompaniedBaggageAllowance
+			}
 
 			// Assign default SIT allowance based on customer type.
 			// We only have service members right now, but once we introduce more, this logic will have to change.
@@ -211,6 +220,7 @@ func (h CreateOrdersHandler) Handle(params ordersop.CreateOrdersParams) middlewa
 				StorageInTransit:        models.IntPointer(sitDaysAllowance),
 				ProGearWeight:           weightAllotment.ProGearWeight,
 				ProGearWeightSpouse:     weightAllotment.ProGearWeightSpouse,
+				UBAllowance:             &weightAllotment.UnaccompaniedBaggageAllowance,
 			}
 
 			/*
@@ -408,8 +418,17 @@ func (h UpdateOrdersHandler) Handle(params ordersop.UpdateOrdersParams) middlewa
 			order.TAC = payload.Tac
 			order.SAC = payload.Sac
 
+			serviceMemberID, err := uuid.FromString(payload.ServiceMemberID.String())
+			if err != nil {
+				return handlers.ResponseForError(appCtx.Logger(), err), err
+			}
+			serviceMember, err := models.FetchServiceMemberForUser(appCtx.DB(), appCtx.Session(), serviceMemberID)
+			if err != nil {
+				return handlers.ResponseForError(appCtx.Logger(), err), err
+			}
+
 			// Check if the grade or dependents are receiving an update
-			if hasEntitlementChanged(order, payload.Grade, payload.DependentsUnderTwelve, payload.DependentsTwelveAndOver, payload.AccompaniedTour) {
+			if hasEntitlementChanged(order, payload.OrdersType, payload.Grade, payload.DependentsUnderTwelve, payload.DependentsTwelveAndOver, payload.AccompaniedTour) {
 				weightAllotment := models.GetWeightAllotment(*payload.Grade)
 				weight := weightAllotment.TotalWeightSelf
 				if *payload.HasDependents {
@@ -429,6 +448,20 @@ func (h UpdateOrdersHandler) Handle(params ordersop.UpdateOrdersParams) middlewa
 					// Convert from int64 to int
 					dependentsUnderTwelve = models.IntPointer(int(*payload.DependentsUnderTwelve))
 				}
+				var grade *internalmessages.OrderPayGrade
+				if payload.Grade != nil {
+					grade = payload.Grade
+				} else {
+					grade = order.Grade
+				}
+
+				// Calculate UB allowance for the order entitlement
+				if order.Entitlement != nil {
+					unaccompaniedBaggageAllowance, err := models.GetUBWeightAllowance(appCtx, order.OriginDutyLocation.Address.IsOconus, order.NewDutyLocation.Address.IsOconus, serviceMember.Affiliation, grade, payload.OrdersType, payload.HasDependents, payload.AccompaniedTour, dependentsUnderTwelve, dependentsTwelveAndOver)
+					if err == nil {
+						weightAllotment.UnaccompaniedBaggageAllowance = unaccompaniedBaggageAllowance
+					}
+				}
 
 				entitlement := models.Entitlement{
 					DependentsAuthorized:    payload.HasDependents,
@@ -439,6 +472,7 @@ func (h UpdateOrdersHandler) Handle(params ordersop.UpdateOrdersParams) middlewa
 					DependentsUnderTwelve:   dependentsUnderTwelve,
 					DependentsTwelveAndOver: dependentsTwelveAndOver,
 					AccompaniedTour:         payload.AccompaniedTour,
+					UBAllowance:             &weightAllotment.UnaccompaniedBaggageAllowance,
 				}
 
 				/*
@@ -503,12 +537,15 @@ func (h UpdateOrdersHandler) Handle(params ordersop.UpdateOrdersParams) middlewa
 
 // Helper func for the UpdateOrdersHandler to check if the entitlement has changed from the new payload
 // This handles the nil checks and value comparisons outside of the handler func for organization
-func hasEntitlementChanged(order models.Order, payloadPayGrade *internalmessages.OrderPayGrade, payloadDependentsUnderTwelve *int64, payloadDependentsTwelveAndOver *int64, payloadAccompaniedTour *bool) bool {
+func hasEntitlementChanged(order models.Order, payloadOrderType *internalmessages.OrdersType, payloadPayGrade *internalmessages.OrderPayGrade, payloadDependentsUnderTwelve *int64, payloadDependentsTwelveAndOver *int64, payloadAccompaniedTour *bool) bool {
 	// Check pay grade
 	if (order.Grade == nil && payloadPayGrade != nil) || (order.Grade != nil && payloadPayGrade == nil) || (order.Grade != nil && payloadPayGrade != nil && *order.Grade != *payloadPayGrade) {
 		return true
 	}
-
+	// check orders type
+	if (order.OrdersType == "" && payloadOrderType != nil) || (order.OrdersType != "" && payloadPayGrade == nil) || (order.OrdersType != "" && payloadPayGrade != nil && internalmessages.OrderPayGrade(order.OrdersType) != *payloadPayGrade) {
+		return true
+	}
 	// Check entitlement
 	if order.Entitlement != nil {
 		// Check dependents under twelve