Merge pull request #5 from codersforcauses/annabelle-django-workshop

little-jan · web-flow · commit b28e41e11b1e · 2025-12-06T14:21:28.000+08:00
Adding Pet Features
diff --git a/server/pet/__init__.py b/server/pet/__init__.py
diff --git a/server/pet/admin.py b/server/pet/admin.py
@@ -0,0 +1,7 @@
+from django.contrib import admin
+from .models import Pet, Food, Medication
+
+# Register your models here.
+admin.site.register(Pet)
+admin.site.register(Food)
+admin.site.register(Medication)
diff --git a/server/pet/apps.py b/server/pet/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class PetConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'pet'
diff --git a/server/pet/migrations/0001_initial.py b/server/pet/migrations/0001_initial.py
@@ -0,0 +1,54 @@
+# Generated by Django 5.2.8 on 2025-12-05 11:41
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Pet',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('petName', models.CharField(max_length=50)),
+                ('animalType', models.CharField(max_length=50)),
+                ('birthDate', models.DateField()),
+                ('breed', models.CharField(max_length=50)),
+                ('weight', models.FloatField()),
+                ('exerciseReq', models.FloatField()),
+                ('belongsToHouse', models.CharField(max_length=50)),
+                ('belongsToBusiness', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Medication',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('medName', models.CharField(max_length=50)),
+                ('descr', models.TextField()),
+                ('dosage', models.FloatField()),
+                ('dosageUnit', models.CharField(max_length=5)),
+                ('feedTime', models.TimeField()),
+                ('nextDose', models.DateTimeField()),
+                ('forPet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='med_for_pet', to='pet.pet')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Food',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('foodName', models.CharField(max_length=50)),
+                ('descr', models.TextField()),
+                ('amount', models.FloatField()),
+                ('amountUnit', models.CharField(max_length=5)),
+                ('feedTime', models.TimeField()),
+                ('forPet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='food_for_pet', to='pet.pet')),
+            ],
+        ),
+    ]
diff --git a/server/pet/migrations/0002_remove_medication_feedtime_alter_food_descr_and_more.py b/server/pet/migrations/0002_remove_medication_feedtime_alter_food_descr_and_more.py
@@ -0,0 +1,67 @@
+# Generated by Django 5.2.8 on 2025-12-05 11:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pet', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='medication',
+            name='feedTime',
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='descr',
+            field=models.TextField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='food',
+            name='feedTime',
+            field=models.TimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='medication',
+            name='descr',
+            field=models.TextField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='medication',
+            name='nextDose',
+            field=models.DateTimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='pet',
+            name='belongsToBusiness',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='pet',
+            name='belongsToHouse',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='pet',
+            name='birthDate',
+            field=models.DateField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='pet',
+            name='breed',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='pet',
+            name='exerciseReq',
+            field=models.FloatField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='pet',
+            name='weight',
+            field=models.FloatField(null=True),
+        ),
+    ]
diff --git a/server/pet/migrations/__init__.py b/server/pet/migrations/__init__.py
diff --git a/server/pet/models.py b/server/pet/models.py
@@ -0,0 +1,34 @@
+from django.db import models
+
+# Create your models here.
+class Pet(models.Model):
+    petName = models.CharField(max_length=50)
+    animalType = models.CharField(max_length=50)
+    birthDate = models.DateField(null=True)
+    breed = models.CharField(max_length=50, null=True)
+    weight = models.FloatField(null=True)
+    exerciseReq = models.FloatField(null=True)
+    belongsToHouse = models.CharField(max_length=50, null=True)
+    belongsToBusiness = models.CharField(max_length=50, null=True)
+    def __str__(self):
+        return self.petName
+
+class Food(models.Model):
+    forPet = models.ForeignKey(Pet, on_delete=models.CASCADE, related_name="food_for_pet")
+    foodName = models.CharField(max_length=50)
+    descr = models.TextField(null=True)
+    amount = models.FloatField()
+    amountUnit = models.CharField(max_length=5)
+    feedTime = models.TimeField(null=True)
+    def __str__(self):
+        return self.foodName
+
+class Medication(models.Model):
+    forPet = models.ForeignKey(Pet, on_delete=models.CASCADE, related_name="med_for_pet")
+    medName = models.CharField(max_length=50)
+    descr = models.TextField(null=True)
+    dosage = models.FloatField()
+    dosageUnit = models.CharField(max_length=5)
+    nextDose = models.DateTimeField(null=True)
+    def __str__(self):
+        return self.medName
diff --git a/server/pet/tests.py b/server/pet/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/server/pet/urls.py b/server/pet/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path("", views.index, name="index"),
+]
diff --git a/server/pet/views.py b/server/pet/views.py
@@ -0,0 +1,6 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+
+# Create your views here.
+def index(request):
+    return HttpResponse("Hello, world. This is the pet information page of Fetch!, a pet care app.")
diff --git a/server/server/settings.py b/server/server/settings.py
@@ -49,6 +49,8 @@
     "corsheaders",
     "healthcheck",
     "user_profile",
+    "pet.apps.PetConfig",
+    "tasks.apps.TasksConfig",
     "landing_page",
 ]
 
diff --git a/server/server/urls.py b/server/server/urls.py
@@ -26,5 +26,7 @@
     path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
     path("api/healthcheck/", include("healthcheck.urls")),
     path("api/user/", include("user_profile.urls")),
+    path("pet/", include("pet.urls")),
+    path("tasks/", include("tasks.urls")),
     path("home/", include("landing_page.urls")),
 ]
diff --git a/server/tasks/__init__.py b/server/tasks/__init__.py
diff --git a/server/tasks/admin.py b/server/tasks/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+from .models import Task
+
+# Register your models here.
+admin.site.register(Task)
diff --git a/server/tasks/apps.py b/server/tasks/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class TasksConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'tasks'
diff --git a/server/tasks/migrations/0001_initial.py b/server/tasks/migrations/0001_initial.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.2.8 on 2025-12-06 01:37
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('pet', '0002_remove_medication_feedtime_alter_food_descr_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Task',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('descr', models.TextField(null=True)),
+                ('due', models.DateTimeField()),
+                ('isComplete', models.BooleanField(default=False)),
+                ('forPet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='task_for_pet', to='pet.pet')),
+            ],
+        ),
+    ]
diff --git a/server/tasks/migrations/__init__.py b/server/tasks/migrations/__init__.py
diff --git a/server/tasks/models.py b/server/tasks/models.py
@@ -0,0 +1,10 @@
+from django.db import models
+from pet.models import Pet
+
+# Create your models here.
+class Task(models.Model):
+    forPet = models.ForeignKey(Pet, on_delete=models.CASCADE, related_name="task_for_pet")
+    title = models.CharField(max_length=200)
+    descr = models.TextField(null=True)
+    due = models.DateTimeField()
+    isComplete = models.BooleanField(default=False)
diff --git a/server/tasks/tests.py b/server/tasks/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/server/tasks/urls.py b/server/tasks/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path("", views.index, name="index"),
+]
diff --git a/server/tasks/views.py b/server/tasks/views.py
@@ -0,0 +1,6 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+
+# Create your views here.
+def index(request):
+    return HttpResponse("Hello, world. This is the tasks page of Fetch!, a pet care app.")
diff --git a/server/user_profile/migrations/0002_alter_profile_bio.py b/server/user_profile/migrations/0002_alter_profile_bio.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.8 on 2025-11-29 06:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_profile', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='bio',
+            field=models.TextField(null=True),
+        ),
+    ]
diff --git a/server/user_profile/migrations/0003_merge_20251206_0616.py b/server/user_profile/migrations/0003_merge_20251206_0616.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.2.8 on 2025-12-06 06:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_profile', '0002_alter_profile_age_alter_profile_bio'),
+        ('user_profile', '0002_alter_profile_bio'),
+    ]
+
+    operations = [
+    ]
diff --git a/server/user_profile/models.py b/server/user_profile/models.py
@@ -17,4 +17,3 @@ def __str__(self):
 @receiver(post_save, sender=User)
 def create_or_update_user_profile(sender, instance, created, **kwargs):
     Profile.objects.get_or_create(user=instance)
-

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from django.test import TestCase`
	`2`	`+`
	`3`	`+# Create your tests here.`