Merge remote-tracking branch 'origin/statistics'

# Conflicts:
#	main.py
#	routers/__init__.py
#	schemas/deal.py

services/deal.py

@@ -18,6 +18,7 @@ from services.client import ClientService
 from services.deal_group import DealGroupService
 from services.service import ServiceService
 from services.shipping_warehouse import ShippingWarehouseService
+from services.user import UserService
 
 
 class DealService(BaseService):
@@ -360,6 +361,14 @@ class DealService(BaseService):
                 shipping_warehouse = await shipping_warehouse_service.create_by_name(request.data.shipping_warehouse)
 
             deal.shipping_warehouse = shipping_warehouse
+
+            # Updating manager
+            if request.data.manager:
+                user_service = UserService(self.session)
+                user = await user_service.get_by_id(request.data.manager.id)
+                deal.manager = user
+            else:
+                deal.manager = None
             await self.session.commit()
             return DealUpdateGeneralInfoResponse(ok=True, message='Данные о сделке успешно обновлены')
         except Exception as e: