Merge branch 'database' of https://github.com/chrisshyi/spotify-lib-vis into database

spotifyvis/migrations/0001_initial.py

@@ -1,5 +1,3 @@
-# Generated by Django 2.0.5 on 2018-06-06 07:26
-
 from django.db import migrations, models
 import django.db.models.deletion
 

spotifyvis/migrations/0002_auto_20180605_2347.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.5 on 2018-06-05 02:09
+# Generated by Django 2.0.5 on 2018-06-05 23:47
 
 from django.db import migrations
 
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RenameField(
-            model_name='user',
+            model_name='track',
-            old_name='username',
+            old_name='artist',
-            new_name='user_name',
+            new_name='artists',
         ),
     ]

spotifyvis/migrations/0003_auto_20180605_0211.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.5 on 2018-06-05 02:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('spotifyvis', '0002_auto_20180605_0209'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='user_name',
-            field=models.CharField(blank=True, max_length=30),
-        ),
-    ]

spotifyvis/models.py

@@ -42,7 +42,6 @@ class Track(models.Model):
     class Meta:
         verbose_name = "Track"
         verbose_name_plural = "Tracks"
-        #  unique_together = ('track_id', 'artist',)
 
     track_id = models.CharField(primary_key=True, max_length=id_length)
     #  artist = models.ForeignKey(Artist, on_delete=models.CASCADE)

spotifyvis/views.py

@@ -20,6 +20,7 @@ TRACKS_TO_QUERY = 5
 
 #  generate_random_string {{{ # 
 
+
 def generate_random_string(length):
     """Generates a random string of a certain length