3 files changed, 86 insertions, 21 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index b0433be..df10327 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -64,6 +64,12 @@ ApplicationDomainType::~ApplicationDomainType()
 {
 }
 
+bool ApplicationDomainType::hasProperty(const QByteArray &key) const
+{
+    Q_ASSERT(mAdaptor);
+    return mAdaptor->availableProperties().contains(key);
+}
+
 QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 {
     Q_ASSERT(mAdaptor);
@@ -76,13 +82,18 @@ QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 void ApplicationDomainType::setProperty(const QByteArray &key, const QVariant &value)
 {
     Q_ASSERT(mAdaptor);
-    mChangeSet.insert(key, value);
+    mChangeSet.insert(key);
     mAdaptor->setProperty(key, value);
 }
 
+void ApplicationDomainType::setChangedProperties(const QSet<QByteArray> &changeset)
+{
+    mChangeSet = changeset;
+}
+
 QByteArrayList ApplicationDomainType::changedProperties() const
 {
-    return mChangeSet.keys();
+    return mChangeSet.toList();
 }
 
 qint64 ApplicationDomainType::revision() const
@@ -100,6 +111,36 @@ QByteArray ApplicationDomainType::identifier() const
     return mIdentifier;
 }
 
+Entity::~Entity()
+{
+
+}
+
+Event::~Event()
+{
+
+}
+
+Todo::~Todo()
+{
+
+}
+
+Mail::~Mail()
+{
+
+}
+
+Folder::~Folder()
+{
+
+}
+
+SinkResource::~SinkResource()
+{
+
+}
+
 template<>
 QByteArray getTypeName<Event>()
 {
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 63f030c..32d8999 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -19,9 +19,11 @@
  */
 #pragma once
 
+#include "sink_export.h"
 #include <QSharedPointer>
 #include <QVariant>
 #include <QByteArray>
+#include <QDebug>
 #include "bufferadaptor.h"
 
 namespace Sink {
@@ -35,7 +37,7 @@ namespace ApplicationDomain {
  *
  * ApplicationDomainTypes don't adhere to any standard and are meant to be extended frequently (hence the non-typesafe interface).
  */
-class ApplicationDomainType {
+class SINK_EXPORT ApplicationDomainType {
 public:
     typedef QSharedPointer<ApplicationDomainType> Ptr;
 
@@ -55,16 +57,19 @@ public:
 
     virtual ~ApplicationDomainType();
 
-    virtual QVariant getProperty(const QByteArray &key) const;
-    virtual void setProperty(const QByteArray &key, const QVariant &value);
-    virtual QByteArrayList changedProperties() const;
+    bool hasProperty(const QByteArray &key) const;
+    QVariant getProperty(const QByteArray &key) const;
+    void setProperty(const QByteArray &key, const QVariant &value);
+    void setChangedProperties(const QSet<QByteArray> &changeset);
+    QByteArrayList changedProperties() const;
     qint64 revision() const;
     QByteArray resourceInstanceIdentifier() const;
     QByteArray identifier() const;
 
 private:
+    friend QDebug operator<<(QDebug, const ApplicationDomainType &);
     QSharedPointer<BufferAdaptor> mAdaptor;
-    QHash<QByteArray, QVariant> mChangeSet;
+    QSet<QByteArray> mChangeSet;
     /*
      * Each domain object needs to store the resource, identifier, revision triple so we can link back to the storage location.
      */
@@ -82,34 +87,50 @@ inline bool operator==(const ApplicationDomainType& lhs, const ApplicationDomain
             && lhs.resourceInstanceIdentifier() == rhs.resourceInstanceIdentifier();
 }
 
-struct Entity : public ApplicationDomainType {
+inline QDebug operator<< (QDebug d, const ApplicationDomainType &type)
+{
+    d << "ApplicationDomainType(\n";
+    for (const auto &property : type.mAdaptor->availableProperties()) {
+        d << " " << property << "\t" << type.getProperty(property) << "\n";
+    }
+    d << ")";
+    return d;
+}
+
+struct SINK_EXPORT Entity : public ApplicationDomainType {
     typedef QSharedPointer<Entity> Ptr;
     using ApplicationDomainType::ApplicationDomainType;
+    virtual ~Entity();
 };
 
-struct Event : public Entity {
+struct SINK_EXPORT Event : public Entity {
     typedef QSharedPointer<Event> Ptr;
     using Entity::Entity;
+    virtual ~Event();
 };
 
-struct Todo : public Entity {
+struct SINK_EXPORT Todo : public Entity {
     typedef QSharedPointer<Todo> Ptr;
     using Entity::Entity;
+    virtual ~Todo();
 };
 
-struct Calendar : public Entity {
+struct SINK_EXPORT Calendar : public Entity {
     typedef QSharedPointer<Calendar> Ptr;
     using Entity::Entity;
+    virtual ~Calendar();
 };
 
-struct Mail : public Entity {
+struct SINK_EXPORT Mail : public Entity {
     typedef QSharedPointer<Mail> Ptr;
     using Entity::Entity;
+    virtual ~Mail();
 };
 
-struct Folder : public Entity {
+struct SINK_EXPORT Folder : public Entity {
     typedef QSharedPointer<Folder> Ptr;
     using Entity::Entity;
+    virtual ~Folder();
 };
 
 /**
@@ -118,9 +139,10 @@ struct Folder : public Entity {
  * This type is used for configuration of resources,
  * and for creating and removing resource instances.
  */
-struct SinkResource : public ApplicationDomainType {
+struct SINK_EXPORT SinkResource : public ApplicationDomainType {
     typedef QSharedPointer<SinkResource> Ptr;
     using ApplicationDomainType::ApplicationDomainType;
+    virtual ~SinkResource();
 };
 
 /**
@@ -129,22 +151,22 @@ struct SinkResource : public ApplicationDomainType {
  * Do not store these types to disk, they may change over time.
  */
 template<class DomainType>
-QByteArray getTypeName();
+QByteArray SINK_EXPORT getTypeName();
 
 template<>
-QByteArray getTypeName<Event>();
+QByteArray SINK_EXPORT getTypeName<Event>();
 
 template<>
-QByteArray getTypeName<Todo>();
+QByteArray SINK_EXPORT getTypeName<Todo>();
 
 template<>
-QByteArray getTypeName<SinkResource>();
+QByteArray SINK_EXPORT getTypeName<SinkResource>();
 
 template<>
-QByteArray getTypeName<Mail>();
+QByteArray SINK_EXPORT getTypeName<Mail>();
 
 template<>
-QByteArray getTypeName<Folder>();
+QByteArray SINK_EXPORT getTypeName<Folder>();
 
 /**
  * Type implementation.
@@ -153,7 +175,7 @@ QByteArray getTypeName<Folder>();
  * Contains all non-resource specific, but type-specific code.
  */
 template<typename DomainType>
-class TypeImplementation;
+class SINK_EXPORT TypeImplementation;
 
 }
 }
diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index 9f81eb8..4210125 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -69,6 +69,7 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImple
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
     propertyMapper->addMapping<QString, Buffer>("summary", &Buffer::summary);
+    propertyMapper->addMapping<QString, Buffer>("description", &Buffer::description);
     propertyMapper->addMapping<QString, Buffer>("uid", &Buffer::uid);
     propertyMapper->addMapping<QByteArray, Buffer>("attachment", &Buffer::attachment);
     return propertyMapper;
@@ -78,6 +79,7 @@ QSharedPointer<WritePropertyMapper<TypeImplementation<Event>::BufferBuilder> > T
 {
     auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
     propertyMapper->addMapping<QString>("summary", &BufferBuilder::add_summary);
+    propertyMapper->addMapping<QString>("description", &BufferBuilder::add_description);
     propertyMapper->addMapping<QString>("uid", &BufferBuilder::add_uid);
     propertyMapper->addMapping<QByteArray>("attachment", &BufferBuilder::add_attachment);
     return propertyMapper;