feat, fix : add treated and untreated filters

StartUpNationLabs · Oct 17, 2024 · 31377d2 · 31377d2
1 parent a55cf28
commit 31377d2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 54 deletions.
diff --git a/cloud/backend/alert-management/src/main/java/fr/etu/polytech/controller/AlertResource.java b/cloud/backend/alert-management/src/main/java/fr/etu/polytech/controller/AlertResource.java
@@ -156,6 +156,20 @@ public Response markAlertAsTreated(@PathParam("alertId") String alertId) throws
  .orElseThrow(() -> new ResourceNotFoundException("Alert with ID " + alertId + " not found."));
  }
 
+ @GET
+ @Path("/treated")
+ @Produces(MediaType.APPLICATION_JSON)
+ public List<Alert> getTreatedAlerts() {
+ return alertRepository.findByTreatedStatus(true);
+ }
+
+ @GET
+ @Path("/untreated")
+ @Produces(MediaType.APPLICATION_JSON)
+ public List<Alert> getUntreatedAlerts() {
+ return alertRepository.findByTreatedStatus(false);
+ }
+
  @Scheduled(every = "10m")
  void checkUnresolvedAlerts() {
  List<Alert> unresolvedAlerts = alertRepository.findUnresolvedAlerts();

diff --git a/cloud/backend/alert-management/src/main/java/fr/etu/polytech/dto/AlertDTO.java b/cloud/backend/alert-management/src/main/java/fr/etu/polytech/dto/AlertDTO.java
@@ -9,7 +9,6 @@
 
 public record AlertDTO(
  @NotNull(message = "Time must not be null")
- @NotEmpty(message = "Time must not be empty")
  Date time,
 
  @NotNull(message = "Alert type must not be null")

diff --git a/cloud/backend/alert-management/src/main/java/fr/etu/polytech/entity/Alert.java b/cloud/backend/alert-management/src/main/java/fr/etu/polytech/entity/Alert.java
@@ -49,58 +49,5 @@ public Alert(String type, String message, String gatewayId, int value) {
  }
 
 
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- }
-
- public LocalDateTime getTimestamp() {
- return timestamp;
- }
-
- public void setTimestamp(LocalDateTime timestamp) {
- this.timestamp = timestamp;
- }
-
- public boolean isTreated() {
- return treated;
- }
-
- public void setTreated(boolean treated) {
- this.treated = treated;
- }
 
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
- public Severity getSeverity() {
- return severity;
- }
-
- public void setSeverity(Severity severity) {
- this.severity = severity;
- }
 }
diff --git a/cloud/backend/alert-management/src/main/java/fr/etu/polytech/repository/AlertRepository.java b/cloud/backend/alert-management/src/main/java/fr/etu/polytech/repository/AlertRepository.java
@@ -15,6 +15,10 @@ public List<Alert> findUnresolvedAlerts() {
  return list("treated = false");
  }
 
+ public List<Alert> findByTreatedStatus(boolean treated) {
+ return list("treated", treated);
+ }
+
  public List<Alert> findByGatewayId(String gatewayId) {
  return find("gatewayId", gatewayId).list();
  }