Skip to content

Commit

Permalink
Merge pull request #523 from egovernments/dev
Browse files Browse the repository at this point in the history 
merging dev to master
  • Loading branch information
@kavi-egov
kavi-egov authored Oct 16, 2023
2 parents d4adc4a + 9d058b2 commit 1430239
Show file tree
Hide file tree
Showing 129 changed files with 5,651 additions and 559 deletions.
12 changes: 10 additions & 2 deletions ...alytics/src/main/java/com/tarento/analytics/handler/AdvanceTableChartResponseHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.tarento.analytics.dto.Plot;
import com.tarento.analytics.helper.ComputedFieldFactory;
import com.tarento.analytics.helper.IComputedField;
import com.tarento.analytics.helper.SortingHelper;
import com.tarento.analytics.model.ComputedFields;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -33,6 +34,8 @@ public class AdvanceTableChartResponseHandler implements IResponseHandler {

@Autowired
private ObjectMapper mapper;
@Autowired
private SortingHelper sortingHelper;

@Autowired
private ComputedFieldFactory computedFieldFactory;
Expand Down Expand Up @@ -116,6 +119,7 @@ public AggregateDto translate(AggregateRequestDto requestDto, ObjectNode aggrega
});

});
List<Data> finalDataList = dataList;
mappings.entrySet().stream().forEach(plotMap -> {
List<Plot> plotList = plotMap.getValue().values().stream().collect(Collectors.toList());
//filter out data object with all zero data.
Expand Down Expand Up @@ -146,7 +150,7 @@ public AggregateDto translate(AggregateRequestDto requestDto, ObjectNode aggrega
logger.error("execution of computed field :"+e.getMessage());
}
}
dataList.add(data);
finalDataList.add(data);
}

});
Expand All @@ -168,7 +172,11 @@ public AggregateDto translate(AggregateRequestDto requestDto, ObjectNode aggrega
});
}
}


if (chartNode.has("sort")) {
dataList = sortingHelper.tableSort(dataList, chartNode.get("sort").asText());
}

return getAggregatedDto(chartNode, dataList, requestDto.getVisualizationCode());

}
Expand Down
15 changes: 11 additions & 4 deletions ...board-analytics/src/main/java/com/tarento/analytics/handler/LineChartResponseHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public AggregateDto translate(AggregateRequestDto requestDto, ObjectNode aggrega

if(isPredictionEnabled ){
List<JsonNode> aggrNodes = aggregationNode.findValues(CHART_SPECIFIC);
startDate = aggrNodes.get(0).findValues(START_DATE).get(0).findValues("key").get(0).asLong();
endDate = aggrNodes.get(0).findValues(END_DATE).get(0).findValues("key").get(0).asLong();
startDate = (aggrNodes.get(0).findValues(START_DATE).get(0).findValues("key").get(0).asLong()/86400000)*86400000;
endDate = (aggrNodes.get(0).findValues(END_DATE).get(0).findValues("key").get(0).asLong()/86400000)*86400000;
interval=Constants.Interval.day.toString();
addTargetDates(startDate, endDate,targetEpochKeys);
}
Expand Down Expand Up @@ -117,14 +117,18 @@ public AggregateDto translate(AggregateRequestDto requestDto, ObjectNode aggrega
Set<String> finalBucketKeys = new LinkedHashSet<>();

// For multi aggr, find all plot keys first
enrichBucketKeys(aggrNodes, finalBucketKeys, interval);
// enrichBucketKeys(aggrNodes, finalBucketKeys, interval);
enrichBucketKeys(aggrNodes, finalBucketKeys, interval, startDate, isPredictionEnabled);
initializeMultiAggrPlotMap(multiAggrPlotMap, finalBucketKeys);

for(JsonNode aggrNode : aggrNodes) {
if (aggrNode.findValues(IResponseHandler.BUCKETS).size() > 0) {
ArrayNode buckets = (ArrayNode) aggrNode.findValues(IResponseHandler.BUCKETS).get(0);
for(JsonNode bucket : buckets){
JsonNode bkey = bucket.findValue(IResponseHandler.KEY);
if (isPredictionEnabled && Long.parseLong(bkey.asText()) < startDate) {
continue;
}
String key = getIntervalKey(bkey.asText(), Constants.Interval.valueOf(interval));
plotKeys.add(key);
if(isPredictionEnabled && !headerPath.equals(predictionPath)){
Expand Down Expand Up @@ -354,13 +358,16 @@ private void initializeMultiAggrPlotMap(Map<String, Double> multiAggrPlotMap, Se
});
}

private void enrichBucketKeys(List<JsonNode> aggrNodes, Set<String> finalBucketKeys, String interval) {
private void enrichBucketKeys(List<JsonNode> aggrNodes, Set<String> finalBucketKeys, String interval, Long startDate, Boolean isPredictionEnabled) {
List<String> bkeyList = new ArrayList<>();
for(JsonNode aggrNode : aggrNodes) {
if (aggrNode.findValues(IResponseHandler.BUCKETS).size() > 0) {
ArrayNode buckets = (ArrayNode) aggrNode.findValues(IResponseHandler.BUCKETS).get(0);
for(JsonNode bucket : buckets){
String bkey = bucket.findValue(IResponseHandler.KEY).asText();
if (isPredictionEnabled && Long.parseLong(bkey) < (startDate)) {
continue;
}
bkeyList.add(bkey);
}
}
Expand Down
17 changes: 14 additions & 3 deletions ...ard-analytics/src/main/java/com/tarento/analytics/handler/MetricChartResponseHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class MetricChartResponseHandler implements IResponseHandler{
@Override
public AggregateDto translate(AggregateRequestDto request, ObjectNode aggregations) throws IOException {
List<Data> dataList = new ArrayList<>();
String requestId = request.getRequestId();
String requestId = request.getRequestId();
String visualizationCode = request.getVisualizationCode();

JsonNode aggregationNode = aggregations.get(AGGREGATIONS);
Expand Down Expand Up @@ -203,9 +203,20 @@ public AggregateDto translate(AggregateRequestDto request, ObjectNode aggregatio
data.setPlots( Arrays.asList(latestDateplot,lastUpdatedTime));
request.getResponseRecorder().put(visualizationCode, request.getModuleLevel(), data);
dataList.add(data);
if(chartNode.get(POST_AGGREGATION_THEORY) != null) {
if(chartNode.get(POST_AGGREGATION_THEORY) != null) {
ComputeHelper computeHelper = computeHelperFactory.getInstance(chartNode.get(POST_AGGREGATION_THEORY).asText());
computeHelper.compute(request, dataList);
// computeHelper.compute(request, dataList);
List<Data> capDataList = new ArrayList<>();

if (chartNode.has(IS_CAPPED_BY_CAMPAIGN_PERIOD)) {
List<JsonNode> valueNode = aggregationNode.findValues(chartNode.get(IS_CAPPED_BY_CAMPAIGN_PERIOD).get(0).asText());
if(valueNode.size() > 0) {
Long val = valueNode.get(0).get(IResponseHandler.VALUE).asLong();
Data dataNode = new Data(aggrsPaths.get(0).asText(), val.doubleValue(), chartNode.get(IResponseHandler.VALUE_TYPE).asText());
capDataList.add(dataNode);
}
}
computeHelper.compute(request, dataList, capDataList);
}
}catch (Exception e){
logger.info("data chart name = "+chartName +" ex occurred "+e.getMessage());
Expand Down
32 changes: 31 additions & 1 deletion ...dashboard-analytics/src/main/java/com/tarento/analytics/helper/AdditiveComputedField.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.tarento.analytics.helper;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.tarento.analytics.dto.AggregateRequestDto;
import com.tarento.analytics.dto.Data;
import com.tarento.analytics.dto.Plot;
Expand All @@ -9,12 +11,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

import static com.tarento.analytics.handler.IResponseHandler.HIDE_HEADER_DENOMINATION;
import static com.tarento.analytics.handler.IResponseHandler.IS_CAPPED_BY_CAMPAIGN_PERIOD;

@Component
public class AdditiveComputedField implements IComputedField<Data> {
Expand All @@ -40,16 +44,31 @@ public void add(Data data, List<String> fields, String newField,JsonNode chartNo
Map<String, Plot> plotMap = data.getPlots().stream().collect(Collectors.toMap(Plot::getName, Function.identity()));

double total = 0.0;
double capTotal = 0.0;
for (String field: fields){
if(plotMap.containsKey(field)){
dataType = plotMap.get(field).getSymbol();
if(chartNode.has(IS_CAPPED_BY_CAMPAIGN_PERIOD) && doesTextExistInArrayNode((ArrayNode) chartNode.get(IS_CAPPED_BY_CAMPAIGN_PERIOD), field)) continue;
total = total+ plotMap.get(field).getValue();
}
}
if(postAggrTheoryName != null && !postAggrTheoryName.isEmpty()) {
ComputeHelper computeHelper = computeHelperFactory.getInstance(postAggrTheoryName);
if (chartNode.has(IS_CAPPED_BY_CAMPAIGN_PERIOD)) {
List<String> commonStrings = new ArrayList<>();
chartNode.get(IS_CAPPED_BY_CAMPAIGN_PERIOD).forEach(
item -> {
if (fields.contains(item.asText())) {
commonStrings.add(item.asText());
}
}
);
if(commonStrings.size()>0) {
capTotal = commonStrings.stream().mapToDouble(commonString -> plotMap.get(commonString).getValue()).sum();
}
}

total = computeHelper.compute(aggregateRequestDto,total );
total = computeHelper.compute(aggregateRequestDto,total,capTotal );
}


Expand All @@ -62,5 +81,16 @@ public void add(Data data, List<String> fields, String newField,JsonNode chartNo
}

}
private static boolean doesTextExistInArrayNode(ArrayNode arrayNode, String searchText) {
for (JsonNode element : arrayNode) {
if (element.isTextual()) {
String text = element.asText();
if (text.equals(searchText)) {
return true;
}
}
}
return false;
}
}

3 changes: 2 additions & 1 deletion ...ervices/dashboard-analytics/src/main/java/com/tarento/analytics/helper/ComputeHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
*
*/
public interface ComputeHelper {

public List<Data> compute(AggregateRequestDto request, List<Data> data);
public List<Data> compute(AggregateRequestDto request, List<Data> data, List<Data> capValues);
public Double compute(AggregateRequestDto request, double value);
public Double compute(AggregateRequestDto request, double value, double capTotal);

}
10 changes: 9 additions & 1 deletion ...es/dashboard-analytics/src/main/java/com/tarento/analytics/helper/NoOpsComputedField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.List;

import static com.tarento.analytics.constant.Constants.PostAggregationTheories.RESPONSE_DIFF_DATES;
import static com.tarento.analytics.handler.IResponseHandler.IS_CAPPED_BY_CAMPAIGN_PERIOD;

@Component
public class NoOpsComputedField implements IComputedField<ObjectNode>{
Expand All @@ -37,6 +38,7 @@ public void set(AggregateRequestDto requestDto, String postAggrTheoryName){
public void add(ObjectNode data, List<String> fields, String newField, JsonNode chartNode ) {
ObjectNode noOpsNode = JsonNodeFactory.instance.objectNode();
List<Data> dataList = new ArrayList<>();
List<Data> capDataList = new ArrayList<>();
try {
List<JsonNode> values = data.findValues(fields.get(0));
if (postAggrTheoryName.equalsIgnoreCase(RESPONSE_DIFF_DATES)) {
Expand All @@ -45,8 +47,14 @@ public void add(ObjectNode data, List<String> fields, String newField, JsonNode
Data dataNode = new Data(fields.get(0), val.doubleValue(), chartNode.get(IResponseHandler.VALUE_TYPE).asText());
dataList.add(dataNode);
}

if (chartNode.has(IS_CAPPED_BY_CAMPAIGN_PERIOD) && data.has((chartNode.get(IS_CAPPED_BY_CAMPAIGN_PERIOD).get(0).asText()))) {
Long capValue = data.findValues(chartNode.get(IS_CAPPED_BY_CAMPAIGN_PERIOD).get(0).asText()).get(0).get(IResponseHandler.VALUE).asLong();
Data dataNode = new Data(fields.get(0), capValue.doubleValue(), chartNode.get(IResponseHandler.VALUE_TYPE).asText());
capDataList.add(dataNode);
}
ComputeHelper computeHelper = computeHelperFactory.getInstance(RESPONSE_DIFF_DATES);
List<Data> computedData = computeHelper.compute(aggregateRequestDto, dataList);
List<Data> computedData = computeHelper.compute(aggregateRequestDto, dataList, capDataList);
noOpsNode.put(IResponseHandler.VALUE, ((Double) computedData.get(0).getHeaderValue()).longValue());
data.set(newField, noOpsNode);
}
Expand Down
20 changes: 19 additions & 1 deletion ...ervices/dashboard-analytics/src/main/java/com/tarento/analytics/helper/SortingHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import org.springframework.stereotype.Component;
import com.tarento.analytics.dto.Data;
import com.tarento.analytics.dto.Plot;
import java.util.*;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
Expand All @@ -21,6 +20,11 @@ public List<Data> sort(String sortingKey, List<Data> dataList) {
}
return dataList;
}
public List<Data> tableSort(List<Data> dataList, String sortingKey) {
Comparator<Data> tableSortComparator = tableSortComparator(sortingKey);
dataList.sort(tableSortComparator);
return dataList;
}

private static Comparator<Plot> plotSortComparator(String sortingKey, Boolean isValueSortingApplicable) {
return new Comparator<Plot>() {
Expand Down Expand Up @@ -48,4 +52,18 @@ public int compare(Plot p1, Plot p2) {
};
}

private static Comparator<Data> tableSortComparator(String sortingKey) {
return (p1, p2) -> {
String plotName1 = p1.getHeaderName().toUpperCase();
String plotName2 = p2.getHeaderName().toUpperCase();

if (sortingKey.equals(SORT_KEY_ASC)) {
return plotName1.compareTo(plotName2);
} else if (sortingKey.equals(SORT_KEY_DESC)) {
return plotName2.compareTo(plotName1);
}
return 0;
};
}

}
94 changes: 86 additions & 8 deletions ...oard-analytics/src/main/java/com/tarento/analytics/helper/TargetPerDateComputeHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,6 @@ public List<Data> compute(AggregateRequestDto request, List<Data> data) {
Long dateDifference = TimeUnit.DAYS.convert((eDate - sDate), TimeUnit.MILLISECONDS);
if(dateDifference == 0l) dateDifference = dateDifference + 1l ;

if(request.getChartNode().get(IS_CAPPED_BY_CAMPAIGN_PERIOD) != null && request.getChartNode().get(IS_CAPPED_BY_CAMPAIGN_PERIOD).asBoolean()){
if(request.getFilters()!=null && request.getFilters().containsKey(CAMPAIGN_START_DATE) && request.getFilters().containsKey(CAMPAIGN_END_DATE)) {
Long campaignStartDate = Long.parseLong(String.valueOf(request.getFilters().get(CAMPAIGN_START_DATE)));
Long campaignEndDate = Long.parseLong(String.valueOf(request.getFilters().get(CAMPAIGN_END_DATE)));
Long campaignDateDifference = TimeUnit.DAYS.convert((campaignEndDate - campaignStartDate), TimeUnit.MILLISECONDS);
dateDifference = Math.min(dateDifference, campaignDateDifference);
}
}
for(Data eachData : data) {
Double value = (Double) eachData.getHeaderValue();
logger.info("Value is : " + value + " :: Date Difference is : " + dateDifference);
Expand All @@ -67,6 +59,49 @@ public List<Data> compute(AggregateRequestDto request, List<Data> data) {
return data;
}


@Override
public List<Data> compute(AggregateRequestDto request, List<Data> data, List<Data> capValues) {
if(request.getRequestDate()!= null && request.getRequestDate().getStartDate() != null && request.getRequestDate().getEndDate() != null) {
try {
Long sDate = Long.parseLong(request.getRequestDate().getStartDate());
logger.info("Start Date : " + String.valueOf(sDate));
Long eDate = Long.parseLong(request.getRequestDate().getEndDate());
logger.info("End Date : " + String.valueOf(eDate));
Calendar cal = Calendar.getInstance();
cal.setTime(new Date(eDate));
if(cal.get(Calendar.HOUR_OF_DAY) == LAST_HOUR && cal.get(Calendar.MINUTE) == LAST_MINUTE) {
eDate = eDate + ROUND_OFF;
}
logger.info("End Date after Round Off: " + String.valueOf(eDate));
Long dateDifference = TimeUnit.DAYS.convert((eDate - sDate), TimeUnit.MILLISECONDS);
if(dateDifference == 0l) dateDifference = dateDifference + 1l ;

for(Data eachData : data) {
Double value = (Double) eachData.getHeaderValue();
logger.info("Value is : " + value + " :: Date Difference is : " + dateDifference);
if(request.getChartNode().get(IS_CAPPED_BY_CAMPAIGN_PERIOD) != null && capValues.size()>0){
if(request.getFilters()!=null && request.getFilters().containsKey(CAMPAIGN_START_DATE) && request.getFilters().containsKey(CAMPAIGN_END_DATE)) {
Long campaignStartDate = Long.parseLong(String.valueOf(request.getFilters().get(CAMPAIGN_START_DATE)));
Long campaignEndDate = Long.parseLong(String.valueOf(request.getFilters().get(CAMPAIGN_END_DATE)));
Long campaignDateDifference = TimeUnit.DAYS.convert((campaignEndDate - campaignStartDate), TimeUnit.MILLISECONDS);
if (dateDifference >= campaignDateDifference) {
Double capValue = (Double) capValues.get(0).getHeaderValue();
eachData.setHeaderValue(capValue);
continue;
}
}
}
value = (value / NUMBER_OF_DAYS) * dateDifference;
eachData.setHeaderValue(value);
}
} catch (Exception ex) {
logger.error("Encountered an error while computing the logic in Target Date Computer : " + ex.getMessage());
}
}
return data;
}

@Override
public Double compute(AggregateRequestDto request, double value){

Expand Down Expand Up @@ -97,6 +132,49 @@ public Double compute(AggregateRequestDto request, double value){



}

@Override
public Double compute(AggregateRequestDto request, double value, double capTotal){

if(request.getRequestDate()!= null && request.getRequestDate().getStartDate() != null && request.getRequestDate().getEndDate() !=null) {
try {
Long sDate = Long.parseLong(request.getRequestDate().getStartDate());
logger.info("Start Date : " + String.valueOf(sDate));
Long eDate = Long.parseLong(request.getRequestDate().getEndDate());
logger.info("End Date : " + String.valueOf(eDate));
Calendar cal = Calendar.getInstance();
cal.setTime(new Date(eDate));
if(cal.get(Calendar.HOUR_OF_DAY) == LAST_HOUR && cal.get(Calendar.MINUTE) == LAST_MINUTE) {
eDate = eDate + ROUND_OFF;
}
logger.info("End Date after Round Off: " + String.valueOf(eDate));
Long dateDifference = TimeUnit.DAYS.convert((eDate - sDate), TimeUnit.MILLISECONDS);
if(dateDifference == 0l) dateDifference = dateDifference + 1l ;

value = (value / NUMBER_OF_DAYS) * dateDifference;

if(request.getChartNode().get(IS_CAPPED_BY_CAMPAIGN_PERIOD) != null ){
if(request.getFilters()!=null && request.getFilters().containsKey(CAMPAIGN_START_DATE) && request.getFilters().containsKey(CAMPAIGN_END_DATE)) {
Long campaignStartDate = Long.parseLong(String.valueOf(request.getFilters().get(CAMPAIGN_START_DATE)));
Long campaignEndDate = Long.parseLong(String.valueOf(request.getFilters().get(CAMPAIGN_END_DATE)));
Long campaignDateDifference = TimeUnit.DAYS.convert((campaignEndDate - campaignStartDate), TimeUnit.MILLISECONDS);
if (dateDifference >= campaignDateDifference) {
value = capTotal;
}
}
}
logger.info("Value is : " + value + " :: Date Difference is : " + dateDifference);

} catch (Exception ex) {
logger.error("Encountered an error while computing the logic in Target Date Computer : " + ex.getMessage());
}
}

return value;



}

}
Loading

0 comments on commit 1430239

Please sign in to comment.