fix: Remove unnecessary jobs.update call

selfprivacy_api/dependencies.py

@@ -27,4 +27,4 @@ async def get_token_header(
 
 def get_api_version() -> str:
     """Get API version"""
-    return "3.2.1"
+    return "3.1.0"

selfprivacy_api/graphql/queries/backup.py

@@ -34,24 +34,6 @@ class BackupConfiguration:
     location_id: typing.Optional[str]
 
 
-# TODO: Ideally this should not be done in API but making an internal Service requires more work
-# than to make an API record about a service
-def tombstone_service(service_id: str) -> Service:
-    return Service(
-        id=service_id,
-        display_name=f"{service_id} (Orphaned)",
-        description="",
-        svg_icon="",
-        is_movable=False,
-        is_required=False,
-        is_enabled=False,
-        status=ServiceStatusEnum.OFF,
-        url=None,
-        can_be_backed_up=False,
-        backup_description="",
-    )
-
-
 @strawberry.type
 class Backup:
     @strawberry.field
@@ -73,21 +55,27 @@ class Backup:
         result = []
         snapshots = Backups.get_all_snapshots()
         for snap in snapshots:
-            api_service = None
             service = get_service_by_id(snap.service_name)
-
             if service is None:
-                api_service = tombstone_service(snap.service_name)
-            else:
-                api_service = service_to_graphql_service(service)
-            if api_service is None:
-                raise NotImplementedError(
-                    f"Could not construct API Service record for:{snap.service_name}. This should be unreachable and is a bug if you see it."
+                service = Service(
+                    id=snap.service_name,
+                    display_name=f"{snap.service_name} (Orphaned)",
+                    description="",
+                    svg_icon="",
+                    is_movable=False,
+                    is_required=False,
+                    is_enabled=False,
+                    status=ServiceStatusEnum.OFF,
+                    url=None,
+                    dns_records=None,
+                    can_be_backed_up=False,
+                    backup_description="",
                 )
-
+            else:
+                service = service_to_graphql_service(service)
             graphql_snap = SnapshotInfo(
                 id=snap.id,
-                service=api_service,
+                service=service,
                 created_at=snap.created_at,
                 reason=snap.reason,
             )

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="selfprivacy_api",
-    version="3.2.1",
+    version="3.1.0",
     packages=find_packages(),
     scripts=[
         "selfprivacy_api/app.py",

tests/conftest.py

@@ -208,7 +208,5 @@ def dummy_service(
     service.enable()
     yield service
 
-    # Cleanup because apparently it matters wrt tasks
-    # Some tests may remove it from the list intentionally, this is fine
-    if service in services.services:
-        services.services.remove(service)
+    # cleanup because apparently it matters wrt tasks
+    services.services.remove(service)

tests/test_graphql/test_api_backup.py

@@ -3,8 +3,6 @@ from tests.test_backup import backups
 from tests.common import generate_backup_query
 
 
-import selfprivacy_api.services as all_services
-from selfprivacy_api.services import get_service_by_id
 from selfprivacy_api.graphql.common_types.service import service_to_graphql_service
 from selfprivacy_api.graphql.common_types.backup import (
     _AutobackupQuotas,
@@ -145,7 +143,6 @@ allSnapshots {
     id
     service {
         id
-        displayName
     }
     createdAt
     reason
@@ -309,20 +306,6 @@ def test_snapshots_empty(authorized_client, dummy_service, backups):
     assert snaps == []
 
 
-def test_snapshots_orphaned_service(authorized_client, dummy_service, backups):
-    api_backup(authorized_client, dummy_service)
-    snaps = api_snapshots(authorized_client)
-    assert len(snaps) == 1
-
-    all_services.services.remove(dummy_service)
-    assert get_service_by_id(dummy_service.get_id()) is None
-
-    snaps = api_snapshots(authorized_client)
-    assert len(snaps) == 1
-    assert "Orphaned" in snaps[0]["service"]["displayName"]
-    assert dummy_service.get_id() in snaps[0]["service"]["displayName"]
-
-
 def test_start_backup(authorized_client, dummy_service, backups):
     response = api_backup(authorized_client, dummy_service)
     data = get_data(response)["backup"]["startBackup"]