Implement organization repositories API

galaxy_ng/app/access_control/access_policy.py

@@ -820,3 +820,7 @@ def is_namespace_owner(self, request, viewset, action):
             return True
 
         return False
+
+
+class OrganizationResourceAccessPolicy(AccessPolicyBase):
+    NAME = "OrganizationResource"

galaxy_ng/app/access_control/statements/standalone.py

@@ -259,7 +259,7 @@
     'TagViewSet': [
         {
             "action": ["list", "retrieve"],
-            "principal": "authenticated",
+            "principal  ": "authenticated",
             "effect": "allow",
         },
     ],
@@ -408,6 +408,19 @@
             "condition": "has_distro_permission:container.change_containerdistribution"
         },
     ],
+
+    "OrganizationResource": [
+        {
+            "action": ["create", "destroy"],
+            "principal": "admin",
+            "effect": "allow",
+        },
+        {
+            "action": ["list", "retrieve"],
+            "principal": "authenticated",
+            "effect": "allow",
+        },
+    ]
 }
 
 STANDALONE_STATEMENTS.update(LEGACY_STATEMENTS)

galaxy_ng/app/api/resource_api.py

@@ -28,4 +28,9 @@ class APIConfig(ServiceAPIConfig):
         shared_resource=SharedResource(serializer=OrganizationType, is_provider=False),
         name_field="name",
     ),
+    ResourceConfig(
+        models.Organization,
+        shared_resource=SharedResource(serializer=OrganizationType, is_provider=False),
+        name_field="name",
+    )
 )

galaxy_ng/app/api/ui/serializers/__init__.py

@@ -4,64 +4,52 @@
 from .collection import (
     CollectionDetailSerializer,
     CollectionListSerializer,
-    CollectionVersionSerializer,
-    CollectionVersionDetailSerializer,
     CollectionVersionBaseSerializer,
+    CollectionVersionDetailSerializer,
+    CollectionVersionSerializer,
 )
+from .distribution import DistributionSerializer
+from .execution_environment import ContainerRegistryRemoteSerializer, ContainerRemoteSerializer
 from .imports import (
     ImportTaskDetailSerializer,
     ImportTaskListSerializer,
 )
-
-from .user import (
-    UserSerializer,
-    CurrentUserSerializer,
-)
-
+from .organization import OrganizationRepositorySerializer
+from .search import SearchResultsSerializer
 from .synclist import (
-    SyncListSerializer,
     SyncListCollectionSummarySerializer,
+    SyncListSerializer,
 )
-
-from .distribution import (
-    DistributionSerializer
-)
-
-from .execution_environment import (
-    ContainerRegistryRemoteSerializer,
-    ContainerRemoteSerializer
-)
-
-from .search import (
-    SearchResultsSerializer
+from .user import (
+    CurrentUserSerializer,
+    UserSerializer,
 )
 
 __all__ = (
     # auth
-    'LoginSerializer',
+    "LoginSerializer",
     # collection
-    'CollectionDetailSerializer',
-    'CollectionListSerializer',
-    'CollectionVersionSerializer',
-    'CollectionVersionDetailSerializer',
-    'CollectionVersionBaseSerializer',
+    "CollectionDetailSerializer",
+    "CollectionListSerializer",
+    "CollectionVersionSerializer",
+    "CollectionVersionDetailSerializer",
+    "CollectionVersionBaseSerializer",
     # imports
-    'ImportTaskDetailSerializer',
-    'ImportTaskListSerializer',
+    "ImportTaskDetailSerializer",
+    "ImportTaskListSerializer",
     # current_user
-    'CurrentUserSerializer',
+    "CurrentUserSerializer",
     # user
-    'UserSerializer',
+    "UserSerializer",
     # synclist
-    'SyncListSerializer',
-    'SyncListCollectionSummarySerializer',
+    "SyncListSerializer",
+    "SyncListCollectionSummarySerializer",
     # distribution
-    'DistributionSerializer',
+    "DistributionSerializer",
     # container
-    'ContainerRepositorySerializer',
-    'ContainerRepositoryImageSerializer',
-    'ContainerRegistryRemoteSerializer',
-    'ContainerRemoteSerializer',
+    "ContainerRegistryRemoteSerializer",
+    "ContainerRemoteSerializer",
     # Search
-    'SearchResultsSerializer',
+    "SearchResultsSerializer",
+    "OrganizationRepositorySerializer",
 )

galaxy_ng/app/api/ui/serializers/organization.py

@@ -0,0 +1,18 @@
+from rest_framework.serializers import ModelSerializer
+
+from galaxy_ng.app import models
+
+
+class OrganizationRepositorySerializer(ModelSerializer):
+    class Meta:
+        model = models.OrganizationRepository
+        fields = ("repository",)
+
+
+class OrganizationRepositoryCreateSerializer(ModelSerializer):
+    class Meta:
+        model = models.OrganizationRepository
+        fields = ("repository", "organization")
+        extra_kwargs = {
+            "organization": {"write_only": True},
+        }

galaxy_ng/app/api/ui/urls.py

@@ -12,28 +12,45 @@
 router.register('my-namespaces', viewsets.MyNamespaceViewSet, basename='my-namespaces')
 router.register('my-synclists', viewsets.MySyncListViewSet, basename='my-synclists')
 router.register('users', viewsets.UserViewSet, basename='users')
-router.register('collection-versions',
-                viewsets.CollectionVersionViewSet, basename='collection-versions')
 router.register(
-    'imports/collections',
-    viewsets.CollectionImportViewSet,
-    basename='collection-imports',
+    'collection-versions', viewsets.CollectionVersionViewSet, basename='collection-versions'
+)
+router.register(
+    'imports/collections', viewsets.CollectionImportViewSet, basename='collection-imports'
 )
 router.register('tags', viewsets.TagsViewSet, basename='tags')
 router.register('synclists', viewsets.SyncListViewSet, basename='synclists')
 router.register('remotes', viewsets.CollectionRemoteViewSet, basename='remotes')
 router.register('distributions', viewsets.DistributionViewSet, basename='distributions')
 router.register('my-distributions', viewsets.MyDistributionViewSet, basename='my-distributions')
-
 router.register('tags/collections', viewsets.CollectionsTagsViewSet, basename='collections-tags')
 router.register('tags/roles', viewsets.RolesTagsViewSet, basename='roles-tags')
 
+# organization_router = routers.SimpleRouter()
+# organization_router.register(
+#     'repositories', viewsets.OrganizationRepositoryViewSet, basename='organization-repository'
+# )
 
 auth_views = [
     path("login/", views.LoginView.as_view(), name="auth-login"),
     path("logout/", views.LogoutView.as_view(), name="auth-logout"),
 ]
 
+organization_paths = [
+    path(
+        "repositories/",
+        viewsets.OrganizationRepositoryViewSet.as_view({"get": "list"}),
+        name="organization-repository-list",
+    ),
+    path(
+        "repositories/<str:repository_id>/",
+         viewsets.OrganizationRepositoryViewSet.as_view(
+             {"get": "retrieve", "post": "create", "delete": "destroy"}
+         ),
+        name="organization-repository-detail",
+    ),
+]
+
 container_paths = [
     path(
         "registries/<str:id>/",
@@ -151,7 +168,6 @@
 
 paths = [
     path('', include(router.urls)),
-
     path('auth/', include(auth_views)),
     path("settings/", views.SettingsView.as_view(), name="settings"),
     path("landing-page/", views.LandingPageView.as_view(), name="landing-page"),
@@ -169,6 +185,7 @@
         viewsets.CollectionViewSet.as_view({'get': 'retrieve'}),
         name='collections-detail'
     ),
+    path("organizations/<int:organization_id>/", include(organization_paths)),
     # NOTE: Using path instead of SimpleRouter because SimpleRouter expects retrieve
     # to look up values with an ID
     path(

galaxy_ng/app/api/ui/viewsets/__init__.py

@@ -1,50 +1,41 @@
-from .namespace import (
-    NamespaceViewSet,
-)
-
 from .collection import (
-    CollectionViewSet,
-    CollectionVersionViewSet,
     CollectionImportViewSet,
-    CollectionRemoteViewSet
+    CollectionRemoteViewSet,
+    CollectionVersionViewSet,
+    CollectionViewSet,
 )
+from .distribution import DistributionViewSet, MyDistributionViewSet
+from .execution_environment import ContainerRegistryRemoteViewSet, ContainerRemoteViewSet
+from .group import GroupUserViewSet, GroupViewSet
 from .my_namespace import MyNamespaceViewSet
 from .my_synclist import MySyncListViewSet
-from .tags import (
-    TagsViewSet,
-    CollectionsTagsViewSet,
-    RolesTagsViewSet
-)
-from .user import UserViewSet, CurrentUserViewSet
-from .synclist import SyncListViewSet
+from .namespace import NamespaceViewSet
+from .organization import OrganizationRepositoryViewSet
 from .root import APIRootView
-from .group import GroupViewSet, GroupUserViewSet
-from .distribution import DistributionViewSet, MyDistributionViewSet
-from .execution_environment import (
-    ContainerRegistryRemoteViewSet,
-    ContainerRemoteViewSet
-)
+from .synclist import SyncListViewSet
+from .tags import CollectionsTagsViewSet, RolesTagsViewSet, TagsViewSet
+from .user import CurrentUserViewSet, UserViewSet
 
 __all__ = (
-    'NamespaceViewSet',
-    'MyNamespaceViewSet',
-    'MySyncListViewSet',
-    'CollectionViewSet',
-    'CollectionVersionViewSet',
-    'CollectionImportViewSet',
-    'CollectionRemoteViewSet',
-    'TagsViewSet',
-    'CollectionsTagsViewSet',
-    'RolesTagsViewSet',
-    'CurrentUserViewSet',
-    'UserViewSet',
-    'SyncListViewSet',
-    'APIRootView',
-    'GroupViewSet',
-    'GroupUserViewSet',
-    'DistributionViewSet',
-    'MyDistributionViewSet',
-    'ContainerRegistryRemoteViewSet',
-    'ContainerRemoteViewSet',
-    'ContainerTagViewset'
+    "NamespaceViewSet",
+    "MyNamespaceViewSet",
+    "MySyncListViewSet",
+    "CollectionViewSet",
+    "CollectionVersionViewSet",
+    "CollectionImportViewSet",
+    "CollectionRemoteViewSet",
+    "TagsViewSet",
+    "CollectionsTagsViewSet",
+    "RolesTagsViewSet",
+    "CurrentUserViewSet",
+    "UserViewSet",
+    "SyncListViewSet",
+    "APIRootView",
+    "GroupViewSet",
+    "GroupUserViewSet",
+    "DistributionViewSet",
+    "MyDistributionViewSet",
+    "ContainerRegistryRemoteViewSet",
+    "ContainerRemoteViewSet",
+    "OrganizationRepositoryViewSet",
 )

galaxy_ng/app/api/ui/viewsets/organization.py

@@ -0,0 +1,43 @@
+from django.utils.translation import gettext_lazy as _
+from rest_framework import mixins, status
+from rest_framework.exceptions import NotFound
+from rest_framework.response import Response
+
+from galaxy_ng.app import models
+from galaxy_ng.app.access_control import access_policy
+from galaxy_ng.app.api import base as api_base
+from galaxy_ng.app.api.ui.serializers.organization import (
+    OrganizationRepositorySerializer,
+    OrganizationRepositoryCreateSerializer,
+)
+
+
+class OrganizationRepositoryViewSet(
+    mixins.ListModelMixin,
+    mixins.RetrieveModelMixin,
+    mixins.DestroyModelMixin,
+    api_base.GenericViewSet
+):
+    permission_classes = [access_policy.OrganizationResourceAccessPolicy]
+    lookup_field = 'repository_id'
+
+    def get_queryset(self):
+        org_id = self.kwargs["organization_id"]
+        org_exists = models.Organization.objects.filter(id=org_id).exists()
+        if not org_exists:
+            raise NotFound(_("Organization {} does not exist.").format(org_id))
+        return models.OrganizationRepository.objects.filter(organization_id=org_id)
+
+    def get_serializer_class(self):
+        if self.action == "create":
+            return OrganizationRepositoryCreateSerializer
+        return OrganizationRepositorySerializer
+
+    def create(self, request, *args, **kwargs):
+        serializer = self.get_serializer(data={
+            "repository": self.kwargs["repository_id"],
+            "organization": self.kwargs["organization_id"],
+        })
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return Response(serializer.data, status=status.HTTP_201_CREATED)

galaxy_ng/app/migrations/0051_organizationrepository.py

@@ -0,0 +1,43 @@
+# Generated by Django 4.2.10 on 2024-02-19 14:20
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ansible", "0055_alter_collectionversion_version_alter_role_version"),
+        ("galaxy", "0050_organization_data"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="OrganizationRepository",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "organization",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="galaxy.organization",
+                    ),
+                ),
+                (
+                    "repository",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="ansible.ansiblerepository",
+                    ),
+                ),
+            ],
+        ),
+    ]