WIP

conftest.py

@@ -88,6 +88,13 @@ def db(engine, sqlalchemy_connect_url):
     Base.metadata.create_all(engine)
 
 
+@pytest.fixture(scope="session")
+def django_db_setup():
+    from django.conf import settings
+
+    settings.DATABASES["default"]["NAME"] = "background_test"
+
+
 @pytest.fixture
 def dbsession(db, engine):
     connection = engine.connect()

database/models/core.py

@@ -40,6 +40,12 @@ def validate_external_id(self, key, value):
         return value
 
 
+class Account(object):
+    # __tablename__ = "codecov_auth_account"
+    id_ = Column("id", types.BigInteger, primary_key=True)
+    name = Column(types.String(100), server_default=FetchedValue())
+
+
 class Owner(CodecovBaseModel):
     __tablename__ = "owners"
     ownerid = Column(types.Integer, primary_key=True)
@@ -105,6 +111,31 @@ class Owner(CodecovBaseModel):
         passive_deletes=True,
     )
 
+    business_email = Column(types.Text, server_default=FetchedValue())
+    stripe_coupon_id = Column(types.Text, server_default=FetchedValue())
+    root_parent_service_id = Column(types.Text, server_default=FetchedValue())
+    private_access = Column(types.Boolean, server_default=FetchedValue())
+    staff = Column(types.Boolean, server_default=FetchedValue())
+    cache = Column(postgresql.JSON, server_default=FetchedValue())
+    did_trial = Column(types.Boolean, server_default=FetchedValue())
+    invoice_details = Column(types.Text, server_default=FetchedValue())
+    uses_invoice = Column(types.Boolean, server_default=FetchedValue())
+    delinquent = Column(types.Boolean, server_default=FetchedValue())
+    student = Column(types.Boolean, server_default=FetchedValue())
+    student_created_at = Column(types.DateTime, server_default=FetchedValue())
+    student_updated_at = Column(types.DateTime, server_default=FetchedValue())
+    is_superuser = Column(types.Boolean, server_default=FetchedValue())
+    max_upload_limit = Column(types.Integer, server_default=FetchedValue())
+    sentry_user_id = Column(types.Text, server_default=FetchedValue())
+    sentry_user_data = Column(postgresql.JSON, server_default=FetchedValue())
+    # ownerid = Column(types.Integer, ForeignKey("owners.ownerid"))
+    user_id = Column(types.Integer, ForeignKey("users.id"))
+    user = relationship(User, foreign_keys=[user_id])
+
+    account_id = Column(types.Integer, server_default=FetchedValue())
+    # account_id = Column(types.Integer, ForeignKey("account.id"))
+    # account = relationship(Account, foreign_keys=[account_id])
+
     # TODO: Create association between `User` and `Owner` mirroring `codecov-api`
     # https://github.com/codecov/codecov-api/blob/204f7fd7e37896efe0259e4bc91aad20601087e0/codecov_auth/models.py#L196-L202
 

services/owner.py

@@ -1,6 +1,9 @@
 import logging
 
 import shared.torngit as torngit
+
+# from services.bots import get_adapter_auth_information
+from shared.bots import get_adapter_auth_information
 from shared.config import get_config, get_verify_ssl
 from shared.django_apps.codecov_auth.models import Service
 from shared.typings.torngit import (
@@ -9,7 +12,6 @@
 )
 
 from helpers.token_refresh import get_token_refresh_callback
-from services.bots import get_adapter_auth_information
 
 log = logging.getLogger(__name__)
 

services/repository.py

@@ -5,6 +5,9 @@
 from typing import Any, Mapping, Optional, Tuple
 
 import shared.torngit as torngit
+from shared.bots import (
+    get_adapter_auth_information,
+)
 from shared.config import get_config, get_verify_ssl
 from shared.django_apps.codecov_auth.models import Service
 from shared.torngit.exceptions import (
@@ -25,9 +28,6 @@
     GITHUB_APP_INSTALLATION_DEFAULT_NAME,
 )
 from helpers.token_refresh import get_token_refresh_callback
-from services.bots import (
-    get_adapter_auth_information,
-)
 from services.bots.github_apps import (
     get_github_app_token,
     get_specific_github_app_details,

tasks/tests/unit/test_sync_repos_task.py

@@ -930,12 +930,9 @@ def repo_obj(service_id, name, language, private, branch, using_integration):
 
         mocked_app.tasks[sync_repo_languages_task_name].apply_async.assert_not_called()
 
+    @pytest.mark.django_db(databases={"default"})
     def test_sync_repos_using_integration_affected_repos_known(
-        self,
-        mocker,
-        dbsession,
-        mock_owner_provider,
-        mock_redis,
+        self, mocker, dbsession, mock_owner_provider, mock_redis, engine
     ):
         user = OwnerFactory.create(
             organizations=[],
@@ -946,7 +943,6 @@ def test_sync_repos_using_integration_affected_repos_known(
             service_id="45343385",
         )
         dbsession.add(user)
-
         mocked_app = mocker.patch.object(
             SyncRepoLanguagesGQLTask,
             "app",
@@ -1044,6 +1040,9 @@ async def side_effect(*args, **kwargs):
         mock_owner_provider.get_repos_from_nodeids_generator.side_effect = side_effect
         mock_owner_provider.service = "github"
 
+        print("le query", dbsession.query(Owner).all())
+        print("le engineee", engine.__dict__)
+
         SyncReposTask().run_impl(
             dbsession,
             ownerid=user.ownerid,