Skip to content

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

fix issues

parent d89788b2
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 137 deletions
app/applicationlayer/cms/form/header/serializers.py
View file @ eef24a7c
......@@ -45,7 +45,7 @@ class ChangeRequestFormHeaderSerializer(
else:
approver = 'No'
ret['action'] = approver
ret['action_required'] = approver
requested_to_user = {
"id": instance.requested_to_user.id,
......
app/applicationlayer/cms/form/header/views.py
View file @ eef24a7c
......@@ -1026,6 +1026,14 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
enums.CREnum.SUBMIT.value
)
min_level = models.ChangeRequestFormApprovers.objects.filter(
form_code=form_code
).aggregate(Min('level'))
min_level = min_level.get('level__min')
next_approver_email(form_code, min_level)
serializer = self.get_serializer(instance)
message = status_message_response(
......
app/applicationlayer/cms/urls_cms.py
View file @ eef24a7c
......@@ -3,7 +3,6 @@ from rest_framework import routers
from django.conf.urls import url
from rest_framework.urlpatterns import format_suffix_patterns
from app.applicationlayer.management.notification.views import NotificationsViewset
from app.applicationlayer.cms.form import views as crform_views
from app.applicationlayer.cms.allowed_company import views as allowed
......@@ -36,8 +35,6 @@ from app.applicationlayer.cms.form.download import views as dl
router = routers.DefaultRouter()
router.register(r'notifications', NotificationsViewset)
router.register(r'template', header.ChangeRequestTemplatesViewset)
router.register(r'template-approvers', approver.ChangeRequestTemplateApproversViewset)
router.register(r'template-attachments', attachment.ChangeRequestTemplateAttachmentsViewset)
......
app/applicationlayer/management/notification/views.py
View file @ eef24a7c
......@@ -29,7 +29,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
pagination_class = CustomPagination
def list(self, request, *args, **kwargs):
try:
# try:
req = self.request
account_no = req.query_params.get('account_no')
app = req.query_params.get('app')
......@@ -62,6 +62,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
)
return Response(message)
serializer = self.get_serializer(queryset, many=True)
page = self.paginate_queryset(queryset)
if page is not None:
......@@ -76,12 +77,12 @@ class NotificationsViewset(meviewsets.ModelViewSet):
return self.get_paginated_response(message)
except Exception as e:
message = status_message_response(
500, 'failed',
'Request was not able to process' + str(e), [])
return Response(message,
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# except Exception as e:
# message = status_message_response(
# 500, 'failed',
# 'Request was not able to process' + str(e), [])
# return Response(message,
# status=status.HTTP_500_INTERNAL_SERVER_ERROR)
# comment
@action(methods=["PATCH"], detail=True)
......
app/applicationlayer/urls.py
View file @ eef24a7c
......@@ -8,6 +8,7 @@ from app.applicationlayer.management.department.views import DepartmentViewSet
from app.applicationlayer.management.module.views import ModuleViewSet
from app.applicationlayer.management.account.views import UserViewSet
from app.businesslayer.company.views import AdminCompanyViewSet
from app.applicationlayer.management.notification.views import NotificationsViewset
router = routers.DefaultRouter()
......@@ -17,6 +18,7 @@ router.register(r'companies', CompanyViewSet)
router.register(r'departments', DepartmentViewSet)
router.register(r'modules', ModuleViewSet)
router.register(r'users', UserViewSet)
router.register(r'notifications', NotificationsViewset)
urlpatterns = (
path('', include(router.urls)),
......
app/helper/email_service/sender.py
View file @ eef24a7c
......@@ -485,7 +485,7 @@ def admin_changepassword(args):
def routing_table_actions(args):
name = args[0]
action_by = args[1]
routing_level = args[2]
routing_level = str(args[2])
status = args[3]
cr_number = args[4]
cr_name = args[5]
......
env.template.ini
View file @ eef24a7c
......@@ -40,7 +40,7 @@ FRONT_END_URL = http://devweb.rmsv2.oneberrysystem.com
AUTH_ACCESSS_TOKEN_TIMEOUT =
USER_DEFAULT_PASSWORD =
CATCH_EMAIL = gladys@tirsolutions.com
CR_LINK = http://devweb.rms.oneberrysystem.com/cms/change-request/form/view
CR_LINK = http://devweb.rmsv2.oneberrysystem.com//cms/change-request/form/view
REALTIMESERVER_IP = 127.0.0.1:8000
[LOCAL]
......
requirements/RMSv2.postman_collection.json
View file @ eef24a7c
......@@ -1156,16 +1156,6 @@
"disableBodyPruning": true
},
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "951574546a6d45af34dfef101840bba27f1ab574",
"type": "string"
}
]
},
"method": "GET",
"header": [
{
......@@ -1424,14 +1414,14 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/change-request/form/FRM-20190927-0000002/",
"raw": "{{baseurl}}/change-request/form/FRM-20190928-0000002/",
"host": [
"{{baseurl}}"
],
"path": [
"change-request",
"form",
"FRM-20190927-0000002",
"FRM-20190928-0000002",
""
]
}
......@@ -1494,7 +1484,7 @@
],
"body": {
"mode": "raw",
"raw": "{\r\n \"id\": 18,\r\n \"form_code\": \"FRM-20190927-0000004\",\r\n \"delegation\": \"SD/OD\",\r\n \"action\": \"approved\",\r\n \"level\": \"3\",\r\n \"remarks\": \"\",\r\n \"form_status\": \"Pending\"\r\n}",
"raw": "{\r\n \"id\": 4,\r\n \"form_code\": \"FRM-20190928-0000001\",\r\n \"delegation\": \"Vendor/Implementor\",\r\n \"action\": \"completed\",\r\n \"level\": \"4\",\r\n \"remarks\": \"\",\r\n \"form_status\": \"Approved\"\r\n}",
"options": {
"raw": {
"language": "json"
......@@ -1530,7 +1520,7 @@
],
"body": {
"mode": "raw",
"raw": "{\r\n \"requested_to_template_name\": \"Security Projects\",\r\n \"requested_to_objective\": \"Sample Objective\",\r\n \"requested_to_target_date\": \"2019-09-03T13:59:29.694560\",\r\n \"requested_to_priority\": \"Normal\",\r\n \"description\": \"Lorem Ipsum\",\r\n \"company_desc\": \"Oneberry\",\r\n \"department_desc\": \"Oneberry Superuser\",\r\n \"requested_desc\": \"Super User\",\r\n \"requested_to_template_id\": \"JTC\",\r\n \"requested_to_company\": \"COMPANY-20190923-0000002\",\r\n \"requested_to_department\": \"DEPARTMENT-20190923-0000002\",\r\n \"requested_to_user\": \"USER-20190923-0000001\",\r\n \"requested_by_user\": \"USER-20190923-0000001\",\r\n \"requested_by_department\": \"DEPARTMENT-20190923-0000002\",\r\n \"template_no\": \"TMP-20190927-0000001\",\r\n \"frm_approvers\": [\r\n {\r\n \"id\": 1,\r\n \"level\": \"1\",\r\n \"delegation\": \"HOD\",\r\n \"created\": \"2019-09-27T16:33:40.650391\",\r\n \"code\": \"FRMAPR-20190927-0000001\",\r\n \"remarks\": null,\r\n \"action\": null,\r\n \"action_date\": null,\r\n \"date_sent\": null,\r\n \"user\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_approver\": null\r\n },\r\n {\r\n \"id\": 2,\r\n \"level\": \"2\",\r\n \"delegation\": \"Approver\",\r\n \"created\": \"2019-09-27T16:33:40.698423\",\r\n \"code\": \"FRMAPR-20190927-0000002\",\r\n \"remarks\": null,\r\n \"action\": null,\r\n \"action_date\": null,\r\n \"date_sent\": null,\r\n \"user\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_approver\": null\r\n }\r\n ],\r\n \"frm_stakes\": [\r\n {\r\n \"id\": 1,\r\n \"delegation\": \"Mandatory Stakeholder\",\r\n \"created\": \"2019-09-27T16:33:40.712421\",\r\n \"code\": \"FRMSTK-20190927-0000001\",\r\n \"date_added\": null,\r\n \"user\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_stake\": null\r\n }\r\n ],\r\n \"frm_attachments\": [\r\n {\r\n \"id\": 1,\r\n \"attachment_type\": \"Hello\",\r\n \"attachment_name\": \"heyu\",\r\n \"file_name\": \"Sample\",\r\n \"description\": \"Sameple Desc\",\r\n \"created\": \"2019-09-27T16:33:40.720390\",\r\n \"code\": \"FRMATCH-20190927-0000001\",\r\n \"uploaded_by\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"file_upload\": null,\r\n \"tmp_attach\": null\r\n }\r\n ],\r\n \"frm_details\": [\r\n {\r\n \"id\": 1,\r\n \"field_idx\": \"Hello\",\r\n \"field_ref\": \"heyu\",\r\n \"field_val\": \"Sample\",\r\n \"field_props\": \"Sameple Desc\",\r\n \"created\": \"2019-09-27T16:33:40.765389\",\r\n \"code\": \"FRMDETAIL-20190927-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_detail\": null\r\n }\r\n ]\r\n}",
"raw": "{\r\n \"requested_to_template_name\": \"Security Projects\",\r\n \"requested_to_objective\": \"Sample Objective\",\r\n \"requested_to_target_date\": \"2019-09-03T13:59:29.694560\",\r\n \"requested_to_priority\": \"Normal\",\r\n \"description\": \"Lorem Ipsum\",\r\n \"company_desc\": \"Oneberry\",\r\n \"department_desc\": \"Oneberry Superuser\",\r\n \"requested_desc\": \"Super User\",\r\n \"requested_to_template_id\": \"JTC\",\r\n \"requested_to_company\": \"COMPANY-20190923-0000002\",\r\n \"requested_to_department\": \"DEPARTMENT-20190923-0000002\",\r\n \"requested_to_user\": \"USER-20190923-0000001\",\r\n \"requested_by_user\": \"USER-20190923-0000001\",\r\n \"requested_by_department\": \"DEPARTMENT-20190923-0000002\",\r\n \"template_no\": \"TMP-20190928-0000006\",\r\n \"frm_approvers\": [\r\n {\r\n \"id\": 1,\r\n \"level\": \"1\",\r\n \"delegation\": \"HOD\",\r\n \"created\": \"2019-09-27T16:33:40.650391\",\r\n \"code\": \"FRMAPR-20190927-0000001\",\r\n \"remarks\": null,\r\n \"action\": null,\r\n \"action_date\": null,\r\n \"date_sent\": null,\r\n \"user\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_approver\": null\r\n },\r\n {\r\n \"id\": 2,\r\n \"level\": \"2\",\r\n \"delegation\": \"Approver\",\r\n \"created\": \"2019-09-27T16:33:40.698423\",\r\n \"code\": \"FRMAPR-20190927-0000002\",\r\n \"remarks\": null,\r\n \"action\": null,\r\n \"action_date\": null,\r\n \"date_sent\": null,\r\n \"user\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_approver\": null\r\n }\r\n ],\r\n \"frm_stakes\": [\r\n {\r\n \"id\": 1,\r\n \"delegation\": \"Mandatory Stakeholder\",\r\n \"created\": \"2019-09-27T16:33:40.712421\",\r\n \"code\": \"FRMSTK-20190927-0000001\",\r\n \"date_added\": null,\r\n \"user\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_stake\": null\r\n }\r\n ],\r\n \"frm_attachments\": [\r\n {\r\n \"id\": 1,\r\n \"attachment_type\": \"Hello\",\r\n \"attachment_name\": \"heyu\",\r\n \"file_name\": \"Sample\",\r\n \"description\": \"Sameple Desc\",\r\n \"created\": \"2019-09-27T16:33:40.720390\",\r\n \"code\": \"FRMATCH-20190927-0000001\",\r\n \"uploaded_by\": \"USER-20190923-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"file_upload\": null,\r\n \"tmp_attach\": null\r\n }\r\n ],\r\n \"frm_details\": [\r\n {\r\n \"id\": 1,\r\n \"field_idx\": \"Hello\",\r\n \"field_ref\": \"heyu\",\r\n \"field_val\": \"Sample\",\r\n \"field_props\": \"Sameple Desc\",\r\n \"created\": \"2019-09-27T16:33:40.765389\",\r\n \"code\": \"FRMDETAIL-20190927-0000001\",\r\n \"form_code\": \"FRM-20190927-0000001\",\r\n \"tmp_detail\": null\r\n }\r\n ]\r\n}",
"options": {
"raw": {
"language": "json"
......@@ -1538,14 +1528,14 @@
}
},
"url": {
"raw": "{{baseurl}}/change-request/form/FRM-20190927-0000001/submit/",
"raw": "{{baseurl}}/change-request/form/FRM-20190928-0000002/submit/",
"host": [
"{{baseurl}}"
],
"path": [
"change-request",
"form",
"FRM-20190927-0000001",
"FRM-20190928-0000002",
"submit",
""
]
......@@ -2348,16 +2338,6 @@
"disableBodyPruning": true
},
"request": {
"auth": {
"type": "bearer",
"bearer": [
{
"key": "token",
"value": "951574546a6d45af34dfef101840bba27f1ab574",
"type": "string"
}
]
},
"method": "GET",
"header": [],
"body": {
......@@ -2365,18 +2345,20 @@
"raw": ""
},
"url": {
"raw": "http://localhost:8000/api/v1/management/notifications/",
"protocol": "http",
"raw": "{{baseurl}}/management/notifications/?account_no=USER-20190927-0000011",
"host": [
"localhost"
"{{baseurl}}"
],
"port": "8000",
"path": [
"api",
"v1",
"management",
"notifications",
""
],
"query": [
{
"key": "account_no",
"value": "USER-20190927-0000011"
}
]
}
},
......@@ -2385,21 +2367,6 @@
{
"name": "Update Read Status by ids",
"request": {
"auth": {
"type": "basic",
"basic": [
{
"key": "password",
"value": "password123",
"type": "string"
},
{
"key": "username",
"value": "admin",
"type": "string"
}
]
},
"method": "PATCH",
"header": [
{
......@@ -2411,22 +2378,17 @@
],
"body": {
"mode": "raw",
"raw": "{\n\t\"ids\": [8]\n}"
"raw": "{\n\t\"ids\": [5]\n}"
},
"url": {
"raw": "http://devapi.rmsv2.oneberrysystem.com/api/v1/notifications/USER-20190903-0000002/seen/",
"protocol": "http",
"raw": "{{baseurl}}/management/notifications/USER-20190927-0000011/seen/",
"host": [
"devapi",
"rmsv2",
"oneberrysystem",
"com"
"{{baseurl}}"
],
"path": [
"api",
"v1",
"management",
"notifications",
"USER-20190903-0000002",
"USER-20190927-0000011",
"seen",
""
]
......@@ -2437,21 +2399,6 @@
{
"name": "Update Read Status by account_no",
"request": {
"auth": {
"type": "basic",
"basic": [
{
"key": "password",
"value": "password123",
"type": "string"
},
{
"key": "username",
"value": "admin",
"type": "string"
}
]
},
"method": "PATCH",
"header": [
{
......@@ -2466,19 +2413,14 @@
"raw": ""
},
"url": {
"raw": "http://devapi.rmsv2.oneberrysystem.com/api/v1/notifications/USER-20190903-0000002/seenall/",
"protocol": "http",
"raw": "{{baseurl}}/management/notifications/USER-20190927-0000011/seenall/",
"host": [
"devapi",
"rmsv2",
"oneberrysystem",
"com"
"{{baseurl}}"
],
"path": [
"api",
"v1",
"management",
"notifications",
"USER-20190903-0000002",
"USER-20190927-0000011",
"seenall",
""
]
......@@ -2495,7 +2437,7 @@
"bearer": [
{
"key": "token",
"value": "9139808ae1e35399e754f615084197f6bcfbacaa",
"value": "998954dc92b60118210623c52ff8ff7ac81112e2",
"type": "string"
}
]
......
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