way to much for a single commit

5 files changed, 46 insertions, 116 deletions

diff --git a/apps/notes/migrations/0001_initial.py b/apps/notes/migrations/0001_initial.py
index 3f04eb7..f8e2fff 100644
--- a/apps/notes/migrations/0001_initial.py
+++ b/apps/notes/migrations/0001_initial.py
@@ -1,9 +1,11 @@
-# Generated by Django 2.1.2 on 2018-11-11 18:01
+# Generated by Django 2.1.2 on 2018-11-24 13:55
 
 from django.conf import settings
+import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 import django.db.models.deletion
 import taggit.managers
+import uuid
 
 
 class Migration(migrations.Migration):
@@ -11,28 +13,61 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('taggit', '0002_auto_20150616_2121'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Folder',
+            name='Note',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=250)),
-                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('unique_id', models.UUIDField(default=uuid.uuid4, editable=False)),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+                ('date_updated', models.DateTimeField(auto_now=True)),
+                ('title', models.CharField(max_length=250)),
+                ('body_text', models.TextField(null=True)),
+                ('body_html', models.TextField(blank=True, null=True)),
+                ('body_qjson', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
+                ('url', models.CharField(blank=True, max_length=250, null=True)),
+                ('slug', models.SlugField(blank=True)),
+                ('is_public', models.BooleanField(default=False)),
             ],
         ),
         migrations.CreateModel(
-            name='Note',
+            name='Notebook',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=250)),
-                ('body_markdown', models.TextField(null=True)),
-                ('url', models.CharField(max_length=250)),
-                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('tags', taggit.managers.TaggableManager(blank=True, help_text='Tags', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
+                ('unique_id', models.UUIDField(default=uuid.uuid4, editable=False)),
+                ('name', models.CharField(max_length=250)),
+                ('url', models.CharField(blank=True, max_length=250, null=True)),
+                ('slug', models.SlugField(blank=True)),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+                ('date_updated', models.DateTimeField(auto_now=True)),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
+        migrations.AddField(
+            model_name='note',
+            name='notebook',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='notes.Notebook'),
+        ),
+        migrations.AddField(
+            model_name='note',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='note',
+            name='tags',
+            field=taggit.managers.TaggableManager(blank=True, help_text='Tags', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='notebook',
+            unique_together={('owner', 'slug')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='note',
+            unique_together={('owner', 'slug')},
+        ),
     ]
diff --git a/apps/notes/migrations/0002_auto_20181111_1825.py b/apps/notes/migrations/0002_auto_20181111_1825.py
deleted file mode 100644
index a7bc1c7..0000000
--- a/apps/notes/migrations/0002_auto_20181111_1825.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Generated by Django 2.1.2 on 2018-11-11 18:25
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('notes', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='note',
-            name='date_created',
-            field=models.DateTimeField(blank=True, default=datetime.datetime(2018, 11, 11, 18, 25, 29, 645561), editable=False),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='note',
-            name='date_updated',
-            field=models.DateTimeField(blank=True, default=datetime.datetime(2018, 11, 11, 18, 25, 42, 867666), editable=False),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='note',
-            name='slug',
-            field=models.SlugField(blank=True, unique=True),
-        ),
-    ]
diff --git a/apps/notes/migrations/0003_note_folder.py b/apps/notes/migrations/0003_note_folder.py
deleted file mode 100644
index d548429..0000000
--- a/apps/notes/migrations/0003_note_folder.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.1.2 on 2018-11-14 15:41
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('notes', '0002_auto_20181111_1825'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='note',
-            name='folder',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='notes.Folder'),
-        ),
-    ]
diff --git a/apps/notes/migrations/0004_auto_20181117_2039.py b/apps/notes/migrations/0004_auto_20181117_2039.py
deleted file mode 100644
index 6fc6f2d..0000000
--- a/apps/notes/migrations/0004_auto_20181117_2039.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 2.1.2 on 2018-11-18 02:39
-
-import datetime
-from django.db import migrations, models
-from django.utils.timezone import utc
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('notes', '0003_note_folder'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='folder',
-            name='date_created',
-            field=models.DateTimeField(blank=True, default=datetime.datetime(2018, 11, 18, 2, 38, 45, 996162, tzinfo=utc), editable=False),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='folder',
-            name='date_updated',
-            field=models.DateTimeField(blank=True, default=datetime.datetime(2018, 11, 18, 2, 39, 0, 850658, tzinfo=utc), editable=False),
-            preserve_default=False,
-        ),
-    ]
diff --git a/apps/notes/migrations/0005_auto_20181119_1145.py b/apps/notes/migrations/0005_auto_20181119_1145.py
deleted file mode 100644
index 9b6cee7..0000000
--- a/apps/notes/migrations/0005_auto_20181119_1145.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 2.1.2 on 2018-11-19 17:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('notes', '0004_auto_20181117_2039'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='note',
-            old_name='body_markdown',
-            new_name='body',
-        ),
-        migrations.AddField(
-            model_name='note',
-            name='is_public',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='note',
-            name='rendered_body',
-            field=models.TextField(null=True),
-        ),
-    ]