Merge pull request #38 from divad1196/fix_empty_value

Added tests and handling for empty Date/Datetime fields

Author: divad1196

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.1.5
+    rev: v0.5.0
     hooks:
       # Run the linter.
       - id: ruff
@@ -47,4 +47,3 @@ repos:
   #   hooks:
   #     - id: poetry-export
   #       args: ["--no-cache", "-f", "requirements.txt", "-o", "requirements.txt"]
-

odoo_graphql/graphql_definitions/__init__.py

@@ -1 +0,0 @@
-

odoo_graphql/graphql_resolver.py

@@ -422,6 +422,8 @@ def _get_type_serializer_date(field, variables=None):
     fmt = data.get("format")
 
     def func(value):
+        if value is False:
+            return False
         if fmt:
             return value.strftime(fmt)
         return value.toordinal()
@@ -438,6 +440,8 @@ def _get_type_serializer_datetime(field, variables=None):
     fmt = data.get("format")
 
     def func(value):
+        if value is False:
+            return False
         if tz:
             value = value.replace(tzinfo=pytz.utc).astimezone(tz)
         if fmt:

odoo_graphql_test/__init__.py

@@ -1,2 +1,3 @@
 
-from . import controllers
+from . import models
+from . import controllers

odoo_graphql_test/models/__init__.py

@@ -0,0 +1 @@
+from . import graphql_dummy_test_model

odoo_graphql_test/models/graphql_dummy_test_model.py

@@ -0,0 +1,14 @@
+import json
+import logging
+
+from odoo import models, fields, tools
+
+
+_logger = logging.getLogger(__name__)
+
+
+class GraphQLDummyDefaultTestModel(models.Model):
+    _name = "graphql.dummy.default.test.model"
+
+    date = fields.Date()
+    datetime = fields.Datetime()

odoo_graphql_test/tests/__init__.py

@@ -3,4 +3,6 @@
 # from . import filtered_relationship
 # from . import archived_relationship
 
-from . import test_queries
+from . import test_queries
+from . import test_fields
+from . import test_filtered_relationship

odoo_graphql_test/tests/queries/dummy.gql

@@ -0,0 +1,7 @@
+query GetDummy {
+    GraphqlDummyDefaultTestModel {
+        id
+        date
+        datetime
+    }
+}

odoo_graphql_test/tests/archived_relationship.py renamed to odoo_graphql_test/tests/test_archived_relationship.py

@@ -0,0 +1,19 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.osv import expression
+
+from .common import TestGraphQlCommon
+from .utils import contains, firstMatching, get_query, open_query
+
+
+class TestField(TestGraphQlCommon):
+    # def setUp(self):
+    #     super().setUp()
+
+    def test_empty_date_fields(self):
+        with open_query("dummy.gql") as f:
+            query = f.read()
+
+        dummy = self.env["graphql.dummy.default.test.model"].create({})
+        res = self.env["graphql.handler"].handle_query(query)
+        print(res)

odoo_graphql_test/tests/test_fields.py

@@ -2,26 +2,34 @@
 
 from .common import TestGraphQlCommon
 from .utils import firstMatching, get_query
+from odoo.osv import expression
 
 
+# TODO: Fix this test
 class TestFilteredRelationship(TestGraphQlCommon):
     def test_filtered_relationship(self):
         query = get_query("contact_filtered_tag.gql")
         # These are demo data
         partner = self.env.ref("base.res_partner_address_15")  # Brandon Freeman
         tag = self.env.ref("base.res_partner_category_8")
+
+        # Add the default tag to the user
         partner.category_id |= tag
 
+
         res = firstMatching(
             self.handle_query(query, variables={"domain": []})["data"]["ResPartner"],
             lambda p: p["id"] == partner.id,
         )
 
         assert res["category_id"] is not None
+
+
         res = firstMatching(
-            self.handle_query(query, variables={"domain": [("1", "=", "0")]})["data"][
+            self.handle_query(query, variables={"domain": [expression.FALSE_LEAF]})["data"][
                 "ResPartner"
             ],
             lambda p: p["id"] == partner.id,
         )
-        assert res["category_id"] is None
+        assert isinstance(res["category_id"], list)
+        assert not len(res["category_id"])