For Key added(CommentsTable) + Patches

Author: Raunak Ritesh

Notes/admin.py

@@ -29,7 +29,8 @@ class CommentModelAdmin(admin.ModelAdmin):
 
 	# Show Filters on the side bar and list only those Tasks which are referenced by the Foreign Key in Comments Table.
 	list_filter = (
-		('taskId_id', admin.RelatedOnlyFieldListFilter),
+		('taskId', admin.RelatedOnlyFieldListFilter),
+		('createdBy', admin.RelatedOnlyFieldListFilter),
 	)
 
 	class Meta:

Notes/admin.pyc

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Notes', '0010_auto_20180718_1835'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='comment',
+            name='user',
+            field=models.ForeignKey(to='Notes.User', null=True),
+        ),
+    ]

Notes/migrations/0007_user.pyc

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Notes', '0011_comment_user'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='comment',
+            name='createdBy',
+        ),
+        migrations.RenameField(
+        	model_name='comment',
+        	old_name='user',
+        	new_name='createdBy',
+        ),
+    ]

Notes/migrations/0008_auto_20180718_1758.pyc

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Notes', '0012_remove_comment_createdby'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comment',
+            name='createdBy',
+            field=models.ForeignKey(to='Notes.User'),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='createdBy',
+            field=models.ForeignKey(to='Notes.User'),
+        ),
+    ]

Notes/migrations/0009_auto_20180718_1833.pyc

@@ -39,7 +39,7 @@ class Task(models.Model):
 	# createdBy = models.CharField(max_length=10, blank=False)
 	dueDate = models.DateField(null=False)
 	isDeleted = models.BooleanField(default=False)
-	createdBy = models.ForeignKey(User, null=True)
+	createdBy = models.ForeignKey(User)
 
 	def __str__(self):
 		return '%s ' % (self.title)
@@ -63,8 +63,9 @@ class Comment(models.Model):
 	taskId = models.ForeignKey(Task, null=False, blank=False) #UNFORTUNATELY RENAMED TO taskId_id
 	createdOn = models.DateTimeField(auto_now_add=True)
 	UpdatedOn = models.DateTimeField(auto_now_add=True)
-	createdBy = models.CharField(max_length=10, blank=False) #CANNOT be blank.
+	# createdBy = models.CharField(max_length=10, blank=False) #CANNOT be blank.
 	commentText = models.CharField(max_length=100, blank=False)
+	createdBy = models.ForeignKey(User)
 
 	def __str__(self):
 		return '%s' % (self.commentText)

Notes/migrations/0010_auto_20180718_1835.pyc

@@ -9,6 +9,7 @@
 # Imports from models.py of this app
 from models import Task
 from models import Comment
+from models import User
 
 # Create your views here.
 class Pages(View):
@@ -93,9 +94,12 @@ def post(self, request):		# - Create a task (POST /tasks/
 			if t == '' or l == '' or cby == '' or due == '':
 				return HttpResponse('title, label, author, due Date are mandatory Fields.', status=200)
 
-			entry = Task(title = t, description = d, label = l, color = col, comments = co, createdBy = cby, dueDate = due)
+			user = User.objects.get(username = cby) #Get User Instance from given name
+			entry = Task(title = t, description = d, label = l, color = col, comments = co, createdBy = user, dueDate = due)
 			entry.save()
 			return HttpResponse('Success', status=200)
+		except User.DoesNotExist, e:
+			return HttpResponse('User does not exists in the User Table', status=200)
 		except Exception, e:
 			error = "Please provide all the details:- 'title', 'desc',\
 					'label', 'color', 'comments', 'author', 'due' where\
@@ -194,15 +198,21 @@ def post(self, request):	# Post a new Comment
 			tid = c['tid']
 			cby = c['author']
 			ctext = c['text']
-			
+
 			if ctext == '' or tid == '' or cby == '':
 				return HttpResponse('Comment, TaskId, Author are mandatory Fields.')
 
-			entry = Comment(taskId_id = tid, createdBy = cby, commentText = ctext)
+			user = User.objects.get(username = cby) #Get User Instance from given name
+
+			# It should be Noted that taskId_id is set by the exact id as defined in the database
+			# but createdBy attribute is set by an instance of the User.
+			entry = Comment(taskId_id = tid, createdBy = user, commentText = ctext)
 			entry.save()
 			return HttpResponse('Success', status=200)
+		except User.DoesNotExist as e:
+			return HttpResponse('User does not exists in the User Table', status=200)
 		except Exception as e:
-			return HttpResponse('Please Provide a Task Id which exists in the Database. text, tid, author are mandatory Fields.', status=200)
+			return HttpResponse('Please Provide a Task Id, and Author which exists in the Database. text, tid, author are mandatory Fields.', status=200)
 
 	def put(self, request):		# Edit a comment
 		# http://127.0.0.1:8000/Notes/comments/?id=1

Notes/migrations/0011_comment_user.py

@@ -72,8 +72,16 @@ INDEX PAGE: > http://127.0.0.1:8000/Notes/index/
 ```
 
 ## DATABASE EXPLAINED
-
+### User Table
+Username and Active Status can be changed later.
+```
+	userId = models.AutoField(primary_key=True)
+	username = models.CharField(max_length=20, blank=False)
+	createdOn = models.DateTimeField(auto_now_add=True)
+	isActive = models.BooleanField(default=True)
+```
 ### Task Table
+Has a Foriegn Key Field to User Table.
 * FIELDS THAT CANNOT BE BLANK = Title. Label. CreatedBy. DueDate
 * CAN BE BLANK = Description. Color. Comments. Attachment
 ```
@@ -96,19 +104,20 @@ INDEX PAGE: > http://127.0.0.1:8000/Notes/index/
 	color = CharField(max_length=7, choices=COLOURS, blank=True) #STORE A HEX FIELD.
 	attachment = FileField(upload_to='attachments', blank=True)
 	comments = CharField(max_length=255, blank=True)
-	createdBy = CharField(max_length=10, blank=False)
+	createdBy = models.ForeignKey(User, null=True)
 	dueDate = DateField(null=False)
 ```
 
 ### Comments Table
+Has 2 Foreign Key Fields - To Comments Table and User Table.
 * FIELDS THAT CANNOT BE BLANK = createdBy, CommentText.
 * Rest all are auto inserted.
 ```
 	commentId = AutoField(primary_key=True)
 	taskId = ForeignKey(Task, null=False, blank=False)
 	createdOn = DateTimeField(auto_now_add=True)
 	UpdatedOn = DateTimeField(auto_now_add=True)
-	createdBy = CharField(max_length=10, blank=False)
+	createdBy = models.ForeignKey(User)
 	commentText = CharField(max_length=100, blank=False)
 ```
 ## Acknowledgments