fixed n+1 queries

addon_service/addon_operation_invocation/serializers.py

@@ -68,7 +68,12 @@ class Meta:
     thru_addon = CustomPolymorphicResourceRelatedField(
         many=False,
         required=False,
-        queryset=ConfiguredAddon.objects.active(),
+        queryset=ConfiguredAddon.objects.active().select_related(
+            "base_account__external_service",
+            "base_account__authorizedstorageaccount",
+            "base_account__authorizedcitationaccount",
+            "base_account__account_owner",
+        ),
         related_link_view_name=view_names.related_view(RESOURCE_TYPE),
         polymorphic_serializer=ConfiguredAddonPolymorphicSerializer,
     )
@@ -92,6 +97,10 @@ class Meta:
         "by_user": "addon_service.serializers.UserReferenceSerializer",
     }
 
+    def to_internal_value(self, data):
+        validated_data = super().to_internal_value(data)
+        return validated_data
+
     def create(self, validated_data):
         _thru_addon = validated_data.get("thru_addon")
         _thru_account = validated_data.get("thru_account")

addon_service/addon_operation_invocation/views.py

@@ -86,8 +86,31 @@ def retrieve_related(self, request, *args, **kwargs):
 
     def perform_create(self, serializer):
         super().perform_create(serializer)
+        narrowed_down_types = (
+            [
+                "thru_addon__configuredcitationaddon",
+                "thru_addon__base_account__authorizedcitationaccount",
+            ]
+            if "citation"
+            in serializer.initial_data.get(
+                "thru_addon", serializer.initial_data.get("thru_account")
+            )["type"]
+            else [
+                "thru_addon__configuredstorageaddon",
+                "thru_addon__base_account__authorizedstorageaccount",
+            ]
+        )
         # after creating the AddonOperationInvocation, look into invoking it
-        _invocation = serializer.instance
+        _invocation = (
+            AddonOperationInvocation.objects.filter(pk=serializer.instance.pk)
+            .select_related(
+                "thru_addon__base_account__external_service",
+                *narrowed_down_types,
+                "thru_addon__base_account___credentials",
+                "thru_account___credentials",
+            )
+            .first()
+        )
         _operation_type = _invocation.operation.operation_type
         match _operation_type:
             case AddonOperationType.REDIRECT | AddonOperationType.IMMEDIATE:
@@ -96,3 +119,4 @@ def perform_create(self, serializer):
                 perform_invocation__celery.delay(_invocation.pk)
             case _:
                 raise ValueError(f"unknown operation type: {_operation_type}")
+        serializer.instance = _invocation

addon_service/authentication.py

@@ -9,6 +9,8 @@ class GVCombinedAuthentication(drf_authentication.BaseAuthentication):
     """Authentication supporting session, basic, and token methods."""
 
     def authenticate(self, request: DrfRequest):
+        if request.session.get("user_reference_uri"):
+            return True, None
         _user_uri = osf.get_osf_user_uri(request)
         if _user_uri:
             UserReference.objects.get_or_create(user_uri=_user_uri)

addon_service/common/serializer_fields.py

@@ -8,6 +8,9 @@
     SkipDataMixin,
 )
 
+from addon_service.authorized_account.models import AuthorizedAccount
+from addon_service.configured_addon.models import ConfiguredAddon
+
 
 class ReadOnlyResourceRelatedField(
     json_api_serializers.ResourceRelatedField, drf_serializers.ReadOnlyField
@@ -54,16 +57,18 @@ def get(self, *, pk):
 class CustomPolymorphicResourceRelatedField(PolymorphicResourceRelatedField):
     def to_representation(self, value):
         data = super().to_representation(value)
-        if hasattr(value, "authorizedcitationaccount"):
-            data["type"] = "authorized-citation-accounts"
-        elif hasattr(value, "authorizedcomputingaccount"):
-            data["type"] = "authorized-computing-accounts"
-        elif hasattr(value, "authorizedstorageaccount"):
-            data["type"] = "authorized-storage-accounts"
-        elif hasattr(value, "configuredcitationaddon"):
-            data["type"] = "configured-citation-addons"
-        elif hasattr(value, "configuredcomputingaddon"):
-            data["type"] = "configured-computing-addons"
-        elif hasattr(value, "configuredstorageaccount"):
-            data["type"] = "configured-storage-addons"
+        if isinstance(value, AuthorizedAccount):
+            if hasattr(value, "authorizedcitationaccount"):
+                data["type"] = "authorized-citation-accounts"
+            elif hasattr(value, "authorizedstorageaccount"):
+                data["type"] = "authorized-storage-accounts"
+            elif hasattr(value, "authorizedcomputingaccount"):
+                data["type"] = "authorized-computing-accounts"
+        elif isinstance(value, ConfiguredAddon):
+            if hasattr(value, "configuredcitationaddon"):
+                data["type"] = "configured-citation-addons"
+            elif hasattr(value, "configuredstorageaddon"):
+                data["type"] = "configured-storage-addons"
+            elif hasattr(value, "configuredcomputingaddon"):
+                data["type"] = "configured-computing-addons"
         return data

addon_service/configured_addon/storage/views.py

@@ -12,7 +12,12 @@
 
 
 class ConfiguredStorageAddonViewSet(ConfiguredAddonViewSet):
-    queryset = ConfiguredStorageAddon.objects.active()
+    queryset = ConfiguredStorageAddon.objects.active().select_related(
+        "base_account__authorizedstorageaccount",
+        "base_account__account_owner",
+        "base_account__external_service__externalstorageservice",
+        "authorized_resource",
+    )
     serializer_class = ConfiguredStorageAddonSerializer
 
     @action(

addon_service/external_service/citation/views.py

@@ -5,5 +5,7 @@
 
 
 class ExternalCitationServiceViewSet(ReadOnlyModelViewSet):
-    queryset = ExternalCitationService.objects.all()
+    queryset = ExternalCitationService.objects.all().select_related(
+        "oauth2_client_config", "oauth1_client_config"
+    )
     serializer_class = ExternalCitationServiceSerializer

addon_service/external_service/computing/views.py

@@ -5,5 +5,7 @@
 
 
 class ExternalComputingServiceViewSet(ReadOnlyModelViewSet):
-    queryset = ExternalComputingService.objects.all()
+    queryset = ExternalComputingService.objects.all().select_related(
+        "oauth2_client_config"
+    )
     serializer_class = ExternalComputingServiceSerializer

addon_service/external_service/storage/views.py

@@ -5,5 +5,7 @@
 
 
 class ExternalStorageServiceViewSet(ReadOnlyModelViewSet):
-    queryset = ExternalStorageService.objects.all()
+    queryset = ExternalStorageService.objects.all().select_related(
+        "oauth2_client_config"
+    )
     serializer_class = ExternalStorageServiceSerializer

addon_service/resource_reference/models.py

@@ -12,17 +12,35 @@ class ResourceReference(AddonsServiceBaseModel):
 
     @property
     def configured_storage_addons(self):
-        return ConfiguredStorageAddon.objects.filter(authorized_resource=self).order_by(
-            Lower("_display_name")
+        return (
+            ConfiguredStorageAddon.objects.filter(authorized_resource=self)
+            .select_related(
+                "base_account__external_service__externalstorageservice",
+                "base_account__authorizedstorageaccount",
+                "base_account__account_owner",
+            )
+            .order_by(Lower("_display_name"))
         )
 
     @property
     def configured_citation_addons(self):
-        return ConfiguredCitationAddon.objects.filter(authorized_resource=self)
+        return ConfiguredCitationAddon.objects.filter(
+            authorized_resource=self
+        ).select_related(
+            "base_account__external_service__externalcitationservice",
+            "base_account__authorizedcitationaccount",
+            "base_account__account_owner",
+        )
 
     @property
     def configured_computing_addons(self):
-        return ConfiguredComputingAddon.objects.filter(authorized_resource=self)
+        return ConfiguredComputingAddon.objects.filter(
+            authorized_resource=self
+        ).select_related(
+            "base_account__external_service__externalcomputingservice",
+            "base_account__authorizedcitationaccount",
+            "base_account__account_owner",
+        )
 
     class Meta:
         verbose_name = "Resource Reference"

addon_service/user_reference/models.py

@@ -39,15 +39,21 @@ def configured_resources(self):
 
     @property
     def authorized_storage_accounts(self):
-        return AuthorizedStorageAccount.objects.filter(account_owner=self)
+        return AuthorizedStorageAccount.objects.filter(
+            account_owner=self
+        ).select_related("external_service")
 
     @property
     def authorized_citation_accounts(self):
-        return AuthorizedCitationAccount.objects.filter(account_owner=self)
+        return AuthorizedCitationAccount.objects.filter(
+            account_owner=self
+        ).select_related("external_service")
 
     @property
     def authorized_computing_accounts(self):
-        return AuthorizedComputingAccount.objects.filter(account_owner=self)
+        return AuthorizedComputingAccount.objects.filter(
+            account_owner=self
+        ).select_related("external_service")
 
     class Meta:
         verbose_name = "User Reference"