Merge pull request #25 from ddws-org/assam-3.0

Assam 3.0
ddws-org · Dec 30, 2024 · 1c6051c · 1c6051c
2 parents 1a5bd33 + d97925e
commit 1c6051c
Show file tree

Hide file tree

Showing 29 changed files with 5,735 additions and 1,423 deletions.
diff --git a/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json
diff --git a/egov-dss-dashboards/dashboard-ingest/egov-expense_v1.json b/egov-dss-dashboards/dashboard-ingest/egov-expense_v1.json
@@ -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"
+        }
+    }
+]
diff --git a/egov-indexer/billingservices-indexer.yml b/egov-indexer/billingservices-indexer.yml
@@ -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
diff --git a/egov-indexer/collection-indexer.yml b/egov-indexer/collection-indexer.yml
@@ -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
@@ -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
@@ -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
@@ -102,7 +78,7 @@ ServiceMaps:
                 moduleName: tenant
                 masterName: tenants
                 tenantId: as
-                filter: '[?(@.code == $tenant)]'
+                filter: "[?(@.code == $tenant)]"
                 filterMapping:
                   - variable: $tenant
                     valueJsonpath: $.tenantId