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, 4 insertions, 30 deletions

diff --git a/lib/csapi/room_upgrades.cpp b/lib/csapi/room_upgrades.cpp
index 244f5b74..e3791b08 100644
--- a/lib/csapi/room_upgrades.cpp
+++ b/lib/csapi/room_upgrades.cpp
@@ -4,43 +4,17 @@
 
 #include "room_upgrades.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
 using namespace Quotient;
 
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-class UpgradeRoomJob::Private {
-public:
-    QString replacementRoom;
-};
-
 UpgradeRoomJob::UpgradeRoomJob(const QString& roomId, const QString& newVersion)
     : BaseJob(HttpVerb::Post, QStringLiteral("UpgradeRoomJob"),
-              basePath % "/rooms/" % roomId % "/upgrade")
-    , d(new Private)
+              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+                  % "/upgrade")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("new_version"), newVersion);
-    setRequestData(_data);
-}
-
-UpgradeRoomJob::~UpgradeRoomJob() = default;
-
-const QString& UpgradeRoomJob::replacementRoom() const
-{
-    return d->replacementRoom;
-}
-
-BaseJob::Status UpgradeRoomJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    if (!json.contains("replacement_room"_ls))
-        return { IncorrectResponse,
-                 "The key 'replacement_room' not found in the response" };
-    fromJson(json.value("replacement_room"_ls), d->replacementRoom);
-
-    return Success;
+    setRequestData(std::move(_data));
+    addExpectedKey("replacement_room");
 }