Register the landing page of new collectives in our database (Fixes: #197)

Author: mejo-

lib/Mount/CollectiveFolderManager.php

@@ -212,13 +212,14 @@ public function getFolder(int $id): Folder {
 	}
 
 	/**
-	 * @param int  $id
+	 * @param int    $id
 	 * @param string $lang
 	 *
+	 * @return Folder
 	 * @throws InvalidPathException
 	 * @throws NotPermittedException
 	 */
-	public function createFolder(int $id, string $lang): void {
+	public function createFolder(int $id, string $lang): Folder {
 		try {
 			$folder = $this->getFolder($id);
 		} catch (NotFoundException $e) {
@@ -234,5 +235,7 @@ public function createFolder(int $id, string $lang): void {
 				$folder->newFile($landingPageFileName, $content);
 			}
 		}
+
+		return $folder;
 	}
 }

lib/Service/CollectiveService.php

@@ -2,11 +2,16 @@
 
 namespace OCA\Collectives\Service;
 
+use OC\Files\Node\File;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Db\CollectiveMapper;
+use OCA\Collectives\Db\Page;
+use OCA\Collectives\Db\PageMapper;
 use OCA\Collectives\Model\CollectiveInfo;
+use OCA\Collectives\Model\PageFile;
 use OCA\Collectives\Mount\CollectiveFolderManager;
 use OCP\Files\InvalidPathException;
+use OCP\Files\NotFoundException as FilesNotFoundException;
 use OCP\Files\NotPermittedException as FilesNotPermittedException;
 use OCP\IL10N;
 
@@ -23,6 +28,9 @@ class CollectiveService {
 	/** @var CircleHelper */
 	private $circleHelper;
 
+	/** @var PageMapper */
+	private $pageMapper;
+
 	/** @var IL10N */
 	private $l10n;
 
@@ -33,18 +41,21 @@ class CollectiveService {
 	 * @param CollectiveHelper        $collectiveHelper
 	 * @param CollectiveFolderManager $collectiveFolderManager
 	 * @param CircleHelper            $circleHelper
+	 * @param PageMapper              $pageMapper
 	 * @param IL10N                   $l10n
 	 */
 	public function __construct(
 		CollectiveMapper $collectiveMapper,
 		CollectiveHelper $collectiveHelper,
 		CollectiveFolderManager $collectiveFolderManager,
 		CircleHelper $circleHelper,
+		PageMapper $pageMapper,
 		IL10N $l10n) {
 		$this->collectiveMapper = $collectiveMapper;
 		$this->collectiveHelper = $collectiveHelper;
 		$this->collectiveFolderManager = $collectiveFolderManager;
 		$this->circleHelper = $circleHelper;
+		$this->pageMapper = $pageMapper;
 		$this->l10n = $l10n;
 	}
 
@@ -121,11 +132,26 @@ public function createCollective(string $userId, string $userLang, string $safeN
 
 		// Create folder for collective and optionally copy default landing page
 		try {
-			$this->collectiveFolderManager->createFolder($collective->getId(), $userLang);
+			$collectiveFolder = $this->collectiveFolderManager->createFolder($collective->getId(), $userLang);
 		} catch (InvalidPathException | FilesNotPermittedException $e) {
 			throw new NotPermittedException($e->getMessage());
 		}
 
+		// Register landing page
+		try {
+			$file = $collectiveFolder->get(PageFile::INDEX_PAGE_TITLE . PageFile::SUFFIX);
+			if (!$file instanceof File) {
+				throw new NotFoundException('Unable to get landing page for collective');
+			}
+
+			$page = new Page();
+			$page->setFileId($file->getId());
+			$page->setLastUserId($userId);
+			$this->pageMapper->updateOrInsert($page);
+		} catch (FilesNotFoundException | InvalidPathException $e) {
+			throw new NotFoundException($e->getMessage());
+		}
+
 		return [$collectiveInfo, $message];
 	}
 

tests/Unit/Service/CollectiveServiceTest.php

@@ -2,9 +2,12 @@
 
 namespace Unit\Service;
 
+use OC\Files\Node\File;
+use OC\Files\Node\Folder;
 use OCA\Circles\Model\Circle;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Db\CollectiveMapper;
+use OCA\Collectives\Db\PageMapper;
 use OCA\Collectives\Mount\CollectiveFolderManager;
 use OCA\Collectives\Service\CircleExistsException;
 use OCA\Collectives\Service\CircleHelper;
@@ -34,10 +37,25 @@ protected function setUp(): void {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$folder = $this->getMockBuilder(Folder::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$file = $this->getMockBuilder(File::class)
+			->disableOriginalConstructor()
+			->getMock();
+		$folder->method('get')
+			->willReturn($file);
+		$collectiveFolderManager->method('createFolder')
+			->willReturn($folder);
+
 		$this->circleHelper = $this->getMockBuilder(CircleHelper::class)
 			->disableOriginalConstructor()
 			->getMock();
 
+		$pageMapper = $this->getMockBuilder(PageMapper::class)
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->l10n = $this->getMockBuilder(IL10N::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -47,6 +65,7 @@ protected function setUp(): void {
 			$collectiveHelper,
 			$collectiveFolderManager,
 			$this->circleHelper,
+			$pageMapper,
 			$this->l10n
 		);
 	}

tests/psalm-baseline.xml

@@ -128,10 +128,11 @@
     </UndefinedDocblockClass>
   </file>
   <file src="lib/Service/CollectiveService.php">
-    <UndefinedClass occurrences="3">
+    <UndefinedClass occurrences="4">
       <code>$circle</code>
       <code>$circle</code>
       <code>$circle</code>
+      <code>File</code>
     </UndefinedClass>
   </file>
   <file src="lib/Versions/CollectiveVersion.php">