Merge pull request #405 from quotient-im/kitsune-basejob-store-json-response

Store JSON response in BaseJob + tweaks to the generated code

1 files changed, 8 insertions, 92 deletions

diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index cde179e0..4761e949 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -4,93 +4,23 @@
 
 #include "joining.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
 using namespace Quotient;
 
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-// Converters
-namespace Quotient {
-
-template <>
-struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned> {
-    static void dumpTo(QJsonObject& jo,
-                       const JoinRoomByIdJob::ThirdPartySigned& pod)
-    {
-        addParam<>(jo, QStringLiteral("sender"), pod.sender);
-        addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
-        addParam<>(jo, QStringLiteral("token"), pod.token);
-        addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
-    }
-};
-
-} // namespace Quotient
-
-class JoinRoomByIdJob::Private {
-public:
-    QString roomId;
-};
-
 JoinRoomByIdJob::JoinRoomByIdJob(
     const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomByIdJob"),
-              basePath % "/rooms/" % roomId % "/join")
-    , d(new Private)
+              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/join")
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
                          thirdPartySigned);
-    setRequestData(_data);
+    setRequestData(std::move(_data));
+    addExpectedKey("room_id");
 }
 
-JoinRoomByIdJob::~JoinRoomByIdJob() = default;
-
-const QString& JoinRoomByIdJob::roomId() const { return d->roomId; }
-
-BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    if (!json.contains("room_id"_ls))
-        return { IncorrectResponse,
-                 "The key 'room_id' not found in the response" };
-    fromJson(json.value("room_id"_ls), d->roomId);
-
-    return Success;
-}
-
-// Converters
-namespace Quotient {
-
-template <>
-struct JsonObjectConverter<JoinRoomJob::Signed> {
-    static void dumpTo(QJsonObject& jo, const JoinRoomJob::Signed& pod)
-    {
-        addParam<>(jo, QStringLiteral("sender"), pod.sender);
-        addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
-        addParam<>(jo, QStringLiteral("token"), pod.token);
-        addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
-    }
-};
-
-template <>
-struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned> {
-    static void dumpTo(QJsonObject& jo, const JoinRoomJob::ThirdPartySigned& pod)
-    {
-        addParam<>(jo, QStringLiteral("signed"), pod.signedData);
-    }
-};
-
-} // namespace Quotient
-
-class JoinRoomJob::Private {
-public:
-    QString roomId;
-};
-
-BaseJob::Query queryToJoinRoom(const QStringList& serverName)
+auto queryToJoinRoom(const QStringList& serverName)
 {
     BaseJob::Query _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("server_name"), serverName);
@@ -101,26 +31,12 @@ JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias,
                          const QStringList& serverName,
                          const Omittable<ThirdPartySigned>& thirdPartySigned)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomJob"),
-              basePath % "/join/" % roomIdOrAlias, queryToJoinRoom(serverName))
-    , d(new Private)
+              QStringLiteral("/_matrix/client/r0") % "/join/" % roomIdOrAlias,
+              queryToJoinRoom(serverName))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
                          thirdPartySigned);
-    setRequestData(_data);
-}
-
-JoinRoomJob::~JoinRoomJob() = default;
-
-const QString& JoinRoomJob::roomId() const { return d->roomId; }
-
-BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    if (!json.contains("room_id"_ls))
-        return { IncorrectResponse,
-                 "The key 'room_id' not found in the response" };
-    fromJson(json.value("room_id"_ls), d->roomId);
-
-    return Success;
+    setRequestData(std::move(_data));
+    addExpectedKey("room_id");
 }