Merge pull request #276 from oarepo/trappl/be-514-include-oai-object-…

…to-model-builder Trappl/be 514 include oai object to model builder
oarepo · Oct 31, 2024 · 26e953c · 26e953c
2 parents dda850d + 815719d
commit 26e953c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 11 deletions.
diff --git a/oarepo_model_builder/builtin_models/oaipmh.json b/oarepo_model_builder/builtin_models/oaipmh.json
@@ -1,9 +1,26 @@
 {
-    "service-config": {
-      "extend:components": [
-        "{{oarepo_oaipmh_harvester.components.OaiSectionComponent}}"
-      ]
+  "properties": {
+    "oai": {
+      "properties": {
+        "harvest": {
+          "properties": {
+            "identifier": {
+              "type": "keyword",
+              "required": true
+            },
+            "datestamp": {
+              "type": "keyword",
+              "required": true
+
+            }
+          }
+        }
+      }
     }
+  },
+  "service-config": {
+    "extend:components": [
+      "{{oarepo_oaipmh_harvester.components.OaiSectionComponent}}"
+    ]
   }
-
-
+}
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder
-version = 4.0.93
+version = 4.0.94
 description = A utility library that generates OARepo required data model files from a JSON specification file
 authors = Miroslav Bauer <[email protected]>, Miroslav Simek <[email protected]>
 readme = README.md

diff --git a/tests/test_include_components.py b/tests/test_include_components.py
@@ -9,17 +9,29 @@
 OAREPO_USE = "use"
 
 
-
 def test_include_invenio():
     schema = load_model(
         "test.yaml",  # NOSONAR
         model_content={
             "version": "1.0.0",
-
             "record": {
                 "module": {"qualified": "test"},
                 OAREPO_USE: ["invenio", "doi", "oaipmh"],
-                "properties": {"a": {"type": "keyword", "required": True}},
+                "properties": {
+                    "a": {"type": "keyword", "required": True},
+                    "harvest": {
+                        "properties": {
+                            "identifier": {
+                                "type": "keyword",
+                                "required": True
+                            },
+                            "datestamp": {
+                                "type": "keyword",
+                                "required": True
+                            },
+                        }
+                    },
+                },
             },
         },
         isort=False,
@@ -36,4 +48,7 @@ def test_include_invenio():
         os.path.join("test", "services", "records", "config.py")
     ).read()
     data = str(data)
-    assert "components=[*PermissionsPresetsConfigMixin.components,*InvenioRecordServiceConfig.components,DoiComponent,OaiSectionComponent]" in re.sub(r"\s", "", data)
+    assert (
+        "components=[*PermissionsPresetsConfigMixin.components,*InvenioRecordServiceConfig.components,DoiComponent,OaiSectionComponent]"
+        in re.sub(r"\s", "", data)
+    )