Skip to content

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

Merge pull request #138 in RMS/api-main-service from red-develop to RMSv2 

* commit 'fd2e5d09':
  bug fix on master department
parents b5cab699 fd2e5d09
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 52 deletions
app/applicationlayer/cms/template/views.py
View file @ 84f273d6
......@@ -142,9 +142,9 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
serializer = self.get_serializer(instance)
return Response(serializer.data)
# @transaction.atomic()
@transaction.atomic()
def destroy(self, request, *args, **kwargs):
# try:
try:
template_no = self.kwargs['template_no']
......@@ -203,9 +203,9 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
models.ChangeRequestTemplateHeader
)
return Response({"message": "Deleted"}, status=status.HTTP_200_OK)
# except Exception as e:
# return Response(e,
# status=status.HTTP_500_INTERNAL_SERVER_ERROR)
except Exception as e:
return Response(e,
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@transaction.atomic
def partial_update(self, request, *args, **kwargs):
......
app/applicationlayer/master/department/views.py
View file @ 84f273d6
......@@ -26,20 +26,28 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
# @rms.department_list
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)
try:
company = self.request.query_params['company_code']
queryset = self.filter_queryset(self.get_queryset())
queryset = queryset.filter(company__code=company)
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 Department found',
serializer.data
)
return self.get_paginated_response(message)
except Exception as e:
# serializer = self.get_serializer(queryset, many=True)
message = status_message_response(
200,
'success',
'list of Department found',
serializer.data
400,
'failed',
'company_code is required',
''
)
return self.get_paginated_response(message)
serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data)
return Response(message)
requirements/RMSv2 copy.postman_collection.json
View file @ 84f273d6
......@@ -96,7 +96,15 @@
"raw": ""
},
"url": {
"raw": ""
"raw": "{{baseurl}}/master/users/",
"host": [
"{{baseurl}}"
],
"path": [
"master",
"users",
""
]
}
},
"response": []
......@@ -2184,15 +2192,11 @@
"raw": ""
},
"url": {
"raw": "http://localhost:8000/api/v1/change-request/allowed-companies/",
"protocol": "http",
"raw": "{{baseurl}}/change-request/allowed-companies/",
"host": [
"localhost"
"{{baseurl}}"
],
"port": "8000",
"path": [
"api",
"v1",
"change-request",
"allowed-companies",
""
......@@ -2218,15 +2222,11 @@
"raw": "{\n\t\"form\": [\n {\n \"create_change_request\": true,\n \"create_change_request_template\": true,\n \"view_all_change_request\": true,\n \"id_number\": \"USER-20190917-0000001\",\n \"company_pivot\": \"COMPANY-20190917-0000001\",\n \"group_pivots\": \"DEPARTMENT-20190917-0000001\"\n },\n {\n \"create_change_request\": true,\n \"create_change_request_template\": true,\n \"view_all_change_request\": true,\n \"id_number\": \"USER-20190917-0000001\",\n \"company_pivot\": \"COMPANY-20190917-0000002\",\n \"group_pivots\": \"DEPARTMENT-20190917-0000002\"\n }\n ]\n}"
},
"url": {
"raw": "http://localhost:8000/api/v1/change-request/allowed-companies/",
"protocol": "http",
"raw": "{{baseurl}}/change-request/allowed-companies/",
"host": [
"localhost"
"{{baseurl}}"
],
"port": "8000",
"path": [
"api",
"v1",
"change-request",
"allowed-companies",
""
......@@ -2251,15 +2251,11 @@
"raw": ""
},
"url": {
"raw": "http://localhost:8000/api/v1/change-request/companies/",
"protocol": "http",
"raw": "{{baseurl}}/change-request/companies/",
"host": [
"localhost"
"{{baseurl}}"
],
"port": "8000",
"path": [
"api",
"v1",
"change-request",
"companies",
""
......@@ -2278,15 +2274,11 @@
"raw": ""
},
"url": {
"raw": "http://localhost:8000/api/v1/change-request/departments/?company_code=COMPANY-20190917-0000001",
"protocol": "http",
"raw": "{{baseurl}}/change-request/departments/?company_code=COMPANY-20190917-0000001",
"host": [
"localhost"
"{{baseurl}}"
],
"port": "8000",
"path": [
"api",
"v1",
"change-request",
"departments",
""
......@@ -2311,15 +2303,11 @@
"raw": ""
},
"url": {
"raw": "http://localhost:8000/api/v1/change-request/user-list/?department_code=DEPARTMENT-20190917-0000001&company_code=COMPANY-20190917-0000001",
"protocol": "http",
"raw": "{{baseurl}}/change-request/user-list/?department_code=DEPARTMENT-20190917-0000001&company_code=COMPANY-20190917-0000001",
"host": [
"localhost"
"{{baseurl}}"
],
"port": "8000",
"path": [
"api",
"v1",
"change-request",
"user-list",
""
......@@ -2544,7 +2532,7 @@
"bearer": [
{
"key": "token",
"value": "d8df1da658a26c27000ea359180d28f3422b6659",
"value": "777c6ebeb20e99c4f329708490528b68ee56002f",
"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