Merge pull request #389 in RMS/api-main-service from RMSv2 to staging

* commit 'e88f6902':
  refactor upload
  refactor upload
  added new field attch_ref to allow upload same file name on attachment
  added serializer data to attachment
  forgot pass

app/accesslayer/views.py

@@ -19,6 +19,7 @@ from django.conf import settings
 from app.helper.email_service import sender
 from app.applicationlayer.utils import main_threading
 from rest_framework.exceptions import ParseError
+from datetime import timedelta
 
 
 class Login(ObtainAuthToken):
@@ -131,7 +132,7 @@ class ForgotPassword(APIView):
 
             REF = 'AUTH'
             TOKEN = ''
-            TIMEOUT = 3600
+            # TIMEOUT = 3600
             PASSCODE = 0
 
             # Generate Random token for TOKEN
@@ -144,16 +145,20 @@ class ForgotPassword(APIView):
             rands.append(randrange(10))
             rands.append(randrange(10))
             PASSCODE = f"{rands[0]}{rands[1]}{rands[2]}{rands[3]}"
+            
+            date_now = datetime.now()
+            timeout_at = date_now + timedelta(seconds=3600)
 
             AuthToken(
                 ref=REF,
                 token=TOKEN,
                 passcode=PASSCODE,
-                timeout=TIMEOUT,
                 is_active=True,
                 user=existingUser,
+                created=date_now,
+                timeout_at=timeout_at
             ).save()
-
+            
             url = f"{settings.FRONT_END_URL}/forgot-password/reset"\
                   f"?token={TOKEN}"
 

app/applicationlayer/cms/form/attachment/serializers.py

@@ -36,12 +36,15 @@ class ChangeRequestFormAttachmentsFileUploadSerializer(
     class Meta:
         model = models.ChangeRequestFormAttachments
         fields = (
+            'id',
+            'code',
             'attachment_type',
             'attachment_name',
             'file_name',
             'description',
             'file_upload',
             'uploaded_by',
-            'form_code'
+            'form_code',
+            'created'
         )
-        # read_only_fields = ['created', 'code']
\ No newline at end of file
+        read_only_fields = ['id,', 'created', 'code']
\ No newline at end of file

app/applicationlayer/cms/form/header/views.py

@@ -1294,11 +1294,18 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 id_number
             )
 
+            self.queryset = models.ChangeRequestFormAttachments.objects.filter(
+                form_code=form_code
+            )
+
+            self.serializer_class = ChangeRequestFormAttachmentsFileUploadSerializer
 
+            serializer = self.get_serializer(self.queryset, many=True)
+            
             message = status_message_response(
                 200, 'success',
                 'Attachments successfully updated!',
-                ''
+                serializer.data
             )
 
             return Response(message, status=status.HTTP_200_OK)

app/applicationlayer/cms/urls_cms.py

@@ -85,7 +85,7 @@ urlpatterns = [
     path('form-user-list/', UserListForm.as_view(), name="User List"),
     path('template-user-list/', UserListTemplate.as_view(), name="User List"),
     # filter endpoints under Allowed Companies table
-    # path('reminder/', reminder.ReminderTriggerAPIView.as_view()),
+    path('reminder/', reminder.ReminderTriggerAPIView.as_view()),
     # path('cancelled/', cancel.CancelTriggerAPIView.as_view()),
 ]
 

app/applicationlayer/master/attachment/views.py

@@ -40,15 +40,20 @@ class MasterAttachmentViewSet(viewsets.ModelViewSet):
     @transaction.atomic
     def create(self, request, *args, **kwargs):
         attachments = []
-        for instance in self.request.data.getlist('url'):
-
-            body = {}
-            data = MasterAttachment.objects.create(url=instance)
-
-            file_name = str(data.url).split('/')
-            body['id'] = data.id
-            body['file_name'] = instance.name
-            attachments.append(body)
+        for key in request.data.keys():
+            for instance in self.request.data.getlist(key):
+
+                body = {}
+                data = MasterAttachment.objects.create(
+                    url=instance,
+                    attch_ref=key
+                )
+
+                file_name = str(data.url).split('/')
+                body['id'] = data.id
+                body['file_name'] = instance.name
+                body['attch_ref'] = key
+                attachments.append(body)
 
         return Response(
             {"results": attachments},

app/entities/migrations/0019_auto_20191015_1721.py

+# Generated by Django 2.2 on 2019-10-15 17:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0018_canceltrigger_overduetrigger_remindertrigger'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='authtoken',
+            name='timeout',
+        ),
+        migrations.AddField(
+            model_name='authtoken',
+            name='created',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='authtoken',
+            name='timeout_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

app/entities/migrations/0020_masterattachment_attch_ref.py

+# Generated by Django 2.2 on 2019-10-15 18:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0019_auto_20191015_1721'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='masterattachment',
+            name='attch_ref',
+            field=models.TextField(default=1),
+            preserve_default=False,
+        ),
+    ]

app/entities/models.py

@@ -7,6 +7,7 @@ from django.dispatch import receiver
 from datetime import datetime
 from . import enums
 from django.utils.text import slugify
+from datetime import timedelta
 
 
 # ********************* AUTH TABLES *********************
@@ -326,11 +327,12 @@ class AuthToken(models.Model):
     ref = models.CharField(max_length=255)
     token = models.TextField()
     passcode = models.CharField(max_length=255)
-    timeout = models.IntegerField()
     is_active = models.BooleanField(default=False)
     user = models.ForeignKey(User, to_field='code',
                              related_name='auth_access_token',
                              on_delete=models.PROTECT)
+    created = models.DateTimeField(blank=True, null=True)
+    timeout_at = models.DateTimeField(blank=True, null=True)
 
     class Meta:
         db_table = 'auth_access_token'
@@ -446,6 +448,7 @@ class MasterAttachment(models.Model):
         upload_to='uploads/',
         blank=True,
         null=True)
+    attch_ref = models.TextField()
     
     class Meta:
         db_table = 'master_attachments'