Fix jsonapi returns None for sample's DateOfBirth field

docs/changelog.rst

@@ -4,6 +4,7 @@ Changelog
 1.5.0 (unreleased)
 ------------------
 
+- #114 Fix jsonapi returns None for sample's DateOfBirth field
 - #113 Added estimated birthdate field to Patient content type
 - #112 Use default TZ when calculating birthdate if `on_date` param is not set
 - #111 Allow/Disallow the introduction of future dates of birth

src/senaite/patient/configure.zcml

@@ -64,6 +64,7 @@
   <include package=".browser" />
   <include package=".catalog" />
   <include package=".content" />
+  <include package=".jsonapi" />
   <include package=".monkeys" />
   <include package=".subscribers" />
   <include package=".upgrade" />

src/senaite/patient/content/fields.py

@@ -19,6 +19,7 @@
 # Some rights reserved, see README and LICENSE.
 
 import six
+
 from AccessControl import ClassSecurityInfo
 from archetypes.schemaextender.field import ExtensionField
 from Products.Archetypes.Field import ObjectField
@@ -29,6 +30,8 @@
 from senaite.patient.browser.widgets import TemporaryIdentifierWidget
 from senaite.patient.config import AUTO_ID_MARKER
 from senaite.patient.config import PATIENT_CATALOG
+from senaite.patient.interfaces import IAgeDateOfBirthField
+from zope.interface import implementer
 
 
 class TemporaryIdentifierField(ExtensionField, ObjectField):
@@ -122,6 +125,7 @@ def get_fullname(self, instance):
         return " ".join(filter(None, [firstname, middlename, lastname]))
 
 
+@implementer(IAgeDateOfBirthField)
 class AgeDateOfBirthField(ExtensionField, ObjectField):
     """ObjectField extender that stores a tuple (dob, from_age, estimated)
     """

src/senaite/patient/interfaces.py

@@ -45,3 +45,10 @@ class IRoutineAnalysis(interface.Interface):
     """Marker interface for routine analyses, that is required for the
     patient's dynamic result range adapter to work properly
     """
+
+
+class IAgeDateOfBirthField(interface.Interface):
+    """Marker interface for AT-custom AgeDateOfBirthField. This interface is
+    necessary for AgeDateOfBirthFieldManager, required by senaite.jsonapi to
+    properly retrieve and jsonify the value
+    """

src/senaite/patient/jsonapi/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

src/senaite/patient/jsonapi/configure.zcml

@@ -0,0 +1,8 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <!-- Adapter for senaite.patient's AT AgeDateOfBirthField -->
+  <adapter
+      for="senaite.patient.interfaces.IAgeDateOfBirthField"
+      factory=".fieldmanagers.AgeDateOfBirthFieldManager"/>
+
+</configure>

src/senaite/patient/jsonapi/fieldmanagers.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+from senaite.jsonapi import api
+from senaite.jsonapi.fieldmanagers import ATFieldManager
+from senaite.jsonapi.interfaces import IFieldManager
+from zope import interface
+
+
+class AgeDateOfBirthFieldManager(ATFieldManager):
+    """Adapter to get/set the value of AT's AgeDateOfBirthField
+    """
+    interface.implements(IFieldManager)
+
+    def json_data(self, instance, default=None):
+        """Get a JSON compatible value
+        """
+        dob = self.field.get_date_of_birth(instance)
+        from_age = self.field.get_from_age(instance)
+        estimated = self.field.get_estimated(instance)
+
+        return [api.to_iso_date(dob), from_age, estimated]