diff --git a/web/tasks/catalog.py b/web/tasks/catalog.py index 782c046..742805c 100644 --- a/web/tasks/catalog.py +++ b/web/tasks/catalog.py @@ -14,6 +14,7 @@ from web.config import settings from web.database import SessionLocal import web.lib.api_logger as api_logger from web.models.connections import CachedGroup, CachedProduct, CachedStore, EvotorConnection, SyncConfig, SyncFilter +from web.models.user import User, UserRoleEnum logger = logging.getLogger(__name__) @@ -207,10 +208,12 @@ def refresh_catalog(self) -> dict: try: connections = ( db.query(EvotorConnection) + .join(User, User.id == EvotorConnection.user_id) .filter( EvotorConnection.user_id.isnot(None), EvotorConnection.access_token.isnot(None), EvotorConnection.access_token != "", + User.role == UserRoleEnum.user, ) .all() ) diff --git a/web/tasks/vk_catalog.py b/web/tasks/vk_catalog.py index c994202..5e9a433 100644 --- a/web/tasks/vk_catalog.py +++ b/web/tasks/vk_catalog.py @@ -11,6 +11,7 @@ import web.lib.api_logger as api_logger from web.config import settings from web.database import SessionLocal from web.models.connections import SyncConfig, VkCachedAlbum, VkCachedProduct, VkConnection +from web.models.user import User, UserRoleEnum logger = logging.getLogger(__name__) @@ -162,12 +163,14 @@ def refresh_vk_catalog(self) -> dict: try: connections = ( db.query(VkConnection) + .join(User, User.id == VkConnection.user_id) .filter( VkConnection.user_id.isnot(None), VkConnection.access_token.isnot(None), VkConnection.access_token != "", VkConnection.vk_user_id.isnot(None), VkConnection.vk_user_id != "", + User.role == UserRoleEnum.user, ) .all() ) diff --git a/web/tasks/vk_sync.py b/web/tasks/vk_sync.py index 88f9b4a..3ce3763 100644 --- a/web/tasks/vk_sync.py +++ b/web/tasks/vk_sync.py @@ -20,6 +20,7 @@ from web.models.connections import ( SyncConfig, SyncFilter, VkCachedAlbum, VkConnection, ) +from web.models.user import User, UserRoleEnum logger = logging.getLogger(__name__) @@ -412,12 +413,14 @@ def mirror_to_vk(self) -> dict: try: vk_connections = ( db.query(VkConnection) + .join(User, User.id == VkConnection.user_id) .filter( VkConnection.user_id.isnot(None), VkConnection.access_token.isnot(None), VkConnection.access_token != "", VkConnection.vk_user_id.isnot(None), VkConnection.vk_user_id != "", + User.role == UserRoleEnum.user, ) .all() )