From 3ec212df93f868150d4193844bd749af52405864 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Wed, 9 Jun 2021 14:54:36 +0200 Subject: [PATCH 01/10] Creation of Notification Entity --- .../ChillMainBundle/Entity/Notification.php | 182 ++++++++++++++++++ .../Repository/NotificationRepository.php | 39 ++++ 2 files changed, 221 insertions(+) create mode 100644 src/Bundle/ChillMainBundle/Entity/Notification.php create mode 100644 src/Bundle/ChillMainBundle/Repository/NotificationRepository.php diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php new file mode 100644 index 000000000..fd0a2acb8 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -0,0 +1,182 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\MainBundle\Entity; + +use App\Repository\Chill\MainBundle\Entity\NotificationRepository; +use Chill\MainBundle\Entity\User; +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; +use Doctrine\ORM\Mapping as ORM; + +/** + * @ORM\Entity(repositoryClass=NotificationRepository::class) + */ +class Notification +{ + /** + * @ORM\Id + * @ORM\GeneratedValue + * @ORM\Column(type="integer") + */ + private $id; + + /** + * @ORM\Column(type="text") + */ + private $message; + + /** + * @ORM\Column(type="datetime_immutable") + */ + private $date; + + /** + * @ORM\ManyToOne(targetEntity=User::class) + * @ORM\JoinColumn(nullable=false) + */ + private $sender; + + /** + * @ORM\ManyToMany(targetEntity=User::class) + * @ORM\JoinTable(name="chill_main_notification_addresses_user") + */ + private $addressees; + + /** + * @ORM\Column(type="string", length=255) + */ + private $relatedEntityClass; + + /** + * @ORM\Column(type="integer") + */ + private $relatedEntityId; + + /** + * @ORM\Column(type="boolean") + */ + private $read; + + public function __construct() + { + $this->addressees = new ArrayCollection(); + } + + public function getId(): ?int + { + return $this->id; + } + + public function getMessage(): ?string + { + return $this->message; + } + + public function setMessage(string $message): self + { + $this->message = $message; + + return $this; + } + + public function getDate(): ?\DateTimeImmutable + { + return $this->date; + } + + public function setDate(\DateTimeImmutable $date): self + { + $this->date = $date; + + return $this; + } + + public function getSender(): ?User + { + return $this->sender; + } + + public function setSender(?User $sender): self + { + $this->sender = $sender; + + return $this; + } + + /** + * @return Collection|User[] + */ + public function getAddressees(): Collection + { + return $this->addressees; + } + + public function addAddressee(User $addressee): self + { + if (!$this->addressees->contains($addressee)) { + $this->addressees[] = $addressee; + } + + return $this; + } + + public function removeAddressee(User $addressee): self + { + $this->addressees->removeElement($addressee); + + return $this; + } + + public function getRelatedEntityClass(): ?string + { + return $this->relatedEntityClass; + } + + public function setRelatedEntityClass(string $relatedEntityClass): self + { + $this->relatedEntityClass = $relatedEntityClass; + + return $this; + } + + public function getRelatedEntityId(): ?int + { + return $this->relatedEntityId; + } + + public function setRelatedEntityId(int $relatedEntityId): self + { + $this->relatedEntityId = $relatedEntityId; + + return $this; + } + + public function getRead(): ?bool + { + return $this->read; + } + + public function setRead(bool $read): self + { + $this->read = $read; + + return $this; + } +} diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php new file mode 100644 index 000000000..04d6def1b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -0,0 +1,39 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\MainBundle\Repository; + +use Chill\MainBundle\Entity\Notification; +use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\Persistence\ManagerRegistry; + +/** + * @method Notification|null find($id, $lockMode = null, $lockVersion = null) + * @method Notification|null findOneBy(array $criteria, array $orderBy = null) + * @method Notification[] findAll() + * @method Notification[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) + */ +class NotificationRepository extends ServiceEntityRepository +{ + public function __construct(ManagerRegistry $registry) + { + parent::__construct($registry, Notification::class); + } + +} From 916209e402df07e39e969b17f7fb202778dc0a7e Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Thu, 10 Jun 2021 15:11:03 +0200 Subject: [PATCH 02/10] Fix remarks MR - notif --- src/Bundle/ChillMainBundle/Entity/Notification.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index fd0a2acb8..76a4b1e4c 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -27,6 +27,7 @@ use Doctrine\ORM\Mapping as ORM; /** * @ORM\Entity(repositoryClass=NotificationRepository::class) + * @ORM\Table(name="chill_main_notification") */ class Notification { @@ -70,7 +71,7 @@ class Notification private $relatedEntityId; /** - * @ORM\Column(type="boolean") + * @ORM\Column(type="json") */ private $read; @@ -168,12 +169,12 @@ class Notification return $this; } - public function getRead(): ?bool + public function getRead(): array { return $this->read; } - public function setRead(bool $read): self + public function setRead(array $read): self { $this->read = $read; From 84913553e831e61de8c05990be15f3d09dbaa505 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Thu, 10 Jun 2021 15:11:36 +0200 Subject: [PATCH 03/10] NotificationRepo as a service --- .../config/services/repositories.yaml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/Bundle/ChillMainBundle/config/services/repositories.yaml diff --git a/src/Bundle/ChillMainBundle/config/services/repositories.yaml b/src/Bundle/ChillMainBundle/config/services/repositories.yaml new file mode 100644 index 000000000..18fd70df8 --- /dev/null +++ b/src/Bundle/ChillMainBundle/config/services/repositories.yaml @@ -0,0 +1,42 @@ +services: + chill.main.countries_repository: + class: Doctrine\ORM\EntityRepository + factory: ["@doctrine.orm.entity_manager", getRepository] + arguments: + - "Chill\\MainBundle\\Entity\\Country" + + chill.main.user_repository: + class: Doctrine\ORM\EntityRepository + factory: ["@doctrine.orm.entity_manager", getRepository] + arguments: + - "Chill\\MainBundle\\Entity\\User" + + chill.main.scope_repository: + class: Doctrine\ORM\EntityRepository + factory: ["@doctrine.orm.entity_manager", getRepository] + arguments: + - "Chill\\MainBundle\\Entity\\Scope" + + chill.main.postalcode_repository: + class: Doctrine\ORM\EntityRepository + factory: ["@doctrine.orm.entity_manager", getRepository] + arguments: + - "Chill\\MainBundle\\Entity\\PostalCode" + + Chill\MainBundle\Repository\PostalCodeRepository: '@chill.main.postalcode_repository' + + chill.main.center_repository: + class: Doctrine\ORM\EntityRepository + factory: ["@doctrine.orm.entity_manager", getRepository] + arguments: + - "Chill\\MainBundle\\Entity\\Center" + + Chill\MainBundle\Repository\CenterRepository: '@chill.main.center_repository' + + chill.main.notification_repository: + class: Doctrine\ORM\EntityRepository + factory: ["@doctrine.orm.entity_manager", getRepository] + arguments: + - "Chill\\MainBundle\\Entity\\Notification" + + Chill\MainBundle\Repository\NotificationRepository: '@chill.main.notification_repository' From a258905c599b993eb76a0ee7daa3d5c4b86cf6f9 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 15 Jun 2021 11:23:43 +0200 Subject: [PATCH 04/10] Add unique constraint (class, id) to notifications --- src/Bundle/ChillMainBundle/Entity/Notification.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index 76a4b1e4c..51ea0e39f 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -27,7 +27,12 @@ use Doctrine\ORM\Mapping as ORM; /** * @ORM\Entity(repositoryClass=NotificationRepository::class) - * @ORM\Table(name="chill_main_notification") + * @ORM\Table( + * name="chill_main_notification", + * uniqueConstraints={ + * @ORM\UniqueConstraint(columns={"relatedEntityClass", "relatedEntityId"}) + * } + * ) */ class Notification { From 23528e7a5ca9fe9d723da54727150c23d44497a5 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 15 Jun 2021 11:53:19 +0200 Subject: [PATCH 05/10] Adding some features to load for notifications) --- .../DataFixtures/ORM/LoadActivity.php | 6 ++- .../ORM/LoadActivityNotifications.php | 39 ++++++++++++++++++ .../ORM/LoadAbstractNotificationsTrait.php | 41 +++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php create mode 100644 src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php index de1ea97c2..ce32143f5 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php @@ -138,11 +138,15 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C foreach($persons as $person) { $activityNbr = rand(0,3); + $ref = 'activity_'.$person->getFullnameCanonical(); + for($i = 0; $i < $activityNbr; $i ++) { - print "Creating an activity type for : ".$person."\n"; + print "Creating an activity type for : ".$person." (ref: ".$ref.") \n"; $activity = $this->newRandomActivity($person); $manager->persist($activity); } + + $this->setReference($ref, $activity); } $manager->flush(); } diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php new file mode 100644 index 000000000..588b2b7e1 --- /dev/null +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php @@ -0,0 +1,39 @@ + 'Hello !', + 'entityClass' => Activity::class, + 'entityRef' => 'activity_gerard depardieu', + 'sender' => 'center a_social', + 'addressees' => [ + 'center a_administrative', + 'center a_direction', + 'multi_center' + ], + ] + ]; + + +} diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php new file mode 100644 index 000000000..071f67497 --- /dev/null +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php @@ -0,0 +1,41 @@ +notifs as $notif) { + $entityId = $this->getReference($notif['entityRef'])->getId(); + + print('Adding notification for '.$notif['entityClass'].'(entity id:'.$entityId.")\n"); + + $newNotif = (new Notification()) + ->setMessage($notif['message']) + ->setSender($this->getReference($notif['sender'])) + ->setRelatedEntityClass($notif['entityClass']) + ->setRelatedEntityId($entityId) + ->setDate(new \DateTimeImmutable('now')) + ->setRead([]) + ; + + foreach ($notif['addressees'] as $addressee) { + $newNotif->addAddressee($this->getReference($addressee)); + } + + $manager->persist($newNotif); + + $manager->flush(); + } + } +} From cf8b9ec172e4e6987900780eabec03c4136b784f Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 15 Jun 2021 11:54:00 +0200 Subject: [PATCH 06/10] Migration for notifications --- .../migrations/Version20210610140248.php | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20210610140248.php diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php new file mode 100644 index 000000000..a0b239d31 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php @@ -0,0 +1,42 @@ +addSql('CREATE SEQUENCE chill_main_notification_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_main_notification (id INT NOT NULL, sender_id INT NOT NULL, message TEXT NOT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, relatedEntityClass VARCHAR(255) NOT NULL, relatedEntityId INT NOT NULL, read JSON NOT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_5BDC8067F624B39D ON chill_main_notification (sender_id)'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_5BDC8067567988B4440F6072 ON chill_main_notification (relatedEntityClass, relatedEntityId)'); + $this->addSql('COMMENT ON COLUMN chill_main_notification.date IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('CREATE TABLE chill_main_notification_addresses_user (notification_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(notification_id, user_id))'); + $this->addSql('CREATE INDEX IDX_E52C5D2BEF1A9D84 ON chill_main_notification_addresses_user (notification_id)'); + $this->addSql('CREATE INDEX IDX_E52C5D2BA76ED395 ON chill_main_notification_addresses_user (user_id)'); + $this->addSql('ALTER TABLE chill_main_notification ADD CONSTRAINT FK_5BDC8067F624B39D FOREIGN KEY (sender_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_notification_addresses_user ADD CONSTRAINT FK_E52C5D2BEF1A9D84 FOREIGN KEY (notification_id) REFERENCES chill_main_notification (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_notification_addresses_user ADD CONSTRAINT FK_E52C5D2BA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_main_notification_addresses_user DROP CONSTRAINT FK_E52C5D2BEF1A9D84'); + $this->addSql('DROP SEQUENCE chill_main_notification_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_main_notification'); + $this->addSql('DROP TABLE chill_main_notification_addresses_user'); + } +} From 86d764c09719be66d91c0ad9130bf501a31860d2 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 15 Jun 2021 14:48:33 +0200 Subject: [PATCH 07/10] Using JSONB for storage in db for attendees in Notifications --- src/Bundle/ChillMainBundle/migrations/Version20210610140248.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php index a0b239d31..d54ff4634 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php @@ -20,7 +20,7 @@ final class Version20210610140248 extends AbstractMigration public function up(Schema $schema): void { $this->addSql('CREATE SEQUENCE chill_main_notification_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); - $this->addSql('CREATE TABLE chill_main_notification (id INT NOT NULL, sender_id INT NOT NULL, message TEXT NOT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, relatedEntityClass VARCHAR(255) NOT NULL, relatedEntityId INT NOT NULL, read JSON NOT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE TABLE chill_main_notification (id INT NOT NULL, sender_id INT NOT NULL, message TEXT NOT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, relatedEntityClass VARCHAR(255) NOT NULL, relatedEntityId INT NOT NULL, read JSONB NOT NULL, PRIMARY KEY(id))'); $this->addSql('CREATE INDEX IDX_5BDC8067F624B39D ON chill_main_notification (sender_id)'); $this->addSql('CREATE UNIQUE INDEX UNIQ_5BDC8067567988B4440F6072 ON chill_main_notification (relatedEntityClass, relatedEntityId)'); $this->addSql('COMMENT ON COLUMN chill_main_notification.date IS \'(DC2Type:datetime_immutable)\''); From db545f9fe62371282a9ddb67724f534db0700bac Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 15 Jun 2021 14:49:17 +0200 Subject: [PATCH 08/10] Adding typehinting for Entity/Notif --- .../ChillMainBundle/Entity/Notification.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index 51ea0e39f..3854525b8 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -41,44 +41,44 @@ class Notification * @ORM\GeneratedValue * @ORM\Column(type="integer") */ - private $id; + private int $id; /** * @ORM\Column(type="text") */ - private $message; + private string $message; /** * @ORM\Column(type="datetime_immutable") */ - private $date; + private \DateTimeImmutable $date; /** * @ORM\ManyToOne(targetEntity=User::class) * @ORM\JoinColumn(nullable=false) */ - private $sender; + private User $sender; /** * @ORM\ManyToMany(targetEntity=User::class) * @ORM\JoinTable(name="chill_main_notification_addresses_user") */ - private $addressees; + private Collection $addressees; /** * @ORM\Column(type="string", length=255) */ - private $relatedEntityClass; + private string $relatedEntityClass; /** * @ORM\Column(type="integer") */ - private $relatedEntityId; + private int $relatedEntityId; /** * @ORM\Column(type="json") */ - private $read; + private array $read; public function __construct() { From 49d022ef55eb011b60b8f86969a56ec1b0041c65 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 15 Jun 2021 18:57:56 +0200 Subject: [PATCH 09/10] NotificationRepository as a service --- .../ChillMainBundle/Entity/Notification.php | 3 +- .../Repository/NotificationRepository.php | 49 ++++++++++++++----- .../config/services/repositories.yaml | 8 --- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index 3854525b8..092445c9b 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -19,14 +19,13 @@ namespace Chill\MainBundle\Entity; -use App\Repository\Chill\MainBundle\Entity\NotificationRepository; use Chill\MainBundle\Entity\User; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; /** - * @ORM\Entity(repositoryClass=NotificationRepository::class) + * @ORM\Entity * @ORM\Table( * name="chill_main_notification", * uniqueConstraints={ diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php index 04d6def1b..844459f8b 100644 --- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php @@ -20,20 +20,47 @@ namespace Chill\MainBundle\Repository; use Chill\MainBundle\Entity\Notification; -use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; -use Doctrine\Persistence\ManagerRegistry; +use Doctrine\ORM\EntityManagerInterface; +use Doctrine\ORM\EntityRepository; +use Doctrine\Persistence\ObjectRepository; -/** - * @method Notification|null find($id, $lockMode = null, $lockVersion = null) - * @method Notification|null findOneBy(array $criteria, array $orderBy = null) - * @method Notification[] findAll() - * @method Notification[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) - */ -class NotificationRepository extends ServiceEntityRepository +final class NotificationRepository implements ObjectRepository { - public function __construct(ManagerRegistry $registry) + private EntityRepository $repository; + + public function __construct(EntityManagerInterface $entityManager) { - parent::__construct($registry, Notification::class); + $this->repository = $entityManager->getRepository(Notification::class); + } + + public function find($id, $lockMode = null, $lockVersion = null): ?Notification + { + return $this->repository->find($id, $lockMode, $lockVersion); + } + + public function findOneBy(array $criteria, array $orderBy = null): ?Notification + { + return $this->repository->findOneBy($criteria, $orderBy); + } + + /** + * @return Notification[] + */ + public function findAll(): array + { + return $this->repository->findAll(); + } + + /** + * @return Notification[] + */ + public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + public function getClassName() { + return Notification::class; } } diff --git a/src/Bundle/ChillMainBundle/config/services/repositories.yaml b/src/Bundle/ChillMainBundle/config/services/repositories.yaml index 18fd70df8..551a2f705 100644 --- a/src/Bundle/ChillMainBundle/config/services/repositories.yaml +++ b/src/Bundle/ChillMainBundle/config/services/repositories.yaml @@ -32,11 +32,3 @@ services: - "Chill\\MainBundle\\Entity\\Center" Chill\MainBundle\Repository\CenterRepository: '@chill.main.center_repository' - - chill.main.notification_repository: - class: Doctrine\ORM\EntityRepository - factory: ["@doctrine.orm.entity_manager", getRepository] - arguments: - - "Chill\\MainBundle\\Entity\\Notification" - - Chill\MainBundle\Repository\NotificationRepository: '@chill.main.notification_repository' From 801af209a164f5171e022b32e6e69e2f66ce2430 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Wed, 16 Jun 2021 14:54:33 +0200 Subject: [PATCH 10/10] Revert "NotificationRepo as a service" This reverts commit 84913553e831e61de8c05990be15f3d09dbaa505. --- .../config/services/repositories.yaml | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 src/Bundle/ChillMainBundle/config/services/repositories.yaml diff --git a/src/Bundle/ChillMainBundle/config/services/repositories.yaml b/src/Bundle/ChillMainBundle/config/services/repositories.yaml deleted file mode 100644 index 551a2f705..000000000 --- a/src/Bundle/ChillMainBundle/config/services/repositories.yaml +++ /dev/null @@ -1,34 +0,0 @@ -services: - chill.main.countries_repository: - class: Doctrine\ORM\EntityRepository - factory: ["@doctrine.orm.entity_manager", getRepository] - arguments: - - "Chill\\MainBundle\\Entity\\Country" - - chill.main.user_repository: - class: Doctrine\ORM\EntityRepository - factory: ["@doctrine.orm.entity_manager", getRepository] - arguments: - - "Chill\\MainBundle\\Entity\\User" - - chill.main.scope_repository: - class: Doctrine\ORM\EntityRepository - factory: ["@doctrine.orm.entity_manager", getRepository] - arguments: - - "Chill\\MainBundle\\Entity\\Scope" - - chill.main.postalcode_repository: - class: Doctrine\ORM\EntityRepository - factory: ["@doctrine.orm.entity_manager", getRepository] - arguments: - - "Chill\\MainBundle\\Entity\\PostalCode" - - Chill\MainBundle\Repository\PostalCodeRepository: '@chill.main.postalcode_repository' - - chill.main.center_repository: - class: Doctrine\ORM\EntityRepository - factory: ["@doctrine.orm.entity_manager", getRepository] - arguments: - - "Chill\\MainBundle\\Entity\\Center" - - Chill\MainBundle\Repository\CenterRepository: '@chill.main.center_repository'