Merge branch 'Testing-branch' into lab02

ysovera_music/homepage/migrations/0003_delete_album_delete_song_artist_bio_and_more.py

+# Generated by Django 4.1.6 on 2023-02-21 10:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0002_alter_album_artist_alter_album_release_date_and_more'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Album',
+        ),
+        migrations.DeleteModel(
+            name='Song',
+        ),
+        migrations.AddField(
+            model_name='artist',
+            name='bio',
+            field=models.TextField(blank=True, max_length=700),
+        ),
+        migrations.AddField(
+            model_name='artist',
+            name='birth_name',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AlterField(
+            model_name='artist',
+            name='monthly_listeners',
+            field=models.IntegerField(default='0000'),
+        ),
+    ]

ysovera_music/homepage/migrations/0004_album.py

+# Generated by Django 4.1.6 on 2023-02-21 10:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0003_delete_album_delete_song_artist_bio_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Album',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('album_name', models.CharField(max_length=200)),
+                ('artist', models.CharField(max_length=200)),
+                ('label', models.CharField(blank=True, max_length=200)),
+                ('description', models.TextField(max_length=200)),
+                ('song_count', models.IntegerField(default='0000')),
+                ('release_date', models.CharField(max_length=200)),
+            ],
+        ),
+    ]

ysovera_music/homepage/migrations/0005_alter_album_description.py

+# Generated by Django 4.1.6 on 2023-02-21 10:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0004_album'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='album',
+            name='description',
+            field=models.TextField(max_length=500),
+        ),
+    ]

ysovera_music/homepage/migrations/0006_song.py

+# Generated by Django 4.1.6 on 2023-02-21 10:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homepage', '0005_alter_album_description'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Song',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('song_title', models.CharField(max_length=200)),
+                ('artist', models.CharField(max_length=200)),
+                ('album', models.CharField(max_length=200)),
+                ('song_length', models.CharField(max_length=200)),
+                ('music_video', models.BooleanField()),
+                ('lyrics', models.TextField(blank=True, max_length=10000)),
+            ],
+        ),
+    ]

ysovera_music/homepage/models.py

@@ -3,36 +3,22 @@ from django.urls import reverse
 
 class Artist(models.Model):
 	artist_name = models.CharField(max_length=200,unique=True)
-	birth_name = models.CharField(max_length=200)
-	bio = models.CharField(max_length=700)
-	monthly_listeners = models.IntegerField()
-"""
-	def __str__(self):
-		return '{} : {}'.format(self.artist_name, self.monthly_listeners)
-"""
+	birth_name = models.CharField(max_length=200,blank=True)
+	bio = models.TextField(max_length=700,blank=True)
+	monthly_listeners = models.IntegerField(default='0000')
+
 class Album(models.Model):
 	album_name = models.CharField(max_length=200)
 	artist = models.CharField(max_length=200)
-	label = models.CharField(max_length=700)
-	description = models.CharField(max_length=200)
-	song_count = models.IntegerField()
+	label = models.CharField(max_length=200,blank=True)
+	description = models.TextField(max_length=500)
+	song_count = models.IntegerField(default='0000')
 	release_date = models.CharField(max_length=200)
-"""
-	def __str__(self):
-		return '{} : {} : {} : {}'.format(self.album_name, self.artist,self.description,self.release_date)
-		return '{}| {} listeners'.format(self.artist_name, self.monthly_listeners)
 
-	def get_absolute_url(self):
-		return reverse('artist_detail', args=[str(self.artist_name)])
-"""
 class Song(models.Model):
 	song_title = models.CharField(max_length=200)
 	artist = models.CharField(max_length=200)
 	album = models.CharField(max_length=200)
 	song_length = models.CharField(max_length=200)
 	music_video = models.BooleanField()
-	lyrics = models.CharField(max_length=10000)
-"""
-	def __str__(self):
-		return '{} : {} : {} : {}'.format(self.song_title, self.artist,self.album,self.song_length)
-"""
\ No newline at end of file
+	lyrics = models.TextField(max_length=10000,blank=True)