feat: send import finished notification to View receipients

Signed-off-by: Luka Trovic <luka@nextcloud.com>

Author: luka-nextcloud

lib/Activity/ActivityManager.php

@@ -787,7 +787,8 @@ public function getActivityMessage($language, $subjectIdentifier) {
 	}
 
 	public function findRecipientsByElement(Table|View $element): array {
-		$cacheKey = 'element_recipients_' . $element->getId();
+		$elementType = $element instanceof Table ? 'table' : 'view';
+		$cacheKey = 'element_recipients_' . $elementType . '_' . $element->getId();
 		$cached = $this->cache->get($cacheKey);
 		if ($cached !== null) {
 			return $cached;
@@ -800,13 +801,7 @@ public function findRecipientsByElement(Table|View $element): array {
 			$recipients[] = $owner;
 		}
 
-		if ($element instanceof View) {
-			$recipients = array_merge($recipients, $this->shareService->findSharedWithUserIds($element->getId(), 'view'));
-		}
-		if ($element instanceof Table) {
-			$recipients = array_merge($recipients, $this->shareService->findSharedWithUserIds($element->getId(), 'table'));
-		}
-
+		$recipients = array_merge($recipients, $this->shareService->findSharedWithUserIds($element->getId(), $elementType));
 		$recipients = array_unique($recipients);
 		$this->cache->set($cacheKey, $recipients);
 		return $recipients;

lib/BackgroundJob/ImportTableJob.php

@@ -81,11 +81,20 @@ public function run($argument): void {
 			],
 			author: $userId
 		);
-		$this->notificationHelper->sendNotification(
-			objectType: ActivityManager::TABLES_OBJECT_TABLE,
-			object: $this->tableMapper->find($tableId),
-			subject: ActivityManager::SUBJECT_IMPORT_FINISHED,
-			author: $userId
-		);
+		if ($viewId) {
+			$this->notificationHelper->sendNotification(
+				objectType: ActivityManager::TABLES_OBJECT_VIEW,
+				object: $this->viewMapper->find($viewId),
+				subject: ActivityManager::SUBJECT_IMPORT_FINISHED,
+				author: $userId
+			);
+		} else {
+			$this->notificationHelper->sendNotification(
+				objectType: ActivityManager::TABLES_OBJECT_TABLE,
+				object: $this->tableMapper->find($tableId),
+				subject: ActivityManager::SUBJECT_IMPORT_FINISHED,
+				author: $userId
+			);
+		}
 	}
 }

lib/Notification/NotificationHelper.php

@@ -43,19 +43,24 @@ public function __construct(
 	}
 
 	/**
-	 * @param Table|Row2|Column $object
+	 * @param Table|View|Row2|Column $object
 	 * @param string $subject
 	 * @param array<string, mixed> $additionalParams
 	 * @param string|null $author
 	 */
-	public function sendNotification(string $objectType, Table|Row2|Column $object, string $subject, array $additionalParams = [], ?string $author = null): void {
+	public function sendNotification(string $objectType, Table|View|Row2|Column $object, string $subject, array $additionalParams = [], ?string $author = null): void {
 		try {
 			switch ($objectType) {
 				case ActivityManager::TABLES_OBJECT_TABLE:
 					if ($object instanceof Table) {
 						$this->sendTableNotification($object, $subject, $author);
 					}
 					break;
+				case ActivityManager::TABLES_OBJECT_VIEW:
+					if ($object instanceof View) {
+						$this->sendViewNotification($object, $subject, $author);
+					}
+					break;
 				case ActivityManager::TABLES_OBJECT_ROW:
 					if ($object instanceof Row2) {
 						$this->sendRowNotification($object, $subject, $additionalParams, $author);
@@ -97,6 +102,26 @@ private function sendTableNotification(Table $object, string $subject, ?string $
 		);
 	}
 
+	private function sendViewNotification(View $object, string $subject, ?string $author): void {
+		$subjectParams = [
+			'author' => $author,
+			'objectType' => ActivityManager::TABLES_OBJECT_VIEW,
+			'view' => [
+				'id' => $object->getId(),
+				'title' => $object->getTitle(),
+			],
+		];
+		$this->sendNotifiesByElement(
+			element: $object,
+			subject: $subject,
+			subjectParams: $subjectParams,
+			objectType: ActivityManager::TABLES_OBJECT_VIEW,
+			objectId: (string)$object->getId(),
+			authorId: null,
+			configKey: null,
+		);
+	}
+
 	/**
 	 * @param string|null $author
 	 */

lib/Notification/Notifier.php

@@ -294,9 +294,23 @@ public function prepare(INotification $notification, string $languageCode): INot
 				break;
 
 			case ActivityManager::SUBJECT_IMPORT_FINISHED:
-				$link = $richParams['table']['link'];
+				$link = $hasViewContext ? $richParams['view']['link'] : $richParams['table']['link'];
 				$recipient = $notification->getUser();
 				$isActivityOwner = $params['author'] === $recipient;
+				if ($hasViewContext) {
+					$parsedSubject = $isActivityOwner
+						? $l->t('You have imported file to view {view}', [
+							$richParams['view']['name'] ?? '',
+						])
+						: $l->t('{user} has imported file to view {view}', [
+							$richParams['user']['name'] ?? '',
+							$richParams['view']['name'] ?? '',
+						]);
+					$subject = $isActivityOwner
+						? $l->t('You have imported file to view {view}')
+						: $l->t('{user} has imported file to view {view}');
+					break;
+				}
 				$parsedSubject = $isActivityOwner
 					? $l->t('You have imported file to table {table}', [
 						$richParams['table']['name'] ?? '',