Copy command and proper move

12 files changed, 73 insertions, 3 deletions

diff --git a/common/facade.cpp b/common/facade.cpp
index c618d4e..4f03073 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -80,6 +80,18 @@ KAsync::Job<void> GenericFacade<DomainType>::move(const DomainType &domainObject
         SinkWarning() << "No domain type adaptor factory available";
         return KAsync::error<void>();
     }
+    return mResourceAccess->sendModifyCommand(domainObject.identifier(), domainObject.revision(), bufferTypeForDomainType(), QByteArrayList(), BufferUtils::extractBuffer(entityFbb), domainObject.changedProperties(), newResource, true);
+}
+
+template <class DomainType>
+KAsync::Job<void> GenericFacade<DomainType>::copy(const DomainType &domainObject, const QByteArray &newResource)
+{
+    SinkTrace() << "Copying entity: " << domainObject.identifier() << domainObject.changedProperties() << newResource;
+    flatbuffers::FlatBufferBuilder entityFbb;
+    if (!mResourceContext.adaptorFactory<DomainType>().createBuffer(domainObject, entityFbb)) {
+        SinkWarning() << "No domain type adaptor factory available";
+        return KAsync::error<void>();
+    }
     return mResourceAccess->sendModifyCommand(domainObject.identifier(), domainObject.revision(), bufferTypeForDomainType(), QByteArrayList(), BufferUtils::extractBuffer(entityFbb), domainObject.changedProperties(), newResource, false);
 }
 
diff --git a/common/facade.h b/common/facade.h
index 0fba34a..c10886f 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -64,6 +64,7 @@ public:
     KAsync::Job<void> create(const DomainType &domainObject) Q_DECL_OVERRIDE;
     KAsync::Job<void> modify(const DomainType &domainObject) Q_DECL_OVERRIDE;
     KAsync::Job<void> move(const DomainType &domainObject, const QByteArray &newResource) Q_DECL_OVERRIDE;
+    KAsync::Job<void> copy(const DomainType &domainObject, const QByteArray &newResource) Q_DECL_OVERRIDE;
     KAsync::Job<void> remove(const DomainType &domainObject) Q_DECL_OVERRIDE;
     virtual QPair<KAsync::Job<void>, typename ResultEmitter<typename DomainType::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
 
diff --git a/common/facadeinterface.h b/common/facadeinterface.h
index 136791e..5d12360 100644
--- a/common/facadeinterface.h
+++ b/common/facadeinterface.h
@@ -70,6 +70,13 @@ public:
     virtual KAsync::Job<void> move(const DomainType &domainObject, const QByteArray &newResource) = 0;
 
     /**
+     * Copy an entity to a new resource.
+     *
+     * The job returns succefully once the task has been successfully placed in the queue
+     */
+    virtual KAsync::Job<void> copy(const DomainType &domainObject, const QByteArray &newResource) = 0;
+
+    /**
      * Remove an entity from the store.
      *
      * The job returns succefully once the task has been successfully placed in the queue
@@ -102,6 +109,11 @@ public:
         return KAsync::error<void>(-1, "Failed to create a facade");
     }
 
+    KAsync::Job<void> copy(const DomainType &domainObject, const QByteArray &newResource)
+    {
+        return KAsync::error<void>(-1, "Failed to create a facade");
+    }
+
     KAsync::Job<void> remove(const DomainType &domainObject)
     {
         return KAsync::error<void>(-1, "Failed to create a facade");
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 8ace855..b94e3f0 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -249,6 +249,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
     }
 
     if (modifyEntity->targetResource()) {
+        auto isMove = modifyEntity->removeEntity();
         auto targetResource = BufferUtils::extractBuffer(modifyEntity->targetResource());
         auto changeset = diff.changedProperties();
         const auto current = d->entityStore.readLatest(bufferType, diff.identifier());
@@ -276,9 +277,20 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
 
         SinkTrace() << "Moving entity to new resource " << newEntity.identifier() << newEntity.resourceInstanceIdentifier() << targetResource;
         auto job = TypeHelper<CreateHelper>{bufferType}.operator()<KAsync::Job<void>, ApplicationDomain::ApplicationDomainType&>(newEntity);
-        job = job.syncThen<void>([=](const KAsync::Error &error) {
+        job = job.syncThen<void>([this, newEntity, isMove, targetResource, bufferType](const KAsync::Error &error) {
             if (!error) {
                 SinkTrace() << "Move of " << newEntity.identifier() << "was successfull";
+                if (isMove) {
+                    startTransaction();
+                    flatbuffers::FlatBufferBuilder fbb;
+                    auto entityId = fbb.CreateString(newEntity.identifier());
+                    auto type = fbb.CreateString(bufferType);
+                    auto location = Sink::Commands::CreateDeleteEntity(fbb, newEntity.revision(), entityId, type, true);
+                    Sink::Commands::FinishDeleteEntityBuffer(fbb, location);
+                    const auto data = BufferUtils::extractBuffer(fbb);
+                    deletedEntity(data, data.size()).exec();
+                    commit();
+                }
             } else {
                 SinkError() << "Failed to move entity " << targetResource << " to resource " << newEntity.identifier();
             }
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 0a05bd9..c4e16b1 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -225,6 +225,12 @@ KAsync::Job<void> LocalStorageFacade<DomainType>::move(const DomainType &, const
 }
 
 template <typename DomainType>
+KAsync::Job<void> LocalStorageFacade<DomainType>::copy(const DomainType &, const QByteArray &)
+{
+    return KAsync::error<void>(1, "Resources and Accounts cannot be copied.");
+}
+
+template <typename DomainType>
 KAsync::Job<void> LocalStorageFacade<DomainType>::remove(const DomainType &domainObject)
 {
     auto configStoreIdentifier = mIdentifier;
diff --git a/common/resourcefacade.h b/common/resourcefacade.h
index ea552c2..4575e72 100644
--- a/common/resourcefacade.h
+++ b/common/resourcefacade.h
@@ -82,6 +82,7 @@ public:
     virtual KAsync::Job<void> create(const DomainType &resource) Q_DECL_OVERRIDE;
     virtual KAsync::Job<void> modify(const DomainType &resource) Q_DECL_OVERRIDE;
     virtual KAsync::Job<void> move(const DomainType &resource, const QByteArray &) Q_DECL_OVERRIDE;
+    virtual KAsync::Job<void> copy(const DomainType &resource, const QByteArray &) Q_DECL_OVERRIDE;
     virtual KAsync::Job<void> remove(const DomainType &resource) Q_DECL_OVERRIDE;
     virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename DomainType::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
 
diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp
index b6251b6..1417861 100644
--- a/common/storage/entitystore.cpp
+++ b/common/storage/entitystore.cpp
@@ -239,11 +239,11 @@ bool EntityStore::remove(const QByteArray &type, const QByteArray &uid, bool rep
             [](const DataStore::Error &error) { SinkWarning() << "Failed to read old revision from storage: " << error.message; });
 
     if (!found) {
-        SinkWarning() << "Failed to find entity " << uid;
+        SinkWarning() << "Remove: Failed to find entity " << uid;
         return false;
     }
     if (alreadyRemoved) {
-        SinkWarning() << "Entity is already removed " << uid;
+        SinkWarning() << "Remove: Entity is already removed " << uid;
         return false;
     }
 
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index e418472..fa99a80 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -520,6 +520,7 @@ bool DataStore::Transaction::validateNamedDatabases()
 DataStore::NamedDatabase DataStore::Transaction::openDatabase(const QByteArray &db, const std::function<void(const DataStore::Error &error)> &errorHandler, bool allowDuplicates) const
 {
     if (!d) {
+        SinkError() << "Tried to open database on invalid transaction: " << db;
         return DataStore::NamedDatabase();
     }
     Q_ASSERT(d->transaction);
diff --git a/common/store.cpp b/common/store.cpp
index fad8c5e..ef8a593 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -225,6 +225,15 @@ KAsync::Job<void> Store::move(const DomainType &domainObject, const QByteArray &
 }
 
 template <class DomainType>
+KAsync::Job<void> Store::copy(const DomainType &domainObject, const QByteArray &newResource)
+{
+    SinkTrace() << "Copy: " << domainObject << newResource;
+    // Potentially copy to separate thread as well
+    auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+    return facade->copy(domainObject, newResource).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to copy"; });
+}
+
+template <class DomainType>
 KAsync::Job<void> Store::remove(const DomainType &domainObject)
 {
     SinkTrace() << "Remove: " << domainObject;
@@ -396,6 +405,7 @@ QList<DomainType> Store::read(const Sink::Query &q)
     template KAsync::Job<void> Store::create<T>(const T &domainObject);           \
     template KAsync::Job<void> Store::modify<T>(const T &domainObject);           \
     template KAsync::Job<void> Store::move<T>(const T &domainObject, const QByteArray &newResource);           \
+    template KAsync::Job<void> Store::copy<T>(const T &domainObject, const QByteArray &newResource);           \
     template QSharedPointer<QAbstractItemModel> Store::loadModel<T>(Query query); \
     template KAsync::Job<T> Store::fetchOne<T>(const Query &);                    \
     template KAsync::Job<QList<T::Ptr>> Store::fetchAll<T>(const Query &);        \
diff --git a/common/store.h b/common/store.h
index 7c7d2fe..b261f47 100644
--- a/common/store.h
+++ b/common/store.h
@@ -88,6 +88,12 @@ template <class DomainType>
 KAsync::Job<void> SINK_EXPORT move(const DomainType &domainObject, const QByteArray &newResource);
 
 /**
+ * Copy an entity to a new resource.
+ */
+template <class DomainType>
+KAsync::Job<void> SINK_EXPORT copy(const DomainType &domainObject, const QByteArray &newResource);
+
+/**
  * Synchronize data to local cache.
  */
 KAsync::Job<void> SINK_EXPORT synchronize(const Sink::Query &query);
diff --git a/common/test.cpp b/common/test.cpp
index 74c499c..0c7ba10 100644
--- a/common/test.cpp
+++ b/common/test.cpp
@@ -130,6 +130,11 @@ public:
         // mTestAccount->moveEntity<T>(domainObject, newResource);
         return KAsync::null<void>();
     };
+    KAsync::Job<void> copy(const T &domainObject, const QByteArray &newResource) Q_DECL_OVERRIDE
+    {
+        // mTestAccount->copyEntity<T>(domainObject, newResource);
+        return KAsync::null<void>();
+    };
     KAsync::Job<void> remove(const T &domainObject) Q_DECL_OVERRIDE
     {
         //FIXME
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 71be514..4a33d17 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -45,6 +45,10 @@ public:
     {
         return KAsync::null<void>();
     };
+    KAsync::Job<void> copy(const T &domainObject, const QByteArray &) Q_DECL_OVERRIDE
+    {
+        return KAsync::null<void>();
+    };
     KAsync::Job<void> remove(const T &domainObject) Q_DECL_OVERRIDE
     {
         return KAsync::null<void>();