3 files changed, 6 insertions, 5 deletions

diff --git a/common/facade.cpp b/common/facade.cpp
index cdd06f9..1045dac 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -64,7 +64,7 @@ KAsync::Job<void> GenericFacade<DomainType>::create(const DomainType &domainObje
     }
     flatbuffers::FlatBufferBuilder entityFbb;
     mDomainTypeAdaptorFactory->createBuffer(domainObject, entityFbb);
-    return mResourceAccess->sendCreateCommand(bufferTypeForDomainType(), BufferUtils::extractBuffer(entityFbb));
+    return mResourceAccess->sendCreateCommand(domainObject.identifier(), bufferTypeForDomainType(), BufferUtils::extractBuffer(entityFbb));
 }
 
 template <class DomainType>
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 33820af..458694f 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -293,13 +293,14 @@ KAsync::Job<void> ResourceAccess::synchronizeResource(bool sourceSync, bool loca
     return sendCommand(Commands::SynchronizeCommand, fbb);
 }
 
-KAsync::Job<void> ResourceAccess::sendCreateCommand(const QByteArray &resourceBufferType, const QByteArray &buffer)
+KAsync::Job<void> ResourceAccess::sendCreateCommand(const QByteArray &uid, const QByteArray &resourceBufferType, const QByteArray &buffer)
 {
     flatbuffers::FlatBufferBuilder fbb;
+    auto entityId = fbb.CreateString(uid.constData());
     // This is the resource buffer type and not the domain type
     auto type = fbb.CreateString(resourceBufferType.constData());
     auto delta = Sink::EntityBuffer::appendAsVector(fbb, buffer.constData(), buffer.size());
-    auto location = Sink::Commands::CreateCreateEntity(fbb, 0, type, delta);
+    auto location = Sink::Commands::CreateCreateEntity(fbb, entityId, type, delta);
     Sink::Commands::FinishCreateEntityBuffer(fbb, location);
     open();
     return sendCommand(Sink::Commands::CreateEntityCommand, fbb);
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index 60f29e9..b9eaacd 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -50,7 +50,7 @@ public:
     virtual KAsync::Job<void> sendCommand(int commandId, flatbuffers::FlatBufferBuilder &fbb) = 0;
     virtual KAsync::Job<void> synchronizeResource(bool remoteSync, bool localSync) = 0;
 
-    virtual KAsync::Job<void> sendCreateCommand(const QByteArray &resourceBufferType, const QByteArray &buffer)
+    virtual KAsync::Job<void> sendCreateCommand(const QByteArray &uid, const QByteArray &resourceBufferType, const QByteArray &buffer)
     {
         return KAsync::null<void>();
     };
@@ -97,7 +97,7 @@ public:
     KAsync::Job<void> sendCommand(int commandId) Q_DECL_OVERRIDE;
     KAsync::Job<void> sendCommand(int commandId, flatbuffers::FlatBufferBuilder &fbb) Q_DECL_OVERRIDE;
     KAsync::Job<void> synchronizeResource(bool remoteSync, bool localSync) Q_DECL_OVERRIDE;
-    KAsync::Job<void> sendCreateCommand(const QByteArray &resourceBufferType, const QByteArray &buffer) Q_DECL_OVERRIDE;
+    KAsync::Job<void> sendCreateCommand(const QByteArray &uid, const QByteArray &resourceBufferType, const QByteArray &buffer) Q_DECL_OVERRIDE;
     KAsync::Job<void>
     sendModifyCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType, const QByteArrayList &deletedProperties, const QByteArray &buffer) Q_DECL_OVERRIDE;
     KAsync::Job<void> sendDeleteCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType) Q_DECL_OVERRIDE;