[network/ruqola] src/rocketchatrestapi-qt: Fix api
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 03c144eeb1bd14906c69a63788dac6aa3f06f6a4 by Laurent Montel.
Committed on 06/08/2026 at 17:32.
Pushed by mlaurent into branch 'master'.
Fix api
M +3 -1 src/rocketchatrestapi-qt/autotests/fetchuserswaitingforgroupkeyjobtest.cpp
M +10 -4 src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.cpp
M +2 -2 src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.h
https://invent.kde.org/network/ruqola/-/commit/03c144eeb1bd14906c69a63788dac6aa3f06f6a4
diff --git a/src/rocketchatrestapi-qt/autotests/fetchuserswaitingforgroupkeyjobtest.cpp b/src/rocketchatrestapi-qt/autotests/fetchuserswaitingforgroupkeyjobtest.cpp
index e62e908413..7c2494c84b 100644
--- a/src/rocketchatrestapi-qt/autotests/fetchuserswaitingforgroupkeyjobtest.cpp
+++ b/src/rocketchatrestapi-qt/autotests/fetchuserswaitingforgroupkeyjobtest.cpp
@@ -34,9 +34,11 @@ void FetchUsersWaitingForGroupKeyJobTest::shouldGenerateRequest()
FetchUsersWaitingForGroupKeyJob job;
RestApiMethod method;
method.setServerUrl(u"http://www.kde.org"_s);
+ const QByteArray roomId = "foo"_ba;
+ job.setRoomId(roomId);
job.setRestApiMethod(&method);
const QNetworkRequest request = job.request();
- QCOMPARE(request.url(), QUrl(u"http://www.kde.org/api/v1/e2e.fetchUsersWaitingForGroupKey"_s));
+ QCOMPARE(request.url(), QUrl(u"http://www.kde.org/api/v1/e2e.fetchUsersWaitingForGroupKey?roomIds[]=foo"_s));
}
#include "moc_fetchuserswaitingforgroupkeyjobtest.cpp"
diff --git a/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.cpp b/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.cpp
index f74e8a6191..1e487d5306 100644
--- a/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.cpp
+++ b/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.cpp
@@ -10,6 +10,7 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QNetworkRequest>
+#include <QUrlQuery>
using namespace Qt::Literals::StringLiterals;
using namespace RocketChatRestApi;
@@ -46,19 +47,24 @@ void FetchUsersWaitingForGroupKeyJob::onGetRequestResponse(const QString &replyE
}
}
-QByteArray FetchUsersWaitingForGroupKeyJob::getRoomId() const
+QByteArray FetchUsersWaitingForGroupKeyJob::roomId() const
{
- return roomId;
+ return mRoomId;
}
void FetchUsersWaitingForGroupKeyJob::setRoomId(const QByteArray &newRoomId)
{
- roomId = newRoomId;
+ mRoomId = newRoomId;
}
QNetworkRequest FetchUsersWaitingForGroupKeyJob::request() const
{
- const QUrl url = mRestApiMethod->generateUrl(RestApiUtil::RestApiUrlType::E2EFetchUsersWaitingForGroupKey);
+ QUrl url = mRestApiMethod->generateUrl(RestApiUtil::RestApiUrlType::E2EFetchUsersWaitingForGroupKey);
+ QUrlQuery queryUrl;
+ queryUrl.addQueryItem(u"roomIds[]"_s, QLatin1StringView(mRoomId));
+ addQueryParameter(queryUrl);
+ url.setQuery(queryUrl);
+
QNetworkRequest request(url);
addAuthRawHeader(request);
return request;
diff --git a/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.h b/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.h
index ef5adbc515..cc59d5641c 100644
--- a/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.h
+++ b/src/rocketchatrestapi-qt/e2e/fetchuserswaitingforgroupkeyjob.h
@@ -23,7 +23,7 @@ public:
[[nodiscard]] QNetworkRequest request() const override;
- [[nodiscard]] QByteArray getRoomId() const;
+ [[nodiscard]] QByteArray roomId() const;
void setRoomId(const QByteArray &newRoomId);
Q_SIGNALS:
@@ -33,6 +33,6 @@ protected:
void onGetRequestResponse(const QString &replyErrorString, const QJsonDocument &replyJson) override;
private:
- QByteArray roomId;
+ QByteArray mRoomId;
};
}