Prevent causal read for outbox message and recipient inserts

The message and the recipients are inserted in one transaction but the
recipients are read another time outside a transaction. Read-write split
database clusters might not be in full sync mode and then reading the
recipients gives partial or no results.

The insert will assign the primary key value to the recipient entities.
Therefore we can skip reading the data.

Signed-off-by: Christoph Wurst <[email protected]>

lib/Db/LocalMessageMapper.php

@@ -32,6 +32,7 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use function array_merge;
 
 /**
  * @template-extends QBMapper<LocalMessage>
@@ -177,8 +178,11 @@ public function saveWithRecipients(LocalMessage $message, array $to, array $cc,
 			$this->db->rollBack();
 			throw $e;
 		}
-		$recipients = $this->recipientMapper->findByLocalMessageId($message->getId());
-		$message->setRecipients($recipients);
+		$message->setRecipients(array_merge(
+			$to,
+			$cc,
+			$bcc,
+		));
 		return $message;
 	}
 

lib/Db/RecipientMapper.php

@@ -84,9 +84,6 @@ public function deleteForLocalMessage(int $localMessageId): void {
 	 * @param Recipient[] $recipients
 	 */
 	public function saveRecipients(int $localMessageId, array $recipients): void {
-		if (empty($recipients)) {
-			return;
-		}
 		foreach ($recipients as $recipient) {
 			$recipient->setLocalMessageId($localMessageId);
 			$this->insert($recipient);

tests/Integration/Service/OutboxServiceIntegrationTest.php

@@ -160,9 +160,7 @@ public function testSaveAndGetMessage(): void {
 		$this->assertNotEmpty($message->getRecipients());
 		$this->assertEmpty($message->getAttachments());
 
-		$retrieved->resetUpdatedFields();
-		$saved->resetUpdatedFields();
-		$this->assertEquals($saved, $retrieved); // Assure both operations are identical
+		self::assertCount(1, $retrieved->getRecipients());
 	}
 
 	public function testSaveAndGetMessages(): void {