Xefir/nextcloud-gpodder
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

extract parsing and storing episode action to separate class

Browse Source
This commit is contained in:
thrillfall 2021-08-22 22:45:34 +02:00
parent 83c18ad623
commit a29aa2ccd5
2 changed files with 98 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/Controller/EpisodeActionController.php
View File

@ -4,16 +4,11 @@ declare(strict_types=1);
namespace OCA\GPodderSync\Controller; namespace OCA\GPodderSync\Controller;
use DateTime; use DateTime;
use DateTimeZone;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use OCA\GPodderSync\Core\EpisodeAction\EpisodeActionReader; use OCA\GPodderSync\Core\EpisodeAction\EpisodeActionSaver;
use OCA\GPodderSync\Db\EpisodeAction\EpisodeActionEntity;
use OCA\GPodderSync\Db\EpisodeAction\EpisodeActionRepository; use OCA\GPodderSync\Db\EpisodeAction\EpisodeActionRepository;
use OCA\GPodderSync\Db\EpisodeAction\EpisodeActionWriter;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\DB\Exception;
use OCP\IRequest; use OCP\IRequest;
class EpisodeActionController extends Controller { class EpisodeActionController extends Controller {
@ -22,29 +17,21 @@ class EpisodeActionController extends Controller {
* @var EpisodeActionRepository * @var EpisodeActionRepository
*/ */
private EpisodeActionRepository $episodeActionRepository; private EpisodeActionRepository $episodeActionRepository;
/**
* @var EpisodeActionWriter
*/
private EpisodeActionWriter $episodeActionWriter;
/**
* @var EpisodeActionReader
*/
private EpisodeActionReader $episodeActionReader;
private $userId; private $userId;
private EpisodeActionSaver $episodeActionSaver;
public function __construct( public function __construct(
string $AppName, string $AppName,
IRequest $request, IRequest $request,
$UserId, $UserId,
EpisodeActionRepository $episodeActionRepository, EpisodeActionRepository $episodeActionRepository,
EpisodeActionWriter $episodeActionWriter, EpisodeActionSaver $episodeActionSaver
EpisodeActionReader $episodeActionReader
) { ) {
parent::__construct($AppName, $request); parent::__construct($AppName, $request);
$this->episodeActionRepository = $episodeActionRepository; $this->episodeActionRepository = $episodeActionRepository;
$this->episodeActionWriter = $episodeActionWriter;
$this->episodeActionReader = $episodeActionReader;
$this->userId = $UserId; $this->userId = $UserId;
$this->episodeActionSaver = $episodeActionSaver;
} }
/** /**
@ -55,26 +42,7 @@ class EpisodeActionController extends Controller {
* @return Response * @return Response
*/ */
public function create($data) { public function create($data) {
$episodeAction = $this->episodeActionReader->fromString($data); return $this->episodeActionSaver->saveEpisodeAction($data, $this->userId);
$episodeActionEntity = new EpisodeActionEntity();
$episodeActionEntity->setPodcast($episodeAction->getPodcast());
$episodeActionEntity->setEpisode($episodeAction->getEpisode());
$episodeActionEntity->setAction($episodeAction->getAction());
$episodeActionEntity->setPosition($episodeAction->getPosition());
$episodeActionEntity->setStarted($episodeAction->getStarted());
$episodeActionEntity->setTotal($episodeAction->getTotal());
$episodeActionEntity->setTimestamp($this->convertTimestampToDbDateTimeString($episodeAction->getTimestamp()));
$episodeActionEntity->setUserId($this->userId);
try {
return $this->episodeActionWriter->save($episodeActionEntity);
} catch (UniqueConstraintViolationException $uniqueConstraintViolationException) {
return $this->updateEpisodeAction($episodeAction, $episodeActionEntity);
} catch (Exception $exception) {
if ($exception->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
return $this->updateEpisodeAction($episodeAction, $episodeActionEntity);
}
}
} }
/** /**
@ -104,28 +72,5 @@ class EpisodeActionController extends Controller {
: (new \DateTime('-1 week')); : (new \DateTime('-1 week'));
} }
/**
* @param string $episodeAction
*
* @return string
*/
private function convertTimestampToDbDateTimeString(string $timestamp)
{
return \DateTime::createFromFormat('D F d H:i:s T Y', $timestamp)
->setTimezone(new DateTimeZone('UTC'))
->format("Y-m-d\TH:i:s");
}
/**
* @param \OCA\GPodderSync\Core\EpisodeAction\EpisodeAction $episodeAction
* @param EpisodeActionEntity $episodeActionEntity
*
* @return EpisodeActionEntity
*/
private function updateEpisodeAction(\OCA\GPodderSync\Core\EpisodeAction\EpisodeAction $episodeAction, EpisodeActionEntity $episodeActionEntity): EpisodeActionEntity
{
$idEpisodeActionEntityToUpdate = $this->episodeActionRepository->findByEpisode($episodeAction->getEpisode(), $this->userId)->getId();
$episodeActionEntity->setId($idEpisodeActionEntityToUpdate);
return $this->episodeActionWriter->update($episodeActionEntity);
}
} }

92
lib/Core/EpisodeAction/EpisodeActionSaver.php Normal file
View File

@ -0,0 +1,92 @@
<?php
declare(strict_types=1);
namespace OCA\GPodderSync\Core\EpisodeAction;
use DateTimeZone;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use OCA\GPodderSync\Db\EpisodeAction\EpisodeActionEntity;
use OCA\GPodderSync\Db\EpisodeAction\EpisodeActionRepository;
use OCA\GPodderSync\Db\EpisodeAction\EpisodeActionWriter;
use OCP\DB\Exception;
class EpisodeActionSaver
{
private EpisodeActionRepository $episodeActionRepository;
private EpisodeActionWriter $episodeActionWriter;
private EpisodeActionReader $episodeActionReader;
public function __construct(
EpisodeActionRepository $episodeActionRepository,
EpisodeActionWriter $episodeActionWriter,
EpisodeActionReader $episodeActionReader
)
{
$this->episodeActionRepository = $episodeActionRepository;
$this->episodeActionWriter = $episodeActionWriter;
$this->episodeActionReader = $episodeActionReader;
}
/**
* @param $data
*
* @return EpisodeActionEntity
*/
public function saveEpisodeAction($data, string $userId): EpisodeActionEntity
{
$episodeAction = $this->episodeActionReader->fromString($data);
$episodeActionEntity = new EpisodeActionEntity();
$episodeActionEntity->setPodcast($episodeAction->getPodcast());
$episodeActionEntity->setEpisode($episodeAction->getEpisode());
$episodeActionEntity->setAction($episodeAction->getAction());
$episodeActionEntity->setPosition($episodeAction->getPosition());
$episodeActionEntity->setStarted($episodeAction->getStarted());
$episodeActionEntity->setTotal($episodeAction->getTotal());
$episodeActionEntity->setTimestamp($this->convertTimestampToDbDateTimeString($episodeAction->getTimestamp()));
$episodeActionEntity->setUserId($userId);
try {
return $this->episodeActionWriter->save($episodeActionEntity);
} catch (UniqueConstraintViolationException $uniqueConstraintViolationException) {
return $this->updateEpisodeAction($episodeAction, $episodeActionEntity, $userId);
} catch (Exception $exception) {
if ($exception->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
return $this->updateEpisodeAction($episodeAction, $episodeActionEntity, $userId);
}
}
}
/**
* @param string $timestamp
*
* @return string
*/
private function convertTimestampToDbDateTimeString(string $timestamp): string
{
return \DateTime::createFromFormat('D F d H:i:s T Y', $timestamp)
->setTimezone(new DateTimeZone('UTC'))
->format("Y-m-d\TH:i:s");
}
/**
* @param EpisodeAction $episodeAction
* @param EpisodeActionEntity $episodeActionEntity
*
* @return EpisodeActionEntity
*/
private function updateEpisodeAction(
EpisodeAction $episodeAction,
EpisodeActionEntity $episodeActionEntity,
string $userId
): EpisodeActionEntity
{
$idEpisodeActionEntityToUpdate = $this->episodeActionRepository->findByEpisode(
$episodeAction->getEpisode(),
$userId
)->getId();
$episodeActionEntity->setId($idEpisodeActionEntityToUpdate);
return $this->episodeActionWriter->update($episodeActionEntity);
}
}