4 files changed, 65 insertions, 9 deletions

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index dcd401c..f2216da 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -242,6 +242,14 @@ public:
         return object;
     }
 
+    template <class DomainType>
+    static DomainType createCopy(const QByteArray &identifier, const DomainType &original)
+    {
+        DomainType object(original);
+        object.mIdentifier = identifier;
+        return object;
+    }
+
     virtual ~ApplicationDomainType();
 
     bool hasProperty(const QByteArray &key) const;
diff --git a/common/store.cpp b/common/store.cpp
index 022c40e..ad2bb1c 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -195,9 +195,8 @@ template <class DomainType>
 KAsync::Job<void> Store::create(const DomainType &domainObject)
 {
     SinkLog() << "Create: " << domainObject;
-    // Potentially move to separate thread as well
     auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
-    return facade->create(domainObject).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to create"; });
+    return facade->create(domainObject).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to create " << error; });
 }
 
 template <class DomainType>
@@ -208,8 +207,15 @@ KAsync::Job<void> Store::modify(const DomainType &domainObject)
         return KAsync::null();
     }
     SinkLog() << "Modify: " << domainObject;
-    // Potentially move to separate thread as well
     auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+    if (domainObject.isAggregate()) {
+        return KAsync::value(domainObject.aggregatedIds())
+            .addToContext(std::shared_ptr<void>(facade))
+            .each([=] (const QByteArray &id) {
+                auto object = Sink::ApplicationDomain::ApplicationDomainType::createCopy(id, domainObject);
+                return facade->modify(object).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to modify " << error; });
+        });
+    }
     return facade->modify(domainObject).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to modify"; });
 }
 
@@ -235,27 +241,48 @@ template <class DomainType>
 KAsync::Job<void> Store::move(const DomainType &domainObject, const QByteArray &newResource)
 {
     SinkLog() << "Move: " << domainObject << newResource;
-    // Potentially move to separate thread as well
     auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
-    return facade->move(domainObject, newResource).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to move"; });
+    if (domainObject.isAggregate()) {
+        return KAsync::value(domainObject.aggregatedIds())
+            .addToContext(std::shared_ptr<void>(facade))
+            .each([=] (const QByteArray &id) {
+                auto object = Sink::ApplicationDomain::ApplicationDomainType::createCopy(id, domainObject);
+                return facade->move(object, newResource).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to move " << error; });
+        });
+    }
+    return facade->move(domainObject, newResource).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to move " << error; });
 }
 
 template <class DomainType>
 KAsync::Job<void> Store::copy(const DomainType &domainObject, const QByteArray &newResource)
 {
     SinkLog() << "Copy: " << domainObject << newResource;
-    // Potentially copy to separate thread as well
     auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
-    return facade->copy(domainObject, newResource).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to copy"; });
+    if (domainObject.isAggregate()) {
+        return KAsync::value(domainObject.aggregatedIds())
+            .addToContext(std::shared_ptr<void>(facade))
+            .each([=] (const QByteArray &id) {
+                auto object = Sink::ApplicationDomain::ApplicationDomainType::createCopy(id, domainObject);
+                return facade->copy(object, newResource).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to copy " << error; });
+        });
+    }
+    return facade->copy(domainObject, newResource).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to copy " << error; });
 }
 
 template <class DomainType>
 KAsync::Job<void> Store::remove(const DomainType &domainObject)
 {
     SinkLog() << "Remove: " << domainObject;
-    // Potentially move to separate thread as well
     auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
-    return facade->remove(domainObject).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to remove"; });
+    if (domainObject.isAggregate()) {
+        return KAsync::value(domainObject.aggregatedIds())
+            .addToContext(std::shared_ptr<void>(facade))
+            .each([=] (const QByteArray &id) {
+                auto object = Sink::ApplicationDomain::ApplicationDomainType::createCopy(id, domainObject);
+                return facade->remove(object).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to remove " << error; });
+        });
+    }
+    return facade->remove(domainObject).addToContext(std::shared_ptr<void>(facade)).onError([](const KAsync::Error &error) { SinkWarning() << "Failed to remove " << error; });
 }
 
 template <class DomainType>
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 3582a3c..e2f3543 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -412,6 +412,26 @@ private slots:
         }
     }
 
+    void testAggregateModify()
+    {
+        auto facade = setupFacade<Sink::ApplicationDomain::Event>("dummyresource.instance1");
+        facade->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("dummyresource.instance1", "id1", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        facade->results << QSharedPointer<Sink::ApplicationDomain::Event>::create("dummyresource.instance1", "id2", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+
+        Sink::ApplicationDomain::Event modification("dummyresource.instance1", "id1", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        modification.aggregatedIds() << "id1" << "id2";
+        modification.setUid("modifiedUid2");
+
+        Sink::Store::modify(modification).exec().waitForFinished();
+        QCOMPARE(facade->modifications.size(), 2);
+        for (const auto &m : facade->modifications) {
+            QCOMPARE(m.getUid(), {"modifiedUid2"});
+        }
+
+        Sink::Store::remove(modification).exec().waitForFinished();
+        QCOMPARE(facade->removals.size(), 2);
+    }
+
     void testModelStress()
     {
         auto facade = setupFacade<Sink::ApplicationDomain::Folder>("dummyresource.instance1");
diff --git a/tests/mailthreadtest.cpp b/tests/mailthreadtest.cpp
index eabfc81..8c325d8 100644
--- a/tests/mailthreadtest.cpp
+++ b/tests/mailthreadtest.cpp
@@ -78,6 +78,7 @@ void MailThreadTest::testListThreadLeader()
     QVERIFY(mails.first().getSubject().startsWith(QString("ThreadLeader")));
     auto threadSize = mails.first().getProperty("count").toInt();
     QCOMPARE(threadSize, 2);
+    QCOMPARE(mails.first().aggregatedIds().size(), 2);
 }
 
 /*