mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
calendar range: remove on remote after removal in the database
This commit is contained in:
parent
dd13e631ac
commit
d150a8251b
@ -13,6 +13,7 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
|
|||||||
|
|
||||||
use Chill\CalendarBundle\Entity\CalendarRange;
|
use Chill\CalendarBundle\Entity\CalendarRange;
|
||||||
use Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage;
|
use Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage;
|
||||||
|
use Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage;
|
||||||
use Doctrine\ORM\Event\LifecycleEventArgs;
|
use Doctrine\ORM\Event\LifecycleEventArgs;
|
||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
use Symfony\Component\Messenger\MessageBusInterface;
|
||||||
use Symfony\Component\Security\Core\Security;
|
use Symfony\Component\Security\Core\Security;
|
||||||
@ -42,6 +43,18 @@ class CalendarRangeEntityListener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function postRemove(CalendarRange $calendarRange, LifecycleEventArgs $eventArgs): void
|
||||||
|
{
|
||||||
|
if (!$calendarRange->preventEnqueueChanges) {
|
||||||
|
$this->messageBus->dispatch(
|
||||||
|
new CalendarRangeRemovedMessage(
|
||||||
|
$calendarRange,
|
||||||
|
$this->security->getUser()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function postUpdate(CalendarRange $calendarRange, LifecycleEventArgs $eventArgs): void
|
public function postUpdate(CalendarRange $calendarRange, LifecycleEventArgs $eventArgs): void
|
||||||
{
|
{
|
||||||
if (!$calendarRange->preventEnqueueChanges) {
|
if (!$calendarRange->preventEnqueueChanges) {
|
||||||
|
@ -0,0 +1,43 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Chill\CalendarBundle\Messenger\Handler;
|
||||||
|
|
||||||
|
use Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage;
|
||||||
|
use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
|
||||||
|
use Chill\MainBundle\Repository\UserRepository;
|
||||||
|
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
|
||||||
|
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @AsMessageHandler
|
||||||
|
*/
|
||||||
|
class CalendarRangeRemoveToRemoteHandler implements MessageHandlerInterface
|
||||||
|
{
|
||||||
|
private RemoteCalendarConnectorInterface $remoteCalendarConnector;
|
||||||
|
|
||||||
|
private UserRepository $userRepository;
|
||||||
|
|
||||||
|
public function __construct(RemoteCalendarConnectorInterface $remoteCalendarConnector, UserRepository $userRepository)
|
||||||
|
{
|
||||||
|
$this->remoteCalendarConnector = $remoteCalendarConnector;
|
||||||
|
$this->userRepository = $userRepository;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __invoke(CalendarRangeRemovedMessage $calendarRangeRemovedMessage)
|
||||||
|
{
|
||||||
|
$this->remoteCalendarConnector->removeCalendarRange(
|
||||||
|
$calendarRangeRemovedMessage->getRemoteId(),
|
||||||
|
$calendarRangeRemovedMessage->getRemoteAttributes(),
|
||||||
|
$this->userRepository->find($calendarRangeRemovedMessage->getCalendarRangeUserId())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,57 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Chill\CalendarBundle\Messenger\Message;
|
||||||
|
|
||||||
|
use Chill\CalendarBundle\Entity\CalendarRange;
|
||||||
|
use Chill\MainBundle\Entity\User;
|
||||||
|
|
||||||
|
class CalendarRangeRemovedMessage
|
||||||
|
{
|
||||||
|
private ?int $byUserId = null;
|
||||||
|
|
||||||
|
private int $calendarRangeUserId;
|
||||||
|
|
||||||
|
private array $remoteAttributes;
|
||||||
|
|
||||||
|
private string $remoteId;
|
||||||
|
|
||||||
|
public function __construct(CalendarRange $calendarRange, ?User $byUser)
|
||||||
|
{
|
||||||
|
$this->remoteId = $calendarRange->getRemoteId();
|
||||||
|
$this->remoteAttributes = $calendarRange->getRemoteAttributes();
|
||||||
|
$this->calendarRangeUserId = $calendarRange->getUser()->getId();
|
||||||
|
|
||||||
|
if (null !== $byUser) {
|
||||||
|
$this->byUserId = $byUser->getId();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getByUserId(): ?int
|
||||||
|
{
|
||||||
|
return $this->byUserId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCalendarRangeUserId(): ?int
|
||||||
|
{
|
||||||
|
return $this->calendarRangeUserId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRemoteAttributes(): array
|
||||||
|
{
|
||||||
|
return $this->remoteAttributes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRemoteId(): string
|
||||||
|
{
|
||||||
|
return $this->remoteId;
|
||||||
|
}
|
||||||
|
}
|
@ -45,6 +45,7 @@ class MachineHttpClient implements HttpClientInterface
|
|||||||
switch ($method) {
|
switch ($method) {
|
||||||
case 'GET':
|
case 'GET':
|
||||||
case 'HEAD':
|
case 'HEAD':
|
||||||
|
case 'DELETE':
|
||||||
$options['headers']['Accept'] = 'application/json';
|
$options['headers']['Accept'] = 'application/json';
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
@ -106,6 +106,15 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void
|
||||||
|
{
|
||||||
|
if ('' === $remoteId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->removeEvent($remoteId, $user);
|
||||||
|
}
|
||||||
|
|
||||||
public function syncCalendarRange(CalendarRange $calendarRange): void
|
public function syncCalendarRange(CalendarRange $calendarRange): void
|
||||||
{
|
{
|
||||||
if ($calendarRange->hasRemoteId()) {
|
if ($calendarRange->hasRemoteId()) {
|
||||||
@ -200,6 +209,23 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function removeEvent($remoteId, User $user): void
|
||||||
|
{
|
||||||
|
$userId = $this->mapCalendarToUser->getUserId($user);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->machineHttpClient->request(
|
||||||
|
'DELETE',
|
||||||
|
'users/' . $userId . '/calendar/events/' . $remoteId
|
||||||
|
);
|
||||||
|
} catch (ClientExceptionInterface $e) {
|
||||||
|
$this->logger->warning('could not remove event from calendar', [
|
||||||
|
'event_remote_id' => $remoteId,
|
||||||
|
'user_id' => $user->getId(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function updateRemoteCalendarRange(CalendarRange $calendarRange): void
|
private function updateRemoteCalendarRange(CalendarRange $calendarRange): void
|
||||||
{
|
{
|
||||||
$userId = $this->mapCalendarToUser->getUserId($calendarRange->getUser());
|
$userId = $this->mapCalendarToUser->getUserId($calendarRange->getUser());
|
||||||
|
@ -34,6 +34,10 @@ class NullRemoteCalendarConnector implements RemoteCalendarConnectorInterface
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public function syncCalendarRange(CalendarRange $calendarRange): void
|
public function syncCalendarRange(CalendarRange $calendarRange): void
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -37,5 +37,7 @@ interface RemoteCalendarConnectorInterface
|
|||||||
*/
|
*/
|
||||||
public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): array;
|
public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): array;
|
||||||
|
|
||||||
|
public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void;
|
||||||
|
|
||||||
public function syncCalendarRange(CalendarRange $calendarRange): void;
|
public function syncCalendarRange(CalendarRange $calendarRange): void;
|
||||||
}
|
}
|
||||||
|
@ -21,3 +21,7 @@ services:
|
|||||||
name: 'doctrine.orm.entity_listener'
|
name: 'doctrine.orm.entity_listener'
|
||||||
event: 'postUpdate'
|
event: 'postUpdate'
|
||||||
entity: 'Chill\CalendarBundle\Entity\CalendarRange'
|
entity: 'Chill\CalendarBundle\Entity\CalendarRange'
|
||||||
|
-
|
||||||
|
name: 'doctrine.orm.entity_listener'
|
||||||
|
event: 'postRemove'
|
||||||
|
entity: 'Chill\CalendarBundle\Entity\CalendarRange'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user