query improvements, updating csv file name prefix

transcom · Feb 7, 2025 · 4fedc40 · 4fedc40
1 parent ce1423e
commit 4fedc40
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql
@@ -351,20 +351,20 @@ BEGIN
             )::JSONB AS too_assigned,
             COUNT(*) OVER() AS total_count
         FROM moves
-        INNER JOIN orders ON moves.orders_id = orders.id
-        LEFT JOIN mto_shipments ON mto_shipments.move_id = moves.id
+        JOIN orders ON moves.orders_id = orders.id
+        JOIN mto_shipments ON mto_shipments.move_id = moves.id
         LEFT JOIN ppm_shipments ON ppm_shipments.shipment_id = mto_shipments.id
-        LEFT JOIN mto_service_items ON mto_shipments.id = mto_service_items.mto_shipment_id
-        LEFT JOIN re_services ON mto_service_items.re_service_id = re_services.id
-        LEFT JOIN service_members ON orders.service_member_id = service_members.id
-        LEFT JOIN duty_locations AS new_duty_locations ON orders.new_duty_location_id = new_duty_locations.id
-        LEFT JOIN duty_locations AS origin_duty_locations ON orders.origin_duty_location_id = origin_duty_locations.id
+        JOIN mto_service_items ON mto_shipments.id = mto_service_items.mto_shipment_id
+        JOIN re_services ON mto_service_items.re_service_id = re_services.id
+        JOIN service_members ON orders.service_member_id = service_members.id
+        JOIN duty_locations AS new_duty_locations ON orders.new_duty_location_id = new_duty_locations.id
+        JOIN duty_locations AS origin_duty_locations ON orders.origin_duty_location_id = origin_duty_locations.id
         LEFT JOIN office_users AS too_user ON moves.too_assigned_id = too_user.id
         LEFT JOIN office_users AS locked_user ON moves.locked_by = locked_user.id
         LEFT JOIN transportation_offices AS counseling_offices
             ON moves.counseling_transportation_office_id = counseling_offices.id
         LEFT JOIN shipment_address_updates ON shipment_address_updates.shipment_id = mto_shipments.id
-        LEFT JOIN move_to_dest_gbloc ON move_to_dest_gbloc.move_id = moves.id
+        JOIN move_to_dest_gbloc ON move_to_dest_gbloc.move_id = moves.id
         WHERE moves.show = TRUE
     ';
 

diff --git a/src/pages/Office/MoveQueue/MoveQueue.jsx b/src/pages/Office/MoveQueue/MoveQueue.jsx
@@ -369,9 +369,9 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen
           handleClick={handleClick}
           useQueries={useDestinationRequestsQueueQueries}
           showCSVExport
-          csvExportFileNamePrefix="Task-Order-Queue"
+          csvExportFileNamePrefix="Destination-Requests-Queue"
           csvExportQueueFetcher={getDestinationRequestsQueue}
-          csvExportQueueFetcherKey="queueMoves"
+          csvExportQueueFetcherKey="destinationQueueMoves"
           sessionStorageKey={queueType}
           key={queueType}
         />