fix(api): use context to load document

Signed-off-by: Max <max@nextcloud.com>

Author: max-nextcloud

lib/Db/DocumentMapper.php

@@ -8,7 +8,6 @@
 namespace OCA\Text\Db;
 
 use Generator;
-use OCA\Text\Context\IContext;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -42,25 +41,19 @@ public function find(int $documentId): Document {
 		return Document::fromRow($data);
 	}
 
-	/**
-	 * @throws DoesNotExistException
-	 */
-	public function load(IContext $context): Document {
-		$type = $context->getType();
-		$id = $context->getId();
-
+	public function load(string $type, int $id): ?Document {
 		/* @var $qb IQueryBuilder */
 		$qb = $this->db->getQueryBuilder();
 		$result = $qb->select('*')
 			->from($this->getTableName())
 			->where($qb->expr()->eq('context_type', $qb->createNamedParameter($type)))
-			->where($qb->expr()->eq('context_id', $qb->createNamedParameter($id)))
+			->andWhere($qb->expr()->eq('context_id', $qb->createNamedParameter($id)))
 			->executeQuery();
 
 		$data = $result->fetchAssociative();
 		$result->closeCursor();
 		if ($data === false) {
-			throw new DoesNotExistException('Document doesn\'t exist');
+			return null;
 		}
 		return Document::fromRow($data);
 	}

lib/Service/ApiService.php

@@ -48,7 +48,7 @@ public function create(IContext $context, ?string $baseVersionEtag, ?string $gue
 		}
 
 		try {
-			$document = $this->documentService->getOrCreateDocument($document, $context);
+			$document = $this->documentService->getOrCreateDocument($document);
 		} catch (Exception $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
 			return new DataResponse(['error' => 'Failed to create the document session'], Http::STATUS_INTERNAL_SERVER_ERROR);

lib/Service/DocumentService.php

@@ -100,9 +100,8 @@ public function isSaveFromText(): bool {
 	 * @throws NotPermittedException
 	 * @throws Exception
 	 */
-	public function getOrCreateDocument(Document $document, IContext $context): Document {
-		// TODO: drop $context once $document contains contextId and contextType
-		$loaded = $this->getDocument($context->getId());
+	public function getOrCreateDocument(Document $document): Document {
+		$loaded = $this->documentMapper->load($document->getContextType(), $document->getContextId());
 		if ($loaded !== null) {
 			$this->logger->info('Keep previous document of ' . $document->toString());
 			return $loaded;