Skip to content

Commit

Permalink
#377 Listing only vaccines in status pending
Browse files Browse the repository at this point in the history
  • Loading branch information
josdem committed Oct 21, 2024
1 parent 2dde6d3 commit b8a61a8
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import com.josdem.vetlog.command.PetCommand;
import com.josdem.vetlog.enums.PetStatus;
import com.josdem.vetlog.enums.PetType;
import com.josdem.vetlog.enums.VaccinationStatus;
import com.josdem.vetlog.model.User;
import com.josdem.vetlog.model.Vaccination;
import com.josdem.vetlog.service.BreedService;
import com.josdem.vetlog.service.LocaleService;
import com.josdem.vetlog.service.PetService;
Expand All @@ -30,6 +32,8 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import java.io.IOException;
import java.util.List;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -182,7 +186,10 @@ public ModelAndView delete(@RequestParam("uuid") String uuid) {
private ModelAndView fillPetAndImageUrl(ModelAndView modelAndView) {
var user = userService.getCurrentUser();
var pets = petService.getPetsByUser(user);
pets.forEach(pet -> pet.setVaccines(vaccinationService.getVaccinationsByPet(pet)));
pets.forEach(pet -> {
final List<Vaccination> pendingVaccines = vaccinationService.getVaccinationsByPet(pet).stream().filter(vaccination -> vaccination.getStatus().equals(VaccinationStatus.PENDING)).toList();
pet.setVaccines(pendingVaccines);
});
modelAndView.addObject("pets", pets);
modelAndView.addObject(GCP_IMAGE_URL, gcpUrl + imageBucket + "/");
modelAndView.addObject("defaultImage", defaultImage);
Expand Down

0 comments on commit b8a61a8

Please sign in to comment.