refactor: use SnowflakeAwareEntity

lib/Migration/Version23000Date20251105125333.php

@@ -64,10 +64,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 				'notnull' => false,
 				'default' => null,
 			]);
-			$table->addColumn('created_at', Types::DATETIME, [
-				'notnull' => false,
-				'default' => null,
-			]);
+			/** Removed in @see Version23000Date20260107162758 */
+			// $table->addColumn('created_at', Types::DATETIME, [
+			// 'notnull' => false,
+			// 'default' => null,
+			// ]);
 			$table->addColumn('send_at', Types::DATETIME, [
 				'notnull' => false,
 				'default' => null,

lib/Migration/Version23000Date20260107162758.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+use Override;
+
+/**
+ * Remove createdAt column from scheduled messages as the property is overlapping with snowflake aware entity now
+ */
+class Version23000Date20260107162758 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	#[Override]
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		$schema = $schemaClosure();
+
+		$table = $schema->getTable('talk_scheduled_msg');
+		if (!$table->hasColumn('created_at')) {
+			return null;
+		}
+
+		$table->dropColumn('created_at');
+		return $schema;
+	}
+}

lib/Model/ScheduledMessage.php

@@ -11,13 +11,11 @@
 
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\ResponseDefinitions;
-use OCP\AppFramework\Db\Entity;
+use OCP\AppFramework\Db\SnowflakeAwareEntity;
 use OCP\Comments\MessageTooLongException;
 use OCP\DB\Types;
 
 /**
- * @method string getId()
- * @method void setId(string $id)
  * @method void setRoomId(int $roomId)
  * @method int getRoomId()
  * @method void setActorId(string $actorId)
@@ -31,14 +29,12 @@
  * @method string getMessage()
  * @method void setMessageType(string $messageType)
  * @method string getMessageType()
- * @method \DateTime getCreatedAt()
- * @method void setCreatedAt(\DateTime $createdAt)
  * @method void setSendAt(\DateTime|null $sendAt)
  * @method \DateTime|null getSendAt()
  *
  * @psalm-import-type TalkScheduledMessage from ResponseDefinitions
  */
-class ScheduledMessage extends Entity {
+class ScheduledMessage extends SnowflakeAwareEntity {
 	public const METADATA_THREAD_TITLE = 'threadTitle';
 	public const METADATA_THREAD_ID = 'threadId';
 	public const METADATA_SILENT = 'silent';
@@ -53,7 +49,6 @@ class ScheduledMessage extends Entity {
 	protected string $message = '';
 	protected string $messageType = '';
 	protected ?string $metaData = null;
-	protected ?\DateTime $createdAt = null;
 	protected ?\DateTime $sendAt = null;
 
 	public function __construct() {
@@ -66,7 +61,6 @@ public function __construct() {
 		$this->addType('messageType', Types::STRING);
 		$this->addType('metaData', Types::TEXT);
 		$this->addType('sendAt', Types::DATETIME);
-		$this->addType('createdAt', Types::DATETIME);
 	}
 
 	/**
@@ -109,13 +103,13 @@ public function setMessage(string $message): void {
 	public function toArray(string $format, ?Message $parent, ?Thread $thread) : array {
 		$metaData = $this->getDecodedMetaData();
 		$data = [
-			'id' => (string)$this->id,
+			'id' => (string)$this->getId(),
 			'actorId' => $this->getActorId(),
 			'actorType' => $this->getActorType(),
 			'threadId' => $this->getThreadId(),
 			'message' => $this->getMessage(),
 			'messageType' => $this->getMessageType(),
-			'createdAt' => $this->getCreatedAt()->getTimestamp(),
+			'createdAt' => $this->getCreatedAt()?->getTimestamp() ?? 0,
 			'sendAt' => $this->getSendAt()?->getTimestamp() ?? 0,
 			'silent' => $metaData[self::METADATA_SILENT] ?? false,
 		];

lib/Model/ScheduledMessageMapper.php

@@ -10,11 +10,9 @@
 
 use OCA\Talk\Room;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
-use OCP\Snowflake\IGenerator;
 
 /**
  * @method ScheduledMessage mapRowToEntity(array $row)
@@ -27,7 +25,6 @@
 class ScheduledMessageMapper extends QBMapper {
 	public function __construct(
 		IDBConnection $db,
-		protected IGenerator $generator,
 	) {
 		parent::__construct($db, 'talk_scheduled_msg', ScheduledMessage::class);
 	}
@@ -125,11 +122,4 @@ public function getMessagesDue(\DateTimeInterface $dateTime): array {
 
 		return $this->findEntities($query);
 	}
-
-	#[\Override]
-	public function insert(Entity $entity): Entity {
-		/** @psalm-suppress InvalidArgument */
-		$entity->setId($this->generator->nextId());
-		return parent::insert($entity);
-	}
 }

lib/Service/ScheduledMessageService.php

@@ -65,7 +65,6 @@ public function scheduleMessage(
 		}
 		$scheduledMessage->setThreadId($threadId);
 		$scheduledMessage->setMetaData($metadata);
-		$scheduledMessage->setCreatedAt($this->timeFactory->getDateTime());
 
 		$this->scheduledMessageMapper->insert($scheduledMessage);