Fix import export signatures

Author: hipek8

pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
   "django-cryptography-django5",
   "django-extensions==3.1.5",
   "django-filter==25.1",
-  "django-import-export==4.3.10",
+  "django-import-export==4.0.2",
   "django-money==3.4.1",
   "django-mptt==0.14",
   "django-prometheus==2.2.0",

requirements/dev.txt

@@ -115,7 +115,7 @@ django-extensions==3.1.5
     # via ralph (pyproject.toml)
 django-filter==25.1
     # via ralph (pyproject.toml)
-django-import-export==4.3.10
+django-import-export==4.0.2
     # via ralph (pyproject.toml)
 django-js-asset==3.1.2
     # via django-mptt
@@ -545,7 +545,7 @@ stevedore==5.4.1
     #   oslo-config
     #   python-ironicclient
     #   python-keystoneclient
-tablib==3.8.0
+tablib==3.5.0
     # via django-import-export
 tblib==3.1.0
     # via ralph (pyproject.toml)

requirements/docs.txt

@@ -89,7 +89,7 @@ django-extensions==3.1.5
     # via ralph (pyproject.toml)
 django-filter==25.1
     # via ralph (pyproject.toml)
-django-import-export==4.3.10
+django-import-export==4.0.2
     # via ralph (pyproject.toml)
 django-js-asset==3.1.2
     # via django-mptt
@@ -442,7 +442,7 @@ stevedore==5.4.1
     #   oslo-config
     #   python-ironicclient
     #   python-keystoneclient
-tablib==3.8.0
+tablib==3.5.0
     # via django-import-export
 tblib==3.1.0
     # via ralph (pyproject.toml)

requirements/prod.txt

@@ -84,7 +84,7 @@ django-extensions==3.1.5
     # via ralph (pyproject.toml)
 django-filter==25.1
     # via ralph (pyproject.toml)
-django-import-export==4.3.10
+django-import-export==4.0.2
     # via ralph (pyproject.toml)
 django-js-asset==3.1.2
     # via django-mptt
@@ -390,7 +390,7 @@ stevedore==5.4.1
     #   oslo-config
     #   python-ironicclient
     #   python-keystoneclient
-tablib==3.8.0
+tablib==3.5.0
     # via django-import-export
 tblib==3.1.0
     # via ralph (pyproject.toml)

requirements/test.txt

@@ -110,7 +110,7 @@ django-extensions==3.1.5
     # via ralph (pyproject.toml)
 django-filter==25.1
     # via ralph (pyproject.toml)
-django-import-export==4.3.10
+django-import-export==4.0.2
     # via ralph (pyproject.toml)
 django-js-asset==3.1.2
     # via django-mptt
@@ -491,7 +491,7 @@ stevedore==5.4.1
     #   oslo-config
     #   python-ironicclient
     #   python-keystoneclient
-tablib==3.8.0
+tablib==3.5.0
     # via django-import-export
 tblib==3.1.0
     # via ralph (pyproject.toml)

src/ralph/admin/mixins.py

@@ -407,11 +407,11 @@ def get_export_queryset(self, request):
             queryset = queryset.prefetch_related(*resource_prefetch_related)
         return list(queryset)
 
-    def get_export_resource_classes(self):
+    def get_export_resource_classes(self, request):
         """
         If `export_class` is defined in Admin, use it.
         """
-        resource_classes = self.get_resource_classes()
+        resource_classes = self.get_resource_classes(request)
         export_classes = [
             getattr(resource_class, "export_class", None)
             for resource_class in resource_classes

src/ralph/assets/admin.py

@@ -114,7 +114,7 @@ class ServiceEnvironmentAdmin(CustomFieldValueAdminMixin, RalphAdmin):
     search_fields = ["service__name", "environment__name"]
     list_select_related = ["service", "environment"]
     raw_id_fields = ["service", "environment"]
-    resource_class = resources.ServiceEnvironmentResource
+    resource_classes = [resources.ServiceEnvironmentResource]
     fields = ("service", "environment", "remarks", "tags")
 
 
@@ -215,7 +215,7 @@ class ServiceAdmin(RalphAdmin):
         "business_owners",
         "technical_owners",
     ]
-    resource_class = resources.ServiceResource
+    resource_classes = [resources.ServiceResource]
     change_views = [ServiceBaseObjects]
 
 

src/ralph/data_center/admin.py

@@ -372,7 +372,7 @@ class DataCenterAssetAdmin(
     if settings.ENABLE_DNSAAS_INTEGRATION:
         change_views += [DNSView]
     show_transition_history = True
-    resource_class = resources.DataCenterAssetResource
+    resource_classes = [resources.DataCenterAssetResource]
     list_display = [
         "hostname",
         "status",

src/ralph/data_importer/tests/test_export.py

@@ -53,9 +53,7 @@ def _export(self, model, filters=None):
 
         file_format = RawFormat()
         queryset = admin_class.get_export_queryset(request)
-        export_data = admin_class.get_export_data(
-            file_format, queryset, request=request
-        )
+        export_data = admin_class.get_export_data(file_format, request, queryset)
         return export_data
 
     def _init(self, num=10):

src/ralph/lib/transitions/tests/factories.py

@@ -4,7 +4,7 @@
 from factory.fuzzy import FuzzyText
 
 from ralph.accounts.tests.factories import UserFactory
-from ralph.back_office.models import BackOfficeAsset
+from ralph.back_office.models import BackOfficeAsset, BackOfficeAssetStatus
 from ralph.back_office.tests.factories import BackOfficeAssetFactory
 from ralph.data_center.models import DataCenterAsset
 from ralph.data_center.tests.factories import DataCenterAssetFullFactory
@@ -32,8 +32,8 @@ class Meta:
 class TransitionFactory(DjangoModelFactory):
     name = FuzzyText(length=10)
     model = SubFactory(TransitionModelFactory)
-    source = ["new", "used"]
-    target = "used"
+    source = [BackOfficeAssetStatus.new.id, BackOfficeAssetStatus.used.id]
+    target = BackOfficeAssetStatus.used.id
 
     class Meta:
         model = Transition