3 files changed, 26 insertions, 6 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index fccf082..1649cb4 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -76,13 +76,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
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index ca1ec1b..ce35af0 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -23,6 +23,7 @@
 #include <QSharedPointer>
 #include <QVariant>
 #include <QByteArray>
+#include <QDebug>
 #include "bufferadaptor.h"
 
 namespace Sink {
@@ -56,16 +57,18 @@ public:
 
     virtual ~ApplicationDomainType();
 
-    virtual QVariant getProperty(const QByteArray &key) const;
-    virtual void setProperty(const QByteArray &key, const QVariant &value);
-    virtual QByteArrayList changedProperties() 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.
      */
@@ -83,6 +86,16 @@ inline bool operator==(const ApplicationDomainType& lhs, const ApplicationDomain
             && lhs.resourceInstanceIdentifier() == rhs.resourceInstanceIdentifier();
 }
 
+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 SINKCOMMON_EXPORT Entity : public ApplicationDomainType {
     typedef QSharedPointer<Entity> Ptr;
     using ApplicationDomainType::ApplicationDomainType;
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;