From d8a8b2ec29c537255a8082c22da01496a31424be Mon Sep 17 00:00:00 2001
From: inexcode <inex.code@selfprivacy.org>
Date: Sat, 13 Aug 2022 03:39:37 +0400
Subject: [PATCH] fixes

---
 selfprivacy_api/graphql/common_types/service.py       | 11 ++++++++---
 .../{storage_mutation.py => storage_mutations.py}     |  0
 selfprivacy_api/graphql/queries/storage.py            |  7 +------
 selfprivacy_api/graphql/schema.py                     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename selfprivacy_api/graphql/mutations/{storage_mutation.py => storage_mutations.py} (100%)

diff --git a/selfprivacy_api/graphql/common_types/service.py b/selfprivacy_api/graphql/common_types/service.py
index 1634f89..65e418f 100644
--- a/selfprivacy_api/graphql/common_types/service.py
+++ b/selfprivacy_api/graphql/common_types/service.py
@@ -33,7 +33,10 @@ class StorageVolume:
     model: typing.Optional[str]
     serial: typing.Optional[str]
     type: str
-    usages: list["StorageUsageInterface"] = strawberry.field(resolver=get_usages)
+    @strawberry.field
+    def usages(self) -> list["StorageUsageInterface"]:
+        """Get usages of a volume"""
+        return get_usages(self)
 
 
 @strawberry.interface
@@ -79,7 +82,6 @@ def get_storage_usage(root: "Service") -> ServiceStorageUsage:
 
 @strawberry.type
 class Service:
-    storage_usage: ServiceStorageUsage = strawberry.field(resolver=get_storage_usage)
     id: str
     display_name: str
     description: str
@@ -90,7 +92,10 @@ class Service:
     status: ServiceStatusEnum
     url: typing.Optional[str]
     dns_records: typing.Optional[typing.List[DnsRecord]]
-
+    @strawberry.field
+    def storage_usage(self) -> ServiceStorageUsage:
+        """Get storage usage for a service"""
+        return get_storage_usage(self)
 
 def service_to_graphql_service(service: ServiceInterface) -> Service:
     """Convert service to graphql service"""
diff --git a/selfprivacy_api/graphql/mutations/storage_mutation.py b/selfprivacy_api/graphql/mutations/storage_mutations.py
similarity index 100%
rename from selfprivacy_api/graphql/mutations/storage_mutation.py
rename to selfprivacy_api/graphql/mutations/storage_mutations.py
diff --git a/selfprivacy_api/graphql/queries/storage.py b/selfprivacy_api/graphql/queries/storage.py
index 273b6a7..6800518 100644
--- a/selfprivacy_api/graphql/queries/storage.py
+++ b/selfprivacy_api/graphql/queries/storage.py
@@ -2,15 +2,10 @@
 # pylint: disable=too-few-public-methods
 import typing
 import strawberry
-from selfprivacy_api.graphql.common_types.service import (
-    ServiceStorageUsage,
-    service_to_graphql_service,
-    get_volume_by_id,
-)
+
 from selfprivacy_api.graphql.common_types.service import (
     StorageVolume,
 )
-from selfprivacy_api.services import get_services_by_location
 from selfprivacy_api.utils.block_devices import BlockDevices
 
 
diff --git a/selfprivacy_api/graphql/schema.py b/selfprivacy_api/graphql/schema.py
index aa7a6a4..271d066 100644
--- a/selfprivacy_api/graphql/schema.py
+++ b/selfprivacy_api/graphql/schema.py
@@ -6,7 +6,7 @@ from selfprivacy_api.graphql import IsAuthenticated
 from selfprivacy_api.graphql.mutations.api_mutations import ApiMutations
 from selfprivacy_api.graphql.mutations.mutation_interface import GenericMutationReturn
 from selfprivacy_api.graphql.mutations.ssh_mutations import SshMutations
-from selfprivacy_api.graphql.mutations.storage_mutation import StorageMutations
+from selfprivacy_api.graphql.mutations.storage_mutations import StorageMutations
 from selfprivacy_api.graphql.mutations.system_mutations import SystemMutations
 
 from selfprivacy_api.graphql.queries.api_queries import Api