Merge pull request #12025 from transcom/B-18645-Move-grade-to-Orders-…

…From-Allowances-MAIN

B-18645 main

pkg/services/order/order_updater.go

@@ -228,6 +228,19 @@ func orderFromTOOPayload(_ appcontext.AppContext, existingOrder models.Order, pa
 		order.AmendedOrdersAcknowledgedAt = &acknowledgedAt
 	}
 
+	if payload.Grade != nil {
+		order.Grade = (*internalmessages.OrderPayGrade)(payload.Grade)
+		// Calculate new DBWeightAuthorized based on the new grade
+		weightAllotment := models.GetWeightAllotment(*order.Grade)
+		weight := weightAllotment.TotalWeightSelf
+		// Payload does not have this information, retrieve dependents from the existing order
+		if existingOrder.HasDependents && *order.Entitlement.DependentsAuthorized {
+			// Only utilize dependent weight authorized if dependents are both present and authorized
+			weight = weightAllotment.TotalWeightSelfPlusDependents
+		}
+		order.Entitlement.DBAuthorizedWeight = &weight
+	}
+
 	return order
 }
 
@@ -348,6 +361,19 @@ func orderFromCounselingPayload(existingOrder models.Order, payload ghcmessages.
 		order.OrdersType = internalmessages.OrdersType(*payload.OrdersType)
 	}
 
+	if payload.Grade != nil {
+		order.Grade = (*internalmessages.OrderPayGrade)(payload.Grade)
+		// Calculate new DBWeightAuthorized based on the new grade
+		weightAllotment := models.GetWeightAllotment(*order.Grade)
+		weight := weightAllotment.TotalWeightSelf
+		// Payload does not have this information, retrieve dependents from the existing order
+		if existingOrder.HasDependents && *order.Entitlement.DependentsAuthorized {
+			// Only utilize dependent weight authorized if dependents are both present and authorized
+			weight = weightAllotment.TotalWeightSelfPlusDependents
+		}
+		order.Entitlement.DBAuthorizedWeight = &weight
+	}
+
 	return order
 }
 

pkg/services/order/order_updater_test.go

@@ -437,6 +437,7 @@ func (suite *OrderServiceSuite) TestUpdateOrderAsCounselor() {
 		reportByDate := strfmt.Date(time.Now().Add(72 * time.Hour))
 		deptIndicator := ghcmessages.DeptIndicatorCOASTGUARD
 		ordersTypeDetail := ghcmessages.OrdersTypeDetail("INSTRUCTION_20_WEEKS")
+		grade := ghcmessages.GradeO5
 
 		body := ghcmessages.CounselingUpdateOrderPayload{
 			IssueDate:            &dateIssued,
@@ -449,6 +450,7 @@ func (suite *OrderServiceSuite) TestUpdateOrderAsCounselor() {
 			OrdersTypeDetail:     &ordersTypeDetail,
 			Tac:                  handlers.FmtString("E19A"),
 			Sac:                  nullable.NewString("987654321"),
+			Grade:                &grade,
 		}
 
 		eTag := etag.GenerateEtag(order.UpdatedAt)
@@ -471,6 +473,7 @@ func (suite *OrderServiceSuite) TestUpdateOrderAsCounselor() {
 		suite.EqualValues(body.DepartmentIndicator, updatedOrder.DepartmentIndicator)
 		suite.EqualValues(body.Tac, updatedOrder.TAC)
 		suite.EqualValues(body.Sac.Value, updatedOrder.SAC)
+		suite.Equal(*updatedOrder.Entitlement.DBAuthorizedWeight, 16000)
 	})
 
 	suite.Run("Rolls back transaction if Order is invalid", func() {

playwright/tests/office/qaecsr/csrFlows.spec.js

@@ -136,6 +136,7 @@ test.describe('Customer Support User Flows', () => {
       await expect(page.locator('select[name="ordersTypeDetail"]')).toBeDisabled();
       await expect(page.locator('input[name="tac"]')).toBeDisabled();
       await expect(page.locator('input[name="sac"]')).toBeDisabled();
+      await expect(page.locator('select[name="payGrade"]')).toBeDisabled();
       // no save button should exist
       await expect(page.getByRole('button', { name: 'Save' })).toHaveCount(0);
     });
@@ -157,11 +158,9 @@ test.describe('Customer Support User Flows', () => {
       await expect(page.locator('input[name="storageInTransit"]')).toBeDisabled();
       await expect(page.locator('input[name="organizationalClothingAndIndividualEquipment"]')).toBeDisabled();
 
-      // read only grade and authorized weight
+      // read only authorized weight
       await expect(page.locator('select[name=agency]')).toBeDisabled();
       await expect(page.locator('select[name=agency]')).toBeDisabled();
-      await expect(page.locator('select[name="grade"]')).toBeDisabled();
-      await expect(page.locator('select[name="grade"]')).toBeDisabled();
       await expect(page.locator('input[name="dependentsAuthorized"]')).toBeDisabled();
 
       // no save button should exist

src/components/Office/AllowancesDetailForm/AllowancesDetailForm.jsx

@@ -10,7 +10,7 @@ import { EntitlementShape } from 'types/order';
 import { formatWeight } from 'utils/formatters';
 import Hint from 'components/Hint';
 
-const AllowancesDetailForm = ({ header, entitlements, payGradeOptions, branchOptions, formIsDisabled }) => {
+const AllowancesDetailForm = ({ header, entitlements, branchOptions, formIsDisabled }) => {
   return (
     <div className={styles.AllowancesDetailForm}>
       {header && <h3 data-testid="header">{header}</h3>}
@@ -71,15 +71,6 @@ const AllowancesDetailForm = ({ header, entitlements, payGradeOptions, branchOpt
         showDropdownPlaceholderText={false}
         isDisabled={formIsDisabled}
       />
-      <DropdownInput
-        data-testid="payGradeInput"
-        name="grade"
-        label="Pay grade"
-        id="payGradeInput"
-        options={payGradeOptions}
-        showDropdownPlaceholderText={false}
-        isDisabled={formIsDisabled}
-      />
       <MaskedTextField
         data-testid="sitInput"
         defaultValue="0"
@@ -121,7 +112,6 @@ const AllowancesDetailForm = ({ header, entitlements, payGradeOptions, branchOpt
 
 AllowancesDetailForm.propTypes = {
   entitlements: EntitlementShape.isRequired,
-  payGradeOptions: DropdownArrayOf.isRequired,
   branchOptions: DropdownArrayOf.isRequired,
   header: PropTypes.string,
   formIsDisabled: PropTypes.bool,

src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx

@@ -47,18 +47,6 @@ jest.mock('formik', () => ({
 
 const { Formik } = jest.requireActual('formik');
 
-const payGradeOptions = [
-  { key: 'E_1', value: 'E-1' },
-  { key: 'E_2', value: 'E-2' },
-  { key: 'E_3', value: 'E-3' },
-  { key: 'E_4', value: 'E-4' },
-  { key: 'E_5', value: 'E-5' },
-  { key: 'E_6', value: 'E-6' },
-  { key: 'E_7', value: 'E-7' },
-  { key: 'E_8', value: 'E-8' },
-  { key: 'E_9', value: 'E-9' },
-];
-
 const branchOptions = [
   { key: 'Army', value: 'Army' },
   { key: 'Navy', value: 'Navy' },
@@ -83,11 +71,7 @@ describe('AllowancesDetailForm', () => {
   it('renders the form', async () => {
     render(
       <Formik initialValues={initialValues}>
-        <AllowancesDetailForm
-          entitlements={entitlements}
-          payGradeOptions={payGradeOptions}
-          branchOptions={branchOptions}
-        />
+        <AllowancesDetailForm entitlements={entitlements} branchOptions={branchOptions} />
       </Formik>,
     );
 
@@ -99,11 +83,7 @@ describe('AllowancesDetailForm', () => {
   it('renders the pro-gear hints', async () => {
     render(
       <Formik initialValues={initialValues}>
-        <AllowancesDetailForm
-          entitlements={entitlements}
-          payGradeOptions={payGradeOptions}
-          branchOptions={branchOptions}
-        />
+        <AllowancesDetailForm entitlements={entitlements} branchOptions={branchOptions} />
       </Formik>,
     );
 
@@ -114,12 +94,7 @@ describe('AllowancesDetailForm', () => {
   it('renders the title header', async () => {
     render(
       <Formik initialValues={initialValues}>
-        <AllowancesDetailForm
-          entitlements={entitlements}
-          payGradeOptions={payGradeOptions}
-          branchOptions={branchOptions}
-          header="Test Header"
-        />
+        <AllowancesDetailForm entitlements={entitlements} branchOptions={branchOptions} header="Test Header" />
       </Formik>,
     );