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

Assam 3.0 #25

Merged
merged 11 commits into from
Dec 30, 2024
Merged

Assam 3.0 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
342397d
correct host
palak-egov Aug 14, 2024
52ab49d
correct hosts
palak-egov Aug 14, 2024
df79439
ka as tenant
palak-egov Aug 14, 2024
4c40eda
correct call
palak-egov Aug 14, 2024
602ac22
correct external urls
palak-egov Aug 20, 2024
f121700
mdms-v2 changes
palak-egov Aug 27, 2024
1534655
Merge branch 'UAT' into assam-3.0
palak-egov Nov 20, 2024
4431180
Update hrms-employee-persister.yml
debasishchakraborty-egovt Dec 6, 2024
4b364b8
Merge pull request #26 from ddws-org/debasishchakraborty-egovt-patch-2
debasishchakraborty-egovt Dec 6, 2024
6f0d950
updated water-service.yml file for dataVerified field
Saloni-eGov Dec 10, 2024
d97925e
Added chnages for config
Dec 27, 2024
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
86 changes: 43 additions & 43 deletions egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions egov-dss-dashboards/dashboard-ingest/egov-expense_v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"operation": "shift",
"spec": {
"tenantId": "tenantId",
"challanNo": "challanNo",
"amount": "amount",
"typeOfExpense": "typeOfExpense",
"vendorName": "vendorName",
"businessService": "businessService",
"isBillPaid": "isBillPaid",
"applicationStatus": "applicationStatus",
"additionalDetails": "additionalDetails",
"taxPeriodFrom": "taxPeriodFrom",
"taxPeriodTo": "taxPeriodTo",
"billDate": "billDate",
"paidDate": "paidDate"
}
}
]
201 changes: 179 additions & 22 deletions egov-indexer/billingservices-indexer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,181 @@
ServiceMaps:
serviceName: Billing Service
version: 1.0.0
mappings:
- topic: create-demand-index
configKey: INDEX
indexes:
- name: demandindex-v1
type: demand
id: $.id, $.tenantId
isBulk: true
jsonPath: $.Demands
timeStampField: $.auditDetail.createdTime

- topic: demand-reindex
configKey: REINDEX
indexes:
- name: demandindex-v1
type: demand
id: $.id, $.tenantId
isBulk: true
jsonPath: $.hits
timeStampField: $.auditDetail.createdTime
serviceName: Billing Service
version: 1.0.0
mappings:
- topic: create-demand-index
configKey: INDEX
indexes:
- name: demandindex-v1
type: demands
id: $.id, $.tenantId
isBulk: true
jsonPath: $.Demands.*
timeStampField: $.auditDetails.createdTime
customJsonMapping:
indexMapping: { "Data": { "taxPeriodFrom": "", "businessService": "", "minimumAmountPayable": "", "taxPeriodTo": "", "fixedBillExpiryDate": null, "additionalDetails": null, "demandDetails": [], "consumerType": "", "auditDetails": {}, "tenantId": "", "consumerCode": "", "id": "", "billExpiryTime": "", "isPaymentCompleted": "", "status": "", "@timestamp": "", "tenantData": {} }}
fieldMapping:
- inJsonPath: $.taxPeriodFrom
outJsonPath: $.Data.taxPeriodFrom
- inJsonPath: $.businessService
outJsonPath: $.Data.businessService
- inJsonPath: $.minimumAmountPayable
outJsonPath: $.Data.minimumAmountPayable
- inJsonPath: $.taxPeriodTo
outJsonPath: $.Data.taxPeriodTo
- inJsonPath: $.fixedBillExpiryDate
outJsonPath: $.Data.fixedBillExpiryDate
- inJsonPath: $.additionalDetails
outJsonPath: $.Data.additionalDetails
- inJsonPath: $.payer.correspondenceCity
outJsonPath: $.Data.payer.correspondenceCity
- inJsonPath: $.demandDetails
outJsonPath: $.Data.demandDetails
- inJsonPath: $.consumerType
outJsonPath: $.Data.consumerType
- inJsonPath: $.auditDetails
outJsonPath: $.Data.auditDetails
- inJsonPath: $.tenantId
outJsonPath: $.Data.tenantId
- inJsonPath: $.consumerCode
outJsonPath: $.Data.consumerCode
- inJsonPath: $.id
outJsonPath: $.Data.id
- inJsonPath: $.billExpiryTime
outJsonPath: $.Data.billExpiryTime
- inJsonPath: $.isPaymentCompleted
outJsonPath: $.Data.isPaymentCompleted
- inJsonPath: $.status
outJsonPath: $.Data.status
- inJsonPath: $.@timestamp
outJsonPath: $.Data.@timestamp
mdmsMapping:
- path: http://mdms-v2:8080/assam/mdms-v2/v1/_search
moduleName: tenant
masterName: tenants
tenantId: as
filter: "[?(@.code == $tenant)]"
filterMapping:
- variable: $tenant
valueJsonpath: $.tenantId
uriResponseMapping:
- inJsonPath: $.MdmsRes.tenant.tenants
outJsonPath: $.Data.tenantData

- topic: update-demand-index
configKey: INDEX
indexes:
- name: demandindex-v1
type: demands
id: $.id, $.tenantId
isBulk: true
jsonPath: $.Demands.*
timeStampField: $.auditDetails.lastModifiedTime
customJsonMapping:
indexMapping: { "Data": { "taxPeriodFrom": "", "businessService": "", "minimumAmountPayable": "", "taxPeriodTo": "", "fixedBillExpiryDate": null, "additionalDetails": null, "demandDetails": [ ], "consumerType": "", "auditDetails": { }, "tenantId": "", "consumerCode": "", "id": "", "billExpiryTime": "", "isPaymentCompleted": "", "status": "", "@timestamp": "", "tenantData": { } } }
fieldMapping:
- inJsonPath: $.taxPeriodFrom
outJsonPath: $.Data.taxPeriodFrom
- inJsonPath: $.businessService
outJsonPath: $.Data.businessService
- inJsonPath: $.minimumAmountPayable
outJsonPath: $.Data.minimumAmountPayable
- inJsonPath: $.taxPeriodTo
outJsonPath: $.Data.taxPeriodTo
- inJsonPath: $.fixedBillExpiryDate
outJsonPath: $.Data.fixedBillExpiryDate
- inJsonPath: $.additionalDetails
outJsonPath: $.Data.additionalDetails
- inJsonPath: $.payer.correspondenceCity
outJsonPath: $.Data.payer.correspondenceCity
- inJsonPath: $.demandDetails
outJsonPath: $.Data.demandDetails
- inJsonPath: $.consumerType
outJsonPath: $.Data.consumerType
- inJsonPath: $.auditDetails
outJsonPath: $.Data.auditDetails
- inJsonPath: $.tenantId
outJsonPath: $.Data.tenantId
- inJsonPath: $.consumerCode
outJsonPath: $.Data.consumerCode
- inJsonPath: $.id
outJsonPath: $.Data.id
- inJsonPath: $.billExpiryTime
outJsonPath: $.Data.billExpiryTime
- inJsonPath: $.isPaymentCompleted
outJsonPath: $.Data.isPaymentCompleted
- inJsonPath: $.status
outJsonPath: $.Data.status
- inJsonPath: $.@timestamp
outJsonPath: $.Data.@timestamp
mdmsMapping:
- path: http://mdms-v2:8080/assam/mdms-v2/v1/_search
moduleName: tenant
masterName: tenants
tenantId: as
filter: "[?(@.code == $tenant)]"
filterMapping:
- variable: $tenant
valueJsonpath: $.tenantId
uriResponseMapping:
- inJsonPath: $.MdmsRes.tenant.tenants
outJsonPath: $.Data.tenantData


- topic: demand-enrich-legacyindex
configKey: LEGACYINDEX
indexes:
- name: demand-enriched-index
type: demand
id: $.id, $.tenantId
isBulk: true
timeStampField: $.auditDetails.createdTime
jsonPath: $.Demands.*
customJsonMapping:
indexMapping: { "Data": { "taxPeriodFrom": "", "businessService": "", "minimumAmountPayable": "", "taxPeriodTo": "", "fixedBillExpiryDate": null, "additionalDetails": null, "demandDetails": [ ], "consumerType": "", "auditDetails": { }, "tenantId": "", "consumerCode": "", "id": "", "billExpiryTime": "", "isPaymentCompleted": "", "status": "", "@timestamp": "", "tenantData": { } } }
fieldMapping:
- inJsonPath: $.taxPeriodFrom
outJsonPath: $.Data.taxPeriodFrom
- inJsonPath: $.businessService
outJsonPath: $.Data.businessService
- inJsonPath: $.minimumAmountPayable
outJsonPath: $.Data.minimumAmountPayable
- inJsonPath: $.taxPeriodTo
outJsonPath: $.Data.taxPeriodTo
- inJsonPath: $.fixedBillExpiryDate
outJsonPath: $.Data.fixedBillExpiryDate
- inJsonPath: $.additionalDetails
outJsonPath: $.Data.additionalDetails
- inJsonPath: $.payer.correspondenceCity
outJsonPath: $.Data.payer.correspondenceCity
- inJsonPath: $.demandDetails
outJsonPath: $.Data.demandDetails
- inJsonPath: $.consumerType
outJsonPath: $.Data.consumerType
- inJsonPath: $.auditDetails
outJsonPath: $.Data.auditDetails
- inJsonPath: $.tenantId
outJsonPath: $.Data.tenantId
- inJsonPath: $.consumerCode
outJsonPath: $.Data.consumerCode
- inJsonPath: $.id
outJsonPath: $.Data.id
- inJsonPath: $.billExpiryTime
outJsonPath: $.Data.billExpiryTime
- inJsonPath: $.isPaymentCompleted
outJsonPath: $.Data.isPaymentCompleted
- inJsonPath: $.status
outJsonPath: $.Data.status
- inJsonPath: $.@timestamp
outJsonPath: $.Data.@timestamp
mdmsMapping:
- path: http://mdms-v2:8080/assam/mdms-v2/v1/_search
moduleName: tenant
masterName: tenants
tenantId: as
filter: "[?(@.code == $tenant)]"
filterMapping:
- variable: $tenant
valueJsonpath: $.tenantId
uriResponseMapping:
- inJsonPath: $.MdmsRes.tenant.tenants
outJsonPath: $.Data.tenantData
34 changes: 5 additions & 29 deletions egov-indexer/collection-indexer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,7 @@ ServiceMaps:
timeStampField: $.auditDetails.createdDate
jsonPath: $.Receipt.*
customJsonMapping:
indexMapping:
{
'Data':
{
'tenantId': '',
'transactionId': '',
'Bill': {},
'auditDetails': {},
'instrument': {},
'tenantData': {},
'@timestamp': 'timestamp',
},
}
indexMapping: {"Data":{"tenantId":"","transactionId":"","Bill":{},"auditDetails":{},"instrument":{},"tenantData":{},"@timestamp":"timestamp"}}
fieldMapping:
- inJsonPath: $.tenantId
outJsonPath: $.Data.tenantId
Expand All @@ -42,8 +30,8 @@ ServiceMaps:
- path: http://mdms-v2:8080/assam/mdms-v2/v1/_search
moduleName: tenant
masterName: tenants
tenantId: pb
filter: '[?(@.code == $tenant)]'
tenantId: as
filter: "[?(@.code == $tenant)]"
filterMapping:
- variable: $tenant
valueJsonpath: $.tenantId
Expand Down Expand Up @@ -71,19 +59,7 @@ ServiceMaps:
timeStampField: $.auditDetails.createdDate
jsonPath: $.Receipt.*
customJsonMapping:
indexMapping:
{
'Data':
{
'tenantId': '',
'transactionId': '',
'Bill': {},
'auditDetails': {},
'instrument': {},
'tenantData': {},
'@timestamp': 'timestamp',
},
}
indexMapping: {"Data":{"tenantId":"","transactionId":"","Bill":{},"auditDetails":{},"instrument":{},"tenantData":{},"@timestamp":"timestamp"}}
fieldMapping:
- inJsonPath: $.tenantId
outJsonPath: $.Data.tenantId
Expand All @@ -102,7 +78,7 @@ ServiceMaps:
moduleName: tenant
masterName: tenants
tenantId: as
filter: '[?(@.code == $tenant)]'
filter: "[?(@.code == $tenant)]"
filterMapping:
- variable: $tenant
valueJsonpath: $.tenantId
Expand Down
Loading