Update OAuth App to Use The RemoteRepositoryRelation Model

readthedocs/api/v2/views/model_views.py

@@ -397,7 +397,7 @@ def get_queryset(self):
             )
 
         query = query.filter(
-            remote_relations__account__provider__in=[
+            remote_repository_relations__account__provider__in=[
                 service.adapter.provider_id for service in registry
             ],
         ).distinct()

readthedocs/oauth/migrations/0011_add_remote_relation_model.py

@@ -40,15 +40,15 @@ class Migration(migrations.Migration):
                             'user',
                             models.ForeignKey(
                                 on_delete=django.db.models.deletion.CASCADE,
-                                related_name='remote_relations',
+                                related_name='remote_repository_relations',
                                 to=settings.AUTH_USER_MODEL
                             ),
                         ),
                         (
                             'remoterepository',
                             models.ForeignKey(
                                 on_delete=django.db.models.deletion.CASCADE,
-                                related_name='remote_relations',
+                                related_name='remote_repository_relations',
                                 to='oauth.RemoteRepository'
                             ),
                         ),
@@ -77,7 +77,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 null=True,
                 on_delete=django.db.models.deletion.SET_NULL,
-                related_name='remote_relations',
+                related_name='remote_repository_relations',
                 to='socialaccount.SocialAccount',
                 verbose_name='Connected account'
             ),

readthedocs/oauth/migrations/0012_data_migration_for_remote_relation_model.py

@@ -10,10 +10,10 @@
 log = logging.getLogger(__name__)
 
 
-def move_data_to_remote_relations(apps, schema_editor):
+def move_data_to_remote_repository_relations(apps, schema_editor):
     RemoteRepositoryRelation = apps.get_model('oauth', 'RemoteRepositoryRelation')
 
-    def remote_relations_generator(relations, batch_size):
+    def remote_repository_relations_generator(relations, batch_size):
         for relation in relations.iterator(chunk_size=batch_size):
             relation.account_id = relation.remoterepository.account_id
             relation.admin = relation.remoterepository.admin
@@ -42,14 +42,14 @@ def remote_relations_generator(relations, batch_size):
     )
 
     batch_size = 1000
-    remote_relations = remote_relations_generator(
+    remote_repository_relations = remote_repository_relations_generator(
         relations_queryset, batch_size
     )
 
     # Follows Example from django docs
     # https://docs.djangoproject.com/en/2.2/ref/models/querysets/#bulk-create
     while True:
-        batch = list(islice(remote_relations, batch_size))
+        batch = list(islice(remote_repository_relations, batch_size))
 
         if not batch:
             break
@@ -72,5 +72,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(move_data_to_remote_relations),
+        migrations.RunPython(move_data_to_remote_repository_relations),
     ]

readthedocs/oauth/models.py

@@ -206,18 +206,18 @@ def matches(self, user):
 class RemoteRepositoryRelation(TimeStampedModel):
     remoterepository = models.ForeignKey(
         RemoteRepository,
-        related_name='remote_relations',
+        related_name='remote_repository_relations',
         on_delete=models.CASCADE
     )
     user = models.ForeignKey(
         User,
-        related_name='remote_relations',
+        related_name='remote_repository_relations',
         on_delete=models.CASCADE
     )
     account = models.ForeignKey(
         SocialAccount,
         verbose_name=_('Connected account'),
-        related_name='remote_relations',
+        related_name='remote_repository_relations',
         null=True,
         blank=True,
         on_delete=models.SET_NULL,

readthedocs/oauth/services/base.py

@@ -202,11 +202,12 @@ def sync(self):
         all_remote_repositories = remote_repositories + remote_repositories_organizations
         repository_full_names = [r.full_name for r in all_remote_repositories if r is not None]
         (
-            self.user.oauth_repositories
+            self.user.remote_repository_relations
             .exclude(
-                Q(full_name__in=repository_full_names) | Q(project__isnull=False)
+                Q(remoterepository__full_name__in=repository_full_names) |
+                Q(remoterepository__project__isnull=False)
             )
-            .filter(remote_relations__account=self.account)
+            .filter(account=self.account)
             .delete()
         )
 

readthedocs/oauth/utils.py

@@ -31,11 +31,12 @@ def update_webhook(project, integration, request=None):
 
     updated = False
     try:
-        remote_relations = project.remote_repository.remote_relations.filter(
-            account__isnull=False
+        remote_repository_relations = project.remote_repository.remote_repository_relations.filter(
+            account__isnull=False,
+            user=request.user
         ).select_related('account')
 
-        for relation in remote_relations:
+        for relation in remote_repository_relations:
             service = service_cls(request.user, relation.account)
             updated, __ = service.update_webhook(project, integration)
 

readthedocs/rtd_tests/tests/test_oauth.py

@@ -970,7 +970,7 @@ def test_make_project_pass(self):
         )
         self.assertEqual(repo.ssh_url, '[email protected]:testorga/testrepo.git')
         self.assertEqual(repo.html_url, 'https://gitlab.com/testorga/testrepo')
-        self.assertTrue(repo.remote_relations.first().admin)
+        self.assertTrue(repo.remote_repository_relations.first().admin)
         self.assertFalse(repo.private)
 
     def test_make_private_project_fail(self):

readthedocs/rtd_tests/tests/test_oauth_sync.py

@@ -120,14 +120,16 @@ def test_sync_delete_stale(self, mock_request):
         )
 
         self.assertEqual(RemoteRepository.objects.count(), 3)
+        self.assertEqual(RemoteRepositoryRelation.objects.count(), 3)
         self.assertEqual(RemoteOrganization.objects.count(), 1)
 
         self.service.sync()
 
-        # After calling .sync, old-repository should be deleted,
-        # project-linked-repository should be conserved, and only the one
-        # returned by the API should be present (organization/repository)
-        self.assertEqual(RemoteRepository.objects.count(), 2)
+        # After calling .sync, old-repository remote relation should be deleted,
+        # project-linked-repository remote relation should be conserved,
+        # and only the one's returned by the API should be present (organization/repository)
+        self.assertEqual(RemoteRepository.objects.count(), 3)
+        self.assertEqual(RemoteRepositoryRelation.objects.count(), 2)
         self.assertTrue(RemoteRepository.objects.filter(full_name='organization/repository').exists())
         self.assertTrue(RemoteRepository.objects.filter(full_name='organization/project-linked-repository').exists())
         self.assertEqual(RemoteOrganization.objects.count(), 0)