Merge remote-tracking branch 'refs/remotes/origin/Vanessa' into Annabel

eaa_frontend/src/components/EditTicketComponent.vue

@@ -23,7 +23,7 @@
         <div class="form-group">
           <div class="form-group">
             <label for="animalType"><strong>Liigigrupp: </strong></label>
-            <select v-model="editableTicket.upperSpecies" @change="fetchSpecies" >
+            <select v-model="editableTicket.upperSpecies" id="animalType" @change="fetchSpecies" >
               <option disabled value="">Vali liigigrupp</option>
               <option v-for="upper in upperSpecies" :key="upper.id" :value="upper">
                 {{ upper }}

src/main/java/com/EmergencyAlertApplication/EAA/Controllers/StatisticsController.java

@@ -10,7 +10,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.sql.Timestamp;
-import java.time.LocalDate;
 import java.util.*;
 
 @RestController
@@ -37,7 +36,6 @@ public class StatisticsController {
             List<String> region = filtersDTO.getPiirkond();
             List<String> resolution = filtersDTO.getLahendus();
             List<String> injury = filtersDTO.getVigastus();
-
             List<Ticket> filteredTickets = statisticsService.getFilteredTickets(startDate, endDate, upperSpecies, species, region, resolution, injury); //
             // Create table DTOs
             List<StatisticsTableDTO> statisticsDTOs = new ArrayList<>();
@@ -53,32 +51,6 @@ public class StatisticsController {
                 List<String> injuries = ticketToAnimalTagService.getTicketAnimalTags(filteredTicket.getId());
                 dto.setInjuries(injuries);
 
-                /*
-                if (shouldIncludeInResponse(species)) {
-                    dto.setSpecies(filteredTicket.getSpecies().getName());
-                } else {
-                    dto.setSpecies(null);
-                }
-
-                if (shouldIncludeInResponse(region)) {
-                    dto.setRegion(filteredTicket.getRegion().getName());
-                } else {
-                    dto.setRegion(null);
-                }
-
-                if (shouldIncludeInResponse(resolution)) {
-                    dto.setResolution(filteredTicket.getResolution().getName());
-                } else {
-                    dto.setResolution(null);
-                }
-
-                if (shouldIncludeInResponse(injury)) {
-                    List<String> injuries = ticketToAnimalTagService.getTicketAnimalTags(filteredTicket.getId());
-                    dto.setInjuries(injuries);
-                } else {
-                    dto.setInjuries(null);
-                }*/
-
                 statisticsDTOs.add(dto);
                 System.out.println(dto.getDate() + " " + dto.getUpperSpecies() + " " + dto.getSpecies() + " " + dto.getRegion() + " " + dto.getResolution() + " " + dto.getInjuries());
             }
@@ -88,7 +60,4 @@ public class StatisticsController {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
         }
     }
-    private boolean shouldIncludeInResponse(List<String> filters) {
-        return filters != null && filters.stream().anyMatch(filter -> filter != null && !filter.isEmpty());
-    }
 }
\ No newline at end of file

src/main/java/com/EmergencyAlertApplication/EAA/DTOs/StatisticsTableDTO.java

@@ -4,33 +4,12 @@ import java.time.LocalDate;
 import java.util.List;
 
 public class StatisticsTableDTO {
-    //private int number;
     private LocalDate date;
     private String upperSpecies;
     private String species;
     private String region;
     private List<String> injuries;
     private String resolution;
-    //private int sum;
-
-    /**public StatisticsTableDTO(/*int number, LocalDate date, String upperSpecies, String species, String region, List<String></String> injury, String resolution/*, int sum) {
-        //this.number = number;
-        this.date = date;
-        this.upperSpecies = upperSpecies;
-        this.species = species;
-        this.region = region;
-        this.injuries = injuries;
-        this.resolution = resolution;
-        //this.sum = sum;
-    }*/
-
-    /*public int getNumber() {
-        return number;
-    }
-
-    public void setNumber(int number) {
-        this.number = number;
-    }*/
 
     public LocalDate getDate() {
         return date;
@@ -79,12 +58,4 @@ public class StatisticsTableDTO {
     public void setResolution(String resolution) {
         this.resolution = resolution;
     }
-
-    /*public int getSum() {
-        return sum;
-    }
-
-    public void setSum(int sum) {
-        this.sum = sum;
-    }*/
 }

src/main/java/com/EmergencyAlertApplication/EAA/Services/StatisticsService.java

@@ -4,9 +4,7 @@ import com.EmergencyAlertApplication.EAA.Repositories.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.sql.Time;
 import java.sql.Timestamp;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,13 +23,16 @@ public class StatisticsService {
         List<Ticket> allTickets = statisticsRepository.findAll();
         List<Ticket> filteredTickets = new ArrayList<>();
         for (Ticket ticket : allTickets) {
-            if (isTicketWithinDateRange(ticket, startDate, endDate) && doesTicketMatchFilters(ticket, upperSpecies, species, region, resolution, injuries)) {
+            if (isTicketClosed(ticket) && isTicketWithinDateRange(ticket, startDate, endDate) && doesTicketMatchFilters(ticket, upperSpecies, species, region, resolution, injuries)) {
                 filteredTickets.add(ticket);
             }
         }
         return filteredTickets;
     }
 
+    private boolean isTicketClosed(Ticket ticket) {
+        return ticket.getStatus().getName().equals("Lõpetatud");
+    }
     private boolean isTicketWithinDateRange(Ticket ticket, Timestamp startDate, Timestamp endDate) {
         return ticket.getCloseDate().after(startDate) && ticket.getCloseDate().before(endDate);
     }