added new endpoint branches

app/applicationlayer/master/branch/serializer.py

+from rest_framework import serializers
+from app.entities.models import Branch
+
+
+class BranchSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Branch
+        fields = '__all__'
+        

app/applicationlayer/master/branch/views.py

+from app.entities.models import Branch
+from rest_framework import viewsets, status
+from rest_framework.response import Response
+from django_filters import rest_framework as filters
+from app.applicationlayer.master.branch.serializer import BranchSerializer
+from app.applicationlayer.utils import (CustomPagination,
+                                        status_message_response)
+
+
+class BranchViewSet(viewsets.ModelViewSet):
+    queryset = Branch.objects.all()
+    serializer_class = BranchSerializer
+    pagination_class = CustomPagination
+    lookup_field = 'id'
+    
+    def list(self, request, *args, **kwargs):
+        
+        queryset = self.filter_queryset(self.get_queryset())
+        page = self.paginate_queryset(queryset)
+
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'list of branches found',
+                serializer.data
+            )
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)

app/applicationlayer/master/urls.py

@@ -16,4 +16,9 @@ router.register(r'attachments', MasterAttachmentViewSet)
 urlpatterns = [
     path('', include(router.urls)),
     url(r'^user-types/$', UserTypeViewSet.as_view(), name="user-types"),
-]
+<<<<<<< HEAD
\ No newline at end of file
+]
+=======
+    url(r'^dashboard/$', RMSDashBoardViewSet.as_view(), name="dashboard"),
+]
+>>>>>>> ef388d8... filter files for all dependent of branches endpoint

app/entities/migrations/0006_branch.py

+# Generated by Django 2.2 on 2020-01-22 11:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0005_auto_20200115_1950'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Branch',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('enviroment', models.CharField(max_length=255)),
+                ('branch_name', models.CharField(max_length=255)),
+                ('repo_type', models.CharField(max_length=50)),
+                ('repository', models.CharField(max_length=255, unique=True)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                'db_table': 'branches',
+            },
+        ),
+    ]
+

app/entities/models.py

@@ -1227,4 +1227,70 @@ class AssetGroup(models.Model):
         if self.code == '':
             self.code = code
             self.created = datetime.now()
-            self.save()
+<<<<<<< HEAD
\ No newline at end of file
+            self.save()
+=======
+            self.save()
+
+
+class ChangeRequestSettings(models.Model):
+    code = models.CharField(unique=True, max_length=255)
+    active_user = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        to_field='code',
+        related_name='cms_settings_active_users'
+    )
+    behalf_user = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        to_field='code',
+        related_name='cms_settings_behalf_users'
+    )
+    behalf_approved = models.BooleanField(default=False)
+    behalf_accepted = models.BooleanField(default=False)
+    behalf_rejected = models.BooleanField(default=False)
+    behalf_implemented = models.BooleanField(default=False)
+    behalf_completed = models.BooleanField(default=False)
+    created = models.DateTimeField(auto_now_add=True)
+    deleted_at = models.DateTimeField(null=True, blank=True)
+    
+    class Meta:
+        db_table = 'change_request_settings'
+        ordering = ['-created']
+        unique_together = ['active_user', 'behalf_user']
+    
+    def __str__(self):
+        return f'{self.code}'
+
+    def save(self, *args, **kwargs):
+        super(ChangeRequestSettings, self).save(*args, **kwargs)
+        code = number_generator(enums.GenerateCode.CMS_SETTINGS.value, self.id)
+        
+        if self.code == '':
+            self.code = code
+            self.created = datetime.now()
+            self.save()
+
+# branches info
+
+
+class Branch(models.Model):
+    enviroment = models.CharField(
+        max_length=255)
+    branch_name = models.CharField(
+        max_length=255)
+    repo_type = models.CharField(
+        max_length=50)
+    repository = models.CharField(
+        unique=True,
+        max_length=255)
+    created = models.DateTimeField(
+        auto_now_add=True)
+
+    class Meta:
+        db_table = 'branches'
+
+    def __str__(self):
+        return f'{self.branch_name}'
+>>>>>>> ef388d8... filter files for all dependent of branches endpoint