Merge remote-tracking branch 'origin/fhirfield_only'

* origin/fhirfield_only:
  FHIRFieldIndex related patch, classes are removed. Issue #23 isuue #24 * Now FhirField accepts fhir_version and it is required * accept custom mapping.

src/plone/app/fhirfield/__init__.py

@@ -16,6 +16,7 @@
 def initialize(context):
     """ """
     import pkg_resources
+
     import logging
 
     log = logging.getLogger("plone.app.fhirfield")

src/plone/app/fhirfield/configure.zcml

@@ -7,7 +7,6 @@
     xmlns:five="http://namespaces.zope.org/five"
     i18n_domain="plone.app.fhirfield">
 
-    <five:registerPackage package="." initialize=".initialize" />
     <i18n:registerTranslations directory="locales" />
 
     <include package=".browser" />

src/plone/app/fhirfield/field.py

@@ -2,8 +2,8 @@
 import sys
 
 import six
-
 from fhir.resources.STU3.fhirabstractbase import FHIRValidationError
+from fhirpath.enums import FHIR_VERSION
 from plone import api
 from plone.app.fhirfield.compat import _
 from plone.app.fhirfield.helpers import import_string
@@ -46,7 +46,9 @@ class FhirResource(Object):
 
     _type = FhirResourceValue
 
-    def __init__(self, model=None, resource_type=None, model_interface=None, **kw):
+    def __init__(
+        self, fhir_version, model=None, resource_type=None, model_interface=None, **kw
+    ):
         """
         :arg model: dotted path of FHIR Model class
 
@@ -60,6 +62,8 @@ def __init__(self, model=None, resource_type=None, model_interface=None, **kw):
         self.resource_type = resource_type
         self.model_interface = model_interface
         self.validate_invariants = kw.pop("validate_invariants", False)
+        self._index_mapping = kw.pop("mapping", None)
+        self._fhir_version = FHIR_VERSION[fhir_version]
 
         self._init_validate()
 
@@ -103,6 +107,14 @@ def get_resource_type(self):
         else:
             raise NotImplementedError
 
+    def get_fhir_version(self):
+        """ """
+        return self._fhir_version
+
+    def get_mapping(self):
+        """ """
+        return self._index_mapping
+
     def _init_validate(self):
         """ """
         if self.resource_type and self.model is not None:

src/plone/app/fhirfield/indexes/es/__init__.py

@@ -9,14 +9,13 @@
 import pkg_resources
 
 from collective.elasticsearch.indexes import INDEX_MAPPING as CIM
+
 from collective.elasticsearch.mapping import MappingAdapter
 from collective.elasticsearch.query import QueryAssembler
-from plone.app.fhirfield.indexes.PluginIndexes import FhirFieldIndex
 from plone.app.fhirfield.variables import FHIR_RESOURCE_LIST  # noqa: F401
 from plone.registry.interfaces import IRegistry
 from zope.component import getUtility
 
-from .fhir import EsFhirFieldIndex
 from .helpers import build_elasticsearch_sortable
 
 
@@ -30,6 +29,7 @@
     CIM.update(INDEX_MAPPING)
 
 
+
 def QueryAssembler_normalize(self, query):
     """ """
     sort_on = []

src/plone/app/fhirfield/interfaces.py

@@ -5,6 +5,7 @@
 from zope.interface import Attribute
 from zope.interface import Interface
 from zope.schema.interfaces import IObject
+from plone.schema import JSONField
 
 
 class IFhirResourceModel(Interface):
@@ -30,6 +31,8 @@ class IFhirResource(IObject):
         title=_("FHIR Resource Model from fhirclient"), required=False
     )
     model_interface = zs.DottedName(title=_("FHIR Model Interface"), required=False)
+    fhir_version = zs.TextLine(title="FHIR Version(Release)", required=True)
+    mapping = JSONField(title=_("Index Mapping"), required=False)
 
     def from_dict(dict_value):
         """ """