diff --git a/src/main/java/ru/nsu/fit/directors/userservice/api/VkApi.java b/src/main/java/ru/nsu/fit/directors/userservice/api/VkApi.java index 1a89acb..11d55eb 100644 --- a/src/main/java/ru/nsu/fit/directors/userservice/api/VkApi.java +++ b/src/main/java/ru/nsu/fit/directors/userservice/api/VkApi.java @@ -3,10 +3,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; import ru.nsu.fit.directors.userservice.dto.request.RequestVkNotification; import ru.nsu.fit.directors.userservice.dto.response.VkNotificationResponse; @@ -20,9 +18,12 @@ public VkNotificationResponse sendNotification(RequestVkNotification requestVkNo log.info("Send vk notification {}", requestVkNotification); ParameterizedTypeReference reference = new ParameterizedTypeReference<>() {}; return vkApiClient.post() - .uri(uriBuilder -> uriBuilder.path("/method/notifications.sendMessage").build()) - .contentType(MediaType.APPLICATION_JSON) - .body(Mono.just(requestVkNotification), RequestVkNotification.class) + .uri(uriBuilder -> uriBuilder.path("/method/notifications.sendMessage") + .queryParam("v", "5.154") + .queryParam("access_token", requestVkNotification.access_token()) + .queryParam("user_ids", requestVkNotification.user_ids()) + .queryParam("message", requestVkNotification.message()) + .build()) .retrieve() .toEntity(reference) .log() diff --git a/src/main/java/ru/nsu/fit/directors/userservice/dto/request/RequestVkNotification.java b/src/main/java/ru/nsu/fit/directors/userservice/dto/request/RequestVkNotification.java index 67387db..d6179c4 100644 --- a/src/main/java/ru/nsu/fit/directors/userservice/dto/request/RequestVkNotification.java +++ b/src/main/java/ru/nsu/fit/directors/userservice/dto/request/RequestVkNotification.java @@ -5,4 +5,5 @@ public record RequestVkNotification( String access_token, String user_ids ) { + }