rescuers added

core/settings.py

@@ -40,6 +40,7 @@ INSTALLED_APPS = [
     # my apps
     "sites",
     "fbf",
+    "rescuer",
 ]
 
 MIDDLEWARE = [

fbf/migrations/0001_initial.py

@@ -1,6 +1,8 @@
-# Generated by Django 4.2.2 on 2023-06-06 17:33
+# Generated by Django 4.2.2 on 2023-06-08 15:45
 
+from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 import uuid
 
 
@@ -8,7 +10,10 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = []
+    dependencies = [
+        ("rescuer", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
 
     operations = [
         migrations.CreateModel(
@@ -26,4 +31,42 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=256)),
             ],
         ),
+        migrations.CreateModel(
+            name="FallenBird",
+            fields=[
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("date_found", models.DateTimeField()),
+                ("place", models.CharField(max_length=256)),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                ("updated", models.DateTimeField(auto_now=True)),
+                (
+                    "bird",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="fbf.bird"
+                    ),
+                ),
+                (
+                    "rescuer",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="rescuer.rescuer",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
     ]

fbf/migrations/0002_fallenbird.py

@@ -1,48 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-06 18:30
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("fbf", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="FallenBird",
-            fields=[
-                (
-                    "id",
-                    models.UUIDField(
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                    ),
-                ),
-                ("date_found", models.DateTimeField()),
-                ("place", models.CharField(max_length=256)),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                ("updated", models.DateTimeField(auto_now=True)),
-                (
-                    "bird",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="fbf.bird"
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-        ),
-    ]

fbf/models.py

@@ -1,6 +1,7 @@
 from django.db import models
 from django.conf import settings
 from uuid import uuid4
+from rescuer.models import Rescuer
 
 
 class FallenBird(models.Model):
@@ -10,6 +11,7 @@ class FallenBird(models.Model):
     place = models.CharField(max_length=256)
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
+    rescuer = models.ForeignKey(Rescuer, on_delete=models.CASCADE)
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 
     def __str__(self):

rescuer/admin.py

@@ -0,0 +1,17 @@
+from django.contrib import admin
+
+from django.contrib import admin
+from .models import Rescuer
+
+
+@admin.register(Rescuer)
+class CustomerAdmin(admin.ModelAdmin):
+    list_display = [
+        "last_name",
+        "first_name",
+        "street",
+        "street_number",
+        "city",
+        "state",
+        "user",
+    ]

rescuer/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class RescuerConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "rescuer"

rescuer/migrations/0001_initial.py

@@ -0,0 +1,64 @@
+# Generated by Django 4.2.2 on 2023-06-08 15:45
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Rescuer",
+            fields=[
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                (
+                    "gender",
+                    models.CharField(
+                        choices=[
+                            ("Frau", "Frau"),
+                            ("Herr", "Herr"),
+                            ("Divers", "Divers"),
+                        ],
+                        max_length=10,
+                    ),
+                ),
+                ("first_name", models.CharField(max_length=200)),
+                ("last_name", models.CharField(max_length=200)),
+                ("street", models.CharField(max_length=200)),
+                ("street_number", models.CharField(max_length=20)),
+                ("city", models.CharField(max_length=200)),
+                ("zip_code", models.CharField(max_length=200)),
+                (
+                    "state",
+                    models.CharField(
+                        choices=[("Deutschland", "Deutschland")], max_length=200
+                    ),
+                ),
+                ("date_of_birth", models.DateField()),
+                ("email", models.EmailField(max_length=200)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

rescuer/models.py

@@ -0,0 +1,31 @@
+from django.db import models
+
+from datetime import date
+from uuid import uuid4
+
+from django.conf import settings
+from django.db import models
+
+STATE_CHOICES = [
+    ("Deutschland", "Deutschland"),
+]
+
+GENDER_CHOICES = [("Frau", "Frau"), ("Herr", "Herr"), ("Divers", "Divers")]
+
+
+class Rescuer(models.Model):
+    id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
+    gender = models.CharField(max_length=10, choices=GENDER_CHOICES)
+    first_name = models.CharField(max_length=200)
+    last_name = models.CharField(max_length=200)
+    street = models.CharField(max_length=200)
+    street_number = models.CharField(max_length=20)
+    city = models.CharField(max_length=200)
+    zip_code = models.CharField(max_length=200)
+    state = models.CharField(max_length=200, choices=STATE_CHOICES)
+    date_of_birth = models.DateField()
+    email = models.EmailField(max_length=200)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+
+    def __str__(self) -> str:
+        return self.first_name + " " + self.last_name

rescuer/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

rescuer/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.