From cb5d851143a5b88282245fa1df1bc6ea647d005a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20Iv=C3=A1n=20Solano=20Gonz=C3=A1lez?= Date: Sat, 16 Apr 2022 08:40:56 -0500 Subject: [PATCH] changes on simptoms and updates on secretary visualization, also avoiding from some errors --- .../acatlan/coviserv/Service/SicknesService.java | 7 ++++--- .../coviserv/controller/SecretaryController.java | 16 +++++++++------- .../coviserv/controller/UserController.java | 3 ++- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/unam/acatlan/coviserv/Service/SicknesService.java b/src/main/java/com/unam/acatlan/coviserv/Service/SicknesService.java index b7e2cef..b65eb7e 100755 --- a/src/main/java/com/unam/acatlan/coviserv/Service/SicknesService.java +++ b/src/main/java/com/unam/acatlan/coviserv/Service/SicknesService.java @@ -36,9 +36,10 @@ public class SicknesService { if (symptoms.getSymptoms().length > 0) { for (int i = 0; i < symptoms.getSymptoms().length; i++) { Symptoms symptom = symptomsRepository.findById(symptoms.getSymptoms()[i]).get(); - List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusDays(1))).collect(Collectors.toList()); + List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS).minusDays(1))).collect(Collectors.toList()); //to use in test to probo - //List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList());List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList()); + //List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList()); + //List ev = evolutions(student.getUser().getUsername()).stream().filter(evolution -> evolution.getSymptoms().equals(symptom) && evolution.getDateTime().isAfter(LocalDateTime.now().minusMinutes(1))).collect(Collectors.toList()); if (symptomsRepository.existsById(symptoms.getSymptoms()[i]) && ev.isEmpty()) { Evolution evolution = Evolution.builder() .student(student) @@ -77,7 +78,7 @@ public class SicknesService { lastDay[0] = evolution.getDateTime().truncatedTo(ChronoUnit.DAYS); firstTime[0] = false; } - return !evolution.getDateTime().isBefore(lastDay[0]); + return (!evolution.getDateTime().isBefore(lastDay[0]) && evolution.getDateTime().isAfter(lastDay[0].minusDays(1))); }).collect(Collectors.toList()); } diff --git a/src/main/java/com/unam/acatlan/coviserv/controller/SecretaryController.java b/src/main/java/com/unam/acatlan/coviserv/controller/SecretaryController.java index 5634568..e485e44 100755 --- a/src/main/java/com/unam/acatlan/coviserv/controller/SecretaryController.java +++ b/src/main/java/com/unam/acatlan/coviserv/controller/SecretaryController.java @@ -21,6 +21,7 @@ import javax.validation.Valid; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Files; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -84,14 +85,15 @@ public class SecretaryController { @GetMapping("/files/{student}") List files(@Autowired Authentication authentication, @PathVariable String student) { - AuthUser authUser = (AuthUser) authentication.getPrincipal(); - File folder = new File(student); - File[] files = folder.listFiles(); ArrayList urls = new ArrayList<>(); - for (int i = 0; i < files.length; i++) { - System.out.println(files[i].getAbsolutePath()); - urls.add("http://132.248.80.77:9707/api/user/media" + files[i].getAbsolutePath()); - //urls.add("http://localhost:9707/api/user/media" + files[i].getAbsolutePath()); + File folder = new File(student); + if (folder.exists()) { + File[] files = folder.listFiles(); + for (int i = 0; i < files.length; i++) { + System.out.println(files[i].getAbsolutePath()); + urls.add("http://132.248.80.77:9707/api/user/media" + files[i].getAbsolutePath()); + //urls.add("http://localhost:9707/api/user/media" + files[i].getAbsolutePath()); + } } return urls; } diff --git a/src/main/java/com/unam/acatlan/coviserv/controller/UserController.java b/src/main/java/com/unam/acatlan/coviserv/controller/UserController.java index 5604dc7..c94a459 100755 --- a/src/main/java/com/unam/acatlan/coviserv/controller/UserController.java +++ b/src/main/java/com/unam/acatlan/coviserv/controller/UserController.java @@ -25,6 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -83,7 +84,7 @@ public class UserController { List lastSymptoms = new ArrayList<>(); List evolutions = sicknesService.evolutions(authUser.getUsername()); for (Evolution evolution : evolutions) { - if (!lastSymptoms.contains(evolution.getSymptoms())) { + if (!lastSymptoms.contains(evolution.getSymptoms()) && evolution.getDateTime().truncatedTo(ChronoUnit.DAYS).isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS).minusDays(1))) { lastSymptoms.add(evolution.getSymptoms()); } }