Merge the frontend changes

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

@@ -237,6 +237,8 @@ public BillResponseV2 fetchBill(GenerateBillCriteria billCriteria, RequestInfoWr
 		if (CollectionUtils.isEmpty(bills))
 		{
 			log.info( "If bills are empty" +bills.size());
+			//if(!billCriteria.getBusinessService().equalsIgnoreCase("WS") && !billCriteria.getBusinessService().equalsIgnoreCase("SW"))
+			//if(!billCriteria.getBusinessService().equalsIgnoreCase("SW"))
 			updateDemandsForexpiredBillDetails(billCriteria.getBusinessService(), billCriteria.getConsumerCode(), billCriteria.getTenantId(), requestInfoWrapper);
 			return generateBill(billCriteria, requestInfo);
 		}

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/controllers/DashboardController.java

@@ -135,6 +135,7 @@ public String getVisualizationChartV2( @RequestBody RequestDto requestDto, @Requ
 		StringBuilder finalString = new StringBuilder(requestBodyString).append(headersString);
 		requestInfo.setHashKey(finalString.toString().hashCode());
 
+		logger.info("hashKey:: "+finalString.toString().hashCode());
 		Map<String, Object> headers = requestDto.getHeaders();
 		String response = "";
 		try {

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/handler/IResponseHandler.java

@@ -83,7 +83,7 @@ public interface IResponseHandler {
 	public static final String IS_ROUND_OFF = "isRoundOff";
 
 	public static Double BOUNDARY_VALUE = 50.0;
-	
+
 	public static final String DIVISION = "division";
 
 	/**
@@ -148,12 +148,10 @@ default void addComputedField(Data data, String newfield, String partField, Stri
 	 * @return
 	 */
 	default Double percentageValue(List<Double> values, boolean isRoundOff) {
-
-		logger.info("values for percentage are  " + values);
 		double val = (values.get(0)/values.get(1) * 100);
-
-		val = Math.round(val);
-
+		if(isRoundOff) {
+			val = Math.round(val);
+		}
 		return (values.size() > 1 && values.get(0) != 0.0 && values.get(1) != 0.0) ? val : 0.0;
 	}
 

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/handler/MetricChartResponseHandler.java

@@ -23,6 +23,7 @@
 import com.tarento.analytics.dto.Plot;
 import com.tarento.analytics.helper.ComputeHelper;
 import com.tarento.analytics.helper.ComputeHelperFactory;
+import com.tarento.analytics.utils.ResponseRecorder;
 
 /**
  * This handles ES response for single index, multiple index to represent single data value

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/org/service/TarentoServiceImpl.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -25,7 +26,6 @@
 import com.tarento.analytics.dto.AggregateRequestDto;
 import com.tarento.analytics.dto.CummulativeDataRequestDto;
 import com.tarento.analytics.dto.DashboardHeaderDto;
-import com.tarento.analytics.dto.Plot;
 import com.tarento.analytics.dto.RoleDto;
 import com.tarento.analytics.enums.ChartType;
 import com.tarento.analytics.exception.AINException;
@@ -71,6 +71,7 @@ public class TarentoServiceImpl implements ClientService {
 	@Cacheable(value="versions", key="#request.hashKey")
 	public AggregateDto getAggregatedData(AggregateRequestDto request, List<RoleDto> roles) throws AINException, IOException {
 		// Read visualization Code
+		logger.info("inside Tarento AggregateDto");
 		String internalChartId = request.getVisualizationCode();
 		ObjectNode aggrObjectNode = JsonNodeFactory.instance.objectNode();
 		ObjectNode insightAggrObjectNode = JsonNodeFactory.instance.objectNode();
@@ -84,10 +85,48 @@ public AggregateDto getAggregatedData(AggregateRequestDto request, List<RoleDto>
 			filters.put("tenantId", filters.get("ulb"));
 		}
 
+		Map<String, String> indexes = new HashMap<>();
 
 		// Load Chart API configuration to Object Node for easy retrieval later
 		ObjectNode node = configurationLoader.get(Constants.ConfigurationFiles.CHART_API_CONFIG);
 		ObjectNode chartNode = (ObjectNode) node.get(internalChartId);
+		// added pivot code from here
+		ArrayNode queries = (ArrayNode) chartNode.get(Constants.JsonPaths.QUERIES);
+	        queries.forEach(query -> {
+	            String module = query.get(Constants.JsonPaths.MODULE).asText();
+	            String indexName = "";
+	            if (request.getModuleLevel().equals(Constants.Modules.HOME_REVENUE) ||
+	                    request.getModuleLevel().equals(Constants.Modules.HOME_SERVICES) ||
+	                    query.get(Constants.JsonPaths.MODULE).asText().equals(Constants.Modules.COMMON) ||
+	                    request.getModuleLevel().equals(module)) {
+
+	                indexName = query.get(Constants.JsonPaths.INDEX_NAME).asText();
+	                String initialIndexName = indexName;
+	                boolean isDefaultPresent = false;
+	                boolean isRequestContainsInterval = null == request.getRequestDate() ? false : (request.getRequestDate().getInterval() != null && !request.getRequestDate().getInterval().isEmpty());
+	                String interval = isRequestContainsInterval ? request.getRequestDate().getInterval() : (isDefaultPresent ? chartNode.get(Constants.JsonPaths.INTERVAL).asText() : "");
+	                logger.info("interval :: {} "+interval);
+					logger.info("VisualizationCode :: {} "+request.getVisualizationCode());
+					logger.info("Before constructing indexName :: {} "+indexName);
+					if (indexName.contains("*") && !StringUtils.isBlank(interval)) {
+						logger.info("entered into if block :: "+indexName);
+						//if interval is coming as year changed to month to match data
+						if(interval.equals("year")){
+							interval = "month";
+						}
+						indexName = indexName.replace("*", interval);
+					} else if (indexName.contains("*") && StringUtils.isBlank(interval)) {
+						logger.info("entered into else if block :: "+indexName);
+						indexName = indexName.replace("*", "month");
+					}
+					indexes.put(indexName, initialIndexName);
+					logger.info("after constructing indexName :: {} "+indexName);
+	            }
+	            logger.info("Before setting indexName to NODE :: {} "+indexName);
+	            ((ObjectNode) query).put(Constants.JsonPaths.INDEX_NAME, indexName);
+
+	        });
+	        ((ObjectNode) chartNode).put(Constants.JsonPaths.QUERIES, queries);
 		InsightsConfiguration insightsConfig = null;
 		if(chartNode.get(Constants.JsonPaths.INSIGHT) != null) { 
 			insightsConfig = mapper.treeToValue(chartNode.get(Constants.JsonPaths.INSIGHT), InsightsConfiguration.class);
@@ -96,7 +135,9 @@ public AggregateDto getAggregatedData(AggregateRequestDto request, List<RoleDto>
 		boolean isDefaultPresent = chartType.equals(ChartType.LINE) && chartNode.get(Constants.JsonPaths.INTERVAL)!=null;
 		boolean isRequestContainsInterval = null == request.getRequestDate() ? false : (request.getRequestDate().getInterval()!=null && !request.getRequestDate().getInterval().isEmpty()) ;
 		String interval = isRequestContainsInterval? request.getRequestDate().getInterval(): (isDefaultPresent ? chartNode.get(Constants.JsonPaths.INTERVAL).asText():"");
-
+		ObjectMapper mapper1 = new ObjectMapper();
+	    String json1 = mapper1.writerWithDefaultPrettyPrinter().writeValueAsString(chartNode);
+		logger.info("CHART NODE before  executeConfiguredQueries:: {}"+json1);
 		executeConfiguredQueries(chartNode, aggrObjectNode, nodes, request, interval);
 		request.setChartNode(chartNode);
 		ResponseRecorder responseRecorder = new ResponseRecorder();
@@ -133,7 +174,19 @@ Data is fetched with updated RequestDates (updated in getInsightsDate which subt
 				aggregateDto = insightsHandler.getInsights(aggregateDto, request.getVisualizationCode(), request.getModuleLevel(), insightsConfig,request.getResponseRecorder());
 			}
 		}
-
+
+		if(!queries.isEmpty())
+			queries.forEach(query -> {
+	            String indexName = indexes.get(query.get(Constants.JsonPaths.INDEX_NAME).asText());
+	            logger.info("VisualizationCode During indexname reset :: {} "+request.getVisualizationCode());
+	            logger.info("Index name from CHART NODE:::::::"+query.get(Constants.JsonPaths.INDEX_NAME).asText());
+	            logger.info("Index name from Map:::::::"+indexName);
+	            if(!StringUtils.isBlank(indexName))
+	            	((ObjectNode) query).put(Constants.JsonPaths.INDEX_NAME, indexName);
+	        });
+		ObjectMapper mapper = new ObjectMapper();
+	    String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(chartNode.get(Constants.JsonPaths.QUERIES));
+		logger.info("Index name after resetting CHART NODE :: {}"+json);
 		return aggregateDto;
 	}
 
@@ -147,6 +200,7 @@ Data is fetched with updated RequestDates (updated in getInsightsDate which subt
 	 *                 be fetched from  AggregateRequestDto
 	 */
 	private void executeConfiguredQueries(ObjectNode chartNode, ObjectNode aggrObjectNode, ObjectNode nodes, AggregateRequestDto request, String interval) {
+		logger.info("nodes :: {}"+nodes);
 		preHandle(request, chartNode, mdmsApiMappings);
 
 		ArrayNode queries = (ArrayNode) chartNode.get(Constants.JsonPaths.QUERIES);
@@ -159,6 +213,7 @@ private void executeConfiguredQueries(ObjectNode chartNode, ObjectNode aggrObjec
 					request.getModuleLevel().equals(module)) {
 
 				String indexName = query.get(Constants.JsonPaths.INDEX_NAME).asText();
+				logger.info("indexName in  executeConfiguredQueries:: {}"+indexName);
 				ObjectNode objectNode = queryService.getChartConfigurationQuery(request, query, indexName, interval);
 				try {
 					JsonNode aggrNode = restService.search(indexName,objectNode.toString());

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/service/impl/RestService.java

@@ -1,29 +1,29 @@
-
+
 package com.tarento.analytics.service.impl;
 
-import static javax.servlet.http.HttpServletRequest.BASIC_AUTH;
-import static org.apache.commons.codec.CharEncoding.US_ASCII;
-import static org.springframework.http.HttpHeaders.AUTHORIZATION;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tomcat.util.codec.binary.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.HttpClientErrorException;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
+import static javax.servlet.http.HttpServletRequest.BASIC_AUTH;
+import static org.apache.commons.codec.CharEncoding.US_ASCII;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.HttpClientErrorException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Component
@@ -61,13 +61,13 @@ public JsonNode search(String index, String searchQuery) {
         LOGGER.info("Index Name : " + index);
         LOGGER.info("Searching ES for Query: " + searchQuery);
         HttpEntity<String> requestEntity = new HttpEntity<>(searchQuery, headers);
-        JsonNode responseNode = null;
-
+        JsonNode responseNode = null;
+     
 
         try {
             ResponseEntity<Object> response = retryTemplate.postForEntity(url, requestEntity);
             responseNode = new ObjectMapper().convertValue(response.getBody(), JsonNode.class);
-            LOGGER.info("RestTemplate response :- "+responseNode);
+            //LOGGER.info("RestTemplate response :- "+responseNode);
 
         } catch (HttpClientErrorException e) {
             e.printStackTrace();
@@ -162,4 +162,4 @@ private String getBase64Value(String userName, String password) {
     }
 
 }
-
+

business-services/egov-hrms/pom.xml

@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.egov</groupId>
   <artifactId>egov-hrms</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.6-SNAPSHOT</version>
   <name>egov-hrms</name>
   <description>HR Management System</description>
   <properties>
@@ -97,6 +97,12 @@
       <artifactId>jsoup</artifactId>
       <version>1.10.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.egov.common</groupId>
+      <artifactId>health-services-models</artifactId>
+      <version>1.0.6-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -108,6 +114,9 @@
       <id>repo.egovernments.org.snapshots</id>
       <name>eGov ERP Releases Repository</name>
       <url>https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/</url>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
     </repository>
   </repositories>
   <build>

business-services/egov-hrms/src/main/java/org/egov/hrms/EgovEmployeeApplication.java

@@ -44,8 +44,15 @@
 
 import javax.annotation.PostConstruct;
 
+import lombok.extern.slf4j.Slf4j;
 import org.egov.common.utils.MultiStateInstanceUtil;
+import org.egov.hrms.config.PropertiesManager;
+import org.egov.hrms.repository.RestCallRepository;
+import org.egov.hrms.service.DefaultUserService;
+import org.egov.hrms.service.IndividualService;
+import org.egov.hrms.service.UserService;
 import org.egov.tracer.config.TracerConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -55,10 +62,12 @@
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.context.annotation.Primary;
 
 @SpringBootApplication
-@ComponentScan(basePackages = { "org.egov.hrms", "org.egov.hrms.web.controllers" , "org.egov.hrms.config"})
+@ComponentScan(basePackages = { "org.egov.hrms", "org.egov.hrms.web.controller" , "org.egov.hrms.config"})
 @Import({TracerConfiguration.class, MultiStateInstanceUtil.class})
+@Slf4j
 public class EgovEmployeeApplication {
 
     @Value("${app.timezone}")
@@ -77,6 +86,34 @@ public ObjectMapper getObjectMapper() {
         return objectMapper;
     }
 
+    @Bean
+    @Primary
+    public UserService getUserService(@Value("${egov.hrms.user.service.qualifier}") String userServiceQualifier,
+                                      @Autowired PropertiesManager propertiesManager,
+                                      @Autowired RestCallRepository restCallRepository,
+                                      @Autowired ObjectMapper objectMapper,
+                                      @Autowired MultiStateInstanceUtil multiStateInstanceUtil,
+                                      @Value("${egov.user.create.endpoint}") String userCreateEndpoint,
+                                      @Value("${egov.user.update.endpoint}") String userUpdateEndpoint,
+                                      @Value("${egov.user.search.endpoint}") String userSearchEndpoint) {
+        if (userServiceQualifier.equalsIgnoreCase("individualService")) {
+            log.info("using individual module as user service");
+            return new IndividualService(propertiesManager, restCallRepository);
+        }
+        else {
+            log.info("using egov-user module as user service");
+            DefaultUserService userService = new DefaultUserService();
+            userService.setPropertiesManager(propertiesManager);
+            userService.setRestCallRepository(restCallRepository);
+            userService.setObjectMapper(objectMapper);
+            userService.setCentralInstanceUtil(multiStateInstanceUtil);
+            userService.setUserCreateEndpoint(userCreateEndpoint);
+            userService.setUserUpdateEndpoint(userUpdateEndpoint);
+            userService.setUserSearchEndpoint(userSearchEndpoint);
+            return userService;
+        }
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(EgovEmployeeApplication.class, args);
     }

business-services/egov-hrms/src/main/java/org/egov/hrms/config/PropertiesManager.java

@@ -116,4 +116,22 @@ public class PropertiesManager {
 
 	@Value("${decryption.abac.enable}")
 	private Boolean isDecryptionEnable;
+
+	@Value("${egov.individual.host}")
+	private String individualHost;
+
+	@Value("${egov.individual.create.endpoint}")
+	private String individualCreateEndpoint;
+
+	@Value("${egov.individual.update.endpoint}")
+	private String individualUpdateEndpoint;
+
+	@Value("${egov.individual.delete.endpoint}")
+	private String individualDeleteEndpoint;
+
+	@Value("${egov.individual.search.endpoint}")
+	private String individualSearchEndpoint;
+
+	@Value("${egov.hrms.auto.generate.password}")
+	private boolean autoGeneratePassword;
 }

business-services/egov-hrms/src/main/java/org/egov/hrms/model/Employee.java

@@ -90,8 +90,6 @@ public class Employee {
 
 
     @Valid
-    @NotEmpty
-    @Size(min = 1)
     private List<Assignment> assignments = new ArrayList<>();
 
     @Valid

business-services/egov-hrms/src/main/java/org/egov/hrms/repository/EmployeeQueries.java

@@ -52,4 +52,6 @@ public class EmployeeQueries {
 	public static final String HRMS_GET_ASSIGNMENT = "select distinct(employeeid)  from eg_hrms_assignment assignment where assignment.tenantid notnull  ";
 
 	public static final String HRMS_COUNT_EMP_QUERY = "SELECT active, count(*) FROM eg_hrms_employee WHERE tenantid ";
+
+	public static final String HRMS_GET_UNASSIGNED_EMPLOYEES = "SELECT employee.uuid from eg_hrms_employee employee LEFT JOIN eg_hrms_assignment assignment ON employee.uuid = assignment.employeeid where assignment.employeeid is null";
 }

business-services/egov-hrms/src/main/java/org/egov/hrms/repository/EmployeeQueryBuilder.java

@@ -158,5 +158,11 @@ private void addToPreparedStatement(List<Object> preparedStmtList, List<?> ids)
 		});
 	}
 
+	public String getUnassignedEmployeesSearchQuery(EmployeeSearchCriteria criteria, List<Object> preparedStmtList) {
+		StringBuilder builder = new StringBuilder(EmployeeQueries.HRMS_GET_UNASSIGNED_EMPLOYEES);
+		addWhereClauseAssignment(criteria, builder, preparedStmtList);
+		return builder.toString();
+	}
+
 
 }