Minor: Format code

pull/5707/head
Angel Fernando Quiroz Campos 1 year ago
parent e3f57c1299
commit d6b5a43ca9
No known key found for this signature in database
GPG Key ID: B284841AE3E562CD
  1. 1
      src/CoreBundle/Controller/ResourceController.php
  2. 8
      src/CoreBundle/DataProvider/Extension/CourseRelUserExtension.php
  3. 4
      src/CoreBundle/Migrations/Schema/V200/Version20240731120000.php
  4. 3
      src/CoreBundle/Repository/TrackEDownloadsRepository.php
  5. 15
      src/CoreBundle/State/MessageProcessor.php

@ -10,7 +10,6 @@ use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ResourceLink; use Chamilo\CoreBundle\Entity\ResourceLink;
use Chamilo\CoreBundle\Entity\ResourceNode; use Chamilo\CoreBundle\Entity\ResourceNode;
use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\TrackEDownloads;
use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Entity\User;
use Chamilo\CoreBundle\Repository\ResourceWithLinkInterface; use Chamilo\CoreBundle\Repository\ResourceWithLinkInterface;
use Chamilo\CoreBundle\Repository\TrackEDownloadsRepository; use Chamilo\CoreBundle\Repository\TrackEDownloadsRepository;

@ -42,10 +42,11 @@ final class CourseRelUserExtension implements QueryCollectionExtensionInterface
AccessUrlRelCourse::class, AccessUrlRelCourse::class,
'url_rel', 'url_rel',
'WITH', 'WITH',
'url_rel.course = ' . $rootAlias 'url_rel.course = '.$rootAlias
) )
->andWhere('url_rel.url = :access_url_id') ->andWhere('url_rel.url = :access_url_id')
->setParameter('access_url_id', $accessUrl->getId()); ->setParameter('access_url_id', $accessUrl->getId())
;
} else { } else {
$metaData = $this->entityManager->getClassMetadata($resourceClass); $metaData = $this->entityManager->getClassMetadata($resourceClass);
if ($metaData->hasAssociation('course')) { if ($metaData->hasAssociation('course')) {
@ -53,7 +54,8 @@ final class CourseRelUserExtension implements QueryCollectionExtensionInterface
->innerJoin("$rootAlias.course", 'c') ->innerJoin("$rootAlias.course", 'c')
->innerJoin('c.urls', 'url_rel') ->innerJoin('c.urls', 'url_rel')
->andWhere('url_rel.url = :access_url_id') ->andWhere('url_rel.url = :access_url_id')
->setParameter('access_url_id', $accessUrl->getId()); ->setParameter('access_url_id', $accessUrl->getId())
;
} }
} }
} }

@ -33,7 +33,7 @@ final class Version20240731120000 extends AbstractMigration
"); ");
// Update message status based on message_rel_user entries // Update message status based on message_rel_user entries
$this->addSql(" $this->addSql('
UPDATE message m UPDATE message m
LEFT JOIN ( LEFT JOIN (
SELECT message_id, COUNT(*) AS rel_count SELECT message_id, COUNT(*) AS rel_count
@ -45,7 +45,7 @@ final class Version20240731120000 extends AbstractMigration
WHEN mru.rel_count IS NULL THEN 3 -- Message::MESSAGE_STATUS_DELETED WHEN mru.rel_count IS NULL THEN 3 -- Message::MESSAGE_STATUS_DELETED
ELSE 0 -- Set to 0 or whatever the default status should be ELSE 0 -- Set to 0 or whatever the default status should be
END END
"); ');
} }
public function down(Schema $schema): void public function down(Schema $schema): void

@ -29,7 +29,8 @@ class TrackEDownloadsRepository extends ServiceEntityRepository
->setDownDocPath($documentUrl) ->setDownDocPath($documentUrl)
->setDownUserId($user->getId()) ->setDownUserId($user->getId())
->setDownDate(new DateTime()) ->setDownDate(new DateTime())
->setResourceLink($resourceLink); ->setResourceLink($resourceLink)
;
$this->_em->persist($download); $this->_em->persist($download);
$this->_em->flush(); $this->_em->flush();

@ -9,13 +9,14 @@ namespace Chamilo\CoreBundle\State;
use ApiPlatform\Metadata\DeleteOperationInterface; use ApiPlatform\Metadata\DeleteOperationInterface;
use ApiPlatform\Metadata\Operation; use ApiPlatform\Metadata\Operation;
use ApiPlatform\Metadata\Patch; use ApiPlatform\Metadata\Patch;
use ApiPlatform\Metadata\Post;
use ApiPlatform\State\ProcessorInterface; use ApiPlatform\State\ProcessorInterface;
use Chamilo\CoreBundle\Entity\Message; use Chamilo\CoreBundle\Entity\Message;
use Chamilo\CoreBundle\Entity\MessageAttachment; use Chamilo\CoreBundle\Entity\MessageAttachment;
use Chamilo\CoreBundle\Entity\MessageRelUser; use Chamilo\CoreBundle\Entity\MessageRelUser;
use Chamilo\CoreBundle\Repository\ResourceNodeRepository; use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use InvalidArgumentException;
use LogicException;
use Notification; use Notification;
use Symfony\Bundle\SecurityBundle\Security; use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
@ -62,7 +63,7 @@ final class MessageProcessor implements ProcessorInterface
$user = $this->security->getUser(); $user = $this->security->getUser();
if (!$user) { if (!$user) {
throw new \LogicException('User not found.'); throw new LogicException('User not found.');
} }
// Check if the relationship already exists // Check if the relationship already exists
@ -70,7 +71,7 @@ final class MessageProcessor implements ProcessorInterface
$existingRelation = $messageRelUserRepository->findOneBy([ $existingRelation = $messageRelUserRepository->findOneBy([
'message' => $message, 'message' => $message,
'receiver' => $user, 'receiver' => $user,
'receiverType' => MessageRelUser::TYPE_SENDER 'receiverType' => MessageRelUser::TYPE_SENDER,
]); ]);
if (!$existingRelation) { if (!$existingRelation) {
@ -81,7 +82,7 @@ final class MessageProcessor implements ProcessorInterface
$this->entityManager->persist($messageRelUser); $this->entityManager->persist($messageRelUser);
} }
if ($message->getMsgType() === Message::MESSAGE_TYPE_INBOX) { if (Message::MESSAGE_TYPE_INBOX === $message->getMsgType()) {
$this->saveNotificationForInboxMessage($message); $this->saveNotificationForInboxMessage($message);
} }
@ -97,12 +98,12 @@ final class MessageProcessor implements ProcessorInterface
$request = $this->requestStack->getCurrentRequest(); $request = $this->requestStack->getCurrentRequest();
if (!$request) { if (!$request) {
throw new \LogicException('Cannot get current request'); throw new LogicException('Cannot get current request');
} }
$requestData = json_decode($request->getContent(), true); $requestData = json_decode($request->getContent(), true);
if (!isset($requestData['userId'])) { if (!isset($requestData['userId'])) {
throw new \InvalidArgumentException('The field userId is required.'); throw new InvalidArgumentException('The field userId is required.');
} }
$userId = $requestData['userId']; $userId = $requestData['userId'];
@ -128,7 +129,7 @@ final class MessageProcessor implements ProcessorInterface
$messageRelUserRepository = $this->entityManager->getRepository(MessageRelUser::class); $messageRelUserRepository = $this->entityManager->getRepository(MessageRelUser::class);
$remainingReceivers = $messageRelUserRepository->count(['message' => $message]); $remainingReceivers = $messageRelUserRepository->count(['message' => $message]);
if ($remainingReceivers === 0) { if (0 === $remainingReceivers) {
$message->setStatus(Message::MESSAGE_STATUS_DELETED); $message->setStatus(Message::MESSAGE_STATUS_DELETED);
$this->entityManager->flush(); $this->entityManager->flush();
} }

Loading…
Cancel
Save