Merge pull request #48 from oarepo/delete_published_service

published service deleted
oarepo · Jan 23, 2025 · c2d2a15 · c2d2a15
2 parents 30fdba8 + a303ff0
commit c2d2a15
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 395 deletions.
diff --git a/oarepo_model_builder_drafts/datatypes/components/__init__.py b/oarepo_model_builder_drafts/datatypes/components/__init__.py
@@ -14,7 +14,6 @@
     DraftSearchOptionsModelComponent,
 )
 from .draft_tests import DraftModelTestComponent
-from .published_service import PublishedServiceComponent
 
 DRAFT_COMPONENTS = [
     DraftParentComponent,
@@ -28,7 +27,6 @@
     DraftMappingModelComponent,
     DraftResourceModelComponent,
     DraftServiceModelComponent,
-    PublishedServiceComponent,
     ParentMarshmallowComponent,
     DraftsRecordDumperModelComponent,
     DraftSearchOptionsModelComponent,

diff --git a/oarepo_model_builder_drafts/datatypes/components/published_service.py b/oarepo_model_builder_drafts/datatypes/components/published_service.py
diff --git a/oarepo_model_builder_drafts/invenio/__init__.py b/oarepo_model_builder_drafts/invenio/__init__.py
@@ -7,14 +7,8 @@
     "drafts-record-service-config": "templates/invenio_drafts_record_service_config.py.jinja2",
     "drafts-parent-marshmallow": "templates/invenio_drafts_parent_marshmallow.py.jinja2",
     "drafts-parent-marshmallow-link": "templates/invenio_drafts_parent_marshmallow_link.py.jinja2",
-    "drafts-published-record-service-config": "templates/invenio_drafts_published_record_service_config.py.jinja2",
-    "drafts-published-record-service": "templates/invenio_drafts_published_record_service.py.jinja2",
     "drafts-parent-state": "templates/invenio_drafts_parent_state.py.jinja2",
     "drafts-has-draft-checkfield": "templates/invenio_drafts_has_draft_checkfield.py.jinja2",
-    "drafts-published-ext-service": "templates/invenio_drafts_published_ext_service.py.jinja2",
-    "drafts-api-views-published": "templates/invenio_drafts_api_views_published.py.jinja2",
-    "drafts-app-views-published": "templates/invenio_drafts_app_views_published.py.jinja2",
-    "drafts-proxies": "templates/invenio_drafts_proxies.py.jinja2",
     "drafts-record-communities-service-config": "templates/invenio_drafts_record_communities_service_config.py.jinja2",
     "drafts-record-search-options": "templates/invenio_drafts_record_search_options.py.jinja2",
     "drafts-record-facets": "templates/invenio_drafts_record_facets.py.jinja2",

diff --git a/oarepo_model_builder_drafts/invenio/invenio_drafts_proxies.py b/oarepo_model_builder_drafts/invenio/invenio_drafts_proxies.py
diff --git a/oarepo_model_builder_drafts/invenio/invenio_drafts_published_api_views.py b/oarepo_model_builder_drafts/invenio/invenio_drafts_published_api_views.py
diff --git a/oarepo_model_builder_drafts/invenio/invenio_drafts_published_app_views.py b/oarepo_model_builder_drafts/invenio/invenio_drafts_published_app_views.py
diff --git a/oarepo_model_builder_drafts/invenio/invenio_drafts_published_invenio_ext_service.py b/oarepo_model_builder_drafts/invenio/invenio_drafts_published_invenio_ext_service.py
diff --git a/oarepo_model_builder_drafts/invenio/invenio_drafts_published_record_service.py b/oarepo_model_builder_drafts/invenio/invenio_drafts_published_record_service.py
diff --git a/oarepo_model_builder_drafts/invenio/invenio_drafts_published_record_service_config.py b/oarepo_model_builder_drafts/invenio/invenio_drafts_published_record_service_config.py
diff --git a/oarepo_model_builder_drafts/invenio/invenio_drafts_setup_cfg.py b/oarepo_model_builder_drafts/invenio/invenio_drafts_setup_cfg.py
@@ -5,10 +5,3 @@
 class InvenioDraftsSetupCfgBuilder(OutputBuilder):
     TYPE = "invenio_drafts_setup_cfg"
 
-    def finish(self):
-        super().finish()
-
-        output: CFGOutput = self.builder.get_output("cfg", "setup.cfg")
-
-        if not self.current_model.definition["published-service"].get("skip"):
-            output.add_dependency("oarepo-published-service", ">=1.0.0")
diff --git a/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_api_views_published.py.jinja2 b/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_api_views_published.py.jinja2
diff --git a/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_app_views_published.py.jinja2 b/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_app_views_published.py.jinja2
diff --git a/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_proxies.py.jinja2 b/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_proxies.py.jinja2