Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UM-6596 Staging 2.9 upgrade #2809

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

UM-6596 Staging 2.9 upgrade #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5983476
UM-6596 Staging 2.9 upgrade
Gurjeet-eGov Nov 6, 2023
d593f5e
UM-6596 staging 2.9 upgrade
Gurjeet-eGov Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
318 changes: 318 additions & 0 deletions egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 112 additions & 0 deletions egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,14 @@
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "sdssOverviewCitizenFeedbackScore",
"name": "DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
}
]
},
Expand Down Expand Up @@ -476,6 +484,30 @@
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssOverviewPendancy",
"name": "NATIONAL_DSS_OVERVIEW_PENDANCY",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssPtCitizenServiceDeliveryIndex",
"name": "NATIONAL_DSS_PT_CITIZEN_SERVICE_DELIVERY_INDEX",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssOverviewCitizenFeedbackScore",
"name": "NATIONAL_DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
}
]
},
Expand Down Expand Up @@ -850,6 +882,22 @@
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "sdssPtSlaAchieved",
"name": "DSS_PT_SLA_ACHIEVED",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "sdssPtCitizenFeedbackScore",
"name": "DSS_PT_CITIZEN_FEEDBACK_SCORE",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
}
]
},
Expand Down Expand Up @@ -1251,6 +1299,38 @@
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssPtSlaAchieved",
"name": "NATIONAL_DSS_PT_SLA_ACHIEVED",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssPtPendancy",
"name": "NATIONAL_DSS_PT_PENDANCY",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssPtCitizenServiceDeliveryIndex",
"name": "NATIONAL_DSS_PT_CITIZEN_SERVICE_DELIVERY_INDEX",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssPtCitizenFeedbackScore",
"name": "NATIONAL_DSS_PT_CITIZEN_FEEDBACK_SCORE",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
}
]
},
Expand Down Expand Up @@ -3637,6 +3717,14 @@
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "sdssOverviewCitizenFeedbackScore",
"name": "DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
}
]
},
Expand Down Expand Up @@ -8395,6 +8483,30 @@
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssOverviewCitizenFeedbackScore",
"name": "NATIONAL_DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssPtCitizenServiceDeliveryIndex",
"name": "NATIONAL_DSS_PT_CITIZEN_SERVICE_DELIVERY_INDEX",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
},
{
"id": "nssOverviewPendancy",
"name": "NATIONAL_DSS_OVERVIEW_PENDANCY",
"code": "",
"chartType": "metric",
"filter": "",
"headers": []
}
]
}
Expand Down
32 changes: 28 additions & 4 deletions egov-indexer/property-services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,13 @@ ServiceMaps:
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.ProcessInstances
outJsonPath: $.Data.history
outJsonPath: $.Data.history
- path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search
queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.BusinessServices[0].businessServiceSla
outJsonPath: $.Data.businessserviceSla
mdmsMapping:
- path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
moduleName: tenant
Expand Down Expand Up @@ -394,7 +400,13 @@ ServiceMaps:
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.ProcessInstances
outJsonPath: $.Data.history
outJsonPath: $.Data.history
- path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search
queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.BusinessServices[0].businessServiceSla
outJsonPath: $.Data.businessserviceSla
mdmsMapping:
- path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
moduleName: tenant
Expand Down Expand Up @@ -542,7 +554,13 @@ ServiceMaps:
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.ProcessInstances
outJsonPath: $.Data.history
outJsonPath: $.Data.history
- path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search
queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.BusinessServices[0].businessServiceSla
outJsonPath: $.Data.businessserviceSla
mdmsMapping:
- path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
moduleName: tenant
Expand Down Expand Up @@ -701,7 +719,13 @@ ServiceMaps:
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.ProcessInstances
outJsonPath: $.Data.history
outJsonPath: $.Data.history
- path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search
queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId
apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}}
uriResponseMapping:
- inJsonPath: $.BusinessServices[0].businessServiceSla
outJsonPath: $.Data.businessserviceSla
mdmsMapping:
- path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
moduleName: tenant
Expand Down
138 changes: 138 additions & 0 deletions egov-persister/service-request-persister.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
serviceMaps:
serviceName: service-request
mappings:
- version: 1.0
description: Persists service definition details in service definition table
fromTopic: save-service-definition
isTransaction: true
queryMaps:

- query: INSERT INTO eg_service_definition(id, tenantid, code, module, isactive, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails, clientid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
basePath: $.ServiceDefinition
jsonMaps:
- jsonPath: $.ServiceDefinition.id

- jsonPath: $.ServiceDefinition.tenantId

- jsonPath: $.ServiceDefinition.code

- jsonPath: $.ServiceDefinition.module

- jsonPath: $.ServiceDefinition.isActive

- jsonPath: $.ServiceDefinition.auditDetails.createdBy

- jsonPath: $.ServiceDefinition.auditDetails.lastModifiedBy

- jsonPath: $.ServiceDefinition.auditDetails.createdTime

- jsonPath: $.ServiceDefinition.auditDetails.lastModifiedTime

- jsonPath: $.ServiceDefinition.additionalDetails
type: JSON
dbType: JSONB

- jsonPath: $.ServiceDefinition.clientId



- query: INSERT INTO eg_service_attribute_definition(id, referenceid, tenantid, code, datatype, "values", isactive, required, regex, "order", createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
basePath: $.ServiceDefinition.attributes.*
jsonMaps:
- jsonPath: $.ServiceDefinition.attributes.*.id

- jsonPath: $.ServiceDefinition.attributes.*.referenceId

- jsonPath: $.ServiceDefinition.attributes.*.tenantId

- jsonPath: $.ServiceDefinition.attributes.*.code

- jsonPath: $.ServiceDefinition.attributes.*.dataType

- jsonPath: $.ServiceDefinition.attributes.*.values
type: ARRAY
dbType: STRING

- jsonPath: $.ServiceDefinition.attributes.*.isActive

- jsonPath: $.ServiceDefinition.attributes.*.required

- jsonPath: $.ServiceDefinition.attributes.*.regex

- jsonPath: $.ServiceDefinition.attributes.*.order

- jsonPath: $.ServiceDefinition.attributes.*.auditDetails.createdBy

- jsonPath: $.ServiceDefinition.attributes.*.auditDetails.lastModifiedBy

- jsonPath: $.ServiceDefinition.attributes.*.auditDetails.createdTime

- jsonPath: $.ServiceDefinition.attributes.*.auditDetails.lastModifiedTime

- jsonPath: $.ServiceDefinition.attributes.*.additionalDetails
type: JSON
dbType: JSONB





- version: 1.0
description: Persists service details in service table
fromTopic: save-service
isTransaction: true
queryMaps:


- query: INSERT INTO eg_service(id, tenantid, servicedefid, referenceid, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails, accountid, clientid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
basePath: $.Service
jsonMaps:
- jsonPath: $.Service.id

- jsonPath: $.Service.tenantId

- jsonPath: $.Service.serviceDefId

- jsonPath: $.Service.referenceId

- jsonPath: $.Service.auditDetails.createdBy

- jsonPath: $.Service.auditDetails.lastModifiedBy

- jsonPath: $.Service.auditDetails.createdTime

- jsonPath: $.Service.auditDetails.lastModifiedTime

- jsonPath: $.Service.additionalDetails
type: JSON
dbType: JSONB

- jsonPath: $.Service.accountId

- jsonPath: $.Service.clientId


- query: INSERT INTO eg_service_attribute_value(id, referenceid, attributecode, value, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);
basePath: $.Service.attributes.*
jsonMaps:
- jsonPath: $.Service.attributes.*.id

- jsonPath: $.Service.attributes.*.referenceId

- jsonPath: $.Service.attributes.*.attributeCode

- jsonPath: $.Service.attributes.*.value
type: JSON
dbType: JSONB

- jsonPath: $.Service.attributes.*.auditDetails.createdBy

- jsonPath: $.Service.attributes.*.auditDetails.lastModifiedBy

- jsonPath: $.Service.attributes.*.auditDetails.createdTime

- jsonPath: $.Service.attributes.*.auditDetails.lastModifiedTime

- jsonPath: $.Service.attributes.*.additionalDetails
type: JSON
dbType: JSONB
Loading