use plugins instead of OptionSet.provider

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Author: MyPyDavid

rdmo/options/models.py

@@ -8,7 +8,6 @@
 
 from rdmo.conditions.models import Condition
 from rdmo.core.models import TranslationMixin
-from rdmo.core.plugins import get_plugin
 from rdmo.core.utils import join_url
 
 
@@ -87,20 +86,16 @@ def label(self) -> str:
         return self.uri
 
     @property
-    def provider(self) -> list:
-        return get_plugin('OPTIONSET_PROVIDERS', self.provider_key)
-
-    @property
-    def has_provider(self) -> bool:
-        return self.provider is not None
+    def has_plugins(self) -> bool:
+        return self.plugins.exists()
 
     @property
     def has_search(self) -> bool:
-        return self.has_provider and self.provider.search
+        return self.has_plugins and any(i.has_search for i in self.plugins.all())
 
     @property
     def has_refresh(self) -> bool:
-        return self.has_provider and self.provider.refresh
+        return self.has_plugins and any(i.has_refresh for i in self.plugins.all())
 
     @property
     def has_conditions(self) -> bool:

rdmo/projects/serializers/v1/page.py

@@ -49,7 +49,7 @@ class Meta:
             'uri',
             'model',
             'options',
-            'has_provider',
+            'has_plugins',
             'has_search',
             'has_refresh',
             'has_conditions'

rdmo/projects/viewsets.py

@@ -261,21 +261,28 @@ def options(self, request, pk=None):
 
             # check if the optionset belongs to this catalog and if it has a provider
             project.catalog.prefetch_elements()
-            if Question.objects.filter_by_catalog(project.catalog).filter(optionsets=optionset) and \
-                    optionset.provider is not None:
+            if (
+                Question.objects.filter_by_catalog(project.catalog).filter(optionsets=optionset)
+                and optionset.has_plugins
+            ):
                 options = []
-                for option in optionset.provider.get_options(project, search=request.GET.get('search'),
-                                                             user=request.user, site=request.site):
-                    if 'id' not in option:
-                        raise RuntimeError(f"'id' is missing in options of '{optionset.provider.class_name}'")
-                    elif 'text' not in option:
-                        raise RuntimeError(f"'text' is missing in options of '{optionset.provider.class_name}'")
-                    if 'text_and_help' not in option:
-                        if 'help' in option:
-                            option['text_and_help'] = '{text} [{help}]'.format(**option)
-                        else:
-                            option['text_and_help'] = '{text}'.format(**option)
-                    options.append(option)
+                for plugin in optionset.plugins.all():
+                    provider = plugin.initialize_class()
+                    if provider is None:
+                        continue  # skip when plugin class initialization fails
+
+                    for option in provider.get_options(project, search=request.GET.get('search'),
+                                         user=request.user, site=request.site):
+                        if 'id' not in option:
+                            raise RuntimeError(f"'id' is missing in options of '{provider.class_name}'")
+                        elif 'text' not in option:
+                            raise RuntimeError(f"'text' is missing in options of '{provider.class_name}'")
+                        if 'text_and_help' not in option:
+                            if 'help' in option:
+                                option['text_and_help'] = '{text} [{help}]'.format(**option)
+                            else:
+                                option['text_and_help'] = '{text}'.format(**option)
+                        options.append(option)
 
                 return Response(options)