From 8ea0d89d71de8dbe0c42a755f3e7d3892b8fb240 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Tue, 2 Aug 2022 22:58:39 +0300
Subject: [PATCH] Fix

---
 selfprivacy_api/graphql/subscriptions/jobs.py | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/selfprivacy_api/graphql/subscriptions/jobs.py b/selfprivacy_api/graphql/subscriptions/jobs.py
index 55d4c10..26dd2aa 100644
--- a/selfprivacy_api/graphql/subscriptions/jobs.py
+++ b/selfprivacy_api/graphql/subscriptions/jobs.py
@@ -1,4 +1,5 @@
 import asyncio
+import datetime
 from typing import AsyncGenerator
 import typing
 
@@ -7,10 +8,23 @@ from selfprivacy_api.graphql import IsAuthenticated
 
 from selfprivacy_api.jobs import Job, Jobs
 
+@strawberry.type
+class ApiJob:
+    name: str
+    description: str
+    status: str
+    status_text: typing.Optional[str]
+    progress: typing.Optional[int]
+    created_at: datetime.datetime
+    updated_at: datetime.datetime
+    finished_at: typing.Optional[datetime.datetime]
+    error: typing.Optional[str]
+    result: typing.Optional[str]
+
 @strawberry.type
 class JobSubscription:
     @strawberry.subscription(permission_classes=[IsAuthenticated])
-    async def job_subscription(self) -> AsyncGenerator[typing.List[Job], None]:
+    async def job_subscription(self) -> AsyncGenerator[typing.List[ApiJob], None]:
         is_updated = True
         def callback(jobs: typing.List[Job]):
             nonlocal is_updated
@@ -20,7 +34,18 @@ class JobSubscription:
             while True:
                 if is_updated:
                     is_updated = False
-                    yield Jobs().jobs
+                    yield [ ApiJob(
+                        name=job.name,
+                        description=job.description,
+                        status=job.status.name,
+                        status_text=job.status_text,
+                        progress=job.progress,
+                        created_at=job.created_at,
+                        updated_at=job.updated_at,
+                        finished_at=job.finished_at,
+                        error=job.error,
+                        result=job.result,
+                    ) for job in Jobs().get_jobs() ]
         except GeneratorExit:
             Jobs().remove_observer(callback)
             return