Merge pull request #551 from HiEventsDev/develop

Fix: Include attendees from offline payment order in exports (#550)

Author: daveearley

backend/app/Repository/Eloquent/AttendeeRepository.php

@@ -37,7 +37,11 @@ public function findByEventIdForExport(int $eventId): Collection
 
         $this->model->select('attendees.*');
         $this->model->join('orders', 'orders.id', '=', 'attendees.order_id');
-        $this->model->whereIn('orders.status', [OrderStatus::COMPLETED->name, OrderStatus::CANCELLED->name]);
+        $this->model->whereIn('orders.status', [
+            OrderStatus::AWAITING_OFFLINE_PAYMENT->name,
+            OrderStatus::COMPLETED->name,
+            OrderStatus::CANCELLED->name
+        ]);
 
         $model = $this->model->limit(10000)->get();
         $this->resetModel();

frontend/src/mutations/useExportAnswers.ts

@@ -22,7 +22,9 @@ export const useExportAnswers = (eventId: IdParam) => {
     const query = useQuery({
         queryKey: ["exportStatus", jobUuid],
         queryFn: async () => {
-            if (!jobUuid) return null;
+            if (!jobUuid) {
+                return null;
+            }
 
             try {
                 const data = await questionClient.checkExportStatus(eventId, jobUuid);
@@ -46,10 +48,13 @@ export const useExportAnswers = (eventId: IdParam) => {
             }
         },
         enabled: !!jobUuid,
-        refetchInterval: (data) => (data?.status === "IN_PROGRESS"
-                ? 5000
-                : false
-        ),
+        refetchInterval: (data) => {
+            const status = data?.state?.data?.status;
+            return (status === "IN_PROGRESS"
+                    ? 5000
+                    : false
+            );
+        },
     });
 
     return {