diff --git a/apps/accounts/api/account/task.py b/apps/accounts/api/account/task.py index e5d4b36bb..a042323f5 100644 --- a/apps/accounts/api/account/task.py +++ b/apps/accounts/api/account/task.py @@ -24,7 +24,7 @@ class AccountsTaskCreateAPI(CreateAPIView): def perform_create(self, serializer): data = serializer.validated_data accounts = data.get('accounts', []) - account_ids = [a.id for a in accounts] + account_ids = [str(a.id) for a in accounts] if data['action'] == 'push': task = push_accounts_to_assets_task.delay(account_ids) diff --git a/apps/accounts/serializers/account/account.py b/apps/accounts/serializers/account/account.py index 34333cfe4..4a5e82c6b 100644 --- a/apps/accounts/serializers/account/account.py +++ b/apps/accounts/serializers/account/account.py @@ -43,7 +43,7 @@ class AccountSerializerCreateValidateMixin: def push_account(instance, push_now): if not push_now: return - push_accounts_to_assets_task.delay([instance.id]) + push_accounts_to_assets_task.delay([str(instance.id)]) def create(self, validated_data): push_now = validated_data.pop('push_now', None) diff --git a/apps/assets/api/asset/asset.py b/apps/assets/api/asset/asset.py index 5b67e9114..d8b46baab 100644 --- a/apps/assets/api/asset/asset.py +++ b/apps/assets/api/asset/asset.py @@ -204,8 +204,8 @@ class AssetTaskCreateApi(AssetsTaskMixin, generics.CreateAPIView): if not accounts: accounts = asset.accounts.all() - asset_ids = [asset.id] - account_ids = accounts.values_list("id", flat=True) + account_ids = accounts.values_list('id', flat=True) + account_ids = [str(_id) for _id in account_ids] if action == "push_account": task = push_accounts_to_assets_task.delay(account_ids) elif action == "test_account": diff --git a/apps/assets/tasks/ping.py b/apps/assets/tasks/ping.py index 7dab3c869..3882fe0b3 100644 --- a/apps/assets/tasks/ping.py +++ b/apps/assets/tasks/ping.py @@ -33,7 +33,7 @@ def test_assets_connectivity_task(asset_ids, org_id, task_name=None): def test_assets_connectivity_manual(assets): task_name = gettext_noop("Test assets connectivity ") - asset_ids = [i.id for i in assets] + asset_ids = [str(i.id) for i in assets] org_id = str(current_org.id) return test_assets_connectivity_task.delay(asset_ids, org_id, task_name) @@ -41,5 +41,6 @@ def test_assets_connectivity_manual(assets): def test_node_assets_connectivity_manual(node): task_name = gettext_noop("Test if the assets under the node are connectable ") asset_ids = node.get_all_asset_ids() + asset_ids = [str(i) for i in asset_ids] org_id = str(current_org.id) return test_assets_connectivity_task.delay(asset_ids, org_id, task_name) diff --git a/apps/orgs/signal_handlers/common.py b/apps/orgs/signal_handlers/common.py index f6d5c4132..01ce911c4 100644 --- a/apps/orgs/signal_handlers/common.py +++ b/apps/orgs/signal_handlers/common.py @@ -59,7 +59,7 @@ def expire_user_orgs(*args): @receiver(post_save, sender=Organization) def on_org_create(sender, instance, created=False, **kwargs): - if created: + if not created: return expire_user_orgs()