From 7435ff7ee82c81ba736ae5cce86d6e522ea88920 Mon Sep 17 00:00:00 2001
From: Sanghun Lee <sanghun@lablup.com>
Date: Tue, 22 Oct 2024 19:06:17 +0900
Subject: [PATCH] Change scope parameter as not-required and fix wrong query
 param parser

---
 src/ai/backend/manager/models/gql.py               | 8 +++++---
 src/ai/backend/manager/models/gql_models/domain.py | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/ai/backend/manager/models/gql.py b/src/ai/backend/manager/models/gql.py
index 308685618d..6954eaecb4 100644
--- a/src/ai/backend/manager/models/gql.py
+++ b/src/ai/backend/manager/models/gql.py
@@ -120,7 +120,7 @@
     LegacyComputeSessionList,
 )
 from .keypair import CreateKeyPair, DeleteKeyPair, KeyPair, KeyPairList, ModifyKeyPair
-from .rbac import ScopeField, ScopeType
+from .rbac import ScopeField, ScopeType, SystemScope
 from .rbac.permission_defs import ComputeSessionPermission, DomainPermission
 from .rbac.permission_defs import VFolderPermission as VFolderRBACPermission
 from .resource_policy import (
@@ -391,7 +391,7 @@ class Queries(graphene.ObjectType):
     domain_nodes = PaginatedConnectionField(
         DomainConnection,
         description="Added in 24.12.0.",
-        scope=ScopeField(required=True),
+        scope=ScopeField(),
         filter=graphene.String(),
         order=graphene.String(),
         permission=DomainPermissionValueField(
@@ -991,7 +991,7 @@ async def resolve_domain_nodes(
         root: Any,
         info: graphene.ResolveInfo,
         *,
-        scope: ScopeType,
+        scope: Optional[ScopeType] = None,
         permission: DomainPermission,
         filter: Optional[str] = None,
         order: Optional[str] = None,
@@ -1000,6 +1000,8 @@ async def resolve_domain_nodes(
         before: Optional[str] = None,
         last: Optional[int] = None,
     ) -> ConnectionResolverResult[DomainNode]:
+        if scope is None:
+            scope = SystemScope()
         return await DomainNode.get_connection(
             info,
             scope,
diff --git a/src/ai/backend/manager/models/gql_models/domain.py b/src/ai/backend/manager/models/gql_models/domain.py
index 90a1162bc0..befc431641 100644
--- a/src/ai/backend/manager/models/gql_models/domain.py
+++ b/src/ai/backend/manager/models/gql_models/domain.py
@@ -84,8 +84,8 @@ def parse_value(value: str) -> DomainPermission:
     "row_id": ("id", None),
     "name": ("name", None),
     "is_active": ("is_active", None),
-    "created_at": ("created_at", dtparse),
-    "modified_at": ("modified_at", dtparse),
+    "created_at": ("created_at", None),
+    "modified_at": ("modified_at", None),
 }