Support the attachment property

3 files changed, 34 insertions, 0 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index d989efe..a348e65 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -65,6 +65,7 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImple
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
     propertyMapper->addMapping<QString, Buffer>("summary", &Buffer::summary);
     propertyMapper->addMapping<QString, Buffer>("uid", &Buffer::uid);
+    propertyMapper->addMapping<QByteArray, Buffer>("attachment", &Buffer::attachment);
     return propertyMapper;
 }
 
@@ -73,5 +74,6 @@ QSharedPointer<WritePropertyMapper<TypeImplementation<Event>::BufferBuilder> > T
     auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
     propertyMapper->addMapping<QString>("summary", &BufferBuilder::add_summary);
     propertyMapper->addMapping<QString>("uid", &BufferBuilder::add_uid);
+    propertyMapper->addMapping<QByteArray>("attachment", &BufferBuilder::add_attachment);
     return propertyMapper;
 }
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index 17a73cb..5348b11 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -68,6 +68,16 @@ QVariant propertyToVariant<QByteArray>(const flatbuffers::String *property)
 }
 
 template <>
+QVariant propertyToVariant<QByteArray>(const flatbuffers::Vector<uint8_t> *property)
+{
+    if (property) {
+        //We have to copy the memory, otherwise it would become eventually invalid
+        return QByteArray(reinterpret_cast<const char *>(property->Data()), property->Length());
+    }
+    return QVariant();
+}
+
+template <>
 QVariant propertyToVariant<bool>(uint8_t property)
 {
     return static_cast<bool>(property);
diff --git a/common/propertymapper.h b/common/propertymapper.h
index fb5accc..efde72c 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -37,6 +37,8 @@ template <typename T>
 QVariant propertyToVariant(const flatbuffers::String *);
 template <typename T>
 QVariant propertyToVariant(uint8_t);
+template <typename T>
+QVariant propertyToVariant(const flatbuffers::Vector<uint8_t> *);
 
 
 /**
@@ -87,6 +89,15 @@ public:
             return propertyToVariant<T>((buffer->*f)());
         });
     }
+
+    template <typename T, typename Buffer>
+    void addMapping(const QByteArray &name, const flatbuffers::Vector<uint8_t> * (Buffer::*f)() const)
+    {
+        addMapping(name, [f](Buffer const *buffer) -> QVariant {
+            return propertyToVariant<T>((buffer->*f)());
+        });
+    }
+    
 private:
     QHash<QByteArray, std::function<QVariant(BufferType const *)> > mReadAccessors;
 };
@@ -137,6 +148,17 @@ public:
             };
         });
     }
+
+    template <typename T>
+    void addMapping(const QByteArray &name, void (BufferBuilder::*f)(flatbuffers::Offset<flatbuffers::Vector<uint8_t> >))
+    {
+        addMapping(name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+            auto offset = variantToProperty<T>(value, fbb);
+            return [offset, f](BufferBuilder &builder) {
+                (builder.*f)(offset);
+            };
+        });
+    }
 private:
     QHash<QByteArray, std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)> > mWriteAccessors;
 };