Moved default read/write property mapper to TypeImplementation

There is always exactly one default buffer that we can centralize
in TypeImplementation.

3 files changed, 56 insertions, 6 deletions

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 2de1460..f2a4ad6 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -130,5 +130,14 @@ QByteArray getTypeName<Todo>();
 template<>
 QByteArray getTypeName<AkonadiResource>();
 
+/**
+ * Type implementation.
+ * 
+ * Needs to be implemented for every application domain type.
+ * Contains all non-resource specific, but type-specific code.
+ */
+template<typename DomainType>
+class TypeImplementation;
+
 }
 }
diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index 86100b7..ea0931c 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -20,15 +20,19 @@
 
 #include <QVector>
 #include <QByteArray>
+#include <QString>
 
 #include "../resultset.h"
 #include "../index.h"
 #include "../storage.h"
 #include "../log.h"
+#include "../propertymapper.h"
+
+#include "event_generated.h"
 
 using namespace Akonadi2::ApplicationDomain;
 
-ResultSet EventImplementation::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier)
+ResultSet TypeImplementation<Event>::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier)
 {
     QVector<QByteArray> keys;
     if (query.propertyFilter.contains("uid")) {
@@ -43,7 +47,7 @@ ResultSet EventImplementation::queryIndexes(const Akonadi2::Query &query, const
     return ResultSet(keys);
 }
 
-void EventImplementation::index(const Event &type)
+void TypeImplementation<Event>::index(const Event &type)
 {
     Index uidIndex(Akonadi2::Store::storageLocation(), type.resourceInstanceIdentifier() + "index.uid", Akonadi2::Storage::ReadWrite);
     const auto uid = type.getProperty("uid");
@@ -51,3 +55,29 @@ void EventImplementation::index(const Event &type)
         uidIndex.add(uid.toByteArray(), type.identifier());
     }
 }
+
+QSharedPointer<ReadPropertyMapper<Buffer::Event> > TypeImplementation<Event>::initializeReadPropertyMapper()
+{
+    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer::Event> >::create();
+    propertyMapper->addMapping("summary", [](Buffer::Event const *buffer) -> QVariant {
+        return propertyToVariant<QString>(buffer->summary());
+    });
+    propertyMapper->addMapping("uid", [](Buffer::Event const *buffer) -> QVariant {
+        return propertyToVariant<QString>(buffer->uid());
+    });
+    return propertyMapper;
+}
+
+QSharedPointer<WritePropertyMapper<Buffer::EventBuilder> > TypeImplementation<Event>::initializeWritePropertyMapper()
+{
+    auto propertyMapper = QSharedPointer<WritePropertyMapper<Buffer::EventBuilder> >::create();
+    propertyMapper->addMapping("summary", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(Buffer::EventBuilder &)> {
+        auto offset = variantToProperty<QString>(value, fbb);
+        return [offset](Buffer::EventBuilder &builder) { builder.add_summary(offset); };
+    });
+    propertyMapper->addMapping("uid", [](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(Buffer::EventBuilder &)> {
+        auto offset = variantToProperty<QString>(value, fbb);
+        return [offset](Buffer::EventBuilder &builder) { builder.add_uid(offset); };
+    });
+    return propertyMapper;
+}
diff --git a/common/domain/event.h b/common/domain/event.h
index 4cb0d34..d4ce20e 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -23,23 +23,34 @@
 class ResultSet;
 class QByteArray;
 
+template<typename T>
+class ReadPropertyMapper;
+template<typename T>
+class WritePropertyMapper;
+
 namespace Akonadi2 {
     class Query;
 
 namespace ApplicationDomain {
+    namespace Buffer {
+        class Event;
+        class EventBuilder;
+    }
 
 /**
  * Implements all type-specific code such as updating and querying indexes.
  */
-namespace EventImplementation {
-    typedef Event DomainType;
+template<>
+struct TypeImplementation<Akonadi2::ApplicationDomain::Event> {
     /**
      * Returns the potential result set based on the indexes.
      * 
      * An empty result set indicates that a full scan is required.
      */
-    ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier);
-    void index(const Event &type);
+    static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier);
+    static void index(const Event &type);
+    static QSharedPointer<ReadPropertyMapper<Akonadi2::ApplicationDomain::Buffer::Event> > initializeReadPropertyMapper();
+    static QSharedPointer<WritePropertyMapper<Akonadi2::ApplicationDomain::Buffer::EventBuilder> > initializeWritePropertyMapper();
 };
 
 }