fix: Setup GQLType.doctype resolver manually

Author: fahimalizain

frappe_graphql/utils/cursor_pagination.py

@@ -152,7 +152,7 @@ def get_data(self, doctype, filters, sorting_fields, sort_dir, limit):
 
     def get_fields_to_fetch(self, doctype, filters, sorting_fields):
         fieldnames = get_allowed_fieldnames_for_doctype(doctype)
-        return list(set(fieldnames + [f"SUBSTR(\".{doctype}\", 2) as doctype"] + sorting_fields))
+        return list(set(fieldnames + sorting_fields))
 
     def get_sort_args(self, sorting_input=None):
         sort_dir = self.default_sorting_direction if self.default_sorting_direction in (

frappe_graphql/utils/permissions.py

@@ -8,7 +8,7 @@ def get_allowed_fieldnames_for_doctype(doctype: str, parent_doctype: str = None)
     Gets a list of fieldnames that's allowed for the current User to
     read on the specified doctype. This includes default_fields
     """
-    fieldnames = list(default_fields) + ["\"{}\" as `doctype`".format(doctype)]
+    fieldnames = list(default_fields)
     fieldnames.remove("doctype")
 
     meta = frappe.get_meta(doctype)

frappe_graphql/utils/resolver/__init__.py

@@ -1,4 +1,4 @@
-from graphql import GraphQLSchema, GraphQLType
+from graphql import GraphQLSchema, GraphQLType, GraphQLResolveInfo
 
 import frappe
 from frappe.model.meta import Meta
@@ -24,6 +24,7 @@ def setup_default_resolvers(schema: GraphQLSchema):
         meta = frappe.get_meta(dt)
 
         setup_frappe_df(meta, gql_type)
+        setup_doctype_resolver(meta, gql_type)
         setup_link_field_resolvers(meta, gql_type)
         setup_select_field_resolvers(meta, gql_type)
         setup_child_table_resolvers(meta, gql_type)
@@ -48,5 +49,20 @@ def setup_frappe_df(meta: Meta, gql_type: GraphQLType):
         gql_type.fields[df.fieldname].frappe_df = df
 
 
+def setup_doctype_resolver(meta: Meta, gql_type: GraphQLType):
+    """
+    Sets custom resolver to BaseDocument.doctype field
+    """
+    if "doctype" not in gql_type.fields:
+        return
+
+    gql_type.fields["doctype"].resolve = _doctype_resolver
+
+
+def _doctype_resolver(obj, info: GraphQLResolveInfo, **kwargs):
+    dt = get_singular_doctype(info.parent_type.name)
+    return dt
+
+
 def setup_select_field_resolvers(meta: Meta, gql_type: GraphQLType):
     pass

frappe_graphql/utils/tests/test_permissions.py

@@ -24,7 +24,6 @@ def test_admin_on_user(self):
             fieldnames,
             [x.fieldname for x in meta.fields if x.fieldtype not in no_value_fields]
             + [x for x in default_fields if x != "doctype"]
-            + ["\"{}\" as doctype".format(meta.name)]
         )
 
     def test_permlevels_on_user(self):
@@ -42,7 +41,6 @@ def test_permlevels_on_user(self):
             [x.fieldname for x in user_meta.fields
                 if x.permlevel == 1 and x.fieldtype not in no_value_fields]
             + [x for x in default_fields if x != "doctype"]
-            + ["\"{}\" as doctype".format(user_meta.name)]
         )
 
         # Clear meta_cache for User doctype
@@ -55,7 +53,6 @@ def test_on_child_doctype(self):
             fieldnames,
             [x.fieldname for x in meta.fields if x.fieldtype not in no_value_fields]
             + [x for x in default_fields if x != "doctype"]
-            + ["\"{}\" as doctype".format(meta.name)]
         )
 
     def test_on_child_doctype_with_no_parent_doctype(self):