@open-mercato/core 0.7.1-develop.7186.1.6e080a5017 → 0.7.1-develop.7193.1.910a5b0a1e

package/src/modules/query_index/api/status.ts

@@ -334,6 +334,23 @@ export async function GET(req: Request) {
     )
     const stalledPartitions = activePartitions.filter((p) => p.status === 'stalled')
     const scopeCandidate = !preferOrg || !scopeRow || scopeRow.orgMatch ? scopeRow : null
+    // A scope-only job (no partition rows, e.g. partitionCount: 1) has nothing in
+    // `partitions` for the checks below to see, so its running/stalled/failed state and
+    // timestamps must fall back to the scope row itself instead of defaulting to idle/null.
+    const computeScopeStatus = (row: any): 'failed' | 'completed' | 'stalled' | 'reindexing' | 'purging' => {
+      const heartbeatDate = row.heartbeat_at ? new Date(row.heartbeat_at) : null
+      const finishedDate = row.finished_at ? new Date(row.finished_at) : null
+      if (finishedDate) return row.status === 'failed' ? 'failed' : 'completed'
+      if (!heartbeatDate || Date.now() - heartbeatDate.getTime() > HEARTBEAT_STALE_MS) {
+        return 'stalled'
+      }
+      return (row.status as 'reindexing' | 'purging' | undefined | null) || 'reindexing'
+    }
+    const scopeStatus = scopeCandidate ? computeScopeStatus(scopeCandidate.row) : null
+    const scopeStartedAt = scopeCandidate?.row.started_at ? new Date(scopeCandidate.row.started_at).toISOString() : null
+    const scopeFinishedAt = scopeCandidate?.row.finished_at ? new Date(scopeCandidate.row.finished_at).toISOString() : null
+    const scopeHeartbeatAt = scopeCandidate?.row.heartbeat_at ? new Date(scopeCandidate.row.heartbeat_at).toISOString() : null
+
     let status: 'idle' | 'reindexing' | 'purging' | 'stalled' | 'failed' = 'idle'
     if (activePartitions.length) {
       if (runningPartitions.length) {
@@ -348,13 +365,19 @@ export async function GET(req: Request) {
       // The run finished but lost records; without this it reports "idle" and the only
       // hint that anything went wrong is the coverage percentage.
       status = 'failed'
+    } else if (!partitions.length && scopeStatus && scopeStatus !== 'completed') {
+      status = scopeStatus
     }
 
-    const startedAt = activePartitions[0]?.startedAt ?? partitions[0]?.startedAt ?? null
+    const startedAt = activePartitions[0]?.startedAt
+      ?? partitions[0]?.startedAt
+      ?? (!partitions.length ? scopeStartedAt : null)
     const finishedAt = status === 'idle' || status === 'failed'
-      ? (partitions.find((p) => p.finishedAt)?.finishedAt ?? null)
+      ? (partitions.find((p) => p.finishedAt)?.finishedAt ?? (!partitions.length ? scopeFinishedAt : null))
       : null
-    const heartbeatAt = activePartitions[0]?.heartbeatAt ?? partitions[0]?.heartbeatAt ?? null
+    const heartbeatAt = activePartitions[0]?.heartbeatAt
+      ?? partitions[0]?.heartbeatAt
+      ?? (!partitions.length ? scopeHeartbeatAt : null)
     const jobTotalCount = partitions.reduce((sum, p) => sum + (p.totalCount ?? 0), 0)
     const processedSum = partitions.reduce((sum, p) => sum + (p.processedCount ?? 0), 0)
     const processedCount = jobTotalCount ? Math.min(jobTotalCount, processedSum) : processedSum || null
@@ -369,18 +392,7 @@ export async function GET(req: Request) {
       partitions,
       scope: scopeCandidate
         ? {
-            status: (() => {
-              const heartbeatDate = scopeCandidate!.row.heartbeat_at ? new Date(scopeCandidate!.row.heartbeat_at) : null
-              const finishedDate = scopeCandidate!.row.finished_at ? new Date(scopeCandidate!.row.finished_at) : null
-              if (finishedDate) return scopeCandidate!.row.status === 'failed' ? 'failed' : 'completed'
-              if (
-                !heartbeatDate ||
-                Date.now() - heartbeatDate.getTime() > HEARTBEAT_STALE_MS
-              ) {
-                return 'stalled'
-              }
-              return (scopeCandidate!.row.status as string) || 'reindexing'
-            })(),
+            status: scopeStatus!,
             processedCount: scopeCandidate.row.processed_count ?? null,
             totalCount: scopeCandidate.row.total_count ?? null,
           }