Merges pull request #4 v3.5.0

User Cashout Stuff pulled out of grpc, user ip history enrichments with grip (no maxmind)

2 files changed, 21 insertions, 22 deletions

diff --git a/tests/managers/thl/test_user_manager/test_base.py b/tests/managers/thl/test_user_manager/test_base.py
index 5d12052..2a7e879 100644
--- a/tests/managers/thl/test_user_manager/test_base.py
+++ b/tests/managers/thl/test_user_manager/test_base.py
@@ -56,43 +56,43 @@ class TestUserManager:
 
     def test_get_user_no_inmemory(self):
         self.user_manager.clear_user_inmemory_cache(self.user)
-        self.user_manager.get_user.__wrapped__.cache_clear()
+        self.user_manager.cache_clear()
         u = self.user_manager.get_user(user_id=self.user.user_id)
         # this should hit mysql
         assert u == self.user
 
-        cache_info = self.user_manager.get_user.__wrapped__.cache_info()
-        assert cache_info.hits == 0, cache_info
-        assert cache_info.misses == 1, cache_info
+        cache_info = self.user_manager.cache_info()
+        assert cache_info['hits'] == 0, cache_info
+        assert cache_info['misses'] == 1, cache_info
 
         # this should hit the lru cache
         u = self.user_manager.get_user(user_id=self.user.user_id)
         assert u == self.user
 
-        cache_info = self.user_manager.get_user.__wrapped__.cache_info()
-        assert cache_info.hits == 1, cache_info
-        assert cache_info.misses == 1, cache_info
+        cache_info = self.user_manager.cache_info()
+        assert cache_info['hits'] == 1, cache_info
+        assert cache_info['misses'] == 1, cache_info
 
     def test_get_user_with_inmemory(self):
         # user_manager = self.get_user_manager()
 
         self.user_manager.set_user_inmemory_cache(self.user)
-        self.user_manager.get_user.__wrapped__.cache_clear()
+        self.user_manager.cache_clear()
         u = self.user_manager.get_user(user_id=self.user.user_id)
         # this should hit inmemory cache
         assert u == self.user
 
-        cache_info = self.user_manager.get_user.__wrapped__.cache_info()
-        assert cache_info.hits == 0, cache_info
-        assert cache_info.misses == 1, cache_info
+        cache_info = self.user_manager.cache_info()
+        assert cache_info['hits'] == 0, cache_info
+        assert cache_info['misses'] == 1, cache_info
 
         # this should hit the lru cache
         u = self.user_manager.get_user(user_id=self.user.user_id)
         assert u == self.user
 
-        cache_info = self.user_manager.get_user.__wrapped__.cache_info()
-        assert cache_info.hits == 1, cache_info
-        assert cache_info.misses == 1, cache_info
+        cache_info = self.user_manager.cache_info()
+        assert cache_info['hits'] == 1, cache_info
+        assert cache_info['misses'] == 1, cache_info
 
 
 class TestBlockUserManager:
diff --git a/tests/managers/thl/test_user_manager/test_redis.py b/tests/managers/thl/test_user_manager/test_redis.py
index f6b59c9..89d0a7a 100644
--- a/tests/managers/thl/test_user_manager/test_redis.py
+++ b/tests/managers/thl/test_user_manager/test_redis.py
@@ -8,15 +8,14 @@ from generalresearch.managers.base import Permission
 from generalresearch.managers.thl.user_manager.redis_user_manager import (
     RedisUserManager,
 )
+from generalresearch.redis_helper import RedisConfig
 
 if TYPE_CHECKING:
-    from generalresearch.config import GRLBaseSettings
     from generalresearch.models.thl.user import User
     from generalresearch.pg_helper import PostgresConfig
 
 
 class TestUserManagerRedis:
-
     def test_get_notset(self, redis_user_manager: RedisUserManager, user: User):
         redis_user_manager.clear_user(user=user)
         assert redis_user_manager.get_user(user_id=user.user_id) is None
@@ -48,10 +47,10 @@ class TestUserManagerRedis:
 
     def test_get_with_cache_prefix(
         self,
-        settings: GRLBaseSettings,
         user: User,
         thl_web_rw: PostgresConfig,
         thl_web_rr: PostgresConfig,
+        thl_redis_config: RedisConfig,
     ):
         """
         Confirm the prefix functionality is working; we do this so it
@@ -67,19 +66,19 @@ class TestUserManagerRedis:
             pg_config=thl_web_rw,
             pg_config_rr=thl_web_rr,
             sql_permissions=[Permission.UPDATE, Permission.CREATE],
-            redis=settings.redis,
-            redis_timeout=settings.redis_timeout,
+            redis=thl_redis_config.dsn,
+            redis_timeout=1,
         )
 
         um2 = UserManager(
             pg_config=thl_web_rw,
             pg_config_rr=thl_web_rr,
             sql_permissions=[Permission.UPDATE, Permission.CREATE],
-            redis=settings.redis,
-            redis_timeout=settings.redis_timeout,
+            redis=thl_redis_config.dsn,
+            redis_timeout=1,
             cache_prefix="user-lookup-v2",
         )
-
+        user = user.to_user_ref()
         um1.get_or_create_user(
             product_id=user.product_id, product_user_id=user.product_user_id
         )