services: added base_query() to model

ergo · Nov 23, 2016 · 4d57562 · 4d57562
1 parent 886617d
commit 4d57562
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/ziggurat_foundations/models/base.py b/ziggurat_foundations/models/base.py
@@ -2,6 +2,7 @@
 import sqlalchemy as sa
 
 from ziggurat_foundations.exc import ZigguratSessionException
+from zope.deprecation import deprecation
 
 
 class BaseModel(object):
@@ -123,6 +124,8 @@ def delete(self, db_session=None):
         db_session.delete(self)
 
     @classmethod
+    @deprecation.deprecate("BaseModel.all "
+                           "will be removed in 0.8, use service instead")
     def base_query(cls, db_session=None):
         """
         Returns a base query object one can use to search on simple properties
@@ -133,6 +136,8 @@ def base_query(cls, db_session=None):
         return get_db_session(db_session).query(cls)
 
     @classmethod
+    @deprecation.deprecate("BaseModel.all "
+                           "will be removed in 0.8, use service instead")
     def all(cls, db_session=None):
         """
         Alias for base_query()

diff --git a/ziggurat_foundations/models/services/__init__.py b/ziggurat_foundations/models/services/__init__.py
@@ -19,3 +19,14 @@ def all(cls, klass, db_session=None):
         """
         db_session = get_db_session(db_session)
         return db_session.query(klass)
+
+    @classmethod
+    def base_query(cls, db_session=None):
+        """
+        returns base query for specific service
+
+        :param db_session:
+        :return: query
+        """
+        db_session = get_db_session(db_session)
+        return db_session.query(cls.model)