Merge branch 'feature/RMS.v2.1-AMS' of...

Merge branch 'feature/RMS.v2.1-AMS' of http://54.169.104.100:27015/rms/Backend/api-main-service into red-develop

app/applicationlayer/ams/asset_type/serializers.py

@@ -8,4 +8,4 @@ class AssetTypeSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.AMSAssetType
         fields = '__all__'
-        read_only_fields = ['created', 'code']
\ No newline at end of file
+        read_only_fields = ['created', 'created_by', 'code']
\ No newline at end of file

app/applicationlayer/ams/asset_type/views.py

@@ -29,17 +29,19 @@ class AssetTypeViewset(viewsets.ModelViewSet):
     def create(self, request, *args, **kwargs):
 
         serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        self.perform_create(serializer)
+        # serializer.is_valid(raise_exception=True)
+        if serializer.is_valid(raise_exception=True):
+            serializer.save(created_by=self.request.user)
+            self.perform_create(serializer)
 
-        message = status_message_response(
-            201, 'success',
-            'New Asset Type created', serializer.data
-        )
+            message = status_message_response(
+                201, 'success',
+                'New Asset Type created', serializer.data
+            )
 
-        return Response(
-            message
-        )
+            return Response(
+                message
+            )
 
     def list(self, request, *args, **kwargs):
 

app/entities/migrations/0008_delete_assetgroup.py

+# Generated by Django 2.2 on 2020-03-17 10:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0007_auto_20200317_1005'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='AssetGroup',
+        ),
+    ]

app/entities/models.py

@@ -1246,37 +1246,6 @@ class ChangeRequestSettings(models.Model):
 **********************
 """
 
-class AssetGroup(models.Model):
-    code = models.CharField(
-        unique=True,
-        max_length=255)
-    name = models.CharField(
-        unique=True,
-        max_length=255)
-    asset_group = models.CharField(
-        unique=True,
-        max_length=255)
-    created = models.DateTimeField(
-        blank=True,
-        null=True)
-    
-    class Meta:
-        db_table = 'asset_groups'
-        ordering = ['-created']
-    
-    def __str__(self):
-        return f'{self.code}'
-
-    def save(self, *args, **kwargs):
-        super(AssetGroup, self).save(*args, **kwargs)
-        code = number_generator(enums.GenerateCode.ASSET_GROUP.value, self.id)
-        
-        if self.code == '':
-            self.code = code
-            self.created = datetime.now()
-            self.save()
-
-
 class AMSPrivilege(models.Model):
     id_number = models.ForeignKey(
         User,