imports work, gr base_init works. jenkins test1

3 files changed, 56 insertions, 40 deletions

diff --git a/test_utils/managers/cashout_methods.py b/test_utils/managers/cashout_methods.py
index b201e8c..238cdda 100644
--- a/test_utils/managers/cashout_methods.py
+++ b/test_utils/managers/cashout_methods.py
@@ -1,6 +1,11 @@
+from __future__ import annotations
+
 import random
+from collections.abc import Callable
 from uuid import uuid4
 
+import pytest
+
 from generalresearch.models.thl.wallet import Currency, PayoutType
 from generalresearch.models.thl.wallet.cashout_method import (
     CashoutMethod,
@@ -8,45 +13,55 @@ from generalresearch.models.thl.wallet.cashout_method import (
 )
 
 
-def random_ext_id(base: str = "U02"):
-    suffix = random.randint(0, 99999)
-    return f"{base}{suffix:05d}"
+@pytest.fixture(scope="session")
+def random_ext_id_factory(base: str = "U02") -> Callable[..., str]:
+
+    def _inner() -> str:
+        suffix = random.randint(0, 99999)
+        return f"{base}{suffix:05d}"
 
+    return _inner
 
-EXAMPLE_TANGO_CASHOUT_METHODS = [
-    CashoutMethod(
-        id=uuid4().hex,
-        last_updated="2021-06-23T20:45:38.239182Z",
-        is_live=True,
-        type=PayoutType.TANGO,
-        ext_id=random_ext_id(),
-        name="Safeway eGift Card $25",
-        data=TangoCashoutMethodData(
-            value_type="fixed", countries=["US"], utid=random_ext_id()
+
+@pytest.fixture(scope="session")
+def example_tango_cashout_methods(
+    random_ext_id_factory: Callable[..., str],
+) -> list[CashoutMethod]:
+    return [
+        CashoutMethod(
+            id=uuid4().hex,
+            last_updated="2021-06-23T20:45:38.239182Z",
+            is_live=True,
+            type=PayoutType.TANGO,
+            ext_id=random_ext_id_factory(),
+            name="Safeway eGift Card $25",
+            data=TangoCashoutMethodData(
+                value_type="fixed", countries=["US"], utid=random_ext_id_factory()
+            ),
+            user=None,
+            image_url="https://d30s7yzk2az89n.cloudfront.net/images/brands/b694446-1200w-326ppi.png",
+            original_currency=Currency.USD,
+            min_value=2500,
+            max_value=2500,
         ),
-        user=None,
-        image_url="https://d30s7yzk2az89n.cloudfront.net/images/brands/b694446-1200w-326ppi.png",
-        original_currency=Currency.USD,
-        min_value=2500,
-        max_value=2500,
-    ),
-    CashoutMethod(
-        id=uuid4().hex,
-        last_updated="2021-06-23T20:45:38.239182Z",
-        is_live=True,
-        type=PayoutType.TANGO,
-        ext_id=random_ext_id(),
-        name="Amazon.it Gift Certificate",
-        data=TangoCashoutMethodData(
-            value_type="variable", countries=["IT"], utid="U006961"
+        CashoutMethod(
+            id=uuid4().hex,
+            last_updated="2021-06-23T20:45:38.239182Z",
+            is_live=True,
+            type=PayoutType.TANGO,
+            ext_id=random_ext_id_factory(),
+            name="Amazon.it Gift Certificate",
+            data=TangoCashoutMethodData(
+                value_type="variable", countries=["IT"], utid="U006961"
+            ),
+            user=None,
+            image_url="https://d30s7yzk2az89n.cloudfront.net/images/brands/b405753-1200w-326ppi.png",
+            original_currency=Currency.EUR,
+            min_value=1,
+            max_value=10000,
         ),
-        user=None,
-        image_url="https://d30s7yzk2az89n.cloudfront.net/images/brands/b405753-1200w-326ppi.png",
-        original_currency=Currency.EUR,
-        min_value=1,
-        max_value=10000,
-    ),
-]
+    ]
+
 
 # AMT_ASSIGNMENT_CASHOUT_METHOD = CashoutMethod(
 #     id=uuid4().hex,
diff --git a/test_utils/managers/conftest.py b/test_utils/managers/conftest.py
index b03a646..9c6a1a7 100644
--- a/test_utils/managers/conftest.py
+++ b/test_utils/managers/conftest.py
@@ -32,12 +32,10 @@ from generalresearch.managers.thl.userhealth import (
     UserIpHistoryManager,
 )
 from generalresearch.models import Source
+from generalresearch.models.thl.wallet.cashout_method import CashoutMethod
 from generalresearch.pg_helper import PostgresConfig
 from generalresearch.redis_helper import RedisConfig
 from generalresearch.sql_helper import SqlHelper
-from test_utils.managers.cashout_methods import (
-    EXAMPLE_TANGO_CASHOUT_METHODS,
-)
 
 # === THL ===
 
@@ -172,12 +170,13 @@ def delete_cashoutmethod_db(thl_web_rw: PostgresConfig) -> Callable[..., None]:
 def setup_cashoutmethod_db(
     cashout_method_manager: CashoutMethodManager,
     delete_cashoutmethod_db: Callable[..., None],
+    example_tango_cashout_methods: list[CashoutMethod],
 ) -> Callable[..., None]:
 
     def _inner():
         delete_cashoutmethod_db()
 
-        for x in EXAMPLE_TANGO_CASHOUT_METHODS:
+        for x in example_tango_cashout_methods:
             cashout_method_manager.create(x)
 
     # TODO: convert these ids into instances to use.
diff --git a/test_utils/managers/gr/conftest.py b/test_utils/managers/gr/conftest.py
index 4da8fe3..69f3e9a 100644
--- a/test_utils/managers/gr/conftest.py
+++ b/test_utils/managers/gr/conftest.py
@@ -56,9 +56,11 @@ def gr_redis_config(settings: GRLBaseSettings) -> RedisConfig:
 
 @pytest.fixture(scope="session")
 def gr_db(django_db_factory: Callable[..., PostgresDsn]) -> PostgresConfig:
+    _dsn = django_db_factory("gr.common")
+    print("DDDD:", _dsn)
 
     return PostgresConfig(
-        dsn=django_db_factory("gr_carer"),
+        dsn=_dsn,
         connect_timeout=1,
         statement_timeout=5,
     )