fix more issues with unit tests and psalm tests

Signed-off-by: Timotheus Pokorra <[email protected]>
nextcloud · Oct 23, 2023 · 655e5ec · 655e5ec
1 parent 77aa329
commit 655e5ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -28,6 +28,7 @@
 namespace OCA\Forms\Controller;
 
 use OCA\Forms\Constants;
+use OCA\Forms\Activity\ActivityManager;
 use OCA\Forms\Db\Answer;
 use OCA\Forms\Db\AnswerMapper;
 use OCA\Forms\Db\Form;
@@ -68,6 +69,7 @@ public function __construct(
 		string $appName,
 		IRequest $request,
 		IUserSession $userSession,
+		private ActivityManager $activityManager,
 		private AnswerMapper $answerMapper,
 		private FormMapper $formMapper,
 		private OptionMapper $optionMapper,

diff --git a/lib/Service/FormsService.php b/lib/Service/FormsService.php
@@ -183,7 +183,7 @@ public function getForm(Form $form): array {
 		if ($this->currentUser->getUID() && $form->getAllowEdit()) {
 			$submissionEntity = null;
 			try {
-				$submissionEntity = $this->submissionMapper->findByFormAndUser($id, $this->currentUser->getUID());
+				$submissionEntity = $this->submissionMapper->findByFormAndUser($form->getId(), $this->currentUser->getUID());
 				$answers = $this->getAnswers($form->getId(), $submissionEntity->getId(), $this->currentUser->getUID());
 				if ($answers !== false) {
 					$result['answers'] = $answers;

diff --git a/tests/Unit/Controller/ApiControllerTest.php b/tests/Unit/Controller/ApiControllerTest.php
@@ -45,6 +45,7 @@ function time($expected = null) {
 
 namespace OCA\Forms\Tests\Unit\Controller;
 
+use OCA\Forms\Activity\ActivityManager;
 use OCA\Forms\Constants;
 use OCA\Forms\Controller\ApiController;
 use OCA\Forms\Db\AnswerMapper;
@@ -75,6 +76,8 @@ function time($expected = null) {
 
 class ApiControllerTest extends TestCase {
 	private ApiController $apiController;
+	/** @var ActivityManager|MockObject */
+	private $activityManager;
 	/** @var AnswerMapper|MockObject */
 	private $answerMapper;
 	/** @var FormMapper|MockObject */
@@ -103,6 +106,7 @@ class ApiControllerTest extends TestCase {
 	private $l10n;
 
 	public function setUp(): void {
+		$this->activityManager = $this->createMock(ActivityManager::class);
 		$this->answerMapper = $this->createMock(AnswerMapper::class);
 		$this->formMapper = $this->createMock(FormMapper::class);
 		$this->optionMapper = $this->createMock(OptionMapper::class);
@@ -125,6 +129,7 @@ public function setUp(): void {
 			'forms',
 			$this->request,
 			$this->createUserSession(),
+			$this->activityManager,
 			$this->answerMapper,
 			$this->formMapper,
 			$this->optionMapper,
@@ -372,6 +377,7 @@ public function testCreateNewForm($expectedForm) {
 			 ->setConstructorArgs(['forms',
 			 	$this->request,
 			 	$this->createUserSession(),
+				$this->activityManager,
 			 	$this->answerMapper,
 			 	$this->formMapper,
 			 	$this->optionMapper,
@@ -531,6 +537,7 @@ public function testCloneForm($old, $new) {
 			->setConstructorArgs(['forms',
 				$this->request,
 				$this->createUserSession(),
+				$this->activityManager,
 				$this->answerMapper,
 				$this->formMapper,
 				$this->optionMapper,