3 files changed, 66 insertions, 9 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 105ae56..1e54622 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -31,6 +31,25 @@ namespace ApplicationDomain {
 
 constexpr const char *Mail::ThreadId::name;
 
+void copyBuffer(Sink::ApplicationDomain::BufferAdaptor &buffer, Sink::ApplicationDomain::BufferAdaptor &memoryAdaptor, const QList<QByteArray> &properties, bool copyBlobs)
+{
+    auto propertiesToCopy = properties;
+    if (properties.isEmpty()) {
+        propertiesToCopy = buffer.availableProperties();
+    }
+    for (const auto &property : propertiesToCopy) {
+        const auto value = buffer.getProperty(property);
+        if (copyBlobs && value.canConvert<BLOB>()) {
+            auto oldPath = value.value<BLOB>().value;
+            auto newPath = oldPath + "copy";
+            QFile::copy(oldPath, newPath);
+            memoryAdaptor.setProperty(property, QVariant::fromValue(BLOB{newPath}));
+        } else {
+            memoryAdaptor.setProperty(property, value);
+        }
+    }
+}
+
 ApplicationDomainType::ApplicationDomainType()
     :mAdaptor(new MemoryBufferAdaptor())
 {
@@ -85,9 +104,6 @@ bool ApplicationDomainType::hasProperty(const QByteArray &key) const
 QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 {
     Q_ASSERT(mAdaptor);
-    if (!mAdaptor->availableProperties().contains(key)) {
-        return QVariant();
-    }
     return mAdaptor->getProperty(key);
 }
 
@@ -111,7 +127,7 @@ void ApplicationDomainType::setProperty(const QByteArray &key, const Application
 
 QByteArray ApplicationDomainType::getBlobProperty(const QByteArray &key) const
 {
-    const auto path = getProperty(key).toByteArray();
+    const auto path = getProperty(key).value<BLOB>().value;
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly)) {
         SinkError() << "Failed to open the file: " << file.errorString() << path;
@@ -131,7 +147,7 @@ void ApplicationDomainType::setBlobProperty(const QByteArray &key, const QByteAr
     file.write(value);
     //Ensure that the file is written to disk immediately
     file.close();
-    setProperty(key, path);
+    setProperty(key, QVariant::fromValue(BLOB{path}));
 }
 
 void ApplicationDomainType::setChangedProperties(const QSet<QByteArray> &changeset)
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index d6bbdd4..621a512 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -63,12 +63,12 @@
 #define SINK_BLOB_PROPERTY(NAME, LOWERCASENAME) \
     struct NAME { \
         static constexpr const char *name = #LOWERCASENAME; \
-        typedef QString Type; \
+        typedef BLOB Type; \
     }; \
     void set##NAME(const QByteArray &value) { setBlobProperty(NAME::name, value); } \
-    void set##NAME##Path(const QString &path) { setProperty(NAME::name, QVariant::fromValue(path)); } \
+    void set##NAME##Path(const QString &path) { setProperty(NAME::name, QVariant::fromValue(BLOB{path})); } \
     QByteArray get##NAME() const { return getBlobProperty(NAME::name); } \
-    QString get##NAME##Path() const { return getProperty(NAME::name).value<QString>(); } \
+    QString get##NAME##Path() const { return getProperty(NAME::name).value<BLOB>().value; } \
 
 #define SINK_REFERENCE_PROPERTY(TYPE, NAME, LOWERCASENAME) \
     struct NAME { \
@@ -98,6 +98,12 @@ struct SINK_EXPORT Progress {
 
 };
 
+struct BLOB {
+    QString value;
+};
+
+void copyBuffer(Sink::ApplicationDomain::BufferAdaptor &buffer, Sink::ApplicationDomain::BufferAdaptor &memoryAdaptor, const QList<QByteArray> &properties, bool copyBlobs);
+
 /**
  * The domain type interface has two purposes:
  * * provide a unified interface to read buffers (for zero-copy reading)
@@ -115,14 +121,29 @@ public:
     ApplicationDomainType(const ApplicationDomainType &other);
     ApplicationDomainType& operator=(const ApplicationDomainType &other);
 
+    /**
+     * Returns an in memory representation of the same entity.
+     */
     template <typename DomainType>
     static typename DomainType::Ptr getInMemoryRepresentation(const ApplicationDomainType &domainType, const QList<QByteArray> properties = QList<QByteArray>())
     {
         auto memoryAdaptor = QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create(*(domainType.mAdaptor), properties);
-        //The identifier still internal refers to the memory-mapped pointer, we need to copy the memory or it will become invalid
+        //mIdentifier internally still refers to the memory-mapped memory, we need to copy the memory or it will become invalid
         return QSharedPointer<DomainType>::create(domainType.mResourceInstanceIdentifier, QByteArray(domainType.mIdentifier.constData(), domainType.mIdentifier.size()), domainType.mRevision, memoryAdaptor);
     }
 
+    /**
+     * Returns an in memory copy without id and resource set.
+     */
+    template <typename DomainType>
+    static typename DomainType::Ptr getInMemoryCopy(const ApplicationDomainType &domainType, const QList<QByteArray> properties = QList<QByteArray>())
+    {
+        auto memoryAdaptor = QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create();
+        Q_ASSERT(domainType.mAdaptor);
+        copyBuffer(*(domainType.mAdaptor), *memoryAdaptor, properties, true);
+        return QSharedPointer<DomainType>::create(QByteArray{}, QByteArray{}, 0, memoryAdaptor);
+    }
+
     static QByteArray generateUid();
 
     template <class DomainType>
@@ -430,3 +451,4 @@ Q_DECLARE_METATYPE(Sink::ApplicationDomain::Identity::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail::Contact)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Error)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Progress)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::BLOB)
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index 754c874..249221a 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -33,6 +33,15 @@ flatbuffers::uoffset_t variantToProperty<QString>(const QVariant &property, flat
 }
 
 template <>
+flatbuffers::uoffset_t variantToProperty<Sink::ApplicationDomain::BLOB>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+{
+    if (property.isValid()) {
+        return fbb.CreateString(property.value<Sink::ApplicationDomain::BLOB>().value.toStdString()).o;
+    }
+    return 0;
+}
+
+template <>
 flatbuffers::uoffset_t variantToProperty<QByteArray>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
 {
     if (property.isValid()) {
@@ -111,6 +120,16 @@ QVariant propertyToVariant<QString>(const flatbuffers::String *property)
 }
 
 template <>
+QVariant propertyToVariant<Sink::ApplicationDomain::BLOB>(const flatbuffers::String *property)
+{
+    if (property) {
+        // We have to copy the memory, otherwise it would become eventually invalid
+        return QVariant::fromValue(Sink::ApplicationDomain::BLOB{QString::fromStdString(property->c_str())});
+    }
+    return QVariant();
+}
+
+template <>
 QVariant propertyToVariant<QByteArray>(const flatbuffers::String *property)
 {
     if (property) {