implemented filtering by olbast'

dao/src/main/java/greencity/repository/AddressRepository.java

@@ -103,4 +103,14 @@ public interface AddressRepository extends CrudRepository<Address, Long> {
      */
     @Query(value = "SELECT * FROM address WHERE user_id =:userId AND status != 'DELETED' LIMIT 1", nativeQuery = true)
     Optional<Address> findAnyByUserIdAndAddressStatusNotDeleted(Long userId);
+
+    /**
+     * Method returns first address {@link Address} from each distinct region.
+     *
+     * @return list of {@link Address}
+     */
+    @Query(
+        value = "SELECT a FROM Address  a WHERE a.id IN (SELECT MIN(ad.id) "
+            + "FROM Address  ad WHERE ad.region = a.region)")
+    List<Address> findDistinctRegions();
 }

service/src/main/java/greencity/service/ubs/OrdersAdminsPageServiceImpl.java

@@ -165,7 +165,7 @@ public TableParamsDto getParametersForOrdersTable(String uuid) {
             new ColumnDTO(new TitleDto("violationsAmount", "Кількість порушень клієнта", "Violations"),
                 "violationsAmount", 20, false, true, false, 12, EditType.READ_ONLY, new ArrayList<>(), customersInfo),
             new ColumnDTO(new TitleDto("region", "Область", "Region"), "region", 20, false,
-                true, false, 35, EditType.READ_ONLY, new ArrayList<>(), exportAddress),
+                true, true, 35, EditType.READ_ONLY, regionsList(), exportAddress),
             new ColumnDTO(new TitleDto("city", "Місто", "City"), "city", 20,
                 false,
                 true, true, 36, EditType.READ_ONLY, cityList(), exportAddress),
@@ -791,4 +791,16 @@ private boolean isOrderBlockedByAnotherEmployee(Order order, Long employeeId) {
         return order.getBlockedByEmployee() != null
             && !Objects.equals(employeeId, order.getBlockedByEmployee().getId());
     }
+
+    private List<OptionForColumnDTO> regionsList() {
+        return addressRepository.findDistinctRegions()
+            .stream()
+            .map(address -> OptionForColumnDTO
+                .builder()
+                .key(address.getId().toString())
+                .en(address.getRegionEn())
+                .ua(address.getRegion())
+                .build())
+            .collect(Collectors.toList());
+    }
 }

service/src/test/java/greencity/service/ubs/OrdersAdminsPageServiceImplTest.java

@@ -243,7 +243,8 @@ void getParametersForOrdersTest() {
             .thenReturn(addressList);
         when(addressRepository.findDistinctCities())
             .thenReturn(addressList);
-
+        when(addressRepository.findDistinctRegions())
+            .thenReturn(addressList);
         assertNotNull(ordersAdminsPageService.getParametersForOrdersTable("1"));
     }