RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix desktop chat

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-04-08 08:38:23 -06:00
parent 559f3bc343
commit 8fb4c82a67
5 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
backend/src/main/java/com/petshop/backend/controller/DropdownController.java
View File

@@ -10,7 +10,9 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@RestController
@@ -24,12 +26,14 @@ public class DropdownController {
private final StoreRepository storeRepository;
private final SupplierRepository supplierRepository;
private final UserRepository userRepository;
private final AdoptionRepository adoptionRepository;
public DropdownController(PetRepository petRepository,
ServiceRepository serviceRepository, ProductRepository productRepository,
CategoryRepository categoryRepository, StoreRepository storeRepository,
SupplierRepository supplierRepository,
UserRepository userRepository) {
UserRepository userRepository,
AdoptionRepository adoptionRepository) {
this.petRepository = petRepository;
this.serviceRepository = serviceRepository;
this.productRepository = productRepository;
@@ -37,6 +41,7 @@ public class DropdownController {
this.storeRepository = storeRepository;
this.supplierRepository = supplierRepository;
this.userRepository = userRepository;
this.adoptionRepository = adoptionRepository;
}
@GetMapping("/pets")
@@ -71,8 +76,19 @@ public class DropdownController {
@GetMapping("/appointment-customers")
@PreAuthorize("hasAnyRole('STAFF', 'ADMIN')")
public ResponseEntity<List<DropdownOption>> getAppointmentCustomers() {
Set<Long> ownersWithPets = petRepository.findAll().stream()
.filter(p -> p.getOwner() != null)
.map(p -> p.getOwner().getId())
.collect(Collectors.toSet());
Set<Long> customersWithAdoptions = adoptionRepository.findAll().stream()
.filter(a -> "Completed".equalsIgnoreCase(a.getAdoptionStatus()))
.map(a -> a.getCustomer().getId())
.collect(Collectors.toSet());
Set<Long> customersWithPets = new HashSet<>(ownersWithPets);
customersWithPets.addAll(customersWithAdoptions);
return ResponseEntity.ok(
userRepository.findByRoleAndActiveTrue(User.Role.CUSTOMER).stream()
.filter(u -> customersWithPets.contains(u.getId()))
.map(u -> new DropdownOption(u.getId(), u.getFirstName() + " " + u.getLastName()))
.collect(Collectors.toList())
);
@@ -156,11 +172,16 @@ public class DropdownController {
@GetMapping("/customers/{customerId}/pets")
@PreAuthorize("hasAnyRole('STAFF', 'ADMIN')")
public ResponseEntity<List<DropdownOption>> getCustomerPets(@PathVariable Long customerId) {
return ResponseEntity.ok(
petRepository.findAllByOwner_IdOrderByPetNameAsc(customerId).stream()
Set<Long> seen = new HashSet<>();
List<DropdownOption> pets = new java.util.ArrayList<>();
petRepository.findAllByOwner_IdOrderByPetNameAsc(customerId).stream()
.map(p -> new DropdownOption(p.getPetId(), p.getPetName()))
.collect(Collectors.toList())
);
.forEach(o -> { if (seen.add(o.getId())) pets.add(o); });
adoptionRepository.findByCustomer_IdAndAdoptionStatusIgnoreCase(customerId, "Completed").stream()
.map(a -> new DropdownOption(a.getPet().getPetId(), a.getPet().getPetName()))
.forEach(o -> { if (seen.add(o.getId())) pets.add(o); });
pets.sort(java.util.Comparator.comparing(DropdownOption::getLabel, String.CASE_INSENSITIVE_ORDER));
return ResponseEntity.ok(pets);
}
@GetMapping("/suppliers")

3
backend/src/main/java/com/petshop/backend/repository/AdoptionRepository.java
View File

@@ -9,6 +9,7 @@ import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
@Repository
@@ -37,4 +38,6 @@ public interface AdoptionRepository extends JpaRepository<Adoption, Long> {
boolean existsByPet_IdAndAdoptionStatusIgnoreCaseAndAdoptionIdNot(Long petId, String adoptionStatus, Long adoptionId);
boolean existsByPet_IdAndAdoptionStatusIgnoreCase(Long petId, String adoptionStatus);
List<Adoption> findByCustomer_IdAndAdoptionStatusIgnoreCase(Long customerId, String adoptionStatus);
}