Find tenants without apartments

zhycheng614 · May 19, 2023 · 48df74d · 48df74d
1 parent 1761743
commit 48df74d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/backend/management/config/SecurityConfig.java b/src/main/java/com/backend/management/config/SecurityConfig.java
@@ -45,6 +45,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .antMatchers("/moveOutAndAssignNewOwner").hasAuthority("ROLE_MANAGER")
                 .antMatchers("/getFlatmates").hasAuthority("ROLE_MANAGER")
                 .antMatchers("/findApartmentsWithVacancy").hasAuthority("ROLE_MANAGER")
+                .antMatchers("/getTenantsWithoutApartments").hasAuthority("ROLE_MANAGER")
                 .antMatchers("/reservation").hasAnyAuthority("ROLE_TENANT","ROLE_MANAGER")
                 .antMatchers("/reservation/*").hasAnyAuthority("ROLE_TENANT", "ROLE_MANAGER")
                 .antMatchers("/reservations").hasAnyAuthority("ROLE_TENANT", "ROLE_MANAGER")

diff --git a/src/main/java/com/backend/management/controller/MoveController.java b/src/main/java/com/backend/management/controller/MoveController.java
@@ -54,4 +54,7 @@ public Set<String> getFlatmates(String username) {
 
     @GetMapping("findApartmentsWithVacancy")
     public List<String> findApartmentsWithVacancy() {return moveService.findApartmentsWithVacancy(); }
+
+    @GetMapping("getTenantsWithoutApartments")
+    public List<String> getTenantsWithoutApartments() {return moveService.getTenantsWithoutApartments();}
 }
diff --git a/src/main/java/com/backend/management/repository/UserRepository.java b/src/main/java/com/backend/management/repository/UserRepository.java
@@ -15,5 +15,8 @@ public interface UserRepository extends JpaRepository<User, String> {
     List<User> getOccupants(
             @Param("apartment_number") String apartmentNumber);
 
+    @Query ("SELECT u FROM User u where u.apartmentNumber=NULL")
+    List<User> getTenantsWithoutApartments();
+
 }
 
diff --git a/src/main/java/com/backend/management/service/MoveService.java b/src/main/java/com/backend/management/service/MoveService.java
@@ -68,6 +68,11 @@ public List<String> findApartmentsWithVacancy(){
         return apartments.stream().map(Apartment::getApartmentId).collect(Collectors.toSet()).stream().sorted().collect(Collectors.toList());
     }
 
+    public List<String> getTenantsWithoutApartments() {
+        List<User> tenant = userRepository.getTenantsWithoutApartments();
+        return tenant.stream().map(User::getUsername).collect(Collectors.toSet()).stream().sorted().collect(Collectors.toList());
+    }
+
     private void move(String username, String newApartmentNumber, String newOwnerUsername) {
         Optional<User> userOptional = userRepository.findById(username);
         if (userOptional.isEmpty()) {