bugfix for TIO assigned

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

@@ -2458,6 +2458,7 @@ func queuePaymentRequestStatus(paymentRequest models.PaymentRequest) string {
 
 }
 
+// dad
 // QueuePaymentRequests payload
 func QueuePaymentRequests(paymentRequests *models.PaymentRequests, officeUsers []models.OfficeUser, officeUser models.OfficeUser, officeUsersSafety []models.OfficeUser, activeRole string) *ghcmessages.QueuePaymentRequests {
 
@@ -2516,6 +2517,13 @@ func QueuePaymentRequests(paymentRequests *models.PaymentRequests, officeUsers [
 			if isSupervisor && orders.OrdersType == "SAFETY" {
 				availableOfficeUsers = officeUsersSafety
 			}
+
+			// if the assigned TIO doesn't work at the user's counseling office, append them
+			if queuePaymentRequests[i].AssignedTo != nil && paymentRequest.MoveTaskOrder.TIOAssignedUser.TransportationOfficeID != officeUser.TransportationOfficeID {
+				availableOfficeUsers = append(availableOfficeUsers, *paymentRequest.MoveTaskOrder.TIOAssignedUser)
+			}
+
+			// if they're not a supervisor and it is assignable, the only option should be themself
 			if !isSupervisor {
 				availableOfficeUsers = models.OfficeUsers{officeUser}
 			}

pkg/services/payment_request/payment_request_list_fetcher.go

@@ -65,6 +65,7 @@ func (f *paymentRequestListFetcher) FetchPaymentRequestList(appCtx appcontext.Ap
 		"MoveTaskOrder.Orders.OriginDutyLocation.TransportationOffice",
 		"MoveTaskOrder.Orders.OriginDutyLocation.Address",
 		"MoveTaskOrder.TIOAssignedUser",
+		"MoveTaskOrder.TIOAssignedUser.TransportationOfficeID",
 		"MoveTaskOrder.CounselingOffice",
 		// See note further below about having to do this in a separate Load call due to a Pop issue.
 		// "MoveTaskOrder.Orders.ServiceMember",