some changes

Board-of-Directors · Nov 13, 2023 · 01755db · 01755db
1 parent 9934d5e
commit 01755db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.../java/ru/nsu/fit/directors/userservice/dto/request/RequestGetEstablishmentParameters.java b/.../java/ru/nsu/fit/directors/userservice/dto/request/RequestGetEstablishmentParameters.java
@@ -26,5 +26,6 @@ public record RequestGetEstablishmentParameters(
         limit = limit == null ? 100 : limit;
         sortValue = sortValue == null ? "name" : sortValue;
         workingDayCount = workingDayCount == null ? 7 : workingDayCount;
+        category = category == null ? "" : category;
     }
 }
diff --git a/src/main/java/ru/nsu/fit/directors/userservice/service/EstablishmentServiceImpl.java b/src/main/java/ru/nsu/fit/directors/userservice/service/EstablishmentServiceImpl.java
@@ -6,10 +6,8 @@
 import ru.nsu.fit.directors.userservice.api.EstablishmentApi;
 import ru.nsu.fit.directors.userservice.dto.request.RequestGetEstablishmentParameters;
 import ru.nsu.fit.directors.userservice.dto.response.EstablishmentListDto;
-import ru.nsu.fit.directors.userservice.dto.response.ResponseBasicEstablishmentInfo;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.List;
 
 @Component
 @RequiredArgsConstructor
@@ -20,7 +18,7 @@ public class EstablishmentServiceImpl implements EstablishmentService {
 
     @Override
     public EstablishmentListDto getEstablishmentByParams(RequestGetEstablishmentParameters parameters) {
-        List<ResponseBasicEstablishmentInfo> establishmentInfoList = establishmentApi.syncListGetWithParams(
+        EstablishmentListDto establishmentInfoList = establishmentApi.syncGetWithParams(
             uriBuilder -> uriBuilder.path("/establishment/all")
                 .queryParam("name", parameters.name())
                 .queryParam("hasMap", parameters.hasMap())
@@ -29,9 +27,9 @@ public EstablishmentListDto getEstablishmentByParams(RequestGetEstablishmentPara
                 .build(),
             new ParameterizedTypeReference<>() {
             });
-        establishmentInfoList.forEach(
+        establishmentInfoList.establishmentInfoList().forEach(
             info -> info.setFavourite(favouritesService.getFavouritesIds().contains(info.getId()))
         );
-        return new EstablishmentListDto(establishmentInfoList.size(), establishmentInfoList);
+        return establishmentInfoList;
     }
 }