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

app/applicationlayer/management/account/views.py

@@ -148,7 +148,7 @@ class UserViewSet(viewsets.ModelViewSet):
 
         instance = self.get_object()
         new_instance = model_to_dict(instance)
-        UserHistory.objects.filter(username=instance.username).delete()
+        UserHistory.objects.filter(username=instance.username).update(deleted=True)
         AllowedCompany.objects.filter(id_number=instance.code).delete()
         self.perform_destroy(instance)
 

app/applicationlayer/management/batchupload/views.py

@@ -217,13 +217,15 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         AllowedCompany.objects.create(**privilege_object)
                     except IntegrityError as e:
                         return Response(
-                            {"message": f"Duplicate user privilege at row {data + 2}"},
+                            {"message": str(e)},
+                            # {"message": f"Duplicate user privilege at row {data + 2}"},
                             status=status.HTTP_400_BAD_REQUEST
                         )
 
             except IntegrityError as e:
                 return Response(
-                    {"message": f"Record already exist at row {data + 2}"},
+                    # {"message": f"Record already exist at row {data + 2}"},
+                    {"message": str(e)},
                     status=status.HTTP_400_BAD_REQUEST
                 )
 
@@ -246,7 +248,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             )
             users['admin'] = logged_user_email
 
-        send_mail = UserHistory.objects.filter(sent=False)[0:100].values(
+        send_mail = UserHistory.objects.filter(sent=False).values(
             'name', 'username', 'email', 'password'
         )
 

app/entities/migrations/0040_auto_20191113_1505.py

+# Generated by Django 2.2 on 2019-11-13 15:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0039_auto_20191113_1016'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userhistory',
+            name='deleted',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='userhistory',
+            name='username',
+            field=models.CharField(max_length=255),
+        ),
+    ]

app/entities/models.py

@@ -283,10 +283,11 @@ class UserHistory(AuditClass):
         null=True
     )
     name = models.CharField(max_length=255)
-    username = models.CharField(max_length=255, unique=True)
+    username = models.CharField(max_length=255)
     email = models.EmailField(max_length=255, unique=False)
     password = models.CharField(max_length=255)
     sent = models.BooleanField(default=False)
+    deleted = models.BooleanField(default=False)
 
     class Meta:
         db_table = 'user_history'