Prabhat 1

.gitignore

@@ -2,3 +2,13 @@
 frontend/micro-ui-internals/node_modules/*
 .idea
 index.lock
+/.metadata/
+/.metadata/
+municipal-services/advertisement-canopy-service/.mvn/wrapper/maven-wrapper.properties
+municipal-services/advertisement-canopy-service/mvnw
+municipal-services/advertisement-canopy-service/mvnw.cmd
+core-services/egov-mdms-service/src/main/resources/application.properties
+core-services/egov-mdms-service/src/main/resources/application.properties
+core-services/zuul/src/main/resources/application.properties
+core-services/zuul/src/main/resources/application.properties
+core-services/report/src/main/resources/application.properties

README.md

@@ -22,4 +22,4 @@ UPYOG focuses on inclusion and is designed on the principle of enhancing both pl
 
 ### UPYOG Code is open sources under License [UPYOG CODE, COPYRIGHT AND CONTRIBUTION LICENSE TERMS](https://upyog.niua.org/employee/Upyog%20Code%20and%20Copyright%20License_v1.pdf)
 
-### UPYOG is Developed and Maintained by [NIUA](https://niua.in/)
+#### UPYOG is Developed and Maintained by [NIUA](https://niua.in/)

build/build-config.yml

@@ -365,9 +365,9 @@ config:
       - work-dir: "core-services/libraries/enc-client"
         image-name: "enc-client"
 
-  - name: "builds/upyog/core-services/libraries/services-common"
+  - name: "builds/core-services/libraries/services-common"
     build:
-      - work-dir: "core-services/libraries/services-common"
+      - work-dir: "libraries/services-common"
         image-name: "services-common"
 
   - name: "builds/upyog/core-services/libraries/digit-models"
@@ -623,7 +623,38 @@ config:
         dockerfile: "build/maven/Dockerfile"
       - work-dir: "municipal-services/birth-registration/src/main/resources/db"
         image-name: "birth-registration-db"
-
+
+  - name: "builds/municipal-services/garbage-service"
+    build:
+      - work-dir: "municipal-services/garbage-service"
+        image-name: "garbage-service"
+        dockerfile: "build/maven/Dockerfile"
+      - work-dir: "municipal-services/garbage-service/src/main/resources/db"
+        image-name: "garbage-service-db" 
+
+  - name: "builds/municipal-services/advertisement-canopy-service"
+    build:
+      - work-dir: "municipal-services/advertisement-canopy-service"
+        image-name: "advc-services"
+        dockerfile: "build/maven/Dockerfile"
+      - work-dir: "municipal-services/advertisement-canopy-service/src/main/resources/db"
+        image-name: "advc-services-db"
+
+  - name: "builds/municipal-services/asset-services"
+    build:
+      - work-dir: "municipal-services/asset-services"
+        image-name: "asset-services"
+        dockerfile: "build/maven/Dockerfile"
+      - work-dir: "municipal-services/asset-services/src/main/resources/db"
+        image-name: "asset-services-db" 
+
+  - name: "builds/municipal-services/scheduler-service"
+    build:
+      - work-dir: "municipal-services/scheduler-service"
+        image-name: "scheduler"
+        dockerfile: "build/maven/Dockerfile"
+      - work-dir: "municipal-services/scheduler-service/src/main/resources/db"
+        image-name: "scheduler-db"
  # Utilities
 
   - name: "builds/upyog/utilities/egov-weekly-impact-notifier"
@@ -694,6 +725,8 @@ config:
       - work-dir: "utilities/demo-utility"
         image-name: "demo-utility"
         dockerfile: "build/maven/Dockerfile"
+
+
 
 # Frontend
 
@@ -801,6 +834,6 @@ config:
     build:
       - work-dir: dx-services/requester-services-dx
         image-name: requester-services-dx
-        dockerfile: build/maven/Dockerfile        
-        
+        dockerfile: build/maven/Dockerfile 
+
 

business-services/.gitignore

@@ -189,4 +189,15 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
+*.lnk
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/

business-services/billing-service/src/main/java/org/egov/demand/model/BillSearchCriteria.java

@@ -34,6 +34,9 @@ public class BillSearchCriteria {
 	@Default
 	private Boolean retrieveOldest = false;
 
+	@Default
+	private Boolean retrieveAll = false;
+
 	private Boolean isActive;
 
 	private Boolean isCancelled;

business-services/billing-service/src/main/java/org/egov/demand/repository/querybuilder/BillQueryBuilder.java

@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.egov.demand.model.BillSearchCriteria;
 import org.egov.demand.model.BillV2.BillStatus;
 import org.egov.demand.model.UpdateBillCriteria;
@@ -145,11 +146,14 @@ private StringBuilder addPagingClause(final StringBuilder selectQuery, final Lis
 
 		StringBuilder finalQuery;
 
-		if (searchBillCriteria.getRetrieveOldest())
-			finalQuery = new StringBuilder(BILL_MIN_QUERY.replace(REPLACE_STRING, selectQuery));
-		else
-			finalQuery = new StringBuilder(BILL_MAX_QUERY.replace(REPLACE_STRING, selectQuery));
-
+		if (BooleanUtils.isFalse(searchBillCriteria.getRetrieveAll())) {
+			if (searchBillCriteria.getRetrieveOldest())
+				finalQuery = new StringBuilder(BILL_MIN_QUERY.replace(REPLACE_STRING, selectQuery));
+			else
+				finalQuery = new StringBuilder(BILL_MAX_QUERY.replace(REPLACE_STRING, selectQuery));
+		}else {
+			finalQuery = selectQuery;
+		}
 		if (searchBillCriteria.isOrderBy()) {
 			finalQuery.append(" ORDER BY billresult.bd_consumercode ");
 		}

business-services/billing-service/src/main/java/org/egov/demand/service/BillServicev2.java

@@ -554,7 +554,7 @@ private List<String> getBillNumbers(RequestInfo requestInfo, String tenantId, St
 		else
 			billNumberFormat = billNumberFormat.replace(appProps.getTenantIdReplaceString(), "");
 
-		return idGenRepo.getId(requestInfo, tenantId, "billnumberid", billNumberFormat, count);
+		return idGenRepo.getId(requestInfo, tenantId, "idNameNotInMDMS", billNumberFormat, count);
 	}
 
 

business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java

@@ -43,8 +43,10 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -53,6 +55,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.validation.Valid;
+
 import org.egov.common.contract.request.RequestInfo;
 import org.egov.demand.amendment.model.Amendment;
 import org.egov.demand.amendment.model.AmendmentCriteria;
@@ -72,6 +76,7 @@
 import org.egov.demand.repository.BillRepositoryV2;
 import org.egov.demand.repository.DemandRepository;
 import org.egov.demand.repository.ServiceRequestRepository;
+import org.egov.demand.util.Constants;
 import org.egov.demand.util.DemandEnrichmentUtil;
 import org.egov.demand.util.Util;
 import org.egov.demand.web.contract.DemandRequest;
@@ -276,7 +281,11 @@ public DemandResponse updateAsync(DemandRequest demandRequest, PaymentBackUpdate
 				.tenantId(tenantId)
 				.build();
 
-		if (ObjectUtils.isEmpty(paymentBackUpdateAudit)) {
+		if(org.apache.commons.lang3.StringUtils.equalsIgnoreCase(businessService, Constants.NEWTL_BUSINESS_SERVICE)
+				|| org.apache.commons.lang3.StringUtils.equalsIgnoreCase(businessService, Constants.NEWTL_BUSINESS_SERVICE)) {
+			validateDemandAndUpdateBill(demandRequest, updateBillCriteria);
+		}
+		else if (ObjectUtils.isEmpty(paymentBackUpdateAudit)) {
 
 			updateBillCriteria.setStatusToBeUpdated(BillStatus.EXPIRED);
 			billRepoV2.updateBillStatus(updateBillCriteria);
@@ -290,6 +299,31 @@ public DemandResponse updateAsync(DemandRequest demandRequest, PaymentBackUpdate
 	}
 
 
+	private void validateDemandAndUpdateBill(DemandRequest demandRequest, UpdateBillCriteria updateBillCriteria) {
+
+		Boolean skipUpdate = false;
+
+		if(!CollectionUtils.isEmpty(demandRequest.getDemands())) {
+
+			for(Demand demand : demandRequest.getDemands()) {
+				BigDecimal totoalTax = demand.getDemandDetails().stream().map(DemandDetail::getTaxAmount)
+						.reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal totalCollection = demand.getDemandDetails().stream().map(DemandDetail::getCollectionAmount)
+						.reduce(BigDecimal.ZERO, BigDecimal::add);
+
+				skipUpdate = totoalTax.compareTo(totalCollection) != 0 ? true : false ;
+			}
+
+		}
+
+		// update bill as paid
+		if(!skipUpdate) {
+			updateBillCriteria.setStatusToBeUpdated(BillStatus.PAID);
+			billRepoV2.updateBillStatus(updateBillCriteria);
+		}
+
+	}
+
 	/**
 	 * Search method to fetch demands from DB
 	 * 
@@ -514,5 +548,55 @@ private List<AmendmentUpdate> consumeAmendmentIfExists(List<Demand> demands, Aud
 
 		return updateListForConsumedAmendments;
 	}
+
+	public Object updateInternally(@Valid LinkedHashMap<String, Object> demandRequest) {
+
+		RequestInfo requestInfo = mapper.convertValue(demandRequest.get("requestInfo"), RequestInfo.class);
+		LinkedHashMap<String, Object> inputs = mapper.convertValue(demandRequest.get("inputs"), LinkedHashMap.class);
+		BigDecimal txnAmount = (BigDecimal)inputs.get("txnAmount");
+		DemandRequest demandRequest2 = null;
+
+		DemandCriteria demandCriteria = DemandCriteria.builder()
+										.tenantId((String)inputs.get("tenantId"))
+										.businessService((String)inputs.get("businessService"))
+										.consumerCode(new HashSet<>(Arrays.asList((String) inputs.get("consumerCode"))))
+										.isPaymentCompleted((Boolean)inputs.get("isPaymentCompleted"))
+										.build();
+		// search demands
+		List<Demand> demands = getDemands(demandCriteria, requestInfo);
+
+		// validate amount
+		Boolean completePaymentDone = validateAmountOfTransactionAndDemands(txnAmount, demands);
+
+		if(completePaymentDone) {
+
+			// enrich collection amount = tax amount
+			demands.stream().forEach(demand -> {
+				demand.getDemandDetails().stream().forEach(detail -> {
+					detail.setCollectionAmount(detail.getTaxAmount());
+				});
+			});
+
+			// update demands
+			demandRequest2 = DemandRequest.builder().requestInfo(requestInfo).demands(demands).build();
+			updateAsync(demandRequest2, null);
+		}
+
+		return demandRequest2;
+	}
+
+	private Boolean validateAmountOfTransactionAndDemands(BigDecimal txnAmount, List<Demand> demands) {
+
+		if (CollectionUtils.isEmpty(demands)) {
+	        return false;
+	    }
+
+	    BigDecimal totalTaxAmountOfDemands = demands.stream()
+	            .flatMap(demand -> demand.getDemandDetails().stream())
+	            .map(DemandDetail::getTaxAmount)
+	            .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+	    return txnAmount.compareTo(totalTaxAmountOfDemands) == 0;	    
+	}
 
 }

business-services/billing-service/src/main/java/org/egov/demand/util/Constants.java

@@ -187,4 +187,11 @@ private Constants() {}
 	public static final String CANCELL_REASON_CODE_NOT_FOUND = "EG_BS_CANCELL_REASON_CODE_NOT";
 	public static final String CANCELL_REASON_CODE_NOT_FOUND_MSG = "Cancellation Reason with key " + "'" + CANCELLATION_REASON_CODE + "'" + " is a madnatory Text field in additionalDetails of Bill cancell Request";
 	public static final String CANCELL_REASON_CODE_EMPTY_MSG = "Cancell Reason code cannot be empty";
+
+
+	public static final String NEWTL_BUSINESS_SERVICE = "NewTL";
+
+	public static final String GB_BUSINESS_SERVICE = "GB";
+
+
 }

business-services/billing-service/src/main/java/org/egov/demand/util/Util.java

@@ -7,6 +7,8 @@
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
 import org.egov.common.contract.request.RequestInfo;
 import org.egov.common.contract.request.Role;
 import org.egov.demand.amendment.model.ProcessInstance;
@@ -228,6 +230,10 @@ public void updateDemandPaymentStatus(Demand demand, Boolean isUpdateFromPayment
 		BigDecimal totalCollection = demand.getDemandDetails().stream().map(DemandDetail::getCollectionAmount)
 				.reduce(BigDecimal.ZERO, BigDecimal::add);
 
+		if(StringUtils.equalsIgnoreCase(demand.getBusinessService(), Constants.NEWTL_BUSINESS_SERVICE)) {
+			isUpdateFromPayment = true;
+		}
+
 		if (totoalTax.compareTo(totalCollection) == 0 && isUpdateFromPayment)
 			demand.setIsPaymentCompleted(true);
 		else if (totoalTax.compareTo(totalCollection) != 0)

business-services/billing-service/src/main/java/org/egov/demand/web/controller/BillControllerv2.java

@@ -23,6 +23,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -46,7 +47,8 @@ public class BillControllerv2 {
 	@Autowired
 	private BillHelperV2 billHelper;
 
-	@PostMapping("_search")
+
+    @PostMapping("_search")
 	@ResponseBody
 	public ResponseEntity<?> search(@RequestBody @Valid final RequestInfoWrapper requestInfoWrapper,
 			@ModelAttribute @Valid final BillSearchCriteria billCriteria) {
@@ -57,7 +59,8 @@ public ResponseEntity<?> search(@RequestBody @Valid final RequestInfoWrapper req
 	}
 
 
-	@PostMapping("_fetchbill")
+
+    @PostMapping("_fetchbill")
 	@ResponseBody
 	public ResponseEntity<?> fetchBill(@RequestBody RequestInfoWrapper requestInfoWrapper, 
 			@ModelAttribute @Valid GenerateBillCriteria generateBillCriteria){
@@ -67,15 +70,17 @@ public ResponseEntity<?> fetchBill(@RequestBody RequestInfoWrapper requestInfoWr
 	}
 
 
-	@PostMapping("_generate")
+
+    @PostMapping("_generate")
 	@ResponseBody
 	public ResponseEntity<?> genrateBill(@RequestBody RequestInfoWrapper requestInfoWrapper,
 			@ModelAttribute @Valid GenerateBillCriteria generateBillCriteria) {
 
 		throw new CustomException("EG_BS_API_ERROR", "The Generate bill API has been deprecated, Access the fetchBill");
 	}
 
-	@PostMapping("_create")
+
+    @PostMapping("_create")
 	@ResponseBody
 	public ResponseEntity<?> create(@RequestBody @Valid BillRequestV2 billRequest, BindingResult bindingResult){
 

business-services/billing-service/src/main/java/org/egov/demand/web/controller/DemandController.java

@@ -39,6 +39,7 @@
  */
 package org.egov.demand.web.controller;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -130,5 +131,11 @@ public ResponseEntity<?> migrate(@RequestBody @Valid RequestInfoWrapper wrapper,
 		Map<String, String> resultMap = migrationService.migrateToV1(batchStart, batchSizeInput);
 		return new ResponseEntity<>(resultMap, HttpStatus.OK);
 	}
+
+	@PostMapping("v1/_update")
+	public ResponseEntity<?> updateInternally(@RequestBody @Valid LinkedHashMap<String, Object> demandRequest) {
+
+		return new ResponseEntity<>(demandService.updateInternally(demandRequest), HttpStatus.OK);
+	}
 
 }

business-services/billing-service/src/main/java/org/egov/demand/web/validator/BillValidator.java

@@ -54,7 +54,7 @@ public void validateBillSearchCriteria(BillSearchCriteria billCriteria, RequestI
 		util.validateTenantIdForUserType(billCriteria.getTenantId(), requestInfo);
 
 		if (billCriteria.getBillId() == null && CollectionUtils.isEmpty(billCriteria.getConsumerCode())
-				&& billCriteria.getMobileNumber() == null && billCriteria.getEmail() == null) {
+				&& billCriteria.getMobileNumber() == null && billCriteria.getEmail() == null && billCriteria.getBillNumber()==null) {
 
 			throw new CustomException("EGBS_MANDATORY_FIELDS_ERROR",
 					"BILL_SEARCH_MANDATORY_FIELDS_MISSING Any one of the fields additional to tenantId is mandatory like consumerCode,billId, mobileNumber or email");