Merge pull request #18 from sumaro2101/develop

dao options

Author: sumaro2101

api_v1/users/dao.py

@@ -0,0 +1,9 @@
+from config.models import User
+from config.dao import BaseDAO
+
+
+class UserDAO(BaseDAO):
+    """
+    DAO для CRUD пользователя
+    """
+    model = User

config/dao/base_dao.py

@@ -26,6 +26,7 @@ class BaseDAO:
         items = ModelDAO.find_all_items_by_args(
             session = session,
             one_to_many = (Model.tag,),
+            many_to_many = (Model.users, Model.stations,)
             name='model',
         )
         # Создание сущности
@@ -108,15 +109,34 @@ async def add(cls,
                   session: AsyncSession,
                   **values,
                   ) -> BaseModel:
-        async with session.begin():
-            instance = cls.model(**values)
-            session.add(instance=instance)
-            try:
-                await session.commit()
-            except SQLAlchemyError as ex:
-                await session.rollback()
-                raise ex
-            return instance
+        instance = cls.model(**values)
+        session.add(instance=instance)
+        try:
+            await session.commit()
+        except SQLAlchemyError as ex:
+            await session.rollback()
+            raise ex
+        return instance
+
+    @classmethod
+    async def update(cls,
+                     session: AsyncSession,
+                     instance: BaseModel,
+                     **values,
+                     ) -> BaseModel:
+        [setattr(instance, name, value)
+         for name, value
+         in values.items()]
+        await session.commit()
+        return instance
+
+    @classmethod
+    async def delete(cls,
+                     session: AsyncSession,
+                     instance: BaseModel,
+                     ) -> None:
+        await session.delete(instance)
+        await session.commit()
 
 
 def struct_options_statment(model: BaseModel,