test organization

and a few field renames

addon_service/authorized_storage_account/models.py

@@ -5,7 +5,7 @@
 
 
 class AuthorizedStorageAccount(AddonsServiceBaseModel):
-    # TODO: capabilities = ArrayField(...)
+    # TODO: authorized_capabilities = ArrayField(...)
     default_root_folder = models.CharField(blank=True)
 
     external_storage_service = models.ForeignKey(

addon_service/configured_storage_addon/models.py

@@ -6,12 +6,12 @@
 class ConfiguredStorageAddon(AddonsServiceBaseModel):
     root_folder = models.CharField()
 
-    authorized_storage_account = models.ForeignKey(
+    base_account = models.ForeignKey(
         "addon_service.AuthorizedStorageAccount",
         on_delete=models.CASCADE,
         related_name="configured_storage_addons",
     )
-    internal_resource = models.ForeignKey(
+    authorized_resource = models.ForeignKey(
         "addon_service.InternalResource",
         on_delete=models.CASCADE,
         related_name="configured_storage_addons",

addon_service/configured_storage_addon/serializers.py

@@ -3,6 +3,7 @@
 from rest_framework_json_api.utils import get_resource_type_from_model
 
 from addon_service.models import (
+    AuthorizedStorageAccount,
     ConfiguredStorageAddon,
     InternalResource,
 )
@@ -13,29 +14,29 @@
 
 class ConfiguredStorageAddonSerializer(serializers.HyperlinkedModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name=f"{RESOURCE_NAME}-detail")
-    authorized_storage_account = ResourceRelatedField(
-        queryset=ConfiguredStorageAddon.objects.all(),
+    base_account = ResourceRelatedField(
+        queryset=AuthorizedStorageAccount.objects.all(),
         many=False,
         related_link_view_name=f"{RESOURCE_NAME}-related",
     )
-    internal_resource = ResourceRelatedField(
+    authorized_resource = ResourceRelatedField(
         queryset=InternalResource.objects.all(),
         many=False,
         related_link_view_name=f"{RESOURCE_NAME}-related",
     )
 
     included_serializers = {
-        "authorized_storage_account": (
+        "base_account": (
             "addon_service.serializers.AuthorizedStorageAccountSerializer"
         ),
-        "internal_resource": "addon_service.serializers.InternalResourceSerializer",
+        "authorized_resource": "addon_service.serializers.InternalResourceSerializer",
     }
 
     class Meta:
         model = ConfiguredStorageAddon
         fields = [
             "url",
             "root_folder",
-            "authorized_storage_account",
-            "internal_resource",
+            "base_account",
+            "authorized_resource",
         ]

addon_service/management/commands/fill_garbage.py

@@ -41,7 +41,7 @@ def handle_label(self, label, **options):
                     resource_uri=f"http://osf.example/r{label}{_j}",
                 )
                 _csa = db.ConfiguredStorageAddon.objects.create(
-                    authorized_storage_account=_asa,
-                    internal_resource=_ir,
+                    base_account=_asa,
+                    authorized_resource=_ir,
                 )
         return str(_csa)

addon_service/migrations/0001_initial.py

@@ -215,15 +215,15 @@ class Migration(migrations.Migration):
                 ("modified", models.DateTimeField()),
                 ("root_folder", models.CharField()),
                 (
-                    "authorized_storage_account",
+                    "base_account",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="configured_storage_addons",
                         to="addon_service.authorizedstorageaccount",
                     ),
                 ),
                 (
-                    "internal_resource",
+                    "authorized_resource",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="configured_storage_addons",

addon_service/tests/_factories.py

@@ -70,5 +70,5 @@ class Meta:
         model = db.ConfiguredStorageAddon
 
     root_folder = "/"
-    authorized_storage_account = factory.SubFactory(AuthorizedStorageAccountFactory)
-    internal_resource = factory.SubFactory(InternalResourceFactory)
+    base_account = factory.SubFactory(AuthorizedStorageAccountFactory)
+    authorized_resource = factory.SubFactory(InternalResourceFactory)

addon_service/tests/test_authorized_storage_account.py → addon_service/tests/test_by_type/test_authorized_storage_account.py

@@ -14,7 +14,6 @@
 from addon_service.tests._helpers import get_test_request
 
 
-# smoke-test api
 class TestAuthorizedStorageAccountAPI(APITestCase):
     @classmethod
     def setUpTestData(cls):
@@ -84,7 +83,7 @@ def test_configured_storage_addons__several(self):
         _accounts = set(
             _factories.ConfiguredStorageAddonFactory.create_batch(
                 size=3,
-                authorized_storage_account=self._asa,
+                base_account=self._asa,
             )
         )
         self.assertEqual(
@@ -157,7 +156,7 @@ def test_get_related__empty(self):
     def test_get_related__several(self):
         _addons = _factories.ConfiguredStorageAddonFactory.create_batch(
             size=5,
-            authorized_storage_account=self._asa,
+            base_account=self._asa,
         )
         _resp = self._related_view(
             get_test_request(),

addon_service/tests/test_configured_storage_addon.py → addon_service/tests/test_by_type/test_configured_storage_addon.py

@@ -12,7 +12,6 @@
 from addon_service.tests._helpers import get_test_request
 
 
-# smoke-test api
 class TestConfiguredStorageAddonAPI(APITestCase):
     @classmethod
     def setUpTestData(cls):
@@ -78,7 +77,13 @@ class TestConfiguredStorageAddonViewSet(TestCase):
     @classmethod
     def setUpTestData(cls):
         cls._csa = _factories.ConfiguredStorageAddonFactory()
-        cls._view = ConfiguredStorageAddonViewSet.as_view({"get": "retrieve"})
+        cls._view = ConfiguredStorageAddonViewSet.as_view(
+            {
+                "post": "create",
+                "get": "retrieve",
+                "patch": "update",
+            }
+        )
 
     def test_get(self):
         _resp = self._view(
@@ -96,8 +101,8 @@ def test_get(self):
         self.assertEqual(
             set(_content["data"]["relationships"].keys()),
             {
-                "authorized_storage_account",
-                "internal_resource",
+                "base_account",
+                "authorized_resource",
             },
         )
 
@@ -115,6 +120,10 @@ def test_wrong_user(self):
         )
         self.assertEqual(_resp.status_code, HTTPStatus.FORBIDDEN)
 
+    # def test_create(self):
+    #     _post_req = get_test_request(user=self._user, method='post')
+    #     self._view(_post_req, pk=
+
 
 class TestConfiguredStorageAddonRelatedView(TestCase):
     @classmethod
@@ -128,11 +137,11 @@ def test_get_related(self):
         _resp = self._related_view(
             get_test_request(),
             pk=self._csa.pk,
-            related_field="authorized_storage_account",
+            related_field="base_account",
         )
         self.assertEqual(_resp.status_code, HTTPStatus.OK)
         _content = json.loads(_resp.rendered_content)
         self.assertEqual(
             _content["data"]["id"],
-            str(self._csa.authorized_storage_account_id),
+            str(self._csa.base_account_id),
         )

addon_service/tests/test_external_storage_service.py → addon_service/tests/test_by_type/test_external_storage_service.py

@@ -13,7 +13,6 @@
 from addon_service.tests._helpers import get_test_request
 
 
-# smoke-test api
 class TestExternalStorageServiceAPI(APITestCase):
     @classmethod
     def setUpTestData(cls):

addon_service/tests/test_internal_resource.py → addon_service/tests/test_by_type/test_internal_resource.py

@@ -13,7 +13,6 @@
 from addon_service.tests._helpers import get_test_request
 
 
-# smoke-test api
 class TestInternalResourceAPI(APITestCase):
     @classmethod
     def setUpTestData(cls):
@@ -76,7 +75,7 @@ def test_configured_storage_addons__several(self):
         _accounts = set(
             _factories.ConfiguredStorageAddonFactory.create_batch(
                 size=3,
-                internal_resource=self._resource,
+                authorized_resource=self._resource,
             )
         )
         self.assertEqual(
@@ -152,7 +151,7 @@ def test_get_related__empty(self):
     def test_get_related__several(self):
         _addons = _factories.ConfiguredStorageAddonFactory.create_batch(
             size=5,
-            internal_resource=self._resource,
+            authorized_resource=self._resource,
         )
         _resp = self._related_view(
             get_test_request(),

addon_service/tests/test_internal_user.py → addon_service/tests/test_by_type/test_internal_user.py

@@ -14,7 +14,6 @@
 from addon_service.tests._helpers import get_test_request
 
 
-# smoke-test api
 class TestInternalUserAPI(APITestCase):
     @classmethod
     def setUpTestData(cls):