From 216f82a7ac1cae38c90b5a3aa699265217005114 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Tue, 22 Sep 2020 10:55:09 -0700
Subject: [PATCH] Refactored model field names and added timestamp column

---
 .../poc/migrations/0008_auto_20200922_1027.py | 39 +++++++++++++++++++
 .../poc/migrations/0009_auto_20200922_1033.py | 18 +++++++++
 edivorce/apps/poc/models.py                   | 13 ++++---
 edivorce/apps/poc/views.py                    |  2 +-
 vue/src/components/Uploader/Main.vue          |  2 +-
 5 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 edivorce/apps/poc/migrations/0008_auto_20200922_1027.py
 create mode 100644 edivorce/apps/poc/migrations/0009_auto_20200922_1033.py

diff --git a/edivorce/apps/poc/migrations/0008_auto_20200922_1027.py b/edivorce/apps/poc/migrations/0008_auto_20200922_1027.py
new file mode 100644
index 00000000..75920d31
--- /dev/null
+++ b/edivorce/apps/poc/migrations/0008_auto_20200922_1027.py
@@ -0,0 +1,39 @@
+# Generated by Django 2.2.15 on 2020-09-22 17:27
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0020_auto_20200903_2328'),
+        ('poc', '0007_auto_20200921_1523'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='document',
+            old_name='party_id',
+            new_name='party_code',
+        ),
+        migrations.RenameField(
+            model_name='document',
+            old_name='length',
+            new_name='size',
+        ),
+        migrations.RenameField(
+            model_name='document',
+            old_name='order',
+            new_name='sort_order',
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='date_uploaded',
+            field=models.DateTimeField(default=datetime.datetime.now),
+        ),
+        migrations.AlterUniqueTogether(
+            name='document',
+            unique_together={('bceid_user', 'doc_type', 'party_code', 'filename', 'size')},
+        ),
+    ]
diff --git a/edivorce/apps/poc/migrations/0009_auto_20200922_1033.py b/edivorce/apps/poc/migrations/0009_auto_20200922_1033.py
new file mode 100644
index 00000000..1d1667a1
--- /dev/null
+++ b/edivorce/apps/poc/migrations/0009_auto_20200922_1033.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.15 on 2020-09-22 17:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('poc', '0008_auto_20200922_1027'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='document',
+            name='date_uploaded',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+    ]
diff --git a/edivorce/apps/poc/models.py b/edivorce/apps/poc/models.py
index 647a3d68..51293392 100644
--- a/edivorce/apps/poc/models.py
+++ b/edivorce/apps/poc/models.py
@@ -12,7 +12,7 @@ class Document(models.Model):
     filename = models.CharField(max_length=128, null=True)  # saving the original filename separately
     """ File name and extension """
 
-    length = models.IntegerField(default=0)
+    size = models.IntegerField(default=0)
     """ Size of the file (size and name uniquely identify each file on the input) """
 
     file = models.FileField(upload_to=redis.generate_unique_filename, storage=redis.RedisStorage())
@@ -21,10 +21,10 @@ class Document(models.Model):
     doc_type = models.CharField(max_length=4, null=True, blank=True)
     """ CEIS Document Type Code (2-4 letters) """
 
-    party_id = models.IntegerField(default=0)
+    party_code = models.IntegerField(default=0)
     """ 1 = You, 2 = Your Spouse, 0 = Shared """
 
-    order = models.IntegerField(default=1)
+    sort_order = models.IntegerField(default=1)
     """ file order (page number in the PDF) """
 
     rotation = models.IntegerField(default=0)
@@ -33,12 +33,15 @@ class Document(models.Model):
     bceid_user = models.ForeignKey(BceidUser, related_name='uploads', on_delete=models.CASCADE)
     """ User who uploaded the attachment """
 
+    date_uploaded = models.DateTimeField(auto_now_add=True)
+    """ Date the record was last updated """
+
     class Meta:
-        unique_together = ("bceid_user", "doc_type", "party_id", "filename", "length")
+        unique_together = ("bceid_user", "doc_type", "party_code", "filename", "size")
 
     def save(self, *args, **kwargs):
         self.filename = self.file.name
-        self.length = self.file.size
+        self.size = self.file.size
 
         super(Document, self).save(*args, **kwargs)
 
diff --git a/edivorce/apps/poc/views.py b/edivorce/apps/poc/views.py
index 8d11d48e..3115b553 100644
--- a/edivorce/apps/poc/views.py
+++ b/edivorce/apps/poc/views.py
@@ -39,7 +39,7 @@ class UploadScan(FormView):
 
 class UploadStorage(CreateView):
     model = Document
-    fields = ['file', 'doc_type', 'party_id']
+    fields = ['file', 'doc_type', 'party_code']
     template_name = "storage.html"
     success_url = settings.FORCE_SCRIPT_NAME + 'poc/storage'
 
diff --git a/vue/src/components/Uploader/Main.vue b/vue/src/components/Uploader/Main.vue
index ab2c6de0..b8065307 100644
--- a/vue/src/components/Uploader/Main.vue
+++ b/vue/src/components/Uploader/Main.vue
@@ -102,7 +102,7 @@ export default {
     data() {
       return {
         doc_type: this.docType, 
-        party_id: this.party
+        party_code: this.party
       };
     }
   },