test

Author: felipao-mx

agave/models/mongo.py

@@ -16,22 +16,21 @@ def dict(self) -> DictStrAny:
 
     @classmethod
     def retrieve(cls, id: str, user_id: Optional[str] = None):
+        query = Q(id=id)
+        if user_id:
+            query = query & Q(user_id=user_id)
         try:
-            id_query = Q(id=id)
-            if user_id:
-                id_query = id_query & Q(user_id=user_id)
-            id_obj = cls.objects.get(id_query)
+            obj = cls.objects.get(query)
         except DoesNotExist:
             raise ObjectDoesNotExist
-        return id_obj
+        return obj
 
     @classmethod
     def count(cls, filters: Any) -> int:
-        count = cls.objects.filter(filters).count()
-        return count
+        return cls.objects.filter(filters).count()
 
     @classmethod
-    def filter_limit(cls, filters: Any, limit: int) -> Tuple[Any, bool]:
+    def filter_limit(cls, filters: Q, limit: int) -> Tuple[Any, bool]:
         items = (
             cls.objects.order_by("-created_at").filter(filters).limit(limit)
         )

agave/models/redis.py

@@ -1,4 +1,4 @@
-from typing import Any, List, Optional, Tuple
+from typing import Any, Dict, Optional, Tuple
 
 from cuenca_validations.typing import DictStrAny
 from cuenca_validations.validators import sanitize_item
@@ -23,7 +23,7 @@ def _from_redis(self, value):
         return value.decode('utf-8')
 
 
-def redis_to_dit(obj, exclude_fields: list = None) -> dict:
+def redis_to_dict(obj, exclude_fields: list = None) -> dict:
     excluded = ['o_id']
     response = {
         key: sanitize_item(value)
@@ -38,28 +38,30 @@ class RedisModel(BaseModel, Model):
     o_id = PrimaryKey()  # Para que podamos usar `id` en los modelos
 
     def dict(self) -> DictStrAny:
-        return self._dict(redis_to_dit)
+        return self._dict(redis_to_dict)
 
     @classmethod
     def retrieve(cls, id: str, user_id: Optional[str] = None):
+        params = dict(id=id)
         if user_id:
-            id_obj = cls.query.filter(
-                id=id,
-                user_id=user_id,
-            ).first()
-        else:
-            id_obj = cls.get_by(id=id)
-        if not id_obj:
+            params['user_id'] = user_id
+
+        obj = cls.query.filter(**params).first()
+
+        if not obj:
             raise ObjectDoesNotExist
-        return id_obj
+        return obj
 
     @classmethod
     def count(cls, filters: Any) -> int:
-        count = cls.query.filter(**filters).count()
-        return count
+        return cls.query.filter(**filters).count()
 
     @classmethod
+<<<<<<< HEAD
     def filter_limit(cls, filters: Any, limit: int) -> Tuple[List, bool]:
+=======
+    def filter_limit(cls, filters: Dict, limit: int) -> Tuple[Any, bool]:
+>>>>>>> test
         items = (
             cls.query.filter(**filters).order_by('-created_at').limit(0, limit)
         )