Add optional parameters

Board-of-Directors · Dec 20, 2023 · 57e12ed · 57e12ed
1 parent a6b3e0a
commit 57e12ed
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/ru/nsu/fit/directors/userservice/service/OrderServiceImpl.java b/src/main/java/ru/nsu/fit/directors/userservice/service/OrderServiceImpl.java
@@ -17,6 +17,7 @@
 import ru.nsu.fit.directors.userservice.model.User;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.time.LocalDateTime;
 import java.util.Collections;
@@ -48,14 +49,15 @@ public void cancelOrder(Long orderId) {
 
     @Override
     @Nonnull
-    public List<ResponseOrderDto> getOrders(Integer status) {
+    public List<ResponseOrderDto> getOrders(@Nullable Integer status) {
         User loggedUser = securityService.getLoggedInUser();
         return orderApi.syncListGetWithParams(
             uriBuilder -> uriBuilder.path("/order")
                 .queryParam("userId", loggedUser.getId())
-                .queryParam("status", status)
+                .queryParamIfPresent("status", Optional.ofNullable(status))
                 .build(),
-            new ParameterizedTypeReference<>() {}
+            new ParameterizedTypeReference<>() {
+            }
         );
 
     }
@@ -94,7 +96,8 @@ private List<LocalDateTime> getValidTimes(RequestOrderDto requestOrderDto) {
             uriBuilder -> uriBuilder.path("/establishment/internal/time")
                 .queryParam("establishmentId", requestOrderDto.getEstablishmentId())
                 .build(),
-            new ParameterizedTypeReference<>() {}
+            new ParameterizedTypeReference<>() {
+            }
         );
     }
 }