Selaa lähdekoodia

Cherry-picked specific files from develop to master

opentalent 1 vuosi sitten
vanhempi
commit
1605c30c8d

+ 1 - 1
.env.docker

@@ -7,7 +7,7 @@ DATABASE_URL=mysql://root:mysql660@db:3306/opentalent?serverVersion=5.7
 ###< doctrine/doctrine-bundle ###
 
 ###> nelmio/cors-bundle ###
-CORS_ALLOW_ORIGIN=^https?:\/\/(localhost|127\.0\.0\.1|(local.(admin|app|app\-v3|frames|frames_v3).opentalent.fr))(:[0-9]+)?$
+CORS_ALLOW_ORIGIN=^https?:\/\/(localhost|127\.0\.0\.1|(local.(admin|app|app\-v3|frames|frames_v3|agenda).opentalent.fr))(:[0-9]+)?$
 ###< nelmio/cors-bundle ###
 
 ###> api v1 ###

+ 1 - 1
sql/schema-extensions/002-view_federation_structures.sql

@@ -19,7 +19,7 @@ AS
              LEFT JOIN opentalent.AddressPostal a on oa.addressPostal_id = a.id
              LEFT JOIN opentalent.Country c ON (c.id = a.addressCountry_id)
              LEFT JOIN opentalent.organization_contactpoint ocp ON ocp.organization_id = o.id
-             LEFT JOIN (SELECT * FROM opentalent.ContactPoint WHERE `contactType`='PRINCIPAL') cp ON cp.id = ocp.contactPoint_id
+             INNER JOIN (SELECT * FROM opentalent.ContactPoint WHERE `contactType`='PRINCIPAL') cp ON cp.id = ocp.contactPoint_id
              LEFT JOIN (
                 SELECT oar_.organization_id, CONCAT('[', GROUP_CONCAT(COLUMN_JSON(COLUMN_CREATE('id', oar_.id, 'title', oar_.title, 'date', DATE_FORMAT(oar_.date, '%Y-%m-%dT%TZ'), 'link', oar_.link))), ']') as articles
                 FROM (SELECT * FROM OrganizationArticle WHERE link is not null and link != '' ORDER BY date DESC) as oar_

+ 52 - 143
src/Entity/Public/FederationStructure.php

@@ -1,21 +1,22 @@
 <?php
-declare (strict_types=1);
+
+declare(strict_types=1);
 
 namespace App\Entity\Public;
 
-use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Doctrine\Orm\Filter\NumericFilter;
 use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
-use App\Filter\Utils\FindInSetFilter;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use App\Filter\ApiPlatform\Utils\FindInSetFilter;
 use App\Repository\Public\FederationStructureRepository;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
- * Structure telle qu'elle est représentée sur l'iframe de recherche des structures d'une fédération
+ * Structure telle qu'elle est représentée sur l'iframe de recherche des structures d'une fédération.
  *
  * Fichier source de la view : ./sql/schema-extensions/002-view_federation_structures.sql
  */
@@ -29,12 +30,12 @@ use Symfony\Component\Serializer\Annotation\Groups;
         new GetCollection(
             uriTemplate: '/public/federation_structures',
             normalizationContext: ['groups' => ['federation_structure_collection_get']]
-        )
+        ),
     ],
     paginationEnabled: false
 )]
 #[ORM\Entity(repositoryClass: FederationStructureRepository::class, readOnly: true)]
-#[ORM\Table(name: "view_federation_structures")]
+#[ORM\Table(name: 'view_federation_structures')]
 #[ApiFilter(filterClass: SearchFilter::class, properties: ['name' => 'partial', 'city' => 'exact'])]
 #[ApiFilter(filterClass: NumericFilter::class, properties: ['id', 'parentId'])]
 #[ApiFilter(filterClass: FindInSetFilter::class, properties: ['parents'])]
@@ -42,212 +43,170 @@ class FederationStructure
 {
     #[ORM\Id]
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private int $id;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?string $name;
 
     #[ORM\Column(type: 'integer', nullable: true)]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?int $logoId;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $description;
 
     #[ORM\Column(type: 'integer')]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?int $imageId;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?string $type;
 
     #[ORM\Column(nullable: true)]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?string $website;
 
     /** @var mixed[] */
     #[ORM\Column(type: 'json')]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private array $addresses;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $phone;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $mobilePhone;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $email;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $facebook;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $twitter;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $instagram;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?string $youtube;
 
-    /** @var mixed[]|null  */
+    /** @var mixed[]|null */
     #[ORM\Column(type: 'json')]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(['federation_structure_item_get'])]
     private ?array $articles;
 
-    /** @var list<string>|null  */
+    /** @var list<string>|null */
     #[ORM\Column(type: 'simple_array')]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?array $practices;
 
     #[ORM\Column(type: 'integer')]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?int $parentId;
 
     #[ORM\Column]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private ?string $parentName;
 
-    /** @var list<string>  */
+    /** @var list<string> */
     #[ORM\Column(type: 'simple_array')]
-    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
+    #[Groups(['federation_structure_item_get', 'federation_structure_collection_get'])]
     private array $parents;
 
-    /**
-     * @return int
-     */
     public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @param int $id
-     * @return FederationStructure
-     */
     public function setId(int $id): FederationStructure
     {
         $this->id = $id;
+
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @param string $name
-     * @return FederationStructure
-     */
     public function setName(string $name): FederationStructure
     {
         $this->name = $name;
+
         return $this;
     }
 
-    /**
-     * @return int|null
-     */
     public function getLogoId(): ?int
     {
         return $this->logoId;
     }
 
-    /**
-     * @param int|null $logoId
-     * @return FederationStructure
-     */
     public function setLogoId(?int $logoId): FederationStructure
     {
         $this->logoId = $logoId;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getDescription(): ?string
     {
         return $this->description;
     }
 
-    /**
-     * @param string|null $description
-     * @return FederationStructure
-     */
     public function setDescription(?string $description): FederationStructure
     {
         $this->description = $description;
+
         return $this;
     }
 
-    /**
-     * @return int|null
-     */
     public function getImageId(): ?int
     {
         return $this->imageId;
     }
 
-    /**
-     * @param int|null $imageId
-     * @return FederationStructure
-     */
     public function setImageId(?int $imageId): FederationStructure
     {
         $this->imageId = $imageId;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getType(): ?string
     {
         return $this->type;
     }
 
-    /**
-     * @param string|null $type
-     * @return FederationStructure
-     */
     public function setType(?string $type): FederationStructure
     {
         $this->type = $type;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getWebsite(): ?string
     {
         return $this->website;
     }
 
-    /**
-     * @param string|null $website
-     * @return FederationStructure
-     */
     public function setWebsite(?string $website): FederationStructure
     {
         $this->website = $website;
+
         return $this;
     }
 
@@ -261,133 +220,95 @@ class FederationStructure
 
     /**
      * @param mixed[] $addresses
-     * @return FederationStructure
      */
     public function setAddresses(array $addresses): FederationStructure
     {
         $this->addresses = $addresses;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getPhone(): ?string
     {
         return $this->phone;
     }
 
-    /**
-     * @param string|null $phone
-     * @return FederationStructure
-     */
     public function setPhone(?string $phone): FederationStructure
     {
         $this->phone = $phone;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getMobilePhone(): ?string
     {
         return $this->mobilePhone;
     }
 
-    /**
-     * @param string|null $mobilePhone
-     * @return FederationStructure
-     */
     public function setMobilePhone(?string $mobilePhone): FederationStructure
     {
         $this->mobilePhone = $mobilePhone;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getEmail(): ?string
     {
         return $this->email;
     }
 
-    /**
-     * @param string|null $email
-     */
     public function setEmail(?string $email): self
     {
         $this->email = $email;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getFacebook(): ?string
     {
         return $this->facebook;
     }
 
-    /**
-     * @param string|null $facebook
-     */
     public function setFacebook(?string $facebook): self
     {
         $this->facebook = $facebook;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getTwitter(): ?string
     {
         return $this->twitter;
     }
 
-    /**
-     * @param string|null $twitter
-     */
     public function setTwitter(?string $twitter): self
     {
         $this->twitter = $twitter;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getInstagram(): ?string
     {
         return $this->instagram;
     }
 
-    /**
-     * @param string|null $instagram
-     */
     public function setInstagram(?string $instagram): self
     {
         $this->instagram = $instagram;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getYoutube(): ?string
     {
         return $this->youtube;
     }
 
-    /**
-     * @param string|null $youtube
-     * @return FederationStructure
-     */
     public function setYoutube(?string $youtube): FederationStructure
     {
         $this->youtube = $youtube;
+
         return $this;
     }
 
@@ -401,11 +322,11 @@ class FederationStructure
 
     /**
      * @param mixed[]|null $articles
-     * @return FederationStructure
      */
     public function setArticles(?array $articles): FederationStructure
     {
         $this->articles = $articles;
+
         return $this;
     }
 
@@ -419,47 +340,35 @@ class FederationStructure
 
     /**
      * @param list<string>|null $practices
-     * @return FederationStructure
      */
     public function setPractices(?array $practices): FederationStructure
     {
         $this->practices = $practices;
+
         return $this;
     }
 
-    /**
-     * @return int|null
-     */
     public function getParentId(): ?int
     {
         return $this->parentId;
     }
 
-    /**
-     * @param int|null $parentId
-     * @return FederationStructure
-     */
     public function setParentId(?int $parentId): FederationStructure
     {
         $this->parentId = $parentId;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getParentName(): ?string
     {
         return $this->parentName;
     }
 
-    /**
-     * @param string|null $parentName
-     * @return FederationStructure
-     */
     public function setParentName(?string $parentName): FederationStructure
     {
         $this->parentName = $parentName;
+
         return $this;
     }
 
@@ -473,11 +382,11 @@ class FederationStructure
 
     /**
      * @param list<string> $parents
-     * @return FederationStructure
      */
     public function setParents(array $parents): FederationStructure
     {
         $this->parents = $parents;
+
         return $this;
     }
 }

+ 88 - 161
src/Entity/Public/PublicEvent.php

@@ -1,22 +1,25 @@
 <?php
-declare (strict_types=1);
+
+declare(strict_types=1);
 
 namespace App\Entity\Public;
 
-use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
 use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
 use ApiPlatform\Doctrine\Orm\Filter\NumericFilter;
+use ApiPlatform\Doctrine\Orm\Filter\OrderFilter;
+use ApiPlatform\Doctrine\Orm\Filter\RangeFilter;
 use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
-use App\Filter\Utils\DistanceFilter;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use App\Filter\ApiPlatform\Utils\ArrayFieldFilter;
+use App\Filter\ApiPlatform\Utils\DistanceFilter;
 use App\Repository\Public\PublicEventRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Évènements publics tels que publiés sur l'agenda du site opentalent ou les sites des structures
+ * Évènements publics tels que publiés sur l'agenda du site opentalent ou les sites des structures.
  *
  * Fichier source de la view : ./sql/schema-extensions/001-view_public_events.sql
  */
@@ -26,17 +29,20 @@ use Doctrine\ORM\Mapping as ORM;
             uriTemplate: '/public/events/{uuid}'
         ),
         new GetCollection(
-            uriTemplate: '/public/events'
-        )
+            uriTemplate: '/public/events',
+            paginationItemsPerPage: 16,
+        ),
     ]
 )]
 #[ORM\Entity(repositoryClass: PublicEventRepository::class, readOnly: true)]
-#[ORM\Table(name: "view_public_events")]
-#[ApiFilter(filterClass: SearchFilter::class, properties: ['name' => 'partial', 'city' => 'exact'])]
-#[ApiFilter(filterClass: NumericFilter::class, properties: ['organizationId'])]
+#[ORM\Table(name: 'view_public_events')]
+#[ApiFilter(filterClass: SearchFilter::class, properties: ['name' => 'partial', 'city' => 'exact', 'categoryCode' => 'exact', 'origin' => 'exact'])]
+#[ApiFilter(filterClass: NumericFilter::class, properties: ['organizationId', 'priceMini', 'price_maxi'])]
 #[ApiFilter(filterClass: DateFilter::class, properties: ['datetimeStart', 'datetimeEnd'])]
 #[ApiFilter(filterClass: DistanceFilter::class)]
 #[ApiFilter(filterClass: OrderFilter::class, properties: ['datetimeStart', 'datetimeEnd'], arguments: ['orderParameterName' => 'order'])]
+#[ApiFilter(filterClass: RangeFilter::class, properties: ['priceMini', 'priceMaxi'])]
+#[ApiFilter(filterClass: ArrayFieldFilter::class, properties: ['categories'])]
 class PublicEvent
 {
     #[ORM\Id]
@@ -97,354 +103,251 @@ class PublicEvent
     #[ORM\Column]
     private ?string $thumbnailUrl;
 
-    /** @var list<string>|null  */
+    /** @var list<string>|null */
     #[ORM\Column(type: 'simple_array')]
     private ?array $categories;
 
     #[ORM\Column]
     private string $origin = 'opentalent';
+
     #[ORM\Column(type: 'integer')]
     private int $entityId;
 
-    /**
-     * @return string
-     */
+    #[ORM\Column]
+    private int $priceMini;
+
+    #[ORM\Column]
+    private int $priceMaxi;
+
+    // categoryCode
+    #[ORM\Column]
+    private ?string $categoryCode;
+
     public function getUuid(): string
     {
         return $this->uuid;
     }
 
-    /**
-     * @param string $uuid
-     * @return PublicEvent
-     */
     public function setUuid(string $uuid): PublicEvent
     {
         $this->uuid = $uuid;
+
         return $this;
     }
 
-    /**
-     * @return int|null
-     */
     public function getOrganizationId(): ?int
     {
         return $this->organizationId;
     }
 
-    /**
-     * @param int|null $organizationId
-     * @return PublicEvent
-     */
     public function setOrganizationId(?int $organizationId): PublicEvent
     {
         $this->organizationId = $organizationId;
+
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @param string $name
-     * @return PublicEvent
-     */
     public function setName(string $name): PublicEvent
     {
         $this->name = $name;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getDescription(): ?string
     {
         return $this->description;
     }
 
-    /**
-     * @param string|null $description
-     * @return PublicEvent
-     */
     public function setDescription(?string $description): PublicEvent
     {
         $this->description = $description;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getUrl(): ?string
     {
         return $this->url;
     }
 
-    /**
-     * @param string|null $url
-     * @return PublicEvent
-     */
     public function setUrl(?string $url): PublicEvent
     {
         $this->url = $url;
+
         return $this;
     }
 
-    /**
-     * @return \DateTime
-     */
     public function getDatetimeStart(): \DateTime
     {
         return $this->datetimeStart;
     }
 
-    /**
-     * @param \DateTime $datetimeStart
-     * @return PublicEvent
-     */
     public function setDatetimeStart(\DateTime $datetimeStart): PublicEvent
     {
         $this->datetimeStart = $datetimeStart;
+
         return $this;
     }
 
-    /**
-     * @return \DateTime
-     */
     public function getDatetimeEnd(): \DateTime
     {
         return $this->datetimeEnd;
     }
 
-    /**
-     * @param \DateTime $datetimeEnd
-     * @return PublicEvent
-     */
     public function setDatetimeEnd(\DateTime $datetimeEnd): PublicEvent
     {
         $this->datetimeEnd = $datetimeEnd;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getCity(): ?string
     {
         return $this->city;
     }
 
-    /**
-     * @param string|null $city
-     * @return PublicEvent
-     */
     public function setCity(?string $city): PublicEvent
     {
         $this->city = $city;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getPostalCode(): ?string
     {
         return $this->postalCode;
     }
 
-    /**
-     * @param string|null $postalCode
-     * @return PublicEvent
-     */
     public function setPostalCode(?string $postalCode): PublicEvent
     {
         $this->postalCode = $postalCode;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getStreetAddress(): ?string
     {
         return $this->streetAddress;
     }
 
-    /**
-     * @param string|null $streetAddress
-     * @return PublicEvent
-     */
     public function setStreetAddress(?string $streetAddress): PublicEvent
     {
         $this->streetAddress = $streetAddress;
+
         return $this;
     }
 
-    /**
-     * @return float|null
-     */
     public function getLongitude(): ?float
     {
         return $this->longitude;
     }
 
-    /**
-     * @param float|null $longitude
-     * @return PublicEvent
-     */
     public function setLongitude(?float $longitude): PublicEvent
     {
         $this->longitude = $longitude;
+
         return $this;
     }
 
-    /**
-     * @return float|null
-     */
     public function getLatitude(): ?float
     {
         return $this->latitude;
     }
 
-    /**
-     * @param float|null $latitude
-     * @return PublicEvent
-     */
     public function setLatitude(?float $latitude): PublicEvent
     {
         $this->latitude = $latitude;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getRoomName(): ?string
     {
         return $this->roomName;
     }
 
-    /**
-     * @param string|null $roomName
-     * @return PublicEvent
-     */
     public function setRoomName(?string $roomName): PublicEvent
     {
         $this->roomName = $roomName;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getRoomDescription(): ?string
     {
         return $this->roomDescription;
     }
 
-    /**
-     * @param string|null $roomDescription
-     * @return PublicEvent
-     */
     public function setRoomDescription(?string $roomDescription): PublicEvent
     {
         $this->roomDescription = $roomDescription;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getRoomLocalisation(): ?string
     {
         return $this->roomLocalisation;
     }
 
-    /**
-     * @param string|null $roomLocalisation
-     * @return PublicEvent
-     */
     public function setRoomLocalisation(?string $roomLocalisation): PublicEvent
     {
         $this->roomLocalisation = $roomLocalisation;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getRoomCapacity(): ?string
     {
         return $this->roomCapacity;
     }
 
-    /**
-     * @param string|null $roomCapacity
-     * @return PublicEvent
-     */
     public function setRoomCapacity(?string $roomCapacity): PublicEvent
     {
         $this->roomCapacity = $roomCapacity;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getRoomFloorSize(): ?string
     {
         return $this->roomFloorSize;
     }
 
-    /**
-     * @param string|null $roomFloorSize
-     * @return PublicEvent
-     */
     public function setRoomFloorSize(?string $roomFloorSize): PublicEvent
     {
         $this->roomFloorSize = $roomFloorSize;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getImageUrl(): ?string
     {
         return $this->imageUrl;
     }
 
-    /**
-     * @param string|null $imageUrl
-     * @return PublicEvent
-     */
     public function setImageUrl(?string $imageUrl): PublicEvent
     {
         $this->imageUrl = $imageUrl;
+
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getThumbnailUrl(): ?string
     {
         return $this->thumbnailUrl;
     }
 
-    /**
-     * @param string|null $thumbnailUrl
-     * @return PublicEvent
-     */
     public function setThumbnailUrl(?string $thumbnailUrl): PublicEvent
     {
         $this->thumbnailUrl = $thumbnailUrl;
+
         return $this;
     }
 
@@ -458,47 +361,71 @@ class PublicEvent
 
     /**
      * @param list<string>|null $categories
-     * @return PublicEvent
      */
     public function setCategories(?array $categories): PublicEvent
     {
         $this->categories = $categories;
+
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getOrigin(): string
     {
         return $this->origin;
     }
 
-    /**
-     * @param string $origin
-     * @return PublicEvent
-     */
     public function setOrigin(string $origin): PublicEvent
     {
         $this->origin = $origin;
+
         return $this;
     }
 
-    /**
-     * @return int
-     */
     public function getEntityId(): int
     {
         return $this->entityId;
     }
 
-    /**
-     * @param int $entityId
-     * @return PublicEvent
-     */
     public function setEntityId(int $entityId): PublicEvent
     {
         $this->entityId = $entityId;
+
+        return $this;
+    }
+
+    public function getPriceMini(): int
+    {
+        return $this->priceMini;
+    }
+
+    public function setPriceMini(int $priceMini): PublicEvent
+    {
+        $this->priceMini = $priceMini;
+
+        return $this;
+    }
+
+    public function getPriceMaxi(): int
+    {
+        return $this->priceMaxi;
+    }
+
+    public function setPriceMaxi(int $priceMaxi): PublicEvent
+    {
+        $this->priceMaxi = $priceMaxi;
+
+        return $this;
+    }
+
+    public function getCategoryCode(): ?string
+    {
+        return $this->categoryCode;
+    }
+
+    public function setCategoryCode(?string $categoryCode): PublicEvent
+    {
+        $this->categoryCode = $categoryCode;
+
         return $this;
     }
 }