From a5a9ca0248144d5d312f9a3298a0b323f7b4cd6d Mon Sep 17 00:00:00 2001
From: shermscissors <christian.gales09@gmail.com>
Date: Mon, 14 Feb 2022 12:48:26 -0500
Subject: [PATCH] Refining Peep

---
 django_peep/settings.py                       |  4 ++++
 peep/apps.py                                  |  1 -
 ...e_username_peep_owner_remove_peep_image.py | 22 +++++++++++++++++++
 peep/migrations/0003_peep_image.py            | 18 +++++++++++++++
 peep/models.py                                |  6 +++--
 peep/serializers.py                           | 13 +++++------
 6 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 peep/migrations/0002_rename_username_peep_owner_remove_peep_image.py
 create mode 100644 peep/migrations/0003_peep_image.py

diff --git a/django_peep/settings.py b/django_peep/settings.py
index 16a5dd2..a132951 100644
--- a/django_peep/settings.py
+++ b/django_peep/settings.py
@@ -123,6 +123,7 @@
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
 STATIC_URL = 'static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
@@ -158,3 +159,6 @@
         'user': 'users.serializers.UserCreateSerializer'
     }
 }
+
+MEDIA_ROOT = os.path.join(BASE_DIR, "media/")
+MEDIA_URL = '/media/'
diff --git a/peep/apps.py b/peep/apps.py
index 9d49b29..e18802f 100644
--- a/peep/apps.py
+++ b/peep/apps.py
@@ -1,6 +1,5 @@
 from django.apps import AppConfig
 
-
 class PeepConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'peep'
diff --git a/peep/migrations/0002_rename_username_peep_owner_remove_peep_image.py b/peep/migrations/0002_rename_username_peep_owner_remove_peep_image.py
new file mode 100644
index 0000000..0c41716
--- /dev/null
+++ b/peep/migrations/0002_rename_username_peep_owner_remove_peep_image.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.0.2 on 2022-02-14 17:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('peep', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='peep',
+            old_name='username',
+            new_name='owner',
+        ),
+        migrations.RemoveField(
+            model_name='peep',
+            name='image',
+        ),
+    ]
diff --git a/peep/migrations/0003_peep_image.py b/peep/migrations/0003_peep_image.py
new file mode 100644
index 0000000..861a6a5
--- /dev/null
+++ b/peep/migrations/0003_peep_image.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.2 on 2022-02-14 17:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('peep', '0002_rename_username_peep_owner_remove_peep_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='peep',
+            name='image',
+            field=models.ImageField(default='images/default.jpg', upload_to='images/'),
+        ),
+    ]
diff --git a/peep/models.py b/peep/models.py
index 0f2ef40..0cbc383 100644
--- a/peep/models.py
+++ b/peep/models.py
@@ -2,11 +2,11 @@
 
 # Create your models here.
 class Peep(models.Model):
-    username = models.ForeignKey(
+    owner = models.ForeignKey(
         'users.User', related_name='peeps', on_delete=models.CASCADE)
     post = models.CharField(max_length=140)
     image = models.ImageField(upload_to = 'images/', default= 'images/default.jpg')
-    date = models.DateTimeField()
+    date = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.post
@@ -18,6 +18,8 @@ class Chirp(models.Model):
         Peep, on_delete=models.CASCADE, related_name='chirp')
     user_id = models.ForeignKey(
         'users.User', related_name='chirp', on_delete=models.CASCADE)
+    date = models.DateTimeField(auto_now_add=True)
+    
 
     def __str__(self):
         return self.text
diff --git a/peep/serializers.py b/peep/serializers.py
index 14f2741..bb61392 100644
--- a/peep/serializers.py
+++ b/peep/serializers.py
@@ -3,7 +3,7 @@
 
 class ChirpSerializer(serializers.HyperlinkedModelSerializer):
 
-    restaurant_id = serializers.PrimaryKeyRelatedField(
+    post_id = serializers.PrimaryKeyRelatedField(
     queryset=Peep.objects.all(),
     source='peep'
     )
@@ -14,10 +14,9 @@ class ChirpSerializer(serializers.HyperlinkedModelSerializer):
         view_name='peep_detail', read_only=True)
 
     class Meta:
-        model = Peep
+        model = Chirp
         fields = ('text', 'post_id','user_id',
-                  'peep')
-
+                  'peeps','date')
 
 class PeepSerializer(serializers.HyperlinkedModelSerializer):
     
@@ -25,8 +24,8 @@ class PeepSerializer(serializers.HyperlinkedModelSerializer):
     chirp = ChirpSerializer(many=True, read_only=True)
 
         # how to populate the owner field on restaurant data
-    username = serializers.ReadOnlyField(source='owner.username')
+    owner = serializers.ReadOnlyField(source='owner.username')
 
     class Meta:
-        model=Peep
-        fields=('id', 'username', 'post', 'chirp', 'image', 'date')
\ No newline at end of file
+        model = Peep
+        fields=('id', 'post', 'chirp', 'image', 'date','owner')