UAT Promotion Added all the configurations required for Billing changes

egovernments · May 13, 2023 · 3e1ef72 · 3e1ef72
1 parent de1a9dd
commit 3e1ef72
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 60 deletions.
diff --git a/egov-indexer/expensebill-indexer.yml b/egov-indexer/expensebill-indexer.yml
@@ -5,14 +5,14 @@ ServiceMaps:
    - topic: expense-bill-create
      configKey: INDEX
      indexes:
-       - name: expense-bill-inbox
+       - name: expense-bill-index
          type: general
          id: $.id,$.tenantId
          jsonPath: $.bill
          isBulk: false
          timeStampField: $.auditDetails.createdTime
          customJsonMapping:
-           indexMapping: { "Data":{"id":"","tenantId":"","billNumber":"","billDate":"","dueDate":"","totalAmount":"","totalPaidAmount":"","businessService":"","referenceId":"","fromPeriod":"","toPeriod":"","paymentStatus":"","status":"","payer":{},"billDetails":[],"additionalDetails":{},"auditDetails":{},"history":{}}}
+           indexMapping: { "Data":{"id":"","tenantId":"","billNumber":"","billDate":"","dueDate":"","totalAmount":"","totalPaidAmount":"","businessService":"","referenceId":"","fromPeriod":"","toPeriod":"","paymentStatus":"","status":"","payer":{},"billDetails":[],"additionalDetails":{},"auditDetails":{},"currentProcessInstance":{},"history":{}}}
            fieldMapping:
            - inJsonPath: $.id
              outJsonPath: $.Data.id
@@ -57,66 +57,14 @@ ServiceMaps:
            - inJsonPath: $.additionalDetails.orgName
              outJsonPath: $.Data.orgName
            externalUriMapping:
-           - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
-             queryParam: businessIds=$.billNumber,history=false,tenantId=$.tenantId
-             apiRequest: {"RequestInfo":{"apiId":"org.egov.bill","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":"statea.cityone","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"statea.cityone"}]}}}
-             uriResponseMapping:
-             - inJsonPath: $.ProcessInstances
-               outJsonPath: $.Data.workflow
-
-   - topic: expense-bill-create
-     configKey: INDEX
-     indexes:
-       - name: expense-bill-index
-         type: general
-         id: $.id,$.tenantId
-         jsonPath: $.bill
-         isBulk: false
-         timeStampField: $.auditDetails.createdTime
-         customJsonMapping:
-           indexMapping: { "Data":{"id":"","tenantId":"","billNumber":"","billDate":"","dueDate":"","totalAmount":"","totalPaidAmount":"","businessService":"","referenceId":"","fromPeriod":"","toPeriod":"","paymentStatus":"","status":"","payer":{},"billDetails":[],"additionalDetails":{},"auditDetails":{},"history":{}}}
-           fieldMapping:
-           - inJsonPath: $.id
-             outJsonPath: $.Data.id
-           - inJsonPath: $.tenantId
-             outJsonPath: $.Data.tenantId
-           - inJsonPath: $.billNumber
-             outJsonPath: $.Data.billNumber  
-           - inJsonPath: $.billDate
-             outJsonPath: $.Data.billDate
-           - inJsonPath: $.dueDate
-             outJsonPath: $.Data.dueDate
-           - inJsonPath: $.totalAmount
-             outJsonPath: $.Data.totalAmount
-           - inJsonPath: $.totalPaidAmount
-             outJsonPath: $.Data.totalPaidAmount
-           - inJsonPath: $.businessService
-             outJsonPath: $.Data.businessService
-           - inJsonPath: $.referenceId
-             outJsonPath: $.Data.referenceId
-           - inJsonPath: $.fromPeriod
-             outJsonPath: $.Data.fromPeriod
-           - inJsonPath: $.toPeriod
-             outJsonPath: $.Data.toPeriod
-           - inJsonPath: $.paymentStatus
-             outJsonPath: $.Data.paymentStatus
-           - inJsonPath: $.status
-             outJsonPath: $.Data.status   
-           - inJsonPath: $.payer
-             outJsonPath: $.Data.payer
-           - inJsonPath: $.billDetails
-             outJsonPath: $.Data.billDetails
-           - inJsonPath: $.additionalDetails
-             outJsonPath: $.Data.additionalDetails
-           - inJsonPath: $.auditDetails
-             outJsonPath: $.Data.auditDetails
-           externalUriMapping:
            - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
              queryParam: businessIds=$.billNumber,history=true,tenantId=$.tenantId
              apiRequest: {"RequestInfo":{"apiId":"org.egov.bill","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":"statea.cityone","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"statea.cityone"}]}}}
              uriResponseMapping:
              - inJsonPath: $.ProcessInstances
                outJsonPath: $.Data.history
+             - inJsonPath: $.ProcessInstances[0]
+               outJsonPath: $.Data.currentProcessInstance
 
    - topic: expense-bill-update
      configKey: INDEX
@@ -128,7 +76,7 @@ ServiceMaps:
          isBulk: false
          timeStampField: $.auditDetails.createdTime
          customJsonMapping:
-           indexMapping: { "Data":{"id":"","tenantId":"","billNumber":"","billDate":"","dueDate":"","totalAmount":"","totalPaidAmount":"","businessService":"","referenceId":"","fromPeriod":"","toPeriod":"","paymentStatus":"","status":"","payer":{},"billDetails":[],"additionalDetails":{},"auditDetails":{},"history":{}}}
+           indexMapping: { "Data":{"id":"","tenantId":"","billNumber":"","billDate":"","dueDate":"","totalAmount":"","totalPaidAmount":"","businessService":"","referenceId":"","fromPeriod":"","toPeriod":"","paymentStatus":"","status":"","payer":{},"billDetails":[],"additionalDetails":{},"auditDetails":{},"currentProcessInstance":{},"history":{}}}
            fieldMapping:
            - inJsonPath: $.id
              outJsonPath: $.Data.id
@@ -164,13 +112,23 @@ ServiceMaps:
              outJsonPath: $.Data.additionalDetails
            - inJsonPath: $.auditDetails
              outJsonPath: $.Data.auditDetails
+           - inJsonPath: $.additionalDetails.locality
+             outJsonPath: $.Data.locality
+           - inJsonPath: $.additionalDetails.ward
+             outJsonPath: $.Data.ward
+           - inJsonPath: $.additionalDetails.projectName
+             outJsonPath: $.Data.projectName  
+           - inJsonPath: $.additionalDetails.orgName
+             outJsonPath: $.Data.orgName
            externalUriMapping:
            - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
              queryParam: businessIds=$.billNumber,history=true,tenantId=$.tenantId
              apiRequest: {"RequestInfo":{"apiId":"org.egov.bill","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":"statea.cityone","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"statea.cityone"}]}}}
              uriResponseMapping:
              - inJsonPath: $.ProcessInstances
                outJsonPath: $.Data.history
+             - inJsonPath: $.ProcessInstances[0]
+               outJsonPath: $.Data.currentProcessInstance
 
    - topic: expense-bill-legacyIndex
      configKey: LEGACYINDEX
@@ -218,10 +176,20 @@ ServiceMaps:
              outJsonPath: $.Data.additionalDetails
            - inJsonPath: $.auditDetails
              outJsonPath: $.Data.auditDetails
+           - inJsonPath: $.additionalDetails.locality
+             outJsonPath: $.Data.locality
+           - inJsonPath: $.additionalDetails.ward
+             outJsonPath: $.Data.ward
+           - inJsonPath: $.additionalDetails.projectName
+             outJsonPath: $.Data.projectName  
+           - inJsonPath: $.additionalDetails.orgName
+             outJsonPath: $.Data.orgName
            externalUriMapping:
            - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search
              queryParam: businessIds=$.billNumber,history=true,tenantId=$.tenantId
              apiRequest: {"RequestInfo":{"apiId":"org.egov.bill","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":"statea.cityone","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"statea.cityone"}]}}}
              uriResponseMapping:
              - inJsonPath: $.ProcessInstances
                outJsonPath: $.Data.history
+             - inJsonPath: $.ProcessInstances[0]
+               outJsonPath: $.Data.currentProcessInstance
diff --git a/egov-persister/expense-bill-payment-persister.yaml b/egov-persister/expense-bill-payment-persister.yaml
@@ -396,7 +396,7 @@ serviceMaps:
    description: create payment in eg_expense_payment
    fromTopic: expense-payment-create
    queryMaps: 
-    - query: INSERT INTO eg_expense_payment(id, tenantid, netpayableamount, netpaidamount, status, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
+    - query: INSERT INTO eg_expense_payment(id, tenantid, netpayableamount, netpaidamount, paymentnumber, status, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
       basePath: $.payment
       jsonMaps:
 
@@ -408,6 +408,8 @@ serviceMaps:
 
        - jsonPath: $.payment.netPaidAmount
 
+       - jsonPath: $.payment.paymentNumber
+
        - jsonPath: $.payment.status
 
        - jsonPath: $.payment.auditDetails.createdBy
@@ -572,4 +574,3 @@ serviceMaps:
        - jsonPath: $.payment.bills.*.billDetails[?({id} in @.payableLineItems[*].id)].id
 
        - jsonPath: $.payment.tenantId
-
diff --git a/pdf-service/data-config/nominal-muster-roll.json b/pdf-service/data-config/nominal-muster-roll.json
@@ -649,6 +649,12 @@
                 "type": "function",
                 "format": "var y=[],x=arguments[0];var total_day_worked=0; var total_wage=0; var sun_day_total_attendance=0;var fri_day_total_attendance=0; var mon_day_total_attendance=0; var tue_day_total_attendance=0; var wed_day_total_attendance=0; var thu_day_total_attendance=0; var thu_day_total_attendance=0; var sat_day_total_attendance=0; function rupeeFormat(amount){flag=0;var count=0;var amount=amount.toString(); var len=amount.length;var val=''; for(var i=len-1;i>=0;i--){ val=amount[i]+val;if(amount[i]=='.'){flag=1;count=-1;val=amount.substring(i,len)};if(count%2==0 && i!=0 && count!=0){val=','+val;};count+=1;};if(flag==0){val+='.00'};return val}; if(x){for(var i=0;i<x.length;i++){ mon_day_total_attendance= mon_day_total_attendance + x[i].attendanceEntries[6].attendance; tue_day_total_attendance= tue_day_total_attendance + x[i].attendanceEntries[5].attendance; wed_day_total_attendance= wed_day_total_attendance + x[i].attendanceEntries[4].attendance; thu_day_total_attendance= thu_day_total_attendance + x[i].attendanceEntries[3].attendance; fri_day_total_attendance= fri_day_total_attendance + x[i].attendanceEntries[2].attendance; sat_day_total_attendance= sat_day_total_attendance + x[i].attendanceEntries[1].attendance;sun_day_total_attendance= sun_day_total_attendance+x[i].attendanceEntries[0].attendance;total_day_worked+=x[i].actualTotalAttendance;total_wage+=x[i].totalWage}; total_wage=rupeeFormat(total_wage); y.push({'mon_day_total_attendance':mon_day_total_attendance, 'tue_day_total_attendance':tue_day_total_attendance, 'wed_day_total_attendance': wed_day_total_attendance, 'thu_day_total_attendance':thu_day_total_attendance, 'fri_day_total_attendance':fri_day_total_attendance, 'sat_day_total_attendance':sat_day_total_attendance,'sun_day_total_attendance':sun_day_total_attendance,'total_day_worked':total_day_worked,'total_wage':total_wage })}return y;"
               },
+              {
+                "variable": "totalWageAmount",
+                "value": {
+                  "path": "$.totalWageAmount"
+                }
+              },
               {
                 "variable": "len",
                 "value": {

diff --git a/pdf-service/format-config/nominal-muster-roll.json b/pdf-service/format-config/nominal-muster-roll.json
@@ -195,7 +195,7 @@
 								"bold": true
 							},
 							{
-								"text": "{{#total}}[{\"text\":\"{{total_wage}}\",\"fontSize\":15}]{{/total}}"
+								"text": "{{totalWageAmount}}"
 							}
 						],
 						[