summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nassabain <marco.nassabain@hotmail.com>2021-03-04 00:16:19 +0100
committerSean Molenaar <SMillerDev@users.noreply.github.com>2021-04-08 22:31:21 +0200
commit409c8354336b0c96842da7ba6711468aa939d76e (patch)
tree3426a7b15214d0e077489c28b93c20182e51b765
parentdd818c6203961a82aeef58bcf526aced7b361f04 (diff)
🩹 Patch ItemController + test to use ShareService
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
-rw-r--r--lib/Controller/ItemController.php9
-rw-r--r--tests/Unit/Controller/ItemControllerTest.php6
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/Controller/ItemController.php b/lib/Controller/ItemController.php
index 4a01fb23c..e3ef4b9e5 100644
--- a/lib/Controller/ItemController.php
+++ b/lib/Controller/ItemController.php
@@ -24,6 +24,7 @@ use \OCP\AppFramework\Http;
use \OCA\News\Service\Exceptions\ServiceException;
use \OCA\News\Service\Exceptions\ServiceNotFoundException;
use \OCA\News\Service\ItemServiceV2;
+use \OCA\News\Service\ShareService;
use OCP\IUserSession;
/**
@@ -44,6 +45,10 @@ class ItemController extends Controller
*/
private $feedService;
/**
+ * @var ShareService
+ */
+ private $shareService;
+ /**
* @var IConfig
*/
private $settings;
@@ -52,12 +57,14 @@ class ItemController extends Controller
IRequest $request,
FeedServiceV2 $feedService,
ItemServiceV2 $itemService,
+ ShareService $shareService,
IConfig $settings,
?IUserSession $userSession
) {
parent::__construct($request, $userSession);
$this->itemService = $itemService;
$this->feedService = $feedService;
+ $this->shareService = $shareService;
$this->settings = $settings;
}
@@ -329,7 +336,7 @@ class ItemController extends Controller
public function share($itemId, $shareWithId)
{
try {
- $this->itemService->share(
+ $this->shareService->share(
$this->getUserId(),
$itemId,
$shareWithId
diff --git a/tests/Unit/Controller/ItemControllerTest.php b/tests/Unit/Controller/ItemControllerTest.php
index 8c10dad4b..cbb5a10a9 100644
--- a/tests/Unit/Controller/ItemControllerTest.php
+++ b/tests/Unit/Controller/ItemControllerTest.php
@@ -16,6 +16,7 @@ namespace OCA\News\Tests\Unit\Controller;
use OCA\News\Controller\ItemController;
use OCA\News\Service\FeedServiceV2;
use OCA\News\Service\ItemServiceV2;
+use OCA\News\Service\ShareService;
use \OCP\AppFramework\Http;
use \OCA\News\Db\Item;
@@ -47,6 +48,10 @@ class ItemControllerTest extends TestCase
*/
private $feedService;
/**
+ * @var \PHPUnit\Framework\MockObject\MockObject|ShareService
+ */
+ private $shareService;
+ /**
* @var \PHPUnit\Framework\MockObject\MockObject|IRequest
*/
private $request;
@@ -95,6 +100,7 @@ class ItemControllerTest extends TestCase
$this->request,
$this->feedService,
$this->itemService,
+ $this->shareService,
$this->settings,
$this->userSession
);