Merge staging for Digit 2.5 Upgrade (#1125)

* Updated details for Estimation Letter * Updated TaxHeadCode values properly * Update rainmaker-pgr-v2.yml * Simple change in creation (#327) * change in key value of passvehicle-certificate pdf * Update localitySearcher.yml * Update sewerage-persist.yml * Update sewerage-persist.yml * WOR-302 Fixes for Owner Details * Trying with different data type for Date * Reverting the change done for Date data type * Trying without Date type for DOB inside Array * Using Date data type for DOB * EmailId and OwnerDOB are properly mapped * Update water-persist.yml * Added report run date and fixed date alignment issue * Added data json for report run date * Added report run date for low applications * Added report run date data in low pdf * Update sewerage-persist.yml * Update water-service.yml * Update sewerage-service.yml * udpate locality search of bpa-services udpate locality search of bpa-services * Update water-service.yml * Update sewerage-service.yml * Update water-service.yml * Update sewerage-service.yml * Added uuid in owner update query * WOR-305 Advancepayment added * WOR-305 Minwidth fixed for new label * WOR-305 Adjusted the width of bill * WOR-305 Sewerage added * WOR-305 missing paranthesis issue fixed * WOR-302 Dateofbirth issue is fixed * WOR-302 key value is removed * added OC changes into indexer * WOR-305 Receipt PDF keys added * Added applicant name for QR code * WOR-305 Border alignement is fixed * receipt formula added for pending amount * WOR-305 Advance and pending amount conditional logic added in PDF * added condition for excess amount and pending amount for receipt pdf and correction in json path of taxhead ampunt in bill pdf * WOR-305 Bill PDF advanceavailable and adjusted added * WOR-305 Path issue fixed * WOR-305 Added advance available in PDF * WOR-305 Unnecessary fields removed * WOR-305 testing the value of NA * WOR-305 changes as done with zero as default * For W&S KT assignment 2 Que 1: persister and indexer sewrage config file changes * Ticket no Rain 1132: Consolidated receipt UI alignment issue * Revert "Ws assignment rohit" * Ticket RAIN-1122 : enhance the search query to search the employee by entering the lower case for Emp ID in the search parameters in HRMS service * Update collection-migration-persister.yml * Update collection-migration-persister.yml * Update collection-migration-persister.yml * Update collection-migration-persister.yml * Update water-meter.yml * Added persister file for noc * changes related to land * Create land-persister.yml seperate persister for land * Update bpa-persister.yml remvoing land queires form bpa persister.yml * land changes. * Update bpa-persister.yml removing land persiter queries * Renamed the ladInfo object name as per model * persister change for LandInfo * Update noc-persister.yml * added indexer for noc * [OAP-502] Added noc report (#354) * added noc report * indexer for noc * Update noc-persister.yml * Indexer for noc-service * Update water-persist.yml * Update noc-services-reports.yml * Update reportFileLocationsv1.txt * Update noc-persister.yml * Reverting connectionholder information for testing * Adding the ConnectionHolder details back * WOR-339 Added new attribuets Added ApplicationType, DateEffectiveFrom attributes in the eg_ws_connection table * Update sewerage-persist.yml * changes related to review comments * WOR-362 bill PDF advance adjusted changes has been done * Update noc-persister.yml * Update noc-persister.yml * Added pageNo on footer * Added pageNo on footer * Reverting to older version to test backend * Revert "Reverting to older version to test backend" This reverts commit fe3b56b. * Reverting config for testing the master branch * Update sewerage-persist.yml * Reverting to edit connection feature * Reverting to the edit connection feature * Update land-persister.yml * Update land-persister.yml (#358) Co-authored-by: Phani Kiran Guttha <56917835+phanikiran-wtt-egov@users.noreply.github.com> * Added connection holder query to update topic * Updated connection holder query to the sewerage * Added applicationType, dateEffectiveFrom attributes * Updated query for conflict * Updated primary key details * Fixed ConnectionHolder update query * Update water-persist.yml * Update water-persist.yml * Fixed issues in connectionHolder update * Added dateEffectiveFrom value in Update query * Added dateEffectiveFrom value in update query * Update bill-genie.yml * WOR-271 Rainwater harvesting value path added * Update water-service.yml (#359) * Update water-service.yml * Update water-service.yml * Update sewerage-service.yml * locality searcher for NOC locality searcher for NOC * migrate staging configs to product UAT * updated config for July 15 release * Update ws-onetime-receipt.json * Update ws-bill.json * Update ws-bill.json * Update ws-onetime-receipt.json * updated config changes for bill geniew lower case search * Update water-meter.yml * Create noc-persister.yml (#375) * added yaml files for chatboot and collection migration persister (#376) * created chatbot-telemetry.yaml (#377) * update UAT indexers (#378) * update UAT indexers * revert indexer * added indexer file for chatboot telemetry (#379) * renamed files type for egf bill and firenoc persister (#380) * Update tl-billing-slab-persister.yml (#382) Updated tl-billing-slab for application type value * update tl billing slab persister (#383) * update tl billing persister for application type (#384) * Update water-meter.yml (#387) * #RAIN-1332 Fix for the download bill :Minimum width is added for the ws bill format (#391) #RAIN-1332 Fix for the download bill :Minimum width is added for the ws bill format * RAIN-1332:Fix for in Bill Receipt Pending amount is coming with negative value (#394) RAIN-1332:Fix for in Bill Receipt Pending amount is coming with negative value * Added monitoring-dashboards * RAIN-1332 bill alignment modification is fixed (#406) RAIN-1332 bill alignment modification is fixed * WOR-403 Bill format changes (#412) WOR-403 Bill format changes * WOR-403 Bill format changes (#413) WOR-403 Bill format changes * WOR-403 roundoff adjusted amount and other amount value upto two decimal and fixed alignment issue (#417) * WOR-403 - Changes for the WS Bill create Call (#420) * WOR-403 W&S: Bill format changes (#422) WOR-403 W&S: Bill format changes * WOR-403 W&S: Bill format changes (#423) WOR-403 W&S: Bill format changes * WOR-403 : Corrected the tenant id for the WS bills (#428) WOR-403 : Corrected the tenant id for the WS bills * WOR-403 : Rondoff issue in advance adjusted (#430) * WOR-403 - Changes in Disclaimer for WS Bill PDF (#434) * WOR-403 - Correction in Disclaimer for WS Bill PDF (#436) * Update localitySearcher.yml (#446) adding noc-services locality searcher * RAIN-1605: migrate the configs for uat (#544) * RAIN-1605: migrate the configs - uat PGR Reports (#545) RAIN-1605: migrate the configs - uat PGR Reports * RAIN-1605 - corrected the folder name to config and corrected the file path (#547) * RAIN-1605: update dss fix (#548) * RAIN-1605 - Fixing Reports issue (#549) * RAIN-1605: update pgr query for open complaints (#552) * RAIN-1605: fix pgr dss query (#554) * RAIN-1605 - Updated pdf changes for WS Sanction Letter (#555) * RAIN-1605 - Updated searcher query for W&S in UAT (#560) RAIN-1605 - Updated searcher query for W&S in UAT * RAIN-1660 - WS persister changes and Corder rearranged for PGR Reports (#568) * RAIN-1660 - UAT Config changes for Digit 2.2 Release (#597) * RAIN-1660 - UAT Config changes for Digit 2.2 Release * RAIN-1660 - UAT Config changes for Digit 2.2 Release * RAIN-1660 - Updated missing config-employee create (#599) * RAIN-1660 Updated payer details changes in receipts (#600) * RAIN-1660 BPA:update collection search endpoint (#608) * RAIN-1660 BPA:update collection search end-point (#606) * RAIN -1660 : Indexer config fix for pgr-services (#610) * RAIN -1660 : Indexer config fix for pgr-services * RAIN-1660 : Corrected serviceName in pgr-services indexer config * Create pgr-migration-batch.yml (#614) * RAIN-1660 BPA:Update collectionService endpoint (#620) * RAIN-1660 DSS related config changes for UAT (#623) * RAIN-1660 Added pgr-migration-batch-indexer.yml file (#625) * RAIN-2164 Added amendment coupon pdf changes for water and sewerage connection, updated water and sewerage persister file (#714) * RAIN-2164 Updated the changes required for multiple road types in water and ewerage connection (#715) * RAIN-2164 Added new file employee report for HRMS Admin (#716) * RAIN-2164 - Added HRMS employee report config (#717) file path to report location file * RAIN-2164 Added chatbot telemetry v2 file (#719) for xstate chatbot * RAIN-2164 Updated employee report to (#721) show result based on roles * RAIN-2164 Updated PGR report config file and GRO, LME report designationid and tenantid search fix (#722) * RAIN-2164 Fixes employee name being shown as NULL (#725) in GRO and LME performance report * RAIN-2164 Added persister file for dso, fsm calculator, fsm, vehicle, vendor, fsm receipt, indexer file for fsm and vendor (#724) * RAIN-2164 Added FSM persister changes completed flow and updated FSM receipt pdf (#735) * RAIN-2164 Added #10 and #45 for rating (#738) Added #10 and #45 for rating * Update CODEOWNERS * removing municpal corporation (#744) removing municpal corporation * Phanikiran wtt egov patch 4 (#746) * adding ulb grade * adding ULB Grade * reverting ulb grade in receipt (#747) * ulbgrade issue reverted * reverting ulb grade issue * RAIN-2346 Fixed WS total connections chart config (#786) * RAIN-2346 Updated DSS config changes for WS (#789) * Update ChartApiConfig.json (#791) * RAIN-2346 Updated chartAPI config for DSS issue (#794) * RAIN-2346 Fixes GRO and LME name not being shown in pgr-reports. (#829) * RAIN-2346 Added config changes for Digit 2.4 Release (#860) Co-authored-by: LataNaik-eGov <lata.naik@egovernments.org> * RAIN -2346 Updated Module Name (#888) * RAIN-2346 Updated Bill genie search by propertyid (#895) * RAIN-2346 Updated module name for mcollectbill (#900) * Rain-2346 Updated employee-report.yml (#915) * RAIN-2768 Updated firenoc persister file (#924) * Config changes for Digit 2.5 Release (#1043) * RAIN-2768 Config changes for Digit 2.5 Release * RAIN-2768 Config changes for digit 2.5 release * RAIN-2768 Corrected indentation for indexer file (#1044) RAIN-2768 Corrected indentation for indexer file * RAIN -2768 Updated Mater Dashboard config for FSM DSS (#1046) * RAIN-2768 : Added FSM DSS configurations (#1047) RAIN-2768 : Added FSM DSS configurations * RAIN-2768 : added id : fsm, id : ulb-fsm (#1048) * RAIN-2768 : added id : fsm, id : ulb-fsm RAIN-2768 : added id : fsm, id : ulb-fsm * Update RoleDashboardMappingsConf.json * RAIN-2768 Updated Chart Api changes for fsm dss (#1049) * RAIN-2768 Added Inbox searcher config for TL (#1054) * RAIN-2768 Updated searcher config for sorting application (#1057) * RAIN-2768 Removed duplicate records for PT reports (#1058) * RAIN-2768 Added config for count TL search (#1068) * RAIN-2768 corrected the duplicate owner issue (#1069) for PT Reports * RAIN-2768 Provided custom sorting for PT inbox (#1070) * RAIN-2768 Updated TL searcher for sort issue (#1071) * Revert "RAIN-2768 Updated TL searcher for sort issue (#1071)" (#1072) This reverts commit ff58f0b. * TL :: Employee Inbox :: Applications are not displayed according to application date when tried to sort by application date (#1073) * RAIN-3327 updated searcher query * RAIN-3327 Updates tl inbox searcher query for count and sorting * Revert "TL :: Employee Inbox :: Applications are not displayed according to application date when tried to sort by application date (#1073)" (#1075) This reverts commit 834f142. Co-authored-by: Sathish P <sathish.p@egovernments.org> * RAIN-2768 Updated config searcher for PT and TL (#1077) * RAIN-2768 Removed FSM from TL dashboard (#1081) * RAIN-2768 Updated localization for RC in UAT (#1082) * RAIN-2768 Updated mcollect challan for Hindi localization in UAT (#1085) * RAIN-2768 Updated config for fsm report (#1087) Updated config for fsm report * RAIN-2768 Updated Challan no label in reports config (#1088) * overlap issue fix (#1124) * Suggested changes for merging Co-authored-by: karthik-egov-tarento <karthikeyan.rajendran@egovernments.com> Co-authored-by: veswantht-wtt-egov <60596205+veswantht-wtt-egov@users.noreply.github.com> Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: lakshmisravanikolla-wtt-egov <57343149+lakshmisravanikolla-wtt-egov@users.noreply.github.com> Co-authored-by: rohit-eGov <rohit.shende@egovernments.org> Co-authored-by: rohit-eGov <52992779+rohit-eGov@users.noreply.github.com> Co-authored-by: Amit-yadav-egov-tarento <56678219+Amit-yadav-egov-tarento@users.noreply.github.com> Co-authored-by: Phani Kiran Guttha <56917835+phanikiran-wtt-egov@users.noreply.github.com> Co-authored-by: Nikitha-egov-tarento <nikitha.komminen@egovernments.org> Co-authored-by: Nikitha-egov-tarento <56677624+Nikitha-egov-tarento@users.noreply.github.com> Co-authored-by: priyajais <priya.jaiswal@egovernments.org> Co-authored-by: SeemaNayak-eGov <seema.nayak@egovernments.org> Co-authored-by: priyajais-egov <47023444+priyajais-egov@users.noreply.github.com> Co-authored-by: karthik-egov-tarento <63232529+karthik-egov-tarento@users.noreply.github.com> Co-authored-by: karthik-egov-tarento <karthikeyan.rajendran@egovernments.org> Co-authored-by: Sathish P <sathish.p@egovernments.org> Co-authored-by: Dharma <dharmalingam.k@egovernments.org> Co-authored-by: ashwini-egov <ashwini.raj@egovernments.org> Co-authored-by: sowmya-eGov <59043181+sowmya-eGov@users.noreply.github.com> Co-authored-by: Lata Naik <lata.naik@egovernments.org> Co-authored-by: ashwini-egov <58424409+ashwini-egov@users.noreply.github.com> Co-authored-by: Lata Naik <42994677+LataNaik-eGov@users.noreply.github.com> Co-authored-by: Dharma-eGov <62427116+Dharma-eGov@users.noreply.github.com> Co-authored-by: nikesh-eGov <nikesh.umredkar@egovernments.org> Co-authored-by: srishti-egov <60685896+srishti-egov@users.noreply.github.com> Co-authored-by: talele08 <talele08@users.noreply.github.com> Co-authored-by: shan-egov <74963282+shan-egov@users.noreply.github.com> Co-authored-by: nikesh-eGov <48427967+nikesh-eGov@users.noreply.github.com> Co-authored-by: TruptiDadhich-eGov <83585048+TruptiDadhich-eGov@users.noreply.github.com> Co-authored-by: saumya-egov <74046603+saumya-egov@users.noreply.github.com>
egovernments · Sep 30, 2021 · 36ad979 · 36ad979
1 parent e7dfb7f
commit 36ad979
Show file tree

Hide file tree

Showing 31 changed files with 3,775 additions and 554 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-analytics/MasterDashboardConfig.json b/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json
diff --git a/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json b/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json
@@ -30,6 +30,10 @@
         },
         {
           "id": "ws"
+        },
+        {
+          "name": "Faecal Sludge Management",
+          "id": "fsm"
         }
       ]
     },
@@ -57,6 +61,9 @@
         },
           {
           "id": "ulb-ws"
+        },
+        {
+          "id": "ulb-fsm"
         }
       ]
     }

diff --git a/egov-indexer/egov-fsm.yml b/egov-indexer/egov-fsm.yml
diff --git a/egov-indexer/egov-vehicle.yaml b/egov-indexer/egov-vehicle.yaml
@@ -0,0 +1,262 @@
+ServiceMaps:
+ serviceName: vehicle
+ version: 1.0.0
+ mappings:
+  - topic: save-vehicle-application
+    configKey: INDEX
+    indexes:
+    - name: vehicle
+      type: vehicleapplication
+      id: $.id, $.tenantId
+      isBulk: false
+      timeStampField: $.auditDetails.createdTime
+      jsonPath: $.vehicle
+      customJsonMapping:
+        indexMapping: {"Data":{"vehicle":{},"tenantData":{}}}
+        fieldMapping:
+        - inJsonPath: $
+          outJsonPath: $.Data.vehicle
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData
+
+  - topic: save-vehicle-trip
+    configKey: INDEX
+    indexes:
+    - name: vehicletrip
+      type: vehicletripapplication
+      id: $.id, $.tenantId
+      isBulk: false
+      timeStampField: $.auditDetails.createdTime
+      jsonPath: $.vehicleTrip
+      customJsonMapping:
+        indexMapping: {"Data":{"vehicleTrip":{"additionalDetails":{}},"tenantData":{}, "history":{},"fsm":{},"fstpPlantInfo":{}}}
+        fieldMapping:
+        - inJsonPath: $
+          outJsonPath: $.Data.vehicleTrip
+        externalUriMapping:
+        - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
+          queryParam: businessIds=$.applicationNo,history=true,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":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.ProcessInstances
+            outJsonPath: $.Data.history
+        - path: http://fsm.egov:8080/fsm/v1/_search
+          queryParam: applicationNos=$.tripDetails.*.referenceNo,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"},{"name":"FSTP OPERATOR","code":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.fsm
+            outJsonPath: $.Data.fsm
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: FSM
+          masterName: FSTPPlantInfo
+          tenantId: pg
+          filter: "[?(@.ULBS contains $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.FSM.FSTPPlantInfo
+            outJsonPath: $.Data.fstpPlantInfo
+
+  - topic: update-vehicle-trip
+    configKey: INDEX
+    indexes:
+    - name: vehicletrip
+      type: vehicletripapplication
+      id: $.id, $.tenantId
+      isBulk: false
+      timeStampField: $.auditDetails.createdTime
+      jsonPath: $.vehicleTrip
+      customJsonMapping:
+        indexMapping: {"Data":{"vehicleTrip":{"additionalDetails":{}},"tenantData":{}, "history":{},"fsm":{},"fstpPlantInfo":{}}}
+        fieldMapping:
+        - inJsonPath: $
+          outJsonPath: $.Data.vehicleTrip
+        externalUriMapping:
+        - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
+          queryParam: businessIds=$.applicationNo,history=true,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":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.ProcessInstances
+            outJsonPath: $.Data.history
+        - path: http://fsm.egov:8080/fsm/v1/_search
+          queryParam: applicationNos=$.tripDetails.*.referenceNo,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"},{"name":"FSTP OPERATOR","code":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.fsm
+            outJsonPath: $.Data.fsm
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: FSM
+          masterName: FSTPPlantInfo
+          tenantId: pg
+          filter: "[?(@.ULBS contains $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.FSM.FSTPPlantInfo
+            outJsonPath: $.Data.fstpPlantInfo
+
+  - topic: update-workflow-vehicle-trip
+    configKey: INDEX
+    indexes:
+    - name: vehicletrip
+      type: vehicletripapplication
+      id: $.id, $.tenantId
+      isBulk: false
+      timeStampField: $.auditDetails.createdTime
+      jsonPath: $.vehicleTrip
+      customJsonMapping:
+        indexMapping: {"Data":{"vehicleTrip":{"additionalDetails":{}},"tenantData":{}, "history":{},"fsm":{},"fstpPlantInfo":{}}}
+        fieldMapping:
+        - inJsonPath: $
+          outJsonPath: $.Data.vehicleTrip
+        externalUriMapping:
+        - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
+          queryParam: businessIds=$.applicationNo,history=true,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":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.ProcessInstances
+            outJsonPath: $.Data.history
+        - path: http://fsm.egov:8080/fsm/v1/_search
+          queryParam: applicationNos=$.tripDetails.*.referenceNo,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"},{"name":"FSTP OPERATOR","code":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.fsm
+            outJsonPath: $.Data.fsm
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: FSM
+          masterName: FSTPPlantInfo
+          tenantId: pg
+          filter: "[?(@.ULBS contains $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.FSM.FSTPPlantInfo
+            outJsonPath: $.Data.fstpPlantInfo
+
+  - topic: vehicle-trip-legacyindex
+    configKey: LEGACYINDEX
+    indexes:
+    - name: vehicletrip
+      type: vehicletripapplication
+      id: $.id, $.tenantId
+      isBulk: true
+      timeStampField: $.auditDetails.createdTime
+      jsonPath: $.vehicleTrip.*
+      customJsonMapping:
+        indexMapping: {"Data":{"vehicleTrip":{"additionalDetails":{}},"tenantData":{}, "history":{},"fsm":{},"fstpPlantInfo":{}}}
+        fieldMapping:
+        - inJsonPath: $
+          outJsonPath: $.Data.vehicleTrip
+        externalUriMapping:
+        - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
+          queryParam: businessIds=$.applicationNo,history=true,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":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.ProcessInstances
+            outJsonPath: $.Data.history
+        - path: http://fsm.egov:8080/fsm/v1/_search
+          queryParam: applicationNos=$.tripDetails.*.referenceNo,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"},{"name":"FSTP OPERATOR","code":"FSM_EMP_FSTPO","tenantId":"pg.citya"}]}}}
+          uriResponseMapping:
+          - inJsonPath: $.fsm
+            outJsonPath: $.Data.fsm
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: FSM
+          masterName: FSTPPlantInfo
+          tenantId: pg
+          filter: "[?(@.ULBS contains $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.FSM.FSTPPlantInfo
+            outJsonPath: $.Data.fstpPlantInfo
+
+  - topic: vehicle-application-legacyindex
+    configKey: LEGACYINDEX
+    indexes:
+    - name: vehicle
+      type: vehicleapplication
+      id: $.id, $.tenantId
+      isBulk: true
+      timeStampField: $.auditDetails.createdTime
+      jsonPath: $.vehicle.*
+      customJsonMapping:
+        indexMapping: {"Data":{"vehicle":{"additionalDetails":{}},"tenantData":{}}}
+        fieldMapping:
+        - inJsonPath: $
+          outJsonPath: $.Data.vehicle
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData
+
diff --git a/egov-indexer/egov-vendor.yaml b/egov-indexer/egov-vendor.yaml
@@ -12,71 +12,46 @@ ServiceMaps:
       timeStampField: $.auditDetails.createdTime
       jsonPath: $.vendor
       customJsonMapping:
-        indexMapping: {"Data":{"name":"name","address":{},"owner":{},"vehicles":[],"drivers":[],"additionalDetails":"additionalDetails","source":"source","description":"description","ownerId":"ownerId","status":"status","tenantId":"tenantId","auditDetails":{},"@timestamp":"timestamp"}}
+        indexMapping: {"Data":{"vendor":{},"tenantData":{}}}
         fieldMapping:
-        - inJsonPath: $.name
-          outJsonPath: $.Data.name
-        - inJsonPath: $.address
-          outJsonPath: $.Data.address
-        - inJsonPath: $.owner
-          outJsonPath: $.Data.owner
-        - inJsonPath: $.vehicles
-          outJsonPath: $.Data.vehicles
-        - inJsonPath: $.drivers
-          outJsonPath: $.Data.drivers
-        - inJsonPath: $.additionalDetails
-          outJsonPath: $.Data.additionalDetails
-        - inJsonPath: $.source
-          outJsonPath: $.Data.source
-        - inJsonPath: $.description
-          outJsonPath: $.Data.description                    
-        - inJsonPath: $.ownerId
-          outJsonPath: $.Data.ownerId          
-        - inJsonPath: $.status
-          outJsonPath: $.Data.status          
-        - inJsonPath: $.tenantId
-          outJsonPath: $.Data.tenantId          
-        - inJsonPath: $.auditDetails
-          outJsonPath: $.Data.auditDetails
-        - inJsonPath: $.@timestamp
-          outJsonPath: $.Data.@timestamp
+        - inJsonPath: $
+          outJsonPath: $.Data.vendor
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData
 
-
-  - topic: update-vendor-application
-    configKey: INDEX
+  - topic: vendor-application-legacy-index
+    configKey: LEGACYINDEX
     indexes:
     - name: vendor
       type: vendorapplication
       id: $.id, $.tenantId
-      isBulk: false
+      isBulk: true
       timeStampField: $.auditDetails.createdTime
-      jsonPath: $.vendor
+      jsonPath: $.vendor.*
       customJsonMapping:
-        indexMapping: {"Data":{"name":"name","address":{},"owner":{},"vehicles":[],"drivers":[],"additionalDetails":"additionalDetails","source":"source","description":"description","ownerId":"ownerId","status":"status","tenantId":"tenantId","auditDetails":{},"@timestamp":"timestamp"}}
+        indexMapping: {"Data":{"vendor":{},"tenantData":{}}}
         fieldMapping:
-        - inJsonPath: $.name
-          outJsonPath: $.Data.name
-        - inJsonPath: $.address
-          outJsonPath: $.Data.address
-        - inJsonPath: $.owner
-          outJsonPath: $.Data.owner
-        - inJsonPath: $.vehicles
-          outJsonPath: $.Data.vehicles
-        - inJsonPath: $.drivers
-          outJsonPath: $.Data.drivers
-        - inJsonPath: $.additionalDetails
-          outJsonPath: $.Data.additionalDetails
-        - inJsonPath: $.source
-          outJsonPath: $.Data.source
-        - inJsonPath: $.description
-          outJsonPath: $.Data.description                    
-        - inJsonPath: $.ownerId
-          outJsonPath: $.Data.ownerId          
-        - inJsonPath: $.status
-          outJsonPath: $.Data.status          
-        - inJsonPath: $.tenantId
-          outJsonPath: $.Data.tenantId          
-        - inJsonPath: $.auditDetails
-          outJsonPath: $.Data.auditDetails
-        - inJsonPath: $.@timestamp
-          outJsonPath: $.Data.@timestamp
+        - inJsonPath: $
+          outJsonPath: $.Data.vendor
+        mdmsMapping:
+        - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search
+          moduleName: tenant
+          masterName: tenants
+          tenantId: pg
+          filter: "[?(@.code == $tenant)]"
+          filterMapping:
+          - variable: $tenant
+            valueJsonpath: $.tenantId
+          uriResponseMapping:
+          - inJsonPath: $.MdmsRes.tenant.tenants
+            outJsonPath: $.Data.tenantData