B-21569-INT 2

migrations/app/migrations_manifest.txt

@@ -1074,4 +1074,5 @@
 20250110001339_update_nts_release_enum_name.up.sql
 20250110153428_add_shipment_address_updates_to_move_history.up.sql
 20250110214012_homesafeconnect_cert.up.sql
+20250113152050_rename_ubp.up.sql
 20250113201232_update_estimated_pricing_procs_add_is_peak_func.up.sql

migrations/app/schema/20250113152050_rename_ubp.up.sql

@@ -0,0 +1 @@
+update re_services set name = 'International UB price' where code = 'UBP';

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

@@ -1882,6 +1882,10 @@ func MTOServiceItemModel(s *models.MTOServiceItem, storer storage.FileStorer) *g
 			serviceRequestDocs[i] = payload
 		}
 	}
+	var sort *string = nil
+	if s.ReService.ReServiceItem != nil {
+		sort = s.ReService.ReServiceItem.Sort
+	}
 	payload := &ghcmessages.MTOServiceItem{
 		ID:                            handlers.FmtUUID(s.ID),
 		MoveTaskOrderID:               handlers.FmtUUID(s.MoveTaskOrderID),
@@ -1897,6 +1901,7 @@ func MTOServiceItemModel(s *models.MTOServiceItem, storer storage.FileStorer) *g
 		SitDepartureDate:              handlers.FmtDateTimePtr(s.SITDepartureDate),
 		SitCustomerContacted:          handlers.FmtDatePtr(s.SITCustomerContacted),
 		SitRequestedDelivery:          handlers.FmtDatePtr(s.SITRequestedDelivery),
+		Sort:                          sort,
 		Status:                        ghcmessages.MTOServiceItemStatus(s.Status),
 		Description:                   handlers.FmtStringPtr(s.Description),
 		Dimensions:                    MTOServiceItemDimensions(s.Dimensions),

pkg/handlers/ghcapi/mto_service_items.go

@@ -350,6 +350,7 @@ func (h ListMTOServiceItemsHandler) Handle(params mtoserviceitemop.ListMTOServic
 				query.NewQueryAssociation("SITDestinationFinalAddress"),
 				query.NewQueryAssociation("SITOriginHHGOriginalAddress"),
 				query.NewQueryAssociation("SITOriginHHGActualAddress"),
+				query.NewQueryAssociation("ReService.ReServiceItem.Sort"),
 			})
 
 			var serviceItems models.MTOServiceItems

pkg/handlers/ghcapi/mto_service_items_test.go

@@ -129,7 +129,28 @@ func (suite *HandlerSuite) TestListMTOServiceItemHandler() {
 			},
 		}, nil)
 
-		serviceItems := models.MTOServiceItems{serviceItem, originSit, destinationSit}
+		poeFsc := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{
+			{
+				Model: models.MTOServiceItem{
+					Status: models.MTOServiceItemStatusApproved,
+				},
+			},
+			{
+				Model:    mto,
+				LinkOnly: true,
+			},
+			{
+				Model:    mtoShipment,
+				LinkOnly: true,
+			},
+			{
+				Model: models.ReService{
+					Code: models.ReServiceCodePOEFSC,
+				},
+			},
+		}, nil)
+
+		serviceItems := models.MTOServiceItems{serviceItem, originSit, destinationSit, poeFsc}
 
 		return requestUser, serviceItems
 	}
@@ -178,7 +199,7 @@ func (suite *HandlerSuite) TestListMTOServiceItemHandler() {
 		suite.NoError(okResponse.Payload.Validate(strfmt.Default))
 		fmt.Println(okResponse.Payload)
 
-		suite.Len(okResponse.Payload, 3)
+		suite.Len(okResponse.Payload, 4)
 		for _, serviceItem := range serviceItems {
 			for _, payload := range okResponse.Payload {
 				// Validate that the Customer Contacts were included in the payload
@@ -200,6 +221,13 @@ func (suite *HandlerSuite) TestListMTOServiceItemHandler() {
 				}
 			}
 		}
+
+		// Validate that sort field is populated for service items which have it (ie. POEFSC)
+		for _, payload := range okResponse.Payload {
+			if payload.ReServiceCode != nil && *payload.ReServiceCode == models.ReServiceCodePOEFSC.String() {
+				suite.Equal("2", *payload.Sort)
+			}
+		}
 	})
 
 	suite.Run("Failure list fetch - Internal Server Error", func() {

pkg/models/re_service.go

@@ -119,7 +119,7 @@ const (
 	ReServiceCodeNSTH ReServiceCode = "NSTH"
 	// ReServiceCodeNSTUB Nonstandard UB
 	ReServiceCodeNSTUB ReServiceCode = "NSTUB"
-	// ReServiceCodeUBP International UB
+	// ReServiceCodeUBP International UB price
 	ReServiceCodeUBP ReServiceCode = "UBP"
 	// ReServiceCodeISLH Shipping & Linehaul
 	ReServiceCodeISLH ReServiceCode = "ISLH"
@@ -147,6 +147,7 @@ type ReService struct {
 	Priority        int                  `db:"priority" rw:"r"`
 	Name            string               `json:"name" db:"name" rw:"r"`
 	ServiceLocation *ServiceLocationType `db:"service_location" rw:"r"`
+	ReServiceItem   *ReServiceItem       `has_one:"re_service_item" fk_id:"service_id"`
 	CreatedAt       time.Time            `json:"created_at" db:"created_at" rw:"r"`
 	UpdatedAt       time.Time            `json:"updated_at" db:"updated_at" rw:"r"`
 }

pkg/services/mto_shipment/shipment_approver_test.go

@@ -1059,17 +1059,25 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() {
 		err2 := suite.AppContextForTest().DB().EagerPreload("ReService").Where("mto_shipment_id = ?", internationalShipment.ID).Order("created_at asc").All(&serviceItems)
 		suite.NoError(err2)
 
-		expectedReserviceCodes := []models.ReServiceCode{
+		expectedReServiceCodes := []models.ReServiceCode{
 			models.ReServiceCodeUBP,
+			models.ReServiceCodePOEFSC,
 			models.ReServiceCodeIUBPK,
 			models.ReServiceCodeIUBUPK,
-			models.ReServiceCodePOEFSC,
+		}
+		expectedReServiceNames := []string{
+			"International UB price",
+			"International POE Fuel Surcharge",
+			"International UB pack",
+			"International UB unpack",
 		}
 
 		suite.Equal(4, len(serviceItems))
 		for i := 0; i < len(serviceItems); i++ {
 			actualReServiceCode := serviceItems[i].ReService.Code
-			suite.True(slices.Contains(expectedReserviceCodes, actualReServiceCode), "Contains unexpected: "+actualReServiceCode.String())
+			actualReServiceName := serviceItems[i].ReService.Name
+			suite.True(slices.Contains(expectedReServiceCodes, actualReServiceCode), "Contains unexpected code: "+actualReServiceCode.String())
+			suite.True(slices.Contains(expectedReServiceNames, actualReServiceName), "Contains unexpected name: "+actualReServiceName)
 		}
 	})
 
@@ -1119,17 +1127,25 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() {
 		err2 := suite.AppContextForTest().DB().EagerPreload("ReService").Where("mto_shipment_id = ?", internationalShipment.ID).Order("created_at asc").All(&serviceItems)
 		suite.NoError(err2)
 
-		expectedReserviceCodes := []models.ReServiceCode{
+		expectedReServiceCodes := []models.ReServiceCode{
 			models.ReServiceCodeUBP,
+			models.ReServiceCodePODFSC,
 			models.ReServiceCodeIUBPK,
 			models.ReServiceCodeIUBUPK,
-			models.ReServiceCodePODFSC,
+		}
+		expectedReServiceNames := []string{
+			"International UB price",
+			"International POD Fuel Surcharge",
+			"International UB pack",
+			"International UB unpack",
 		}
 
 		suite.Equal(4, len(serviceItems))
 		for i := 0; i < len(serviceItems); i++ {
 			actualReServiceCode := serviceItems[i].ReService.Code
-			suite.True(slices.Contains(expectedReserviceCodes, actualReServiceCode), "Contains unexpected: "+actualReServiceCode.String())
+			actualReServiceName := serviceItems[i].ReService.Name
+			suite.True(slices.Contains(expectedReServiceCodes, actualReServiceCode), "Contains unexpected code: "+actualReServiceCode.String())
+			suite.True(slices.Contains(expectedReServiceNames, actualReServiceName), "Contains unexpected name: "+actualReServiceName)
 		}
 	})
 
@@ -1179,16 +1195,23 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() {
 		err2 := suite.AppContextForTest().DB().EagerPreload("ReService").Where("mto_shipment_id = ?", internationalShipment.ID).Order("created_at asc").All(&serviceItems)
 		suite.NoError(err2)
 
-		expectedReserviceCodes := []models.ReServiceCode{
+		expectedReServiceCodes := []models.ReServiceCode{
 			models.ReServiceCodeUBP,
 			models.ReServiceCodeIUBPK,
 			models.ReServiceCodeIUBUPK,
 		}
+		expectedReServiceNames := []string{
+			"International UB price",
+			"International UB pack",
+			"International UB unpack",
+		}
 
 		suite.Equal(3, len(serviceItems))
 		for i := 0; i < len(serviceItems); i++ {
 			actualReServiceCode := serviceItems[i].ReService.Code
-			suite.True(slices.Contains(expectedReserviceCodes, actualReServiceCode), "Contains unexpected: "+actualReServiceCode.String())
+			actualReServiceName := serviceItems[i].ReService.Name
+			suite.True(slices.Contains(expectedReServiceCodes, actualReServiceCode), "Contains unexpected code: "+actualReServiceCode.String())
+			suite.True(slices.Contains(expectedReServiceNames, actualReServiceName), "Contains unexpected name: "+actualReServiceName)
 		}
 	})
 

src/components/Office/RequestedServiceItemsTable/RequestedServiceItemsTable.test.jsx

@@ -61,6 +61,30 @@ const serviceItemWithDetails = {
   },
 };
 
+const serviceItemUBP = {
+  id: 'ubp123',
+  createdAt: '2025-01-15',
+  serviceItem: 'International UB price',
+  code: 'UBP',
+  sort: '1',
+};
+
+const serviceItemIUBPK = {
+  id: 'iubpk123',
+  createdAt: '2025-01-15',
+  serviceItem: 'International UB pack',
+  code: 'IUBPK',
+  sort: '3',
+};
+
+const serviceItemIUBUPK = {
+  id: 'iubupk123',
+  createdAt: '2025-01-15',
+  serviceItem: 'International UB unpack',
+  code: 'IUBUPK',
+  sort: '4',
+};
+
 const testDetails = (wrapper) => {
   const detailTypes = wrapper.find('.detailType');
   const detailDefinitions = wrapper.find('.detail dd');
@@ -226,4 +250,39 @@ describe('RequestedServiceItemsTable', () => {
     expect(approveTextButton.at(1).text().includes('Approve')).toBe(true);
     expect(approveTextButton.at(2).text().includes('Approve')).toBe(true);
   });
+
+  it('displays sorted service items in order', () => {
+    const serviceItems = [serviceItemIUBPK, serviceItemUBP, serviceItemIUBUPK];
+    const wrapper = mount(
+      <MockProviders>
+        <RequestedServiceItemsTable
+          {...defaultProps}
+          serviceItems={serviceItems}
+          statusForTableType={SERVICE_ITEM_STATUS.SUBMITTED}
+        />
+      </MockProviders>,
+    );
+
+    expect(wrapper.find('.codeName').at(0).text()).toBe('International UB price');
+    expect(wrapper.find('.codeName').at(1).text()).toBe('International UB pack');
+    expect(wrapper.find('.codeName').at(2).text()).toBe('International UB unpack');
+  });
+
+  it('displays sorted service items in order along with non-sorted service items', () => {
+    const serviceItems = [serviceItemIUBPK, serviceItemUBP, serviceItemWithCrating, serviceItemIUBUPK];
+    const wrapper = mount(
+      <MockProviders>
+        <RequestedServiceItemsTable
+          {...defaultProps}
+          serviceItems={serviceItems}
+          statusForTableType={SERVICE_ITEM_STATUS.SUBMITTED}
+        />
+      </MockProviders>,
+    );
+
+    expect(wrapper.find('.codeName').at(0).text()).toBe('International UB price');
+    expect(wrapper.find('.codeName').at(1).text()).toBe('International UB pack');
+    expect(wrapper.find('.codeName').at(2).text()).toBe('International UB unpack');
+    expect(wrapper.find('.codeName').at(3).text()).toBe('Domestic crating');
+  });
 });

src/components/Office/ServiceItemsTable/ServiceItemsTable.jsx

@@ -19,6 +19,7 @@ import { selectDateFieldByStatus, selectDatePrefixByStatus } from 'utils/dates';
 import { useGHCGetMoveHistory, useMovePaymentRequestsQueries } from 'hooks/queries';
 import ToolTip from 'shared/ToolTip/ToolTip';
 import { ShipmentShape } from 'types';
+import { nullSafeStringCompare } from 'shared/utils';
 
 // Sorts service items in an order preferred by the customer
 // Currently only SIT & shorthaul/linehaul receives special sorting
@@ -48,12 +49,14 @@ function sortServiceItems(items) {
   );
 
   // Filter all service items that are not specifically sorted
-  const remainingServiceItems = items.filter(
-    (item) =>
-      !haulTypeServiceItemCodes.includes(item.code) &&
-      !destinationServiceItemCodes.includes(item.code) &&
-      !originServiceItemCodes.includes(item.code),
-  );
+  const remainingServiceItems = items
+    .filter(
+      (item) =>
+        !haulTypeServiceItemCodes.includes(item.code) &&
+        !destinationServiceItemCodes.includes(item.code) &&
+        !originServiceItemCodes.includes(item.code),
+    )
+    .sort((a, b) => nullSafeStringCompare(a.sort, b.sort));
 
   return [
     ...sortedHaulTypeServiceItems,

src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.test.jsx

@@ -25,7 +25,7 @@ const reServiceItemResponse = [
     isAutoApproved: true,
     marketCode: 'i',
     serviceCode: 'UBP',
-    serviceName: 'International UB',
+    serviceName: 'International UB price',
     shipmentType: 'UNACCOMPANIED_BAGGAGE',
   },
   {
@@ -370,7 +370,7 @@ describe('Shipment Service Items Table', () => {
 
   describe('renders the intl UB shipment type (CONUS -> OCONUS) with service items', () => {
     it.each([
-      ['International UB'],
+      ['International UB price'],
       ['International POE Fuel Surcharge'],
       ['International UB pack'],
       ['International UB unpack'],
@@ -385,7 +385,7 @@ describe('Shipment Service Items Table', () => {
 
   describe('renders the intl UB shipment type (OCONUS -> CONUS) with service items', () => {
     it.each([
-      ['International UB'],
+      ['International UB price'],
       ['International POD Fuel Surcharge'],
       ['International UB pack'],
       ['International UB unpack'],
@@ -399,7 +399,7 @@ describe('Shipment Service Items Table', () => {
   });
 
   describe('renders the intl UB shipment type (OCONUS -> OCONUS) with service items', () => {
-    it.each([['International UB'], ['International UB pack'], ['International UB unpack']])(
+    it.each([['International UB price'], ['International UB pack'], ['International UB unpack']])(
       'expects %s to be in the document',
       async (serviceItem) => {
         render(<ShipmentServiceItemsTable shipment={intlUbOconusToOconusShipment} />);

src/shared/utils.js

@@ -209,3 +209,24 @@ export function checkAddressTogglesToClearAddresses(body) {
 
   return values;
 }
+
+/**
+ * Compare strings. Null, undefined, and blanks are after other values.
+ * @returns -1, 0, 1
+ */
+export function nullSafeStringCompare(a, b) {
+  const A_BEFORE = -1;
+  const A_AFTER = 1;
+  const SAME = 0;
+
+  if (isNullUndefinedOrWhitespace(a) && isNullUndefinedOrWhitespace(b)) {
+    return SAME;
+  }
+  if (isNullUndefinedOrWhitespace(a)) {
+    return A_AFTER;
+  }
+  if (isNullUndefinedOrWhitespace(b)) {
+    return A_BEFORE;
+  }
+  return a.localeCompare(b);
+}