Merge pull request #384 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '8dda9d48':
  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/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/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/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'