Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Expose the new full name in English over the API and update tests

Roland Geider25db60b21435
diff --git a/wger/config/fixtures/test-languages.json b/wger/config/fixtures/test-languages.json
index abf028b3a..a51292f36 100644
--- a/wger/config/fixtures/test-languages.json
+++ b/wger/config/fixtures/test-languages.json
@@ -1,26 +1,29 @@
[
- {
- "pk": 1,
- "model": "core.language",
- "fields": {
- "full_name": "Deutsch",
- "short_name": "de"
- }
- },
- {
- "pk": 2,
- "model": "core.language",
- "fields": {
- "full_name": "English",
- "short_name": "en"
- }
- },
- {
- "pk": 3,
- "model": "core.language",
- "fields": {
- "full_name": "Français",
- "short_name": "fr"
- }
+ {
+ "pk": 1,
+ "model": "core.language",
+ "fields": {
+ "full_name": "Deutsch",
+ "short_name": "de",
+ "full_name_en": "German"
}
+ },
+ {
+ "pk": 2,
+ "model": "core.language",
+ "fields": {
+ "full_name": "English",
+ "short_name": "en",
+ "full_name_en": "English"
+ }
+ },
+ {
+ "pk": 3,
+ "model": "core.language",
+ "fields": {
+ "full_name": "Français",
+ "short_name": "fr",
+ "full_name_en": "French"
+ }
+ }
]
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index 545d79d3c..197e765fb 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -37,7 +37,6 @@ from wger.core.models import (
WeightUnit,
)
-
logger = logging.getLogger(__name__)
@@ -153,7 +152,12 @@ class LanguageSerializer(serializers.ModelSerializer):
class Meta:
model = Language
- fields = ['id', 'short_name', 'full_name']
+ fields = [
+ 'id',
+ 'short_name',
+ 'full_name',
+ 'full_name_en',
+ ]
class DaysOfWeekSerializer(serializers.ModelSerializer):
diff --git a/wger/exercises/sync.py b/wger/exercises/sync.py
index 5a7d7c47d..05583a734 100644
--- a/wger/exercises/sync.py
+++ b/wger/exercises/sync.py
@@ -169,10 +169,11 @@ def sync_languages(
for data in get_all_paginated(url, headers=headers):
short_name = data['short_name']
full_name = data['full_name']
+ full_name_en = data['full_name_en']
language, created = Language.objects.update_or_create(
short_name=short_name,
- defaults={'full_name': full_name},
+ defaults={'full_name': full_name, 'full_name_en': full_name_en},
)
if created:
@@ -300,7 +301,6 @@ def handle_deleted_entries(
style_fn=lambda x: x,
):
if not print_fn:
-
def print_fn(_):
return None
diff --git a/wger/exercises/tests/test_sync.py b/wger/exercises/tests/test_sync.py
index f81707aec..852a5a0f2 100644
--- a/wger/exercises/tests/test_sync.py
+++ b/wger/exercises/tests/test_sync.py
@@ -61,27 +61,32 @@ class MockLanguageResponse:
{
"id": 1,
"short_name": "de",
- "full_name": "Daitsch"
+ "full_name": "Daitsch",
+ "full_name_en": "Kraut"
},
{
"id": 2,
"short_name": "en",
- "full_name": "English"
+ "full_name": "English",
+ "full_name_en": "English"
},
{
"id": 3,
"short_name": "fr",
- "full_name": "Français"
+ "full_name": "Français",
+ "full_name_en": "French"
},
{
"id": 4,
"short_name": "es",
- "full_name": "Español"
+ "full_name": "Español",
+ "full_name_en": "Spanish"
},
{
"id": 19,
"short_name": "eo",
- "full_name": "Esperanto"
+ "full_name": "Esperanto",
+ "full_name_en": "Esperanto"
}
]
}
@@ -565,15 +570,22 @@ class TestSyncMethods(WgerTestCase):
@patch('requests.get', return_value=MockLanguageResponse())
def test_language_sync(self, mock_request):
+ language1 = Language.objects.get(pk=1)
self.assertEqual(Language.objects.count(), 3)
- self.assertEqual(Language.objects.get(pk=1).full_name, 'Deutsch')
+ self.assertEqual(language1.full_name, 'Deutsch')
+ self.assertEqual(language1.full_name_en, 'German')
+ # Act
sync_languages(lambda x: x)
mock_request.assert_called_with(
'https://wger.de/api/v2/language/',
headers=wger_headers(),
)
- self.assertEqual(Language.objects.get(pk=1).full_name, 'Daitsch')
+
+ # Assert
+ language1 = Language.objects.get(pk=1)
+ self.assertEqual(language1.full_name, 'Daitsch')
+ self.assertEqual(language1.full_name_en, 'Kraut')
self.assertEqual(Language.objects.get(pk=5).full_name, 'Esperanto')
self.assertEqual(Language.objects.count(), 5)