Merge pull request #70 from joeyjurjens/update-odin-imports

Load odin things with get_class and correct resource name
django-oscar · Nov 1, 2024 · ffe1f7e · ffe1f7e
2 parents f8dd70c + 728c516
commit ffe1f7e
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 23 deletions.
diff --git a/oscar_elasticsearch/search/api/category.py b/oscar_elasticsearch/search/api/category.py
@@ -29,13 +29,15 @@ class CategoryElasticsearchIndex(BaseElasticSearchApi, ESModelIndexer):
     Model = Category
 
     def make_documents(self, objects):
-        from oscar_odin.mappings import catalogue
+        CategoryToResource = get_class(
+            "oscar_odin.mappings.catalogue", "CategoryToResource"
+        )
 
         CategoryElasticSearchMapping = get_class(
             "search.mappings.categories", "CategoryElasticSearchMapping"
         )
 
-        category_resources = catalogue.CategoryToResource.apply(objects)
+        category_resources = CategoryToResource.apply(objects)
         category_document_resources = CategoryElasticSearchMapping.apply(
             category_resources
         )

diff --git a/oscar_elasticsearch/search/api/product.py b/oscar_elasticsearch/search/api/product.py
@@ -54,7 +54,9 @@ def make_documents(self, objects):
                     % type(objects)
                 )
 
-        from oscar_odin.mappings import catalogue
+        product_queryset_to_resources = get_class(
+            "oscar_odin.mappings.catalogue", "product_queryset_to_resources"
+        )
 
         ProductElasticSearchMapping = get_class(
             "search.mappings.products", "ProductElasticSearchMapping"
@@ -71,7 +73,7 @@ def make_documents(self, objects):
             )
         )
 
-        product_resources = catalogue.product_queryset_to_resources(
+        product_resources = product_queryset_to_resources(
             objects, include_children=True
         )
         product_document_resources = ProductElasticSearchMapping.apply(

diff --git a/oscar_elasticsearch/search/mappings/categories.py b/oscar_elasticsearch/search/mappings/categories.py
@@ -4,9 +4,10 @@
 
 from oscar.core.loading import get_class, get_model
 
-from oscar_odin.resources.catalogue import Category as CategoryResource
-from oscar_odin.mappings._common import OscarBaseMapping
-from oscar_odin.resources._base import OscarResource
+OscarResource = get_class("oscar_odin.resources.base", "OscarResource")
+CategoryResource = get_class("oscar_odin.resources.catalogue", "CategoryResource")
+
+OscarBaseMapping = get_class("oscar_odin.mappings.common", "OscarBaseMapping")
 
 OscarElasticSearchResourceMixin = get_class(
     "search.mappings.mixins", "OscarElasticSearchResourceMixin"

diff --git a/oscar_elasticsearch/search/mappings/mixins.py b/oscar_elasticsearch/search/mappings/mixins.py
@@ -1,4 +1,6 @@
-from oscar_odin.resources._base import OscarResource
+from oscar.core.loading import get_class
+
+OscarResource = get_class("oscar_odin.resources.base", "OscarResource")
 
 
 class OscarElasticSearchResourceMixin(OscarResource):

diff --git a/oscar_elasticsearch/search/mappings/products/__init__.py b/oscar_elasticsearch/search/mappings/products/__init__.py
@@ -2,12 +2,11 @@
 
 from oscar.core.loading import get_class
 
-from oscar_odin.resources._base import OscarResource
-from oscar_odin.resources.catalogue import (
-    Product as ProductResource,
-    Category as CategoryResource,
-)
-from oscar_odin.mappings._common import OscarBaseMapping
+OscarResource = get_class("oscar_odin.resources.base", "OscarResource")
+ProductResource = get_class("oscar_odin.resources.catalogue", "ProductResource")
+CategoryResource = get_class("oscar_odin.resources.catalogue", "CategoryResource")
+
+OscarBaseMapping = get_class("oscar_odin.mappings.common", "OscarBaseMapping")
 
 ProductElasticSearchResource = get_class(
     "search.mappings.products.resources", "ProductElasticSearchResource"

diff --git a/oscar_elasticsearch/search/mappings/products/mappings.py b/oscar_elasticsearch/search/mappings/products/mappings.py
@@ -8,12 +8,6 @@
 
 from oscar.core.loading import get_model, get_class
 
-from oscar_odin.mappings._common import OscarBaseMapping
-from oscar_odin.resources.catalogue import (
-    Product as ProductResource,
-    Category as CategoryResource,
-)
-
 from oscar_elasticsearch.search.constants import (
     ES_CTX_PUBLIC,
     ES_CTX_AVAILABLE,
@@ -24,6 +18,11 @@
 Product = get_model("catalogue", "Product")
 Line = get_model("order", "Line")
 
+ProductResource = get_class("oscar_odin.resources.catalogue", "ProductResource")
+CategoryResource = get_class("oscar_odin.resources.catalogue", "CategoryResource")
+
+OscarBaseMapping = get_class("oscar_odin.mappings.common", "OscarBaseMapping")
+
 OscarElasticSearchResourceMixin = get_class(
     "search.mappings.mixins", "OscarElasticSearchResourceMixin"
 )

diff --git a/oscar_elasticsearch/search/mappings/products/resources.py b/oscar_elasticsearch/search/mappings/products/resources.py
@@ -4,11 +4,14 @@
 
 from datetime import datetime
 
-from oscar_odin.resources._base import OscarResource
+from oscar.core.loading import get_class
+
 from oscar_odin.fields import DecimalField
 
 from oscar_elasticsearch.search.mappings.mixins import OscarElasticSearchResourceMixin
 
+OscarResource = get_class("oscar_odin.resources.base", "OscarResource")
+
 
 class CategoryElasticSearchRelatedResource(OscarResource):
     id: int

diff --git a/sandbox/settings.py b/sandbox/settings.py
@@ -66,7 +66,7 @@
     'sorl.thumbnail',
     'django_tables2',
     'oscar_elasticsearch.search.apps.OscarElasticSearchConfig',
-    "oscar_odin"
+    "oscar_odin.apps.OscarOdinAppConfig"
 ]
 
 MIDDLEWARE = [

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
         "purl",
         "elasticsearch>=8.0.0",
         "uwsgidecorators-fallback",
-        "django-oscar-odin>0.1.0",
+        "django-oscar-odin>=0.3.0",
     ],
     # mark test target to require extras.
     extras_require={