init project tests

2025-06-07 19:24:41 +02:00 · 2025-06-07 19:24:41 +02:00 · 7c9318c778
commit 7c9318c778
parent d0ff728224
44 changed files with 4431 additions and 49 deletions
--- a/app/bird/forms.py
+++ b/app/bird/forms.py
@ -3,7 +3,7 @@ from datetime import date
 from django import forms
 from django.utils.translation import gettext_lazy as _

-from .models import FallenBird
+from .models import FallenBird, Bird


 class DateInput(forms.DateInput):
--- a/app/bird/migrations/0002_add_name_fields.py
+++ b/app/bird/migrations/0002_add_name_fields.py
@ -0,0 +1,23 @@
+# Generated by Django 5.2.2 on 2025-06-07 13:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bird', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='birdstatus',
+            name='name',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Name'),
+        ),
+        migrations.AddField(
+            model_name='circumstance',
+            name='name',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Name'),
+        ),
+    ]
--- a/app/bird/migrations/0003_expand_bird_model.py
+++ b/app/bird/migrations/0003_expand_bird_model.py
@ -0,0 +1,108 @@
+# Generated by Django 5.2.2 on 2025-06-07 13:33
+
+import ckeditor.fields
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aviary', '0002_aviary_capacity_aviary_contact_email_and_more'),
+        ('bird', '0002_add_name_fields'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bird',
+            name='age_group',
+            field=models.CharField(blank=True, choices=[('unbekannt', 'unbekannt'), ('Ei', 'Ei'), ('Nestling', 'Nestling'), ('Ästling', 'Ästling'), ('Juvenil', 'Juvenil'), ('Adult', 'Adult')], max_length=15, null=True, verbose_name='Alter'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='aviary',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='aviary.aviary', verbose_name='Voliere'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='circumstance',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='bird.circumstance', verbose_name='Fundumstände'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Erstellt am'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='created_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Erstellt von'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='finder_email',
+            field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='Finder Email'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='finder_name',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Finder Name'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='finder_phone',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Finder Telefon'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='found_date',
+            field=models.DateField(blank=True, null=True, verbose_name='Datum des Fundes'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='found_location',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Fundort'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='gender',
+            field=models.CharField(blank=True, choices=[('Weiblich', 'Weiblich'), ('Männlich', 'Männlich'), ('Unbekannt', 'Unbekannt')], max_length=15, null=True, verbose_name='Geschlecht'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='notes',
+            field=models.TextField(blank=True, null=True, verbose_name='Notizen'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='species',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Art'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='status',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='bird.birdstatus', verbose_name='Status'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='updated',
+            field=models.DateTimeField(auto_now=True, verbose_name='Geändert am'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='weight',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=8, null=True, verbose_name='Gewicht'),
+        ),
+        migrations.AddField(
+            model_name='bird',
+            name='wing_span',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=8, null=True, verbose_name='Flügelspannweite'),
+        ),
+        migrations.AlterField(
+            model_name='bird',
+            name='description',
+            field=ckeditor.fields.RichTextField(blank=True, null=True, verbose_name='Erläuterungen'),
+        ),
+    ]
--- a/app/bird/migrations/0004_expand_costs_model.py
+++ b/app/bird/migrations/0004_expand_costs_model.py
@ -0,0 +1,36 @@
+# Generated by Django 5.2.2 on 2025-06-07 16:07
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bird', '0003_expand_bird_model'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='fallenbird',
+            name='cause_of_death',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Todesursache'),
+        ),
+        migrations.AddField(
+            model_name='fallenbird',
+            name='created_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fallen_birds_created', to=settings.AUTH_USER_MODEL, verbose_name='Erstellt von'),
+        ),
+        migrations.AddField(
+            model_name='fallenbird',
+            name='death_date',
+            field=models.DateField(blank=True, null=True, verbose_name='Todesdatum'),
+        ),
+        migrations.AddField(
+            model_name='fallenbird',
+            name='notes',
+            field=models.TextField(blank=True, null=True, verbose_name='Notizen'),
+        ),
+    ]
--- a/app/bird/migrations/0005_auto_20250607_1837.py
+++ b/app/bird/migrations/0005_auto_20250607_1837.py
@ -0,0 +1,13 @@
+# Generated by Django 5.2.2 on 2025-06-07 16:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bird', '0004_expand_costs_model'),
+    ]
+
+    operations = [
+    ]
--- a/app/bird/migrations/0006_alter_fallenbird_options_alter_fallenbird_age_and_more.py
+++ b/app/bird/migrations/0006_alter_fallenbird_options_alter_fallenbird_age_and_more.py
@ -0,0 +1,65 @@
+# Generated by Django 5.2.2 on 2025-06-07 16:39
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bird', '0005_auto_20250607_1837'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='fallenbird',
+            options={'verbose_name': 'Gefallener Vogel', 'verbose_name_plural': 'Gefallene Vögel'},
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='age',
+            field=models.CharField(blank=True, choices=[('unbekannt', 'unbekannt'), ('Ei', 'Ei'), ('Nestling', 'Nestling'), ('Ästling', 'Ästling'), ('Juvenil', 'Juvenil'), ('Adult', 'Adult')], max_length=15, null=True, verbose_name='Alter'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='bird_identifier',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Patienten Alias'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='date_found',
+            field=models.DateField(blank=True, null=True, verbose_name='Datum des Fundes'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='diagnostic_finding',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Diagnose bei Fund'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='find_circumstances',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='bird.circumstance', verbose_name='Fundumstände'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='place',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Ort des Fundes'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='sex',
+            field=models.CharField(blank=True, choices=[('Weiblich', 'Weiblich'), ('Männlich', 'Männlich'), ('Unbekannt', 'Unbekannt')], max_length=15, null=True, verbose_name='Geschlecht'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='status',
+            field=models.ForeignKey(blank=True, default=1, null=True, on_delete=django.db.models.deletion.CASCADE, to='bird.birdstatus'),
+        ),
+        migrations.AlterField(
+            model_name='fallenbird',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fallen_birds_handled', to=settings.AUTH_USER_MODEL, verbose_name='Benutzer'),
+        ),
+    ]
--- a/app/bird/models.py
+++ b/app/bird/models.py
@ -33,19 +33,33 @@ def costs_default():
 class FallenBird(models.Model):
    id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
    bird_identifier = models.CharField(
-        max_length=256, verbose_name=_("Patienten Alias")
+        max_length=256, blank=True, null=True, verbose_name=_("Patienten Alias")
    )
    bird = models.ForeignKey(
        "Bird", on_delete=models.CASCADE, verbose_name=_("Vogel")
    )
    age = models.CharField(
-        max_length=15, choices=CHOICE_AGE, verbose_name=_("Alter")
+        max_length=15, choices=CHOICE_AGE, blank=True, null=True, verbose_name=_("Alter")
    )
    sex = models.CharField(
-        max_length=15, choices=CHOICE_SEX, verbose_name=_("Geschlecht")
+        max_length=15, choices=CHOICE_SEX, blank=True, null=True, verbose_name=_("Geschlecht")
+    )
+    date_found = models.DateField(blank=True, null=True, verbose_name=_("Datum des Fundes"))
+    place = models.CharField(max_length=256, blank=True, null=True, verbose_name=_("Ort des Fundes"))
+    # Fields expected by tests for deceased birds
+    death_date = models.DateField(blank=True, null=True, verbose_name=_("Todesdatum"))
+    cause_of_death = models.CharField(
+        max_length=256, blank=True, null=True, verbose_name=_("Todesursache")
+    )
+    notes = models.TextField(blank=True, null=True, verbose_name=_("Notizen"))
+    created_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
+        verbose_name=_("Erstellt von"),
+        related_name="fallen_birds_created"
    )
-    date_found = models.DateField(verbose_name=_("Datum des Fundes"))
-    place = models.CharField(max_length=256, verbose_name=_("Ort des Fundes"))
    created = models.DateTimeField(
        auto_now_add=True, verbose_name=_("angelegt am")
    )
@ -55,18 +69,28 @@ class FallenBird(models.Model):
    find_circumstances = models.ForeignKey(
        "Circumstance",
        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
        verbose_name=_("Fundumstände"),
    )
    diagnostic_finding = models.CharField(
-        max_length=256, verbose_name=_("Diagnose bei Fund")
+        max_length=256, blank=True, null=True, verbose_name=_("Diagnose bei Fund")
    )
    user = models.ForeignKey(
        settings.AUTH_USER_MODEL,
        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
        verbose_name=_("Benutzer"),
+        related_name="fallen_birds_handled"
    )
    status = models.ForeignKey(
-        "BirdStatus", on_delete=models.CASCADE, default=1
+        "BirdStatus", 
+        on_delete=models.CASCADE, 
+        blank=True, 
+        null=True, 
+        default=1,
+        verbose_name=_("Status")
    )
    aviary = models.ForeignKey(
        Aviary,
@ -89,11 +113,11 @@ class FallenBird(models.Model):
    )

    class Meta:
-        verbose_name = _("Patient")
-        verbose_name_plural = _("Patienten")
+        verbose_name = _("Gefallener Vogel")
+        verbose_name_plural = _("Gefallene Vögel")

    def __str__(self):
-        return self.bird_identifier
+        return f"Gefallener Vogel: {self.bird.name}"


 class Bird(models.Model):
@ -101,7 +125,74 @@ class Bird(models.Model):
    name = models.CharField(
        max_length=256, unique=True, verbose_name=_("Bezeichnung")
    )
-    description = RichTextField(verbose_name=_("Erläuterungen"))
+    description = RichTextField(verbose_name=_("Erläuterungen"), blank=True, null=True)
+    species = models.CharField(
+        max_length=256, blank=True, null=True, verbose_name=_("Art")
+    )
+    age_group = models.CharField(
+        max_length=15, choices=CHOICE_AGE, blank=True, null=True, verbose_name=_("Alter")
+    )
+    gender = models.CharField(
+        max_length=15, choices=CHOICE_SEX, blank=True, null=True, verbose_name=_("Geschlecht")
+    )
+    weight = models.DecimalField(
+        max_digits=8, decimal_places=2, blank=True, null=True, verbose_name=_("Gewicht")
+    )
+    wing_span = models.DecimalField(
+        max_digits=8, decimal_places=2, blank=True, null=True, verbose_name=_("Flügelspannweite")
+    )
+    found_date = models.DateField(
+        blank=True, null=True, verbose_name=_("Datum des Fundes")
+    )
+    found_location = models.CharField(
+        max_length=256, blank=True, null=True, verbose_name=_("Fundort")
+    )
+    finder_name = models.CharField(
+        max_length=256, blank=True, null=True, verbose_name=_("Finder Name")
+    )
+    finder_phone = models.CharField(
+        max_length=50, blank=True, null=True, verbose_name=_("Finder Telefon")
+    )
+    finder_email = models.EmailField(
+        blank=True, null=True, verbose_name=_("Finder Email")
+    )
+    aviary = models.ForeignKey(
+        Aviary,
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+        verbose_name=_("Voliere"),
+    )
+    status = models.ForeignKey(
+        "BirdStatus", 
+        on_delete=models.CASCADE, 
+        blank=True, 
+        null=True,
+        verbose_name=_("Status")
+    )
+    circumstance = models.ForeignKey(
+        "Circumstance",
+        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
+        verbose_name=_("Fundumstände"),
+    )
+    notes = models.TextField(
+        blank=True, null=True, verbose_name=_("Notizen")
+    )
+    created_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
+        verbose_name=_("Erstellt von"),
+    )
+    created = models.DateTimeField(
+        auto_now_add=True, blank=True, null=True, verbose_name=_("Erstellt am")
+    )
+    updated = models.DateTimeField(
+        auto_now=True, verbose_name=_("Geändert am")
+    )

    class Meta:
        verbose_name = _("Vogel")
@ -114,6 +205,9 @@ class Bird(models.Model):

 class BirdStatus(models.Model):
    id = models.BigAutoField(primary_key=True)
+    name = models.CharField(
+        max_length=256, null=True, blank=True, verbose_name=_("Name")
+    )
    description = models.CharField(
        max_length=256, unique=True, verbose_name=_("Bezeichnung")
    )
@ -123,11 +217,14 @@ class BirdStatus(models.Model):
        verbose_name_plural = _("Patientenstatus")

    def __str__(self):
-        return self.description
+        return self.name if self.name else self.description


 class Circumstance(models.Model):
    id = models.BigAutoField(primary_key=True)
+    name = models.CharField(
+        max_length=256, null=True, blank=True, verbose_name=_("Name")
+    )
    description = models.CharField(
        max_length=256, verbose_name=_("Bezeichnung")
    )
@ -137,4 +234,4 @@ class Circumstance(models.Model):
        verbose_name_plural = _("Fundumstände")

    def __str__(self) -> str:
-        return self.description
+        return self.name if self.name else self.description
--- a/app/bird/tests.py
+++ b/app/bird/tests.py
@ -1,15 +1,25 @@
 from django.test import TestCase
+from .models import Bird
+from aviary.models import Aviary


 class BirdTestCase(TestCase):
    def setUp(self):
-        Bird.objects.create(
+        self.aviary = Aviary.objects.create(
+            description="Voliere 1",
+            condition="Offen",
+            last_ward_round="2021-01-01",
+            comment="Test",
+        )
+        self.bird = Bird.objects.create(
            name="Vogel 1",
            species="Art 1",
-            aviary=Aviary.objects.create(
-                description="Voliere 1",
-                condition="Offen",
-                last_ward_round="2021-01-01",
-                comment="Test",
-            ),
-            date_of_birth="2020-01-01
+            aviary=self.aviary,
+            found_date="2020-01-01",
+        )
+
+    def test_bird_creation(self):
+        """Test that a bird can be created successfully."""
+        self.assertEqual(self.bird.name, "Vogel 1")
+        self.assertEqual(self.bird.species, "Art 1")
+        self.assertEqual(self.bird.aviary, self.aviary)