adding full_name

boatmovers/migrations/0017_athlete_full_name.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-07-08 12:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boatmovers', '0016_race_gender'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='athlete',
+            name='full_name',
+            field=models.CharField(default=' ', max_length=200),
+            preserve_default=False,
+        ),
+    ]

boatmovers/models.py

@@ -19,6 +19,7 @@ def current_day(ttz=None):
 class Athlete(models.Model):
     first_name = models.CharField(max_length=200)
     last_name = models.CharField(max_length=200)
+    full_name = models.CharField(max_length=200)
     club = models.CharField(max_length=200)
     trueskill_mu = models.FloatField(default=25.)
     trueskill_sigma = models.FloatField(default=25./3.)
@@ -35,7 +36,8 @@ class Athlete(models.Model):
 
     def save(self, *args, **kwargs):
         name = '{f} {l}'.format(f = self.first_name, l = self.last_name)
-        athletes = Athlete.objects.filter(gender=self.gender)
+        self.full_name = name
+        athletes = Athlete.objects.filter(gender=self.gender, full_name=self.full_name)
         if self.pk is not None:
             athletes = athletes.exclude(pk=self.pk)
         for a in athletes:

boatmovers/scrapers.py

@@ -37,8 +37,10 @@ def csv_reader(filename,raceid,clubcol='Ploeg',bankjes=['Slag'],uitslag='Pos',ge
                     first_name = 'Unknown'
                     last_name = 'Athlete'
                     dummy=True
-            athletes = Athlete.objects.filter(first_name = first_name,
-                                              last_name = last_name,
+            athletes = Athlete.objects.filter(full_name='{f} {l}'.format(
+                f=full_name,
+                l=last_name,
+            ),
                                               gender=gender)
             if len(athletes) >= 1:
                 athlete = athletes[0]
@@ -117,8 +119,7 @@ def time_team_scraper(url,raceid,gender='m',startorder=1):
                             first_name = 'Unknown'
                             last_name = 'Athlete'
                             dummy=True
-                    athletes = Athlete.objects.filter(first_name = first_name,
-                                                      last_name = last_name)
+                    athletes = Athlete.objects.filter(full_name=names)
                     if len(athletes) >= 1:
                         athlete = athletes[0]
                     else: