Merge pull request #6 from oarepo/parent-commented

Parent commented
oarepo · Aug 29, 2023 · b6719d0 · b6719d0
2 parents 218bcc2 + 9f7cf1f
commit b6719d0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 23 deletions.
diff --git a/oarepo_model_builder_drafts/builders/parent_jsonschema_builder.py b/oarepo_model_builder_drafts/builders/parent_jsonschema_builder.py
@@ -8,19 +8,29 @@ class JSONSchemaDraftsParentBuilder(JSONSchemaBuilder):
     output_file_name = ["draft-parent-record-schema", "file"]
     parent_module_root_name = "jsonschemas"
 
-    def target_json(self):
+    def builtin_json(self):
         return {
-            "$schema": "http://json-schema.org/draft-07/schema#",
-            # "$id": f"{schema.current_model.schema_server}{schema.current_model.drafts_parent_schema_name}",
-            "$id": "local://parent-v1.0.0.json",
             "type": "object",
-            "properties": {"id": {"type": "keyword"}},
+            "properties": {
+                "$schema": {
+                    "type": "keyword"
+                },
+                "created": {
+                    "type": "datetime"
+                },
+                "id": {
+                    "type": "keyword"
+                },
+                "updated": {
+                    "type": "datetime"
+                }
+            },
         }
 
     def build_node(self, node):
         from oarepo_model_builder.datatypes import datatypes
 
-        json = self.target_json()
+        json = self.builtin_json()
         parsed_section = datatypes.get_datatype(
             parent=None,
             data=json,
@@ -34,5 +44,5 @@ def build_node(self, node):
         )
         if skip:
             return
-        generated = self.generate(node)
+        generated = self.generate(parsed_section)
         self.output.merge(generated)
diff --git a/oarepo_model_builder_drafts/datatypes/components/draft_model/service.py b/oarepo_model_builder_drafts/datatypes/components/draft_model/service.py
@@ -1,6 +1,6 @@
 from oarepo_model_builder.datatypes import DataType, ModelDataType
 from oarepo_model_builder.datatypes.components import ServiceModelComponent
-from oarepo_model_builder.datatypes.components.model.utils import set_default
+from oarepo_model_builder.datatypes.components.model.utils import set_default, append_array
 
 
 class DraftServiceModelComponent(ServiceModelComponent):
@@ -35,17 +35,17 @@ def before_model_prepare(self, datatype, *, context, **kwargs):
                     }
                 ],
             )
+
             record_service_config.setdefault(
-                "imports",
-                [
-                    {
-                        "import": "invenio_drafts_resources.services.RecordServiceConfig",
-                        "alias": "InvenioRecordServiceConfig",
-                    },
-                    {
-                        "import": "oarepo_runtime.config.service.PermissionsPresetsConfigMixin"
-                    },
-                ],
+                "base-classes",
+                ["PermissionsPresetsConfigMixin", "InvenioRecordDraftsServiceConfig"],
             )
 
+            append_array(datatype, "service-config", "imports",
+                         {
+                             "import": "invenio_drafts_resources.services.RecordServiceConfig",
+                             "alias": "InvenioRecordDraftsServiceConfig",
+                         },
+                         )
+
         super().before_model_prepare(datatype, context=context, **kwargs)
diff --git a/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_parent_record.py.jinja2 b/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_parent_record.py.jinja2
@@ -3,11 +3,11 @@ from invenio_records.systemfields import ConstantField
 {{ vars.draft_parent_record.imports|generate_import }}
 {{ vars.draft_parent_record_metadata.class|generate_import }}
 
-class {{ vars.draft_parent_record|class_header }}: #TODO create special name for these? assuming yes
+class {{ vars.draft_parent_record|class_header }}:
 
     model_cls = {{ vars.draft_parent_record_metadata.class|base_name }}
 
-    schema = ConstantField(
-        "$schema", "{{ settings.schema_server }}{{ vars.draft_parent_record_schema.name }}"
-    )
+    #schema = ConstantField(
+    #    "$schema", "{{ settings.schema_server }}{{ vars.draft_parent_record_schema.name }}"
+    #)
 {% endif %}
diff --git a/setup.cfg b/setup.cfg
@@ -32,7 +32,7 @@ oarepo_model_builder.profiles =
     draft = oarepo_model_builder_drafts.profiles.draft:DraftProfile
 
 oarepo_model_builder.builders.draft:
-    0020-jsonschema_drafts_parent  = oarepo_model_builder_drafts.builders.parent_jsonschema_builder:JSONSchemaDraftsParentBuilder
+    #0020-jsonschema_drafts_parent  = oarepo_model_builder_drafts.builders.parent_jsonschema_builder:JSONSchemaDraftsParentBuilder
     0030-mapping  = oarepo_model_builder.builders.mapping:MappingBuilder
 
     0110-invenio_record  = oarepo_model_builder.invenio.invenio_record:InvenioRecordBuilder