Use Plugin filter for integration issue provider

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

Author: MyPyDavid

rdmo/projects/models/integration.py

@@ -35,9 +35,8 @@ def get_absolute_url(self):
     @property
     def provider(self):
         plugins = (
-            Plugin.objects
-            .for_context(plugin_type="issue_provider", project=self.project)
-            .filter(uri_path__contains=self.provider_key)
+            Plugin.objects.for_context(
+                plugin_type="issue_provider", project=self.project, format=self.provider_key)
         )
         if plugins.exists():
             return plugins.first().initialize_class()
@@ -51,6 +50,8 @@ def get_option_value(self, key):
             return None
 
     def save_options(self, options):
+        if self.provider is None:
+            raise ValueError(_('The provider key is required.'))
         for field in self.provider.fields:
             try:
                 integration_option = IntegrationOption.objects.get(integration=self, key=field.get('key'))

rdmo/projects/views/integration.py

@@ -37,8 +37,10 @@ def get_form_kwargs(self):
     def get_context_data(self, **kwargs):
         plugins = (
             Plugin.objects
-                .for_context(plugin_type="issue_provider", project=self.project, user=self.request.user)
-                .filter(uri_path__contains=self.provider_key)
+                .for_context(
+                plugin_type="project_issue_provider", project=self.project,
+                user=self.request.user,format=self.provider_key
+            )
        )
         kwargs['provider'] = plugins.first().initialize_class() if plugins else None
         return super().get_context_data(**kwargs)

rdmo/services/validators.py

@@ -1,13 +1,14 @@
 from rest_framework.serializers import ValidationError
 
-from rdmo.config.plugins import get_plugin
+from rdmo.config.models import Plugin
 
 
 class ProviderValidator:
 
     def __call__(self, data):
         provider_key = data.get('provider_key')
-        provider = get_plugin('PROJECT_ISSUE_PROVIDERS', provider_key)
+        plugins = Plugin.objects.for_context(plugin_type='project_issue_provider', format=provider_key)
+        provider = plugins.first().initialize_class() if plugins else None
         if provider is None:
             raise ValidationError({
                 'provider_key': 'Please provide a valid provider.'