Merge pull request #117 from jedie/dev

Update/fix "fill_basedata" command

Author: jedie

README.md

@@ -221,6 +221,8 @@ Because this is a project and not really a reuse-able-app ;)
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.18.1](https://github.com/jedie/django-for-runners/compare/v0.18.0...v0.18.1)
+  * 2024-08-02 - Update/fix "fill_basedata" command
 * [v0.18.0](https://github.com/jedie/django-for-runners/compare/v0.17.4...v0.18.0)
   * 2024-08-02 - Update README.md
   * 2024-08-02 - Expand test matrix with 3.12 and remove 3.9 support
@@ -248,12 +250,12 @@ Because this is a project and not really a reuse-able-app ;)
   * 2023-04-04 - Switch to "managed-django-project" template:
 * [v0.17.3](https://github.com/jedie/django-for-runners/compare/v0.17.2...v0.17.3)
   * 2023-04-03 - Bugfix check if Postgres is used and migration not done
-* [v0.17.2](https://github.com/jedie/django-for-runners/compare/v0.17.1...v0.17.2)
-  * 2023-04-02 - release 0.17.2
-  * 2023-04-02 - Bugfix adding all template files
 
 <details><summary>Expand older history entries ...</summary>
 
+* [v0.17.2](https://github.com/jedie/django-for-runners/compare/v0.17.1...v0.17.2)
+  * 2023-04-02 - release 0.17.2
+  * 2023-04-02 - Bugfix adding all template files
 * [v0.17.1](https://github.com/jedie/django-for-runners/compare/v0.17.0...v0.17.1)
   * 2023-04-02 - Bugfix packaging and missing files
   * 2023-04-02 - update link to https://github.com/kbr/autotask

for_runners/__init__.py

@@ -3,5 +3,5 @@
     Store your GPX tracks of your running (or other sports activity) in django.
 """
 
-__version__ = '0.18.0'
+__version__ = '0.18.1'
 __author__ = 'Jens Diemer <[email protected]>'

for_runners/management/commands/fill_basedata.py

@@ -5,46 +5,32 @@
 """
 
 
-from django import forms
 from django.conf import settings
 
 # https://github.com/jedie/django-for-runners
 from for_runners.management.commands.base import BaseCommand
 from for_runners.models import DistanceModel, GpxModel
 
 
-class DistanceForm(forms.ModelForm):
-    class Meta:
-        model = DistanceModel
-        fields = ['distance_km']
-
-
 class Command(BaseCommand):
     help = "Create some base data"
 
     def handle(self, *args, **options):
-
         updated_needed = False
-
         for distance_km in settings.BASE_IDEAL_TRACK_LENGTHS:
-            form = DistanceForm(data={'distance_km': distance_km})
-            if not form.is_valid():
-                raise AssertionError(
-                    f'settings.BASE_IDEAL_TRACK_LENGTHS {distance_km!r} not valid: {form.errors["distance_km"]}'
-                )
-
-            distance_km = form.cleaned_data['distance_km']
             obj, created = DistanceModel.objects.get_or_create(distance_km=distance_km)
             if created:
                 updated_needed = True
                 self.stdout.write(f"Create: {repr(obj)}")
             else:
+                obj.full_clean()
                 self.stdout.write(f"{repr(obj)} already exists, ok.")
 
         if not updated_needed:
-            print("No track updated needed, ok.")
+            self.stdout.write("No track updated needed, ok.")
         else:
+            print("Update existing tracks", end="")
             for track in GpxModel.objects.all():
                 track.save()
                 print(".", end="", flush=True)
-            print()
+            self.stdout.write('done.')

for_runners/tests/test_fill_basedata.py

@@ -1,3 +1,5 @@
+import io
+
 from django.conf import settings
 from django.core.management import call_command
 from django.test import TestCase
@@ -12,6 +14,23 @@ def test_import_no_username_given(self):
         assert len(settings.BASE_IDEAL_TRACK_LENGTHS) > 0
         assert DistanceModel.objects.count() == 0
 
-        call_command(FillBasedataCommand())
+        out = io.StringIO()
+        call_command(FillBasedataCommand(), stdout=out)
+
+        distances = sorted(DistanceModel.objects.values_list('distance_km', flat=True))
+        self.assertEqual(distances, sorted(settings.BASE_IDEAL_TRACK_LENGTHS))
+
+        output = out.getvalue()
+        self.assertIn('Create: <DistanceModel: 21.0975 km>', output)
+        self.assertIn('Create: <DistanceModel: 42.195 km>', output)
+
+        # Run again will not change anything:
+        out = io.StringIO()
+        call_command(FillBasedataCommand(), stdout=out)
+
+        self.assertEqual(sorted(DistanceModel.objects.values_list('distance_km', flat=True)), distances)
 
-        assert DistanceModel.objects.count() == len(settings.BASE_IDEAL_TRACK_LENGTHS)
+        output = out.getvalue()
+        self.assertIn('<DistanceModel: 21.0975 km> already exists, ok.', output)
+        self.assertIn('<DistanceModel: 42.195 km> already exists, ok.', output)
+        self.assertIn('No track updated needed, ok.', output)