A working mailtransport resource

5 files changed, 28 insertions, 3 deletions

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 12a9e56..928ea58 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -211,6 +211,7 @@ struct SINK_EXPORT Mail : public Entity {
     SINK_BLOB_PROPERTY(MimeMessage, mimeMessage);
     SINK_PROPERTY(bool, Draft, draft);
     SINK_PROPERTY(bool, Trash, trash);
+    SINK_PROPERTY(bool, Sent, sent);
 };
 
 /**
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index dd4eca8..5b35a9a 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -86,6 +86,7 @@ QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplem
     propertyMapper->addMapping<Mail::MimeMessage, Buffer>(&Buffer::mimeMessage);
     propertyMapper->addMapping<Mail::Draft, Buffer>(&Buffer::draft);
     propertyMapper->addMapping<Mail::Trash, Buffer>(&Buffer::trash);
+    propertyMapper->addMapping<Mail::Sent, Buffer>(&Buffer::sent);
     return propertyMapper;
 }
 
@@ -104,5 +105,6 @@ QSharedPointer<WritePropertyMapper<TypeImplementation<Mail>::BufferBuilder> > Ty
     propertyMapper->addMapping<Mail::MimeMessage>(&BufferBuilder::add_mimeMessage);
     propertyMapper->addMapping<Mail::Draft>(&BufferBuilder::add_draft);
     propertyMapper->addMapping<Mail::Trash>(&BufferBuilder::add_trash);
+    propertyMapper->addMapping<Mail::Sent>(&BufferBuilder::add_sent);
     return propertyMapper;
 }
diff --git a/common/domain/mail.fbs b/common/domain/mail.fbs
index 3a84ca1..a0c0d82 100644
--- a/common/domain/mail.fbs
+++ b/common/domain/mail.fbs
@@ -12,6 +12,7 @@ table Mail {
   mimeMessage:string;
   draft:bool = false;
   trash:bool = false;
+  sent:bool = false;
 }
 
 root_type Mail;
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index be969d2..ee7a7ba 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -92,17 +92,20 @@ void Synchronizer::createEntity(const QByteArray &sinkId, const QByteArray &buff
 void Synchronizer::modifyEntity(const QByteArray &sinkId, qint64 revision, const QByteArray &bufferType, const Sink::ApplicationDomain::ApplicationDomainType &domainObject,
     DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<void(const QByteArray &)> callback)
 {
+    // FIXME removals
+    QByteArrayList deletedProperties;
     // These changes are coming from the source
     const auto replayToSource = false;
     flatbuffers::FlatBufferBuilder entityFbb;
     adaptorFactory.createBuffer(domainObject, entityFbb);
     flatbuffers::FlatBufferBuilder fbb;
     auto entityId = fbb.CreateString(sinkId.toStdString());
+    auto modifiedProperties = BufferUtils::toVector(fbb, domainObject.changedProperties());
+    auto deletions = BufferUtils::toVector(fbb, deletedProperties);
     // This is the resource type and not the domain type
     auto type = fbb.CreateString(bufferType.toStdString());
     auto delta = Sink::EntityBuffer::appendAsVector(fbb, entityFbb.GetBufferPointer(), entityFbb.GetSize());
-    // FIXME removals
-    auto location = Sink::Commands::CreateModifyEntity(fbb, revision, entityId, 0, type, delta, replayToSource);
+    auto location = Sink::Commands::CreateModifyEntity(fbb, revision, entityId, deletions, type, delta, replayToSource, modifiedProperties);
     Sink::Commands::FinishModifyEntityBuffer(fbb, location);
     callback(BufferUtils::extractBuffer(fbb));
 }
@@ -223,6 +226,16 @@ void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray
     }
 }
 
+template<typename DomainType>
+void Synchronizer::modify(const DomainType &entity)
+{
+    const auto bufferType = ApplicationDomain::getTypeName<DomainType>();
+    const auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(mResourceType, bufferType);
+    Q_ASSERT(adaptorFactory);
+    modifyEntity(entity.identifier(), entity.revision(), bufferType, entity, *adaptorFactory,
+                    [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::ModifyEntityCommand, buffer); });
+}
+
 KAsync::Job<void> Synchronizer::synchronize()
 {
     Trace() << "Synchronizing";
@@ -263,7 +276,8 @@ Sink::Storage::Transaction &Synchronizer::syncTransaction()
 }
 
 #define REGISTER_TYPE(T)                                                          \
-    template void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const T &entity, const QHash<QByteArray, Sink::Query::Comparator> &mergeCriteria)
+    template void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const T &entity, const QHash<QByteArray, Sink::Query::Comparator> &mergeCriteria); \
+    template void Synchronizer::modify(const T &entity);
 
 REGISTER_TYPE(ApplicationDomain::Event);
 REGISTER_TYPE(ApplicationDomain::Mail);
diff --git a/common/synchronizer.h b/common/synchronizer.h
index 6521876..6f98f35 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -86,6 +86,13 @@ protected:
     template <typename DomainType>
     void createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const DomainType &entity, const QHash<QByteArray, Sink::Query::Comparator> &mergeCriteria);
 
+    // template <typename DomainType>
+    // void create(const DomainType &entity);
+    template <typename DomainType>
+    void modify(const DomainType &entity);
+    // template <typename DomainType>
+    // void remove(const DomainType &entity);
+
     virtual KAsync::Job<void> synchronizeWithSource() = 0;
 
 private: