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

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/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

@@ -448,6 +448,7 @@ class MasterAttachment(models.Model):
         upload_to='uploads/',
         blank=True,
         null=True)
+    attch_ref = models.TextField()
     
     class Meta:
         db_table = 'master_attachments'