Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@vertigo17
vertigo17 committed Nov 27, 2024
2 parents 3652093 + 6f6bf40 commit af7702c
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 42 deletions.
60 changes: 32 additions & 28 deletions source/src/main/java/org/cerberus/core/apiprivate/CampaignExecutionPrivateController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,21 @@
import org.cerberus.core.enums.MessageEventEnum;
import org.cerberus.core.exception.CerberusException;
import org.cerberus.core.util.ParameterParserUtil;
import org.cerberus.core.util.StringUtil;
import org.cerberus.core.util.answer.AnswerList;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
import org.cerberus.core.crud.service.ITagService;
import org.cerberus.core.util.servlet.ServletUtil;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;

@RestController
@RequestMapping("/campaignexecutions/")
Expand All @@ -57,21 +53,28 @@ public class CampaignExecutionPrivateController {
@Autowired
private ITagService tagService;

@GetMapping(path = "/statistics", produces = MediaType.APPLICATION_JSON_VALUE)
@PostMapping(path = "/statistics", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<String> getTagStatistics(
HttpServletRequest request,
@RequestParam(name = "systems") String[] systemsParam,
@RequestParam(name = "applications") String[] applicationsParam,
@RequestParam(name = "group1") String[] group1Param,
@RequestParam(name = "from") String fromParam,
@RequestParam(name = "to") String toParam
@RequestBody Map<String, String> body
) {
//Retrieve and format URL parameter
fromParam = ParameterParserUtil.parseStringParamAndDecode(fromParam, new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'").format(new Date()), "UTF8");
toParam = ParameterParserUtil.parseStringParamAndDecode(toParam, new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'").format(new Date()), "UTF8");
List<String> systems = ParameterParserUtil.parseListParamAndDecode(systemsParam, new ArrayList<>(), "UTF8");
List<String> applications = ParameterParserUtil.parseListParamAndDecode(applicationsParam, new ArrayList<>(), "UTF8");
List<String> group1List = ParameterParserUtil.parseListParamAndDecode(group1Param, new ArrayList<>(), "UTF8");
String fromParam = StringUtil.isEmptyOrNull(body.get("from"))
? new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'").format(new Date())
: ParameterParserUtil.parseStringParamAndDecode(body.get("from"), new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'").format(new Date()), "UTF8");
String toParam = StringUtil.isEmptyOrNull(body.get("to"))
? new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'").format(new Date())
: ParameterParserUtil.parseStringParamAndDecode(body.get("to"), new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'").format(new Date()), "UTF8");
List<String> systems = (body.get("systems") == null || body.get("systems").isEmpty())
? new ArrayList<>()
: ParameterParserUtil.parseListParamAndDecode(body.get("systems").split(","), new ArrayList<>(), "UTF8");
List<String> applications = (body.get("applications") == null || body.get("applications").isEmpty())
? new ArrayList<>()
: ParameterParserUtil.parseListParamAndDecode(body.get("applications").split(","), new ArrayList<>(), "UTF8");
List<String> group1List = (body.get("group1") == null || body.get("group1").isEmpty())
? new ArrayList<>()
: ParameterParserUtil.parseListParamAndDecode(body.get("group1").split(","), new ArrayList<>(), "UTF8");

String fromDateFormatted = tagStatisticService.formatDateForDb(fromParam);
String toDateFormatted = tagStatisticService.formatDateForDb(toParam);
List<TagStatistic> tagStatistics;
Expand All @@ -87,17 +90,6 @@ public ResponseEntity<String> getTagStatistics(

JSONObject response = new JSONObject();
try {
List<String> missingParameters = checkMissingFilters(mandatoryFilters);
if (!missingParameters.isEmpty()) {
MessageEvent msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
msg.setDescription(msg.getDescription().replace("%ITEM%", "Campaign Statistics"));
msg.setDescription(msg.getDescription().replace("%OPERATION%", "Get Statistics"));
msg.setDescription(msg.getDescription().replace("%REASON%", String.format("Missing filter(s): %s", missingParameters.toString())));
response.put("message", msg.getDescription());
return ResponseEntity
.status(HttpStatus.BAD_REQUEST)
.body(response.toString());
}

if (request.getUserPrincipal() == null) {
MessageEvent message = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_UNAUTHORISED);
Expand All @@ -110,6 +102,18 @@ public ResponseEntity<String> getTagStatistics(
.body(response.toString());
}

List<String> missingParameters = checkMissingFilters(mandatoryFilters);
if (!missingParameters.isEmpty()) {
MessageEvent msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
msg.setDescription(msg.getDescription().replace("%ITEM%", "Campaign Statistics"));
msg.setDescription(msg.getDescription().replace("%OPERATION%", "Get Statistics"));
msg.setDescription(msg.getDescription().replace("%REASON%", String.format("Missing filter(s): %s", missingParameters.toString())));
response.put("message", msg.getDescription());
return ResponseEntity
.status(HttpStatus.BAD_REQUEST)
.body(response.toString());
}

systemsAllowed = tagStatisticService.getSystemsAllowedForUser(request.getUserPrincipal().getName());
applicationsAllowed = tagStatisticService.getApplicationsSystems(systemsAllowed);

Expand Down
16 changes: 5 additions & 11 deletions source/src/main/java/org/cerberus/core/crud/service/impl/TagStatisticService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,25 +410,19 @@ private String updateMaxCampaignDateEnd(String maxDateEnd, JSONObject mapTagEntr

public boolean userHasRightSystems(String user, List<TagStatistic> tagStatistics) {
List<String> systemsAllowedForUser;
List<String> systemList = new ArrayList<>();
try {
systemsAllowedForUser = getSystemsAllowedForUser(user);
} catch (CerberusException exception) {
LOG.error("Unable to get systems allowed for user: ", exception);
return false;
}
for (TagStatistic tagStatistic : tagStatistics) {
List<String> systemList =Arrays.stream(
tagStatistic.getSystemList()
.replaceAll("\"", "")
.replace("[", "")
.replace("]", "")
.split(","))
.collect(Collectors.toList());
if (!new HashSet<>(systemsAllowedForUser).containsAll(systemList)) {
return false;
}
String[] elements = tagStatistic.getSystemList().replaceAll("\"", "").replace("[", "").replace("]", "").split(",");
systemList.addAll(Arrays.asList(elements));
}
return true;
return systemList.stream()
.anyMatch(system -> systemsAllowedForUser.contains(system));
}

private String updateMinCampaignDateStart(String minDateStart, JSONObject mapTagEntry) throws JSONException {
Expand Down
9 changes: 6 additions & 3 deletions source/src/main/webapp/js/pages/ReportingCampaignStatistics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,17 @@ function getStatistics() {
({
url: "api/campaignexecutions/statistics",
async: true,
method: 'GET',
data: {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
data: JSON.stringify({
systems: encodeURI(systems),
applications: encodeURI(applications),
group1: encodeURI(group1),
from: encodeURIComponent(new Date($('#frompicker').data("DateTimePicker").date()).toISOString()),
to: encodeURIComponent(new Date($('#topicker').data("DateTimePicker").date()).toISOString())
},
}),
beforeSend: function() {
setLoadingStatus($("#tagStatisticList"));
},
Expand Down

0 comments on commit af7702c

Please sign in to comment.