Merge pull request #6104 from LibreSign/backport/6103/stable31

[stable31] fix: respect draft status in sign requests

Author: vitormattos

lib/Service/FileService.php

@@ -835,6 +835,7 @@ private function associateAllAndFormat(IUser $user, array $files, array $signers
 						'signed' => null,
 						'signRequestId' => $signer->getId(),
 						'signingOrder' => $signer->getSigningOrder(),
+						'status' => $signer->getStatus(),
 						'me' => array_reduce($identifyMethodsOfSigner, function (bool $carry, IdentifyMethod $identifyMethod) use ($user): bool {
 							if ($identifyMethod->getIdentifierKey() === IdentifyMethodService::IDENTIFY_ACCOUNT) {
 								if ($user->getUID() === $identifyMethod->getIdentifierValue()) {

lib/Service/RequestSignatureService.php

@@ -203,6 +203,7 @@ private function associateToSigners(array $data, int $fileId): array {
 			$this->deleteIdentifyMethodIfNotExits($data['users'], $fileId);
 
 			$this->sequentialSigningService->resetOrderCounter();
+			$fileStatus = $data['status'] ?? null;
 
 			foreach ($data['users'] as $user) {
 				$userProvidedOrder = isset($user['signingOrder']) ? (int)$user['signingOrder'] : null;
@@ -216,19 +217,21 @@ private function associateToSigners(array $data, int $fileId): array {
 							],
 							displayName: $user['displayName'] ?? '',
 							description: $user['description'] ?? '',
-							notify: empty($user['notify']) && $this->isStatusAbleToNotify($data['status'] ?? null),
+							notify: empty($user['notify']) && $this->isStatusAbleToNotify($fileStatus),
 							fileId: $fileId,
 							signingOrder: $signingOrder,
+							fileStatus: $fileStatus,
 						);
 					}
 				} else {
 					$return[] = $this->associateToSigner(
 						identifyMethods: $user['identify'],
 						displayName: $user['displayName'] ?? '',
 						description: $user['description'] ?? '',
-						notify: empty($user['notify']) && $this->isStatusAbleToNotify($data['status'] ?? null),
+						notify: empty($user['notify']) && $this->isStatusAbleToNotify($fileStatus),
 						fileId: $fileId,
 						signingOrder: $signingOrder,
+						fileStatus: $fileStatus,
 					);
 				}
 			}
@@ -250,6 +253,7 @@ private function associateToSigner(
 		bool $notify,
 		int $fileId,
 		int $signingOrder = 0,
+		?int $fileStatus = null,
 	): SignRequestEntity {
 		$identifyMethodsIncances = $this->identifyMethod->getByUserData($identifyMethods);
 		if (empty($identifyMethodsIncances)) {
@@ -268,7 +272,7 @@ private function associateToSigner(
 		$currentStatus = $signRequest->getStatusEnum();
 
 		if ($isNewSignRequest || $currentStatus === \OCA\Libresign\Enum\SignRequestStatus::DRAFT) {
-			$initialStatus = $this->determineInitialStatus($signingOrder);
+			$initialStatus = $this->determineInitialStatus($signingOrder, $fileStatus);
 			$signRequest->setStatusEnum($initialStatus);
 		}
 
@@ -284,7 +288,11 @@ private function associateToSigner(
 		return $signRequest;
 	}
 
-	private function determineInitialStatus(int $signingOrder): \OCA\Libresign\Enum\SignRequestStatus {
+	private function determineInitialStatus(int $signingOrder, ?int $fileStatus = null): \OCA\Libresign\Enum\SignRequestStatus {
+		if ($fileStatus === FileEntity::STATUS_DRAFT) {
+			return \OCA\Libresign\Enum\SignRequestStatus::DRAFT;
+		}
+
 		if (!$this->sequentialSigningService->isOrderedNumericFlow()) {
 			return \OCA\Libresign\Enum\SignRequestStatus::ABLE_TO_SIGN;
 		}