Optimized attempt

Signed-off-by: dartcafe <github@dartcafe.de>

Author: dartcafe

lib/Controller/AdminController.php

@@ -95,24 +95,4 @@ public function runJanitorJob(): JSONResponse {
 	public function runNotificationJob(): JSONResponse {
 		return $this->response(fn () => $this->notificationCron->manuallyRun());
 	}
-
-	/**
-	 * Switch archived status (move to archived polls)
-	 * @param int $pollId poll id
-	 * @deprecated 8.0.0 Not used anymore (use PUT /poll/{pollId}/toggleArchive)
-	 */
-	#[FrontpageRoute(verb: 'PUT', url: '/administration/poll/{pollId}/toggleArchive')]
-	public function toggleArchive(int $pollId): JSONResponse {
-		return $this->response(fn () => $this->pollService->toggleArchive($pollId));
-	}
-
-	/**
-	 * Delete poll
-	 * @param int $pollId poll id
-	 * @deprecated 8.0.0 Not used anymore (use DELETE /poll/{pollId})
-	 */
-	#[FrontpageRoute(verb: 'DELETE', url: '/administration/poll/{pollId}')]
-	public function delete(int $pollId): JSONResponse {
-		return $this->responseDeleteTolerant(fn () => $this->pollService->delete($pollId));
-	}
 }

lib/Controller/BaseApiV1Controller.php

@@ -10,7 +10,6 @@
 
 use Closure;
 use OCA\Polls\Exceptions\Exception;
-use OCA\Polls\Exceptions\NoUpdatesException;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -23,16 +22,14 @@
 /**
  * @psalm-api
  */
-class BaseApiV2Controller extends OCSController
-{
+class BaseApiV2Controller extends OCSController {
 	public function __construct(
-		string   $appName,
+		string $appName,
 		IRequest $request,
-		string   $corsMethods = 'PUT, POST, GET, DELETE',
-		string   $corsAllowedHeaders = 'Authorization, Content-Type, Accept',
-		int      $corsMaxAge = 1728000,
-	)
-	{
+		string $corsMethods = 'PUT, POST, GET, DELETE',
+		string $corsAllowedHeaders = 'Authorization, Content-Type, Accept',
+		int $corsMaxAge = 1728000,
+	) {
 		parent::__construct($appName, $request, $corsMethods, $corsAllowedHeaders, $corsMaxAge);
 	}
 
@@ -41,43 +38,19 @@ public function __construct(
 	 * @param Closure $callback Callback function
 	 */
 	#[NoAdminRequired]
-	protected function response(Closure $callback): DataResponse
-	{
-		return $this->handleResponse($callback, Http::STATUS_OK);
-	}
-
-	/**
-	 * response
-	 * @param Closure $callback Callback function
-	 */
-	#[NoAdminRequired]
-	protected function responseLong(Closure $callback): DataResponse
-	{
-		return $this->handleResponse($callback, Http::STATUS_OK);
-	}
-
-	/**
-	 * responseCreate
-	 * @param Closure $callback Callback function
-	 */
-	#[NoAdminRequired]
-	protected function responseCreate(Closure $callback): DataResponse
-	{
-		return $this->handleResponse($callback, Http::STATUS_CREATED);
-	}
-
-	private function handleResponse(
-		Closure $callback,
-		int     $successStatus = Http::STATUS_OK
-	): DataResponse
-	{
+	protected function response(Closure $callback, int $successStatus = Http::STATUS_OK): DataResponse {
 		try {
 			return new DataResponse($callback(), $successStatus);
-		} catch (NoUpdatesException $e) {
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+
 		} catch (DoesNotExistException $e) {
 			throw new OCSNotFoundException($e->getMessage());
+
 		} catch (Exception $e) {
+
+			if ($e->getStatus() === Http::STATUS_NOT_MODIFIED) {
+				return new DataResponse(statusCode: $e->getStatus());
+			}
+
 			throw new OCSBadRequestException($e->getMessage());
 		}
 	}

lib/Controller/BaseApiV2Controller.php

@@ -10,9 +10,7 @@
 
 use Closure;
 use OCA\Polls\Exceptions\Exception;
-use OCA\Polls\Exceptions\NoUpdatesException;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\JSONResponse;
@@ -32,77 +30,23 @@ public function __construct(
 	/**
 	 * response
 	 * @param Closure $callback Callback function
+	 * @param int $successStatus HTTP status code for success
 	 */
 	#[NoAdminRequired]
-	protected function response(Closure $callback): JSONResponse {
-		return $this->handleResponse($callback, Http::STATUS_OK, Exception::class);
-	}
-
-	/**
-	 * response
-	 * @param Closure $callback Callback function
-	 */
-	#[NoAdminRequired]
-	protected function responseLong(Closure $callback): JSONResponse {
-		return $this->handleResponse($callback, Http::STATUS_OK, NoUpdatesException::class, Http::STATUS_NOT_MODIFIED);
-	}
-
-	/**
-	 * responseCreate
-	 * @param Closure $callback Callback function
-	 */
-	#[NoAdminRequired]
-	protected function responseCreate(Closure $callback): JSONResponse {
-		return $this->handleResponse($callback, Http::STATUS_CREATED, Exception::class);
-	}
-
-	/**
-	 * responseDeleteTolerant
-	 * @param Closure $callback Callback function
-	 */
-	#[NoAdminRequired]
-	protected function responseDeleteTolerant(Closure $callback): JSONResponse {
-		return $this->handleResponse(
-			$callback,
-			Http::STATUS_OK,
-			DoesNotExistException::class,
-			Http::STATUS_OK,
-			'Not found, assume already deleted',
-			Exception::class
-		);
-	}
-
-	private function handleResponse(
+	protected function response(
 		Closure $callback,
-		int $successStatus,
-		string $primaryException,
-		int $fallbackStatus = null,
-		string $fallbackMessage = null,
-		string $secondaryException = null
+		int $successStatus = Http::STATUS_OK,
 	): JSONResponse {
 		try {
 			return new JSONResponse($callback(), $successStatus);
-		} catch (\Exception $e) {
-			if (is_a($e, $primaryException, true)) {
-				if ($fallbackStatus !== null) {
-					return new JSONResponse(['message' => $fallbackMessage ?? ''], $fallbackStatus);
-				}
-				if ($e instanceof Exception) {
-					return new JSONResponse(['message' => $e->getMessage()], $e->getStatus());
-				}
-			}
+		} catch (Exception $e) {
 
-			if (
-				$secondaryException !== null &&
-				is_a($e, $secondaryException, true) &&
-				$e instanceof Exception
-			) {
-				return new JSONResponse(['message' => $e->getMessage()], $e->getStatus());
+			if ($e->getStatus() === Http::STATUS_NOT_MODIFIED) {
+				return new JSONResponse(statusCode: $e->getStatus());
 			}
 
-			throw $e;
+			return new JSONResponse(['message' => $e->getMessage()], $e->getStatus());
 		}
 	}
 
 }
-