Skip to content

R
red-ci-cd
Commit f8bba9a8 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

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

parents 9f666061 3116bd0a
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 164 deletions
app/applicationlayer/management/changerequest/views.py
View file @ f8bba9a8
......@@ -35,8 +35,10 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
self.queryset = self.queryset.filter(
deleted_at=None
)
self.queryset = self.queryset.order_by('-created')
self.queryset = QuerySetHelper.Sort(self)
return super(ChangeRequestTemplatesViewset, self).list(request)
def retrieve(self, request, *args, **kwargs):
......@@ -44,17 +46,17 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
deleted_at=None,
template_no=str(self.kwargs.get('template_no'))
).first()
serializer = self.get_serializer(instance)
return Response(serializer.data)
def destroy(self, request, *args, **kwargs):
try:
# instance = self.get_object()
template_no = self.kwargs['template_no']
instance = models.ChangeRequestTemplateHeader.objects.filter(
Q(template_no=template_no) &
Q(deleted_at=None)
).update(deleted_at=datetime.utcnow())
).update(deleted_at=datetime.now())
return Response({"message": "Deleted"}, status=status.HTTP_200_OK)
except Exception as e:
return Response(e,
......@@ -63,7 +65,6 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
def partial_update(self, request, *args, **kwargs):
try:
kwargs['partial'] = True
# instance = self.get_object()
template_no = self.kwargs['template_no']
instance = models.ChangeRequestTemplateHeader.objects.filter(
template_no=template_no
......@@ -80,85 +81,6 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
return Response(message,
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# @transaction.atomic
# def create(self, request, *args, **kwargs):
# serializer = self.get_serializer(data=request.data)
# serializer.is_valid(raise_exception=True)
# if not template_no.lower() == 'tmp':
# print('not tmp')
# form = request.data['template_no']
# prefix = request.data['requested_to_template_id']
# instance = models.ChangeRequestTemplateHeader.objects.filter(
# Q(requested_to_template_id=prefix) &
# Q(deleted_at=None)
# ).first()
# if instance and instance.template_no != request.data['template_no']:
# return Response(
# {'message': "CR number prefix already exist"},
# status=status.HTTP_400_BAD_REQUEST
# )
# else:
# models.ChangeRequestTemplateHeader.objects.filter(
# template_no=template_no
# ).update(
# deleted_at=datetime.now()
# )
# models.ChangeRequestTemplateStakeHolders.objects.filter(
# template_no=template_no
# ).update(
# deleted_at=datetime.now()
# )
# models.ChangeRequestTemplateAttachments.objects.filter(
# template_no=template_no
# ).update(
# deleted_at=datetime.now()
# )
# models.ChangeRequestTemplateDetails.objects.filter(
# template_no=template_no
# ).update(
# deleted_at=datetime.now()
# )
# models.ChangeRequestTemplateApprovers.objects.filter(
# template_no=template_no
# ).update(
# deleted_at=datetime.now()
# )
# series = template_no
# template_id = request.data['requested_to_template_id']
# check_prefix = models.ChangeRequestTemplateHeader.objects.filter(
# Q(requested_to_template_id=template_id) &
# Q(deleted_at=None)
# )
# if check_prefix.count() > 0 and template_no.lower() == 'tmp':
# return Response(
# {'message': "CR number prefix already exist"},
# status=status.HTTP_400_BAD_REQUEST
# )
# self.perform_create(serializer)
# if template_no.lower() == 'tmp':
# id = serializer.data['id']
# db_counter = models.ChangeRequestTemplateHeader.objects.filter(
# deleted_at=None
# ).count()
# db_counter = db_counter + 2
# db_counter = db_counter - 1
# models.ChangeRequestTemplateHeader.objects.filter(id=id).update(
# set__template_no=number_generator("TMP", db_counter)
# )
# series = number_generator("TMP", db_counter)
# headers = self.get_success_headers(serializer.data)
# return Response(
# data={"code": series},
# status=status.HTTP_201_CREATED, headers=headers
# )
class ChangeRequestTemplateApproversViewset(meviewsets.ModelViewSet):
......@@ -199,11 +121,12 @@ class ChangeRequestTemplateStakeHoldersViewset(meviewsets.ModelViewSet):
queryset = models.ChangeRequestTemplateStakeHolders.objects.all()
serializer_class = serializers.ChangeRequestTemplateStakeHoldersSerializer
pagination_class = paginators.SimplePageNumberPagination
lookup_field = "code"
def list(self, request, *args, **kwargs):
self.queryset = self.queryset.filter(deleted_at=None)
self.queryset = QuerySetHelper.Sort(self)
# self.queryset = QuerySetHelper.Filter(self)
return super(ChangeRequestTemplateStakeHoldersViewset, self).list(request)
def retrieve(self, request, *args, **kwargs):
......@@ -221,7 +144,7 @@ class ChangeRequestTemplateDetailsViewset(meviewsets.ModelViewSet):
def list(self, request, *args, **kwargs):
self.queryset = self.queryset.filter(deleted_at=None)
self.queryset = QuerySetHelper.Sort(self)
# self.queryset = QuerySetHelper.Filter(self)
return super(ChangeRequestTemplateDetailsViewset, self).list(request)
def retrieve(self, request, *args, **kwargs):
......@@ -651,8 +574,6 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
return self.get_paginated_response(serializer.data)
class ChangeRequestFormPost(APIView):
# @transaction.atomic()
......
app/businesslayer/changerequest/change_request_template.py deleted 100644 → 0
View file @ 9f666061
from app.entities import models
def get_template(self, code):
try:
template = {}
header = models.ChangeRequestTemplateHeader.objects.filter(
template_no=code
).values()
approve = models.ChangeRequestTemplateApprovers.objects.filter(
template_no=code
).values()
stakeholder = models.ChangeRequestTemplateStakeHolders.objects.filter(
template_no=code
).values()
attachment = models.ChangeRequestTemplateAttachments.objects.filter(
template_no=code
).values()
details = models.ChangeRequestTemplateDetails.objects.filter(
template_no=code
).values()
task = models.ChangeRequestTemplateTasks.objects.filter(
template_no=code
).values()
template['header'] = header
template['aprrove'] = approve
template['stakeholder'] = stakeholder
template['attachment'] = attachment
template['details'] = details
template['task'] = task
return template
except ChangeRequestTemplateHeader.DoesNotExist:
raise Http404
except ChangeRequestTemplateApprovers.DoesNotExist:
raise Http404
except ChangeRequestTemplateStakeHolders.DoesNotExist:
raise Http404
except ChangeRequestTemplateAttachments.DoesNotExist:
raise Http404
except ChangeRequestTemplateDetails.DoesNotExist:
raise Http404
except ChangeRequestTemplateTasks.DoesNotExist:
raise Http404
app/entities/migrations/0014_auto_20190909_1415.py 0 → 100644
View file @ f8bba9a8
# Generated by Django 2.2 on 2019-09-09 14:15
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0013_changerequesthistory'),
]
operations = [
migrations.RenameField(
model_name='changerequesthistory',
old_name='row_id',
new_name='form_code',
),
]
app/entities/models.py
View file @ f8bba9a8
......@@ -509,8 +509,7 @@ class ChangeRequestTemplateHeader(BaseHeader):
def save(self, *args, **kwargs):
super(ChangeRequestTemplateHeader, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TEMPLATE.value, self.id)
# ChangeRequestTemplateHeader.objects.filter(id=self.id).update(template_no=code)
if self.template_no == '':
self.template_no = code
self.save()
......@@ -533,11 +532,13 @@ class ChangeRequestTemplateApprovers(BaseApprover):
class Meta:
db_table = 'change_request_template_approvers'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestTemplateApprovers, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_APPROVER.value, self.id)
# ChangeRequestTemplateApprovers.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
......@@ -555,12 +556,14 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
class Meta:
db_table = 'change_request_template_stakeholders'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestTemplateStakeHolders, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_STAKE.value, self.id)
# ChangeRequestTemplateStakeHolders.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
......@@ -579,11 +582,13 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
class Meta:
db_table = 'change_request_template_attachments'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestTemplateAttachments, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_ATTACH.value, self.id)
# ChangeRequestTemplateAttachments.objects.filter(id=self.id).update(attachment_no=code)
if self.code == '':
self.code = code
......@@ -603,12 +608,14 @@ class ChangeRequestTemplateDetails(BaseDetails):
class Meta:
db_table = 'change_request_template_details'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestTemplateDetails, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_DETAIL.value, self.id)
# ChangeRequestTemplateDetails.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
......@@ -663,11 +670,13 @@ class ChangeRequestFormHeader(BaseHeader):
class Meta:
db_table = 'change_request_form_headers'
def __str__(self):
return f'{self.form_code}'
def save(self, *args, **kwargs):
super(ChangeRequestFormHeader, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.FORM.value, self.id)
# ChangeRequestFormHeader.objects.filter(id=self.id).update(form_code=code)
if self.form_code == '':
self.form_code = code
self.save()
......@@ -702,12 +711,14 @@ class ChangeRequestFormApprovers(BaseApprover):
class Meta:
db_table = 'change_request_form_approvers'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestFormApprovers, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.FORM_APPROVER.value, self.id)
# ChangeRequestFormApprovers.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
......@@ -733,11 +744,13 @@ class ChangeRequestFormDetails(BaseDetails):
class Meta:
db_table = 'change_request_form_details'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestFormDetails, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.FORM_DETAIL.value, self.id)
# ChangeRequestFormDetails.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
......@@ -765,12 +778,14 @@ class ChangeRequestFormStakeHolders(BaseStakeholder):
class Meta:
db_table = 'change_request_form_stakeholders'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestFormStakeHolders, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.FORM_STAKE.value, self.id)
# ChangeRequestFormStakeHolders.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
......@@ -795,12 +810,14 @@ class ChangeRequestFormAttachments(BaseAttachment):
class Meta:
db_table = 'change_request_form_attachments'
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestFormAttachments, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.FORM_ATTACH.value, self.id)
# ChangeRequestFormAttachments.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
......@@ -823,7 +840,7 @@ class ChangeRequestHistory(AuditClass):
(tag.value, tag.value) for tag in enums.CREntitiesEnum],
default=enums.CREntitiesEnum.CR_FRM_HEADER.value,
max_length=50)
row_id = models.IntegerField()
form_code = models.IntegerField()
fromValue = models.TextField(blank=True, null=True)
toValue = models.TextField(blank=True, null=True)
......@@ -878,6 +895,9 @@ class Notification(models.Model):
class Meta:
db_table = 'notifications'
def __str__(self):
return self.message
def save(self, *args, **kwargs):
super(Notification, self).save(*args, **kwargs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment