Skip to content

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

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

* commit '72a14c16':
  fixed the ordering of accounts at master endpoint
  remove outdated database and postman
parents f23743b6 72a14c16
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 236 additions and 8869 deletions
app/applicationlayer/cms/urls_cms.py
View file @ b5cab699
......@@ -24,9 +24,15 @@ router.register(r'form-approvers', crform_views.ChangeRequestFormApproversViewse
router.register(r'form-stakeholders', crform_views.ChangeRequestFormStakeHoldersViewset)
router.register(r'form-attachments', crform_views.ChangeRequestFormAttachmentsViewset)
router.register(r'form-details', crform_views.ChangeRequestFormDetailsViewset)
# privilege CMS
router.register(r'allowed-companies', allowed.AllowedCompanyViewSet)
# privilege CMS
# filter endpoints under Allowed Companies table
router.register(r'companies', ChangeRequestCompanyViewSet)
router.register(r'departments', ChangeRequestDepartmentViewSet)
# filter endpoints under Allowed Companies table
urlpatterns = (
......
app/applicationlayer/master/Account/views.py
View file @ b5cab699
......@@ -15,7 +15,7 @@ from app.helper.decorators import rms
class AdminAccountViewSet(viewsets.ModelViewSet):
queryset = User.objects.all().order_by('-created')
queryset = User.objects.all().order_by('-id')
serializer_class = serializer.AdminAccountSerializer
pagination_class = CustomPagination
lookup_field = 'code'
......
requirements/RMSv2.postman_collection_091619 → requirements/RMSv2 copy.postman_collection.json
View file @ b5cab699
......@@ -85,6 +85,21 @@
}
},
"response": []
},
{
"name": "User Listing",
"request": {
"method": "GET",
"header": [],
"body": {
"mode": "raw",
"raw": ""
},
"url": {
"raw": ""
}
},
"response": []
}
],
"_postman_isSubFolder": true
......@@ -331,17 +346,17 @@
],
"body": {
"mode": "raw",
"raw": "{\n\t\"name\": \"TIR2\",\n\t\"contact_details\": \"2152509\"\n}"
"raw": "{\n\t\"name\": \"Oneberry Technologies\",\n\t\"contact_details\": \"2152509\"\n}"
},
"url": {
"raw": "{{baseurl}}/management/companies/COMPANY-20190917-0000002/",
"raw": "{{baseurl}}/management/companies/COMPANY-20190923-0000001/",
"host": [
"{{baseurl}}"
],
"path": [
"management",
"companies",
"COMPANY-20190917-0000002",
"COMPANY-20190923-0000001",
""
]
}
......@@ -446,7 +461,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"name\": \"Business Develsopment2\",\n \"company\": \"COMPANY-20190917-0000001\"\n}"
"raw": "{\n \"name\": \"Business Develsopment\",\n \"company\": \"COMPANY-20190923-0000001\"\n}"
},
"url": {
"raw": "{{baseurl}}/management/departments/",
......@@ -746,7 +761,7 @@
],
"body": {
"mode": "raw",
"raw": "{\r\n\t\"application\":[\"APP-20190917-0000001\",\"APP-20190917-0000003\"],\r\n\t\"department\": \"DEPARTMENT-20190917-0000002\",\r\n\t\"user_type\": \"OUA\",\r\n\t\"name\": \"Rita\",\r\n\t\"username\": \"obrita\",\r\n\t\"doa\":\"\",\r\n\t\"default_app\": \"APP-20190917-0000001\",\r\n\t\"contact_no\": \"1312313\",\r\n\t\"email\": \"test@gmail.com\"\r\n}\r\n"
"raw": "{\r\n\t\"application\":[\"APP-20190923-0000001\"],\r\n\t\"department\": \"DEPARTMENT-20190923-0000002\",\r\n\t\"user_type\": \"OUA\",\r\n\t\"name\": \"Rita\",\r\n\t\"username\": \"obrita\",\r\n\t\"doa\":\"\",\r\n\t\"default_app\": \"APP-20190917-0000001\",\r\n\t\"contact_no\": \"1312313\",\r\n\t\"email\": \"test@gmail.com\"\r\n}\r\n"
},
"url": {
"raw": "{{baseurl}}/management/users/",
......@@ -840,13 +855,14 @@
"raw": ""
},
"url": {
"raw": "{{baseurl}}/users/3/",
"raw": "{{baseurl}}/management/users/USER-20190920-0000065/",
"host": [
"{{baseurl}}"
],
"path": [
"management",
"users",
"3",
"USER-20190920-0000065",
""
]
}
......@@ -899,10 +915,10 @@
],
"body": {
"mode": "raw",
"raw": "{\n\t\"old_password\": \"password123\",\n\t\"new_password\": \"newpassword011\",\n\t\"new_password_confirm\": \"newpassword011\"\n}"
"raw": ""
},
"url": {
"raw": "{{baseurl}}/management/users/USER-20190920-0000028/change-password/",
"raw": "{{baseurl}}/management/users/USER-20190920-0000028/reset-password/",
"host": [
"{{baseurl}}"
],
......@@ -910,7 +926,7 @@
"management",
"users",
"USER-20190920-0000028",
"change-password",
"reset-password",
""
]
}
......@@ -996,6 +1012,9 @@
{
"name": "Forgot Password",
"request": {
"auth": {
"type": "noauth"
},
"method": "POST",
"header": [
{
......@@ -1007,7 +1026,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n\t\"email\": \"johnredsmedrano@gmail.com\"\n}"
"raw": "{\n\t\"email\": \"red@tirsolutions.com\"\n}"
},
"url": {
"raw": "http://localhost:8000/api/v1/auth/forgot-password/",
......@@ -1555,43 +1574,6 @@
}
],
"_postman_isSubFolder": true
},
{
"name": "List of User ",
"request": {
"method": "GET",
"header": [],
"body": {
"mode": "raw",
"raw": ""
},
"url": {
"raw": "http://localhost:8000/api/v1/change-request/user-list/?department_code=DEPARTMENT-20190917-0000001&company_code=COMPANY-20190917-0000001",
"protocol": "http",
"host": [
"localhost"
],
"port": "8000",
"path": [
"api",
"v1",
"change-request",
"user-list",
""
],
"query": [
{
"key": "department_code",
"value": "DEPARTMENT-20190917-0000001"
},
{
"key": "company_code",
"value": "COMPANY-20190917-0000001"
}
]
}
},
"response": []
}
],
"_postman_isSubFolder": true
......@@ -2318,6 +2300,43 @@
}
},
"response": []
},
{
"name": "List of User ",
"request": {
"method": "GET",
"header": [],
"body": {
"mode": "raw",
"raw": ""
},
"url": {
"raw": "http://localhost:8000/api/v1/change-request/user-list/?department_code=DEPARTMENT-20190917-0000001&company_code=COMPANY-20190917-0000001",
"protocol": "http",
"host": [
"localhost"
],
"port": "8000",
"path": [
"api",
"v1",
"change-request",
"user-list",
""
],
"query": [
{
"key": "department_code",
"value": "DEPARTMENT-20190917-0000001"
},
{
"key": "company_code",
"value": "COMPANY-20190917-0000001"
}
]
}
},
"response": []
}
],
"_postman_isSubFolder": true
......@@ -2525,7 +2544,7 @@
"bearer": [
{
"key": "token",
"value": "ca1b9e964488b11c735d8d54cc0fef01a96a899e",
"value": "d8df1da658a26c27000ea359180d28f3422b6659",
"type": "string"
}
]
......
requirements/RMSv2.postman_collection.json deleted 100644 → 0
View file @ f23743b6
This diff is collapsed.
requirements/RMSv2.postman_collection_092019_CMS deleted 100644 → 0
View file @ f23743b6
This diff is collapsed.
requirements/modules.sql deleted 100644 → 0
View file @ f23743b6
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (1, '2019-09-03 14:19:25.504073', '', '2019-09-04 16:48:50.127104', 'admin', 'MODULE-20190904-0000001', 'Application Management', 0, 4, 1, '/rms/application-management');
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (2, '2019-09-03 14:21:24.286404', '', '2019-09-04 16:49:13.660932', 'admin', 'MODULE-20190904-0000002', 'Company Management', 0, 5, 1, '/rms/company-management');
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (3, '2019-09-03 14:21:31.402049', '', '2019-09-04 16:49:34.601081', 'admin', 'MODULE-20190904-0000003', 'Department Management', 0, 6, 1, '/rms/department-management');
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (4, '2019-09-03 14:21:38.762899', '', '2019-09-04 16:49:45.865485', 'admin', 'MODULE-20190904-0000004', 'Module Management', 0, 7, 1, '/rms/department-management');
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (5, '2019-09-03 14:32:08.507515', '', '2019-09-04 16:50:03.868745', 'admin', 'MODULE-20190904-0000005', 'User Management', 0, 8, 1, '/rms/user-management');
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (6, '2019-09-03 14:35:50.893193', '', '2019-09-04 16:47:24.621874', 'admin', 'MODULE-20190904-0000006', 'Notification', 0, 1, 2, '/cms/notifications');
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (7, '2019-09-03 14:35:57.413233', '', '2019-09-04 16:47:58.262216', 'admin', 'MODULE-20190904-0000007', 'Change Request', 0, 2, 2, '/cms/change-request/form');
INSERT INTO `modules` (`id`, `created`, `createdby`, `modified`, `modifiedby`, `code`, `name`, `parent`, `sort_id`, `application_id`, `component`) VALUES (8, '2019-09-03 14:36:04.452517', '', '2019-09-04 16:48:06.587965', 'admin', 'MODULE-20190904-0000008', 'Change Request Template', 0, 3, 2, '/cms/change-request/template');
requirements/rms.sql deleted 100644 → 0
View file @ f23743b6
This diff is collapsed.
requirements/rms_091619.sql deleted 100644 → 0
View file @ f23743b6
This diff is collapsed.
requirements/rms_092019_CMS.sql deleted 100644 → 0
View file @ f23743b6
This diff is collapsed.
requirements/rms_092319.sql deleted 100644 → 0
View file @ f23743b6
This diff is collapsed.
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