Skip to content

R
red-ci-cd
Commit 7a09a629 authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

action

parent 93ea28fe
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 126 deletions
app/applicationlayer/cms/form/views.py
View file @ 7a09a629
...@@ -295,7 +295,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -295,7 +295,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
form_header = get_object_or_404(models.ChangeRequestFormHeader, form_header = get_object_or_404(models.ChangeRequestFormHeader,
pk=instance.id) pk=instance.id)
new_instance = model_to_dict(form_header) new_instance = model_to_dict(form_header)
# save history in form header # save history in form header
...@@ -343,25 +343,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -343,25 +343,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
).aggregate(Min('level')) ).aggregate(Min('level'))
min_level = min_level.get('level__min') min_level = min_level.get('level__min')
# get details of next approver/s
next_approver = models.ChangeRequestFormApprovers.objects.filter(
level=str(min_level),
form_code=form_code
)
# LOOP on next approver for sending email
for n_approver in next_approver:
# NOTIF MSG FOR NEXT APPROVER next_approver_email(form_code, min_level)
notification_msg = APPROVER_MESSAGE.split(';')[0]
if n_approver.delegation.lower() == 'vendor/implementor':
notification_msg = VENDOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
next_approver_email(
n_approver.user.code, form_code, n_approver.delegation.lower(),
notification_msg
)
# update next approver details # update next approver details
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
...@@ -385,13 +368,15 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -385,13 +368,15 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# generate batchno history # generate batchno history
batchno = get_max_batchno("batch") batchno = get_max_batchno("batch")
# partial update # partial update
partial = kwargs.pop('partial', True) partial = kwargs.pop('partial', True)
instance = self.get_object() instance = self.get_object()
form_code = kwargs['form_code'] form_code = kwargs['form_code']
status_update = {"status": 'Draft'} status_update = {"status": 'Draft'}
serializer = self.get_serializer(instance, serializer = self.get_serializer(instance,
...@@ -476,41 +461,38 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -476,41 +461,38 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
# generate batchno history # generate batchno history
batchno = get_max_batchno("batch") batchno = get_max_batchno("batch")
# get old data action_data = {
old_instance = models.ChangeRequestFormApprovers.objects.filter( 'id': int(request.data['id']),
pk=id).values() 'action': action,
'remarks': remarks,
'action_date': datetime.now()
}
old_instance = list(old_instance) approver_instance = models.ChangeRequestFormApprovers.objects.get(
pk=id
# update current row in routing table )
models.ChangeRequestFormApprovers.objects.filter(
pk=id).update(action=action, serializer = serializers.ChangeRequestFormApproversSerializer(
remarks=remarks, approver_instance,
action_date=datetime.now()) data=action_data,
partial=True)
serializer.is_valid(raise_exception=True)
old_instance = model_to_dict(approver_instance)
# get new data self.perform_update(serializer)
new_instance = models.ChangeRequestFormApprovers.objects.filter( new_instance = serializer.data
pk=id).values()
new_instance = list(new_instance)
crenum = action.upper()
# save history in form approver
crhistory_save( crhistory_save(
batchno, batchno,
"ACTION", enums.CREnum.ACTION.value,
crenum, enums.CREnum.UPDATE.value,
enums.CREntitiesEnum.CR_FRM_APPROVER.value, enums.CREntitiesEnum.CR_FRM_APPROVER.value,
form_code, form_code,
old_instance, old_instance,
new_instance new_instance
) )
# get details of next approver/s
next_approver = models.ChangeRequestFormApprovers.objects.filter(
level=str(next_level),
form_code=form_code
)
if action.lower() == 'approved': if action.lower() == 'approved':
# NOTIF MSG FOR REQUESTOR # NOTIF MSG FOR REQUESTOR
...@@ -526,16 +508,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -526,16 +508,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
remarks, level remarks, level
) )
# LOOP on next approver for sending email next_approver_email(form_code, next_level)
for n_approver in next_approver:
if n_approver.delegation.lower() == 'vendor/implementor':
notification_msg = VENDOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
next_approver_email(
n_approver.user.code, form_code, delegation,
notification_msg
)
# update next approver details # update next approver details
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
...@@ -613,11 +586,15 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -613,11 +586,15 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
models.ChangeRequestFormHeader.objects.filter( models.ChangeRequestFormHeader.objects.filter(
form_code=form_code).update(status='Cancelled') form_code=form_code).update(status='Cancelled')
return Response(
"Action performed", message = status_message_response(
status=status.HTTP_200_OK 200, 'success',
'Action performed',
serializer.data
) )
return Response(message, status=status.HTTP_200_OK)
@transaction.atomic @transaction.atomic
@action( @action(
methods=['PATCH'], detail=True, methods=['PATCH'], detail=True,
......
app/applicationlayer/cms/utils_cr.py
View file @ 7a09a629
...@@ -18,6 +18,14 @@ from django.db.models import Max ...@@ -18,6 +18,14 @@ from django.db.models import Max
CR_FRONT_LINK = settings.CR_FRONT_LINK CR_FRONT_LINK = settings.CR_FRONT_LINK
APPROVER_MESSAGE = settings.APPROVER_MESSAGE
REQUESTOR_MESSAGE = settings.REQUESTOR_MESSAGE
REQUESTOR_REJECT_MESSAGE = settings.REQUESTOR_REJECT_MESSAGE
VENDOR_ACKNOWLEDGE_MESSAGE = settings.VENDOR_ACKNOWLEDGE_MESSAGE
REQUESTOR_ACKNOWLEDGE_MESSAGE = settings.REQUESTOR_ACKNOWLEDGE_MESSAGE
REQUESTOR_COMPLETION_MESSAGE = settings.REQUESTOR_COMPLETION_MESSAGE
VENDOR_ACCEPTANCE_MESSAGE = settings.VENDOR_ACCEPTANCE_MESSAGE
VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE
def entity_log_bulk(queryset, entity, tbl): def entity_log_bulk(queryset, entity, tbl):
...@@ -277,7 +285,7 @@ def send_mail_requestor(current_user, ...@@ -277,7 +285,7 @@ def send_mail_requestor(current_user,
current_user) current_user)
def next_approver_email(receiver, form_code, delegation, msg): def next_approver_email(form_code, next_level):
cr_link = f'{CR_FRONT_LINK}/{form_code}' cr_link = f'{CR_FRONT_LINK}/{form_code}'
template_instance = get_template_instance(form_code) template_instance = get_template_instance(form_code)
...@@ -289,12 +297,6 @@ def next_approver_email(receiver, form_code, delegation, msg): ...@@ -289,12 +297,6 @@ def next_approver_email(receiver, form_code, delegation, msg):
requested_to_priority = template_instance.requested_to_priority requested_to_priority = template_instance.requested_to_priority
cr_status = template_instance.status cr_status = template_instance.status
# next approver details --------------------------------------------------
receiver_instance = get_account_details(receiver)
receiver_name = receiver_instance.values_list('name', flat=True)[0]
receiver_email = receiver_instance.values_list('email', flat=True)[0]
receiver_code = receiver_instance.values_list('code', flat=True)[0]
# requestor details -------------------------------------------------- # requestor details --------------------------------------------------
sender_instance = get_account_details(requested_by_user) sender_instance = get_account_details(requested_by_user)
sender_email = sender_instance.values_list('email', flat=True)[0] sender_email = sender_instance.values_list('email', flat=True)[0]
...@@ -306,34 +308,55 @@ def next_approver_email(receiver, form_code, delegation, msg): ...@@ -306,34 +308,55 @@ def next_approver_email(receiver, form_code, delegation, msg):
company = get_companies_details(requested_to_company) company = get_companies_details(requested_to_company)
company_name = company.values_list('name', flat=True)[0] company_name = company.values_list('name', flat=True)[0]
# call sender email
name = receiver_name # get details of next approver/s
cr_number = cr_number next_approver = models.ChangeRequestFormApprovers.objects.filter(
cr_name = template_name level=str(next_level),
company_requestedto = company_name form_code=form_code
department_requestedto = dept_name )
priority_level = requested_to_priority
status = cr_status
url = cr_link
recipient = receiver_email # LOOP on next approver for sending email
delegation_type = delegation for n_approver in next_approver:
admin = sender_email
# NOTIF MSG FOR NEXT APPROVER
args = [name, cr_number, cr_name, msg = APPROVER_MESSAGE.split(';')[0]
company_requestedto, department_requestedto, priority_level,
status, url, recipient, delegation_type, admin] if n_approver.delegation.lower() == 'vendor/implementor':
msg = VENDOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
main_threading(args, sender.routing_table_actions_required)
# next approver details --------------------------------------------------
message = f"{sender_name} {msg} ({template_name})" receiver_instance = get_account_details(n_approver.user.code)
receiver_name = receiver_instance.values_list('name', flat=True)[0]
# create notification receiver_email = receiver_instance.values_list('email', flat=True)[0]
receiver_code = receiver_instance.values_list('code', flat=True)[0]
notification_create(form_code, message, receiver_code,
sender_code) # call sender email
name = receiver_name
cr_number = cr_number
cr_name = template_name
company_requestedto = company_name
department_requestedto = dept_name
priority_level = requested_to_priority
status = cr_status
url = cr_link
recipient = receiver_email
delegation_type = n_approver.delegation.lower()
admin = sender_email
args = [name, cr_number, cr_name,
company_requestedto, department_requestedto, priority_level,
status, url, recipient, delegation_type, admin]
main_threading(args, sender.routing_table_actions_required)
message = f"{sender_name} {msg} ({template_name})"
# create notification
notification_create(form_code, message, receiver_code,
sender_code)
def cancel_overdue(request): def cancel_overdue(request):
...@@ -448,5 +471,3 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code, ...@@ -448,5 +471,3 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
return True return True
except IntegrityError as exc: except IntegrityError as exc:
raise APIException(detail=exc) raise APIException(detail=exc)
app/applicationlayer/utils.py
View file @ 7a09a629
...@@ -139,39 +139,41 @@ def send_broadcast_message(room_name, sender, message): ...@@ -139,39 +139,41 @@ def send_broadcast_message(room_name, sender, message):
def notification_create(form_code, message, account_no, sender_account_no): def notification_create(form_code, message, account_no, sender_account_no):
# try:
v = Notification.objects.create(
form_code=form_code,
notif_type='TASK',
message=message,
is_read=False,
app='APP-20190909-0000002',
account_no=account_no,
sender_account_no=sender_account_no
)
print(v)
# ROOM = account_no
# SENDER = sender_account_no
# send_broadcast_message( try:
# ROOM,
# SENDER, Notification.objects.create(
# 'NEW NOTIFICATIONS' form_code=form_code,
# ) notif_type='TASK',
message=message,
# message = { is_read=False,
# 'code': 200, app='APP-20190909-0000002',
# 'status': 'success', account_no=account_no,
# 'message': 'Notification successfully created!', sender_account_no=sender_account_no
# } )
# return Response(message, status=status.HTTP_200_OK)
return True ROOM = account_no
SENDER = sender_account_no
send_broadcast_message(
ROOM,
SENDER,
'NEW NOTIFICATIONS'
)
# except Exception as e: # message = {
# message = { # 'code': 200,
# 'code': 500, # 'status': 'success',
# 'status': 'failed', # 'message': 'Notification successfully created!',
# 'message': 'Request was not able to process' + str(e.__class__) # }
# } # return Response(message, status=status.HTTP_200_OK)
# return Response(message, return True
# status=status.HTTP_500_INTERNAL_SERVER_ERROR)
\ No newline at end of file except Exception as e:
message = {
'code': 500,
'status': 'failed',
'message': 'Request was not able to process' + str(e.__class__)
}
return Response(message,
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
\ No newline at end of file
app/entities/enums.py
View file @ 7a09a629
...@@ -103,6 +103,7 @@ class CREnum(Enum): ...@@ -103,6 +103,7 @@ class CREnum(Enum):
ACCEPTED = "ACCEPTED" ACCEPTED = "ACCEPTED"
ACKNOWLEDGED = "ACKNOWLEDGED" ACKNOWLEDGED = "ACKNOWLEDGED"
REJECTED = "REJECTED" REJECTED = "REJECTED"
ACTION = "ACTION"
class CREntitiesEnum(Enum): class CREntitiesEnum(Enum):
......
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