Added string format

Added formatting for the database

ysovera_music/homepage/models.py

@@ -6,6 +6,7 @@ class Artist(models.Model):
 	monthly_listeners = models.IntegerField()
 
 	def __str__(self):
+<<<<<<< Updated upstream
 		return '{} : {}'.format(self.artist_name, self.monthly_listeners)
 
 class Album(models.Model):
@@ -16,6 +17,21 @@ class Album(models.Model):
 
 	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 Album(models.Model):
+	album_name = models.CharField(max_length=200)
+	artist = models.ForeignKey(
+		Artist,
+		on_delete=models.CASCADE
+	)
+	description = models.CharField(max_length=200)
+	release_date = models.CharField(max_length=200)
+>>>>>>> Stashed changes
 
 class Song(models.Model):
 	song_title = models.CharField(max_length=200)