Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into gladys-dev2

app/accesslayer/views.py

@@ -75,8 +75,8 @@ class RefreshToken(APIView):
 
 
 class CurrentUser(APIView):
-    @decorators.error_safe
-    def get(self, request, token=None, *args, **kwargs):
+    # @decorators.error_safe
+    def get(self, request, token=None, *arUserManagementRetreiveSerializergs, **kwargs):
         serializer = UserManagementRetreiveSerializer
 
         context = {"request": request}

app/applicationlayer/management/user/serializers.py

@@ -88,28 +88,28 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         for data in app:
             if user.user_type.upper() == 'USR' and data.id == 1:
                 pass
+            # elif user.user_type.upper() == 'OUA' and data.id == 1:
+            #     remove = ['Modules', 'Companies', 'Application']
+            # elif user.user_type.upper() == 'CUA' and data.id == 1:
+            #     remove = ['Modules', 'Companies', 'Application']
             else:
-                remove = ['Modules', 'Companies', 'Department']
+                remove = ['Module Management', 'Application Management', 'Department Management', 'Company Management', "User Management"]
 
                 if user.user_type == 'SU':
-                    mod = data.modules.all().values('name', 'component', 'code')
+                    mod = data.modules.all().values()
+                elif user.user_type == 'OUA':
+                    remove.remove("Department Management")
+                    remove.remove("User Management")
+                    pass
+                elif user.user_type == 'CUA':
+                    remove.remove("Department Management")
+                    remove.remove("User Management")
+                elif user.user_type == 'DUA':
+                    remove.remove("User Management")
                 else:
-                    mod = data.modules.exclude(name__in=remove).values(
-                        "id", 'name', 'parent'
-                    )
-                    # mod = mod.exclude(~Q(parent=0))
-                    mod = mod.order_by('parent', 'sort_id')
-                    # list_mod = []
-                    # for body in mod:
-                    #     parent_id = body['id']
-                    #     child_module = models.Module.objects.filter(
-                    #         parent=parent_id
-                    #     )
-                    #     if child_module:
-                    #         body['sub_modules'] = child_module.values(
-                    #             "id", 'name', 'parent'
-                    #         )
-                    #     list_mod.append(body)
+                    remove.remove("User Management")
+                mod = data.modules.exclude(name__in=remove).values()
+                mod = mod.order_by('parent', 'sort_id')
 
                 app_body = {}
                 app_body['app_code'] = data.code

app/entities/migrations/0005_emaillogs.py

+# Generated by Django 2.2 on 2019-09-10 16:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0004_auto_20190910_1610'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EmailLogs',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('createdby', models.CharField(max_length=255)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('modifiedby', models.CharField(max_length=255)),
+                ('template', models.CharField(max_length=255)),
+                ('recipients', models.CharField(max_length=255)),
+                ('content', models.TextField()),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

app/entities/migrations/0006_emaillogs_is_sent.py

+# Generated by Django 2.2 on 2019-09-10 17:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0005_emaillogs'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emaillogs',
+            name='is_sent',
+            field=models.BooleanField(default=True),
+        ),
+    ]

app/entities/modelcommon.py

@@ -32,20 +32,27 @@ class BaseAuditClass(models.Model):
     modifiedby = models.CharField(max_length=255)
 
     def save(self, *args, **kwargs):
-        username = 'Anonymous User'
-        user = get_current_user()
+        # print('333')
+        if self.createdby and self.modifiedby:
+            # username = 'Anonymous User'
+            # self.createdby = username
+            # self.modifiedby = username
+            super(BaseAuditClass, self).save(*args, **kwargs)
+        else:
 
-        # user.is_authenticated():
+            username = 'Anonymous User'
+            user = get_current_user()
 
-        if user and user.username:
-            username = user.username
+            # user.is_authenticated():
 
-        self.modifiedby = username
+            if user and user.username:
+                username = user.username
 
-        if self._state.adding:
-            self.createdby = user
+            self.modifiedby = username
 
-        super(BaseAuditClass, self).save(*args, **kwargs)
+            if self._state.adding:
+                self.createdby = username
+            super(BaseAuditClass, self).save(*args, **kwargs)
 
     class Meta:
         abstract = True

app/entities/models.py

@@ -910,8 +910,8 @@ class Notification(models.Model):
         Notification.objects.filter(id=self.id).update(code=code)
 
 
-
-# class EmailLogs(AuditClass):
-#     template = models.CharField(max_length=255)
-#     recipients = models.CharField(max_length=255)
-#     content = models.TextField()
+class EmailLogs(AuditClass):
+    template = models.CharField(max_length=255)
+    recipients = models.CharField(max_length=255)
+    content = models.TextField()
+    is_sent = models.BooleanField(default=True)

app/helper/email_service/sender.py

@@ -17,29 +17,40 @@ def account_created(args):
   FC = FC.replace('{password}', args[2])
   FC = FC.replace('[URL]', settings.FRONT_END_URL)
 
-  send_mail(
-      subject='OB IMS: Welcome!',
-      message='',
-      from_email=settings.EMAIL_DEFAULT_SENDER,
-      recipient_list=[args[3],],
-      html_message=FC,
-      fail_silently=True
-  )
-
-
-#   try:
-#       send_mail(
-#           subject='OB IMS: Welcome!',
-#           message='',
-#           from_email=settings.EMAIL_DEFAULT_SENDER,
-#           recipient_list=[args[3],],
-#           html_message=FC,
-#           fail_silently=True
-#       )
-#   except Exception as e:
-#       models.EmailLogs.insert(
-
-#       )
+#   send_mail(
+#       subject='OB IMS: Welcome!',
+#       message='',
+#       from_email=settings.EMAIL_DEFAULT_SENDER,
+#       recipient_list=[args[3],],
+#       html_message=FC,
+#       fail_silently=True
+#   )
+  try:
+      send_mail(
+          subject='OB IMS: Welcome!',
+          message='',
+          from_email=settings.EMAIL_DEFAULT_SENDER,
+          recipient_list=[args[3],],
+          html_message=FC,
+          fail_silently=False
+      )
+      models.EmailLogs.objects.create(
+          template='RMS-NEWUSER.html',
+          recipients=args[3],
+          content=FC,
+          is_sent=True,
+          createdby=args[3],
+          modifiedby=args[3]
+      )
+  except Exception as e:
+      models.EmailLogs.objects.create(
+          template='RMS-NEWUSER.html',
+          recipients=args[3],
+          content=FC,
+          is_sent=False,
+          createdby=args[3],
+          modifiedby=args[3]
+      )
 
 
 # def account_created(name, username, password, receiver):

config/settings/base.py

@@ -170,7 +170,7 @@ REST_FRAMEWORK = {
 EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
 EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_PORT = 587
-EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUAs'
+EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
 EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
 EMAIL_USE_SSL = False
 EMAIL_USE_TLS = True