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

spotifyvis/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.5 on 2018-06-03 23:01
+# Generated by Django 2.0.5 on 2018-06-06 07:26
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -20,34 +20,32 @@ class Migration(migrations.Migration):
                 ('genre', models.CharField(max_length=20)),
             ],
             options={
-                'verbose_name': 'Artist',
                 'verbose_name_plural': 'Artists',
+                'verbose_name': 'Artist',
             },
         ),
         migrations.CreateModel(
             name='Track',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('track_id', models.CharField(max_length=30)),
+                ('track_id', models.CharField(max_length=30, primary_key=True, serialize=False)),
                 ('year', models.PositiveSmallIntegerField()),
-                ('popularity', models.DecimalField(decimal_places=2, max_digits=2)),
+                ('popularity', models.PositiveSmallIntegerField()),
                 ('runtime', models.PositiveSmallIntegerField()),
                 ('name', models.CharField(max_length=75)),
             ],
             options={
-                'verbose_name': 'Track',
                 'verbose_name_plural': 'Tracks',
+                'verbose_name': 'Track',
             },
         ),
         migrations.CreateModel(
             name='User',
             fields=[
                 ('user_id', models.CharField(max_length=30, primary_key=True, serialize=False)),
-                ('username', models.CharField(max_length=30)),
             ],
             options={
-                'verbose_name': 'User',
                 'verbose_name_plural': 'Users',
+                'verbose_name': 'User',
             },
         ),
         migrations.CreateModel(
@@ -64,22 +62,18 @@ class Migration(migrations.Migration):
                 ('tempo', models.DecimalField(decimal_places=2, max_digits=2)),
             ],
             options={
-                'verbose_name': 'AudioFeatures',
                 'verbose_name_plural': 'AudioFeatures',
+                'verbose_name': 'AudioFeatures',
             },
         ),
         migrations.AddField(
             model_name='track',
-            name='artist',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='spotifyvis.Artist'),
+            name='artists',
+            field=models.ManyToManyField(blank=True, to='spotifyvis.Artist'),
         ),
         migrations.AddField(
             model_name='track',
             name='users',
-            field=models.ManyToManyField(to='spotifyvis.User'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='track',
-            unique_together={('track_id', 'artist')},
+            field=models.ManyToManyField(blank=True, to='spotifyvis.User'),
         ),
     ]

spotifyvis/migrations/0002_auto_20180606_0523.py

@@ -0,0 +1,53 @@
+# Generated by Django 2.0.5 on 2018-06-06 09:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spotifyvis', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='acousticness',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='danceability',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='energy',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='instrumentalness',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='loudness',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='speechiness',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='tempo',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='valence',
+            field=models.DecimalField(decimal_places=3, max_digits=3),
+        ),
+    ]

spotifyvis/migrations/0003_auto_20180606_0525.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.0.5 on 2018-06-06 09:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spotifyvis', '0002_auto_20180606_0523'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='loudness',
+            field=models.DecimalField(decimal_places=3, max_digits=6),
+        ),
+        migrations.AlterField(
+            model_name='audiofeatures',
+            name='tempo',
+            field=models.DecimalField(decimal_places=3, max_digits=6),
+        ),
+    ]