Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add server version check to sync_all_ingredients_chunked_task
Roland Geiderb1572bee18d1
diff --git a/wger/nutrition/tasks.py b/wger/nutrition/tasks.pyindex c1f851ef7..adc16e256 100644--- a/wger/nutrition/tasks.py+++ b/wger/nutrition/tasks.py@@ -122,8 +122,15 @@ def sync_all_ingredients_chunked_task(Runs in parallel depending on the concurrency settings of the Celery worker."""- # Calculate number of pagesremote = remote_url or settings.WGER_SETTINGS['WGER_INSTANCE']++ try:+ check_min_server_version(remote)+ except CommandError as e:+ logger.error(f'Ingredient sync aborted, server incompatible: {e}')+ return None++ # Calculate number of pagesurl = make_uri(INGREDIENTS_ENDPOINT, server_url=remote, query={'limit': 1})data = requests.get(url, headers=wger_headers(), timeout=30).json()total = data['count']diff --git a/wger/nutrition/tests/test_sync.py b/wger/nutrition/tests/test_sync.pyindex 9fc3c12fb..8cf825268 100644--- a/wger/nutrition/tests/test_sync.py+++ b/wger/nutrition/tests/test_sync.py@@ -17,6 +17,9 @@ from decimal import Decimalfrom unittest.mock import patchfrom uuid import UUID+# Django+from django.core.management import CommandError+# wgerfrom wger.core.tests.base_testcase import WgerTestCasefrom wger.nutrition.models import (@@ -27,6 +30,7 @@ from wger.nutrition.sync import (sync_ingredients,sync_ingredients_page,)+from wger.nutrition.tasks import sync_all_ingredients_chunked_taskfrom wger.utils.requests import wger_headers@@ -242,3 +246,19 @@ class TestSyncMethods(WgerTestCase):expected_url,headers=wger_headers(),)++ @patch('wger.nutrition.tasks.requests.get')+ @patch('wger.nutrition.tasks.check_min_server_version')+ def test_chunked_sync_aborts_on_incompatible_remote(self, mock_check_version, mock_request):+ """The chunked orchestrator must refuse to sync against an incompatible remote.++ This protects users on outdated wger versions whose Celery beat schedule+ still calls this task directly (instead of going through the bulk wrapper).+ """+ mock_check_version.side_effect = CommandError('Remote requires version 2.5.0')++ sync_all_ingredients_chunked_task(remote_url='https://example.com')++ mock_check_version.assert_called_once_with('https://example.com')+ # No API requests must be made when the version check fails.+ mock_request.assert_not_called()