Commit 926c13e6 authored by Volker Krause's avatar Volker Krause

Returns the ids of added reservations

Needed to attach documents to them.
parent bbe742fa
......@@ -108,8 +108,8 @@ private Q_SLOTS:
auto visit = KItinerary::TouristAttractionVisit();
auto addedResId = mgr.batches()[0];
const auto addedResId = mgr.addReservation(QVariant::fromValue(visit));
QCOMPARE(addedResId, mgr.batches().at(0));
QCOMPARE(addSpy.size(), 2);
QCOMPARE(mgr.batches().size(), 1);
......@@ -126,27 +126,31 @@ QString ReservationManager::batchesBasePath()
return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1String("/batches/");
void ReservationManager::importReservation(const QByteArray& data, const QString &fileName)
QVector<QString> ReservationManager::importReservation(const QByteArray& data, const QString &fileName)
ExtractorEngine engine;
engine.setContextDate(QDateTime(QDate::currentDate(), QTime(0, 0)));
engine.setData(data, fileName);
return importReservations(JsonLdDocument::fromJson(engine.extract()));
void ReservationManager::importReservations(const QVector<QVariant> &resData)
QVector<QString> ReservationManager::importReservations(const QVector<QVariant> &resData)
ExtractorPostprocessor postproc;
postproc.setContextDate(QDateTime(QDate::currentDate(), QTime(0, 0)));
const auto data = postproc.result();
QVector<QString> ids;
for (const auto &res : data) {
return ids;
void ReservationManager::addReservation(const QVariant &res)
QString ReservationManager::addReservation(const QVariant &res)
// look for matching reservations, or matching batches
// we need to do that within a +/-24h range, so we find unbound elements too
......@@ -166,7 +170,7 @@ void ReservationManager::addReservation(const QVariant &res)
// this is actually an update of otherRes!
const auto newRes = MergeUtil::merge(otherRes, res);
updateReservation(*it, newRes);
return *it;
if (isSameTrip(res, otherRes)) {
// this is a multi-traveler element, check if we have it as one of the batch elements already
......@@ -177,7 +181,7 @@ void ReservationManager::addReservation(const QVariant &res)
// this is actually an update of a batched reservation
const auto newRes = MergeUtil::merge(otherRes, res);
updateReservation(batchedId, newRes);
return batchedId;
......@@ -190,7 +194,7 @@ void ReservationManager::addReservation(const QVariant &res)
m_resToBatchMap.insert(resId, *it);
emit batchChanged(*it);
return resId;
......@@ -208,6 +212,7 @@ void ReservationManager::addReservation(const QVariant &res)
m_resToBatchMap.insert(resId, resId);
emit batchAdded(resId);
return resId;
void ReservationManager::updateReservation(const QString &resId, const QVariant &res)
......@@ -49,12 +49,19 @@ public:
Q_INVOKABLE QVariant reservation(const QString &id) const;
Q_INVOKABLE void addReservation(const QVariant &res);
/** Adds @p res if it's new, or merges it with an existing reservation or reservation batch.
* @returns The id of the new or existed merged reservation.
Q_INVOKABLE QString addReservation(const QVariant &res);
Q_INVOKABLE void updateReservation(const QString &resId, const QVariant &res);
Q_INVOKABLE void removeReservation(const QString &id);
void importReservation(const QByteArray &data, const QString &fileName = {});
void importReservations(const QVector<QVariant> &resData);
/** Attempts to extract reservation information from @p data.
* @returns A list of reservation ids for the extracted elements. Those can be reservation
* ids that previously existed, in case the extracted elements could be merged.
QVector<QString> importReservation(const QByteArray &data, const QString &fileName = {});
QVector<QString> importReservations(const QVector<QVariant> &resData);
const std::vector<QString>& batches() const;
bool hasBatch(const QString &batchId) const;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment