[OP#41102] link workpackage backend

.gitignore

@@ -12,4 +12,5 @@ example/
 log/
 vendor/
 .php-cs-fixer.cache
+tests/pact/
 

bootstrap.php

@@ -19,6 +19,7 @@
 $classLoader->addPsr4("OCA\\Files\\Event\\", $serverPath . '/apps/files/lib/Event', true);
 $classLoader->addPsr4("OCA\\OpenProject\\AppInfo\\", __DIR__ . '/lib/AppInfo', true);
 $classLoader->addPsr4("OCA\\OpenProject\\Controller\\", __DIR__ . '/lib/Controller', true);
+$classLoader->addPsr4("OCA\\OpenProject\\Exception\\", __DIR__ . '/lib/Exception', true);
 $classLoader->register();
 
 set_include_path(get_include_path() . PATH_SEPARATOR . '/usr/share/php');

lib/Controller/OpenProjectAPIController.php

@@ -11,8 +11,12 @@
 
 namespace OCA\OpenProject\Controller;
 
+use Exception;
+use OCA\OpenProject\Exception\OpenprojectErrorException;
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Http\DataDownloadResponse;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\AppFramework\Http;
@@ -21,6 +25,7 @@
 
 use OCA\OpenProject\Service\OpenProjectAPIService;
 use OCA\OpenProject\AppInfo\Application;
+use OCP\IURLGenerator;
 
 class OpenProjectAPIController extends Controller {
 
@@ -53,10 +58,16 @@ class OpenProjectAPIController extends Controller {
 	 */
 	private $openprojectUrl;
 
+	/**
+	 * @var IURLGenerator
+	 */
+	private $urlGenerator;
+
 	public function __construct(string $appName,
 								IRequest $request,
 								IConfig $config,
 								OpenProjectAPIService $openprojectAPIService,
+								IURLGenerator         $urlGenerator,
 								?string $userId) {
 		parent::__construct($appName, $request);
 		$this->openprojectAPIService = $openprojectAPIService;
@@ -66,6 +77,7 @@ public function __construct(string $appName,
 		$this->clientID = $config->getAppValue(Application::APP_ID, 'client_id');
 		$this->clientSecret = $config->getAppValue(Application::APP_ID, 'client_secret');
 		$this->openprojectUrl = $config->getAppValue(Application::APP_ID, 'oauth_instance_url');
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -168,10 +180,37 @@ public function getSearchedWorkPackages(?string $searchQuery = null, ?int $fileI
 	 * @NoAdminRequired
 	 * @param int $workpackageId
 	 * @param int $fileId
+	 * @param string $fileName
 	 * @return DataResponse
 	 */
-	public function linkWorkPackageToFile(int $workpackageId = 0, int $fileId = 0): DataResponse {
-		return new DataResponse("Fake result, to make UI happy");
+	public function linkWorkPackageToFile(int $workpackageId, int $fileId, string $fileName) {
+		if ($this->accessToken === '' || !OpenProjectAPIService::validateOpenProjectURL($this->openprojectUrl)) {
+			return new DataResponse('', Http::STATUS_BAD_REQUEST);
+		}
+
+		$storageUrl = $this->urlGenerator->getBaseUrl();
+
+		try {
+			$result = $this->openprojectAPIService->linkWorkPackageToFile(
+				$this->openprojectUrl,
+				$this->accessToken,
+				$this->refreshToken,
+				$this->clientID,
+				$this->clientSecret,
+				$workpackageId,
+				$fileId,
+				$fileName,
+				$storageUrl,
+				$this->userId,
+			);
+		} catch (OpenprojectErrorException $e) {
+			return new DataResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
+		} catch (NotPermittedException | NotFoundException $e) {
+			return new DataResponse('file not found', Http::STATUS_NOT_FOUND);
+		} catch (Exception $e) {
+			return new DataResponse($e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+		return new DataResponse($result);
 	}
 
 	/**

lib/Exception/OpenprojectErrorException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace OCA\OpenProject\Exception;
+
+use Exception;
+use Throwable;
+
+class OpenprojectErrorException extends Exception {
+
+	/**
+	 * @param string $message
+	 * @param int $code
+	 * @param Throwable|null $previous
+	 */
+	public function __construct(string $message, int $code = 0, Throwable $previous = null) {
+		parent::__construct($message, $code, $previous);
+	}
+}

lib/Exception/OpenprojectResponseException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace OCA\OpenProject\Exception;
+
+use Exception;
+use Throwable;
+
+class OpenprojectResponseException extends Exception {
+
+	/**
+	 * @param string $message
+	 * @param int $code
+	 * @param Throwable|null $previous
+	 */
+	public function __construct(string $message, int $code = 0, Throwable $previous = null) {
+		parent::__construct($message, $code, $previous);
+	}
+}

lib/Service/OpenProjectAPIService.php

@@ -14,6 +14,11 @@
 use DateTime;
 use DateTimeZone;
 use Exception;
+use OCP\Files\Node;
+use OCA\OpenProject\Exception\OpenprojectErrorException;
+use OCA\OpenProject\Exception\OpenprojectResponseException;
+use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use Psr\Log\LoggerInterface;
@@ -23,10 +28,12 @@
 use OCP\IAvatarManager;
 use OCP\Http\Client\IClientService;
 use OCP\Notification\IManager as INotificationManager;
+use OCP\Files\NotPermittedException;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Exception\ConnectException;
 
+
 use OCA\OpenProject\AppInfo\Application;
 
 class OpenProjectAPIService {
@@ -63,6 +70,8 @@ class OpenProjectAPIService {
 	 */
 	private $client;
 
+	/** @var IRootFolder */
+	private $storage;
 	/**
 	 * Service to make requests to OpenProject v3 (JSON) API
 	 */
@@ -74,7 +83,8 @@ public function __construct(
 								IL10N $l10n,
 								IConfig $config,
 								INotificationManager $notificationManager,
-								IClientService $clientService) {
+								IClientService $clientService,
+								IRootFolder $storage) {
 		$this->appName = $appName;
 		$this->userManager = $userManager;
 		$this->avatarManager = $avatarManager;
@@ -83,6 +93,7 @@ public function __construct(
 		$this->config = $config;
 		$this->notificationManager = $notificationManager;
 		$this->client = $clientService->newClient();
+		$this->storage = $storage;
 	}
 
 	/**
@@ -387,7 +398,8 @@ public function request(string $openprojectUrl, string $accessToken, string $ref
 					$paramsContent .= http_build_query($params);
 					$url .= '?' . $paramsContent;
 				} else {
-					$options['body'] = $params;
+					$options['body'] = $params['body'];
+					$options['headers']['Content-Type'] = 'application/json';
 				}
 			}
 
@@ -581,4 +593,94 @@ public static function getOpenProjectOauthURL(IConfig $config, IURLGenerator $ur
 			'&redirect_uri=' . urlencode($redirectUri) .
 			'&response_type=code';
 	}
+
+	/**
+	 * @param string $userId
+	 * @param int $fileId
+	 * @return \OCP\Files\Node
+	 * @throws NotPermittedException
+	 * @throws \OC\User\NoUserException
+	 * @throws NotFoundException
+	 */
+	public function getNode($userId, $fileId) {
+		$userFolder = $this->storage->getUserFolder($userId);
+
+		$file = $userFolder->getById($fileId);
+		if (isset($file[0]) && $file[0] instanceof Node) {
+			return $file[0];
+		}
+		throw new NotFoundException();
+	}
+
+	/**
+	 * @throws \OCP\Files\InvalidPathException
+	 * @throws NotFoundException
+	 * @throws \OCP\PreConditionNotMetException
+	 * @throws NotPermittedException
+	 * @throws OpenprojectErrorException
+	 * @throws \OC\User\NoUserException
+	 * @throws OpenprojectResponseException
+	 * @return int
+	 */
+	public function linkWorkPackageToFile(
+		string $openprojectUrl,
+		string $accessToken,
+		string $refreshToken,
+		string $clientID,
+		string $clientSecret,
+		int $workpackageId,
+		int $fileId,
+		string $fileName,
+		string $storageUrl,
+		string $userId
+	) {
+		$file = $this->getNode($userId, $fileId);
+		if (!$file->isReadable()) {
+			throw new NotPermittedException();
+		}
+
+		$body = [
+			'_type' => 'Collection',
+			'_embedded' => [
+				'elements' => [
+					[
+						'originData' => [
+							'id' => $fileId,
+							'name' => $fileName,
+							'mimeType' => $file->getMimeType(),
+							'createdAt' => gmdate('Y-m-d\TH:i:s.000\Z', $file->getCreationTime()),
+							'lastModifiedAt' => gmdate('Y-m-d\TH:i:s.000\Z', $file->getMTime()),
+							'createdByName' => '',
+							'lastModifiedByName' => ''
+						],
+						'_links' => [
+							'storageUrl' => [
+								'href' => $storageUrl
+							]
+						]
+					]
+				]
+			]
+		];
+
+		$params['body'] = \Safe\json_encode($body);
+		$result = $this->request(
+			$openprojectUrl, $accessToken, $refreshToken, $clientID, $clientSecret, $userId, 'work_packages/' . $workpackageId. '/file_links', $params, 'POST'
+		);
+
+		if (isset($result['error'])) {
+			throw new OpenprojectErrorException($result['error']);
+		}
+		if (
+			!isset($result['_type']) ||
+			$result['_type'] !== 'Collection' ||
+			!isset($result['_embedded']) ||
+			!isset($result['_embedded']['elements']) ||
+			!isset($result['_embedded']['elements'][0]) ||
+			!isset($result['_embedded']['elements'][0]['id'])
+		) {
+			throw new OpenprojectResponseException('Malformed response');
+		}
+		return $result['_embedded']['elements'][0]['id'];
+	}
 }

phpunit.xml

@@ -34,12 +34,14 @@
 	<php>
 		<env name="PACT_MOCK_SERVER_HOST" value="localhost"/>
 		<env name="PACT_MOCK_SERVER_PORT" value="7200"/>
-		<env name="PACT_CONSUMER_NAME" value="someConsumer"/>
+		<env name="PACT_CONSUMER_NAME" value="integration_openproject"/>
 		<env name="PACT_CONSUMER_VERSION" value="1.0.0"/>
 		<env name="PACT_CONSUMER_TAG" value="master"/>
-		<env name="PACT_PROVIDER_NAME" value="someProvider"/>
-		<env name="PACT_OUTPUT_DIR" value=".\example\output"/>
+		<env name="PACT_PROVIDER_NAME" value="OpenProject"/>
+		<env name="PACT_OUTPUT_DIR" value="./tests/pact/"/>
 		<env name="PACT_MOCK_SERVER_HEALTH_CHECK_TIMEOUT" value="10"/>
+		<env name="PACT_LOGLEVEL" value="INFO"/>
+		<env name="PACT_LOG" value="./tests/pact/pact.log"/>
 		<!-- <env name="PACT_BROKER_URI" value="http://localhost"/> -->
 	</php>
 	<logging/>

src/components/tab/SearchInput.vue

@@ -103,16 +103,19 @@ export default {
 				: null
 		},
 		async linkWorkPackageToFile(selectedOption) {
-			const req = {
-				values: {
-					workpackageId: selectedOption.id,
-					fileId: this.fileInfo.id,
+			const params = new URLSearchParams()
+			params.append('workpackageId', selectedOption.id)
+			params.append('fileId', this.fileInfo.id)
+			params.append('fileName', this.fileInfo.name)
+			const config = {
+				headers: {
+					'Content-Type': 'application/x-www-form-urlencoded',
 				},
 			}
 			const url = generateUrl('/apps/integration_openproject/work-packages')
 
 			try {
-				await axios.post(url, req)
+				await axios.post(url, params, config)
 				this.$emit('saved', selectedOption)
 				this.selectedId.push({
 					id: selectedOption.id,