浏览代码

fix doctrine schema

Olivier Massot 8 月之前
父节点
当前提交
45e3f79f91
共有 40 个文件被更改,包括 53 次插入17 次删除
  1. 8 8
      src/Entity/Access/Access.php
  2. 3 3
      src/Entity/Billing/AbstractBillAccounting.php
  3. 1 0
      src/Entity/Billing/AccessIntangible.php
  4. 1 0
      src/Entity/Billing/AccessPayer.php
  5. 1 0
      src/Entity/Billing/AdvancePayment.php
  6. 1 0
      src/Entity/Billing/Bill.php
  7. 1 0
      src/Entity/Billing/BillAccounting.php
  8. 1 0
      src/Entity/Billing/BillCredit.php
  9. 3 3
      src/Entity/Billing/BillLine.php
  10. 3 3
      src/Entity/Billing/BillPayment.php
  11. 1 0
      src/Entity/Billing/EducationalProjectIntangible.php
  12. 1 0
      src/Entity/Billing/EducationalProjectPayer.php
  13. 1 0
      src/Entity/Booking/AbstractBooking.php
  14. 1 0
      src/Entity/Booking/Course.php
  15. 1 0
      src/Entity/Booking/CourseRecur.php
  16. 1 0
      src/Entity/Booking/EducationalProject.php
  17. 1 0
      src/Entity/Booking/EducationalProjectRecur.php
  18. 1 0
      src/Entity/Booking/Event.php
  19. 1 0
      src/Entity/Booking/EventRecur.php
  20. 1 0
      src/Entity/Booking/Examen.php
  21. 1 0
      src/Entity/Booking/ExamenRecur.php
  22. 1 0
      src/Entity/Booking/OrganizationHoliday.php
  23. 1 0
      src/Entity/Booking/OrganizationHolidayRecur.php
  24. 1 0
      src/Entity/Booking/PersonHoliday.php
  25. 1 0
      src/Entity/Booking/PersonHolidayRecur.php
  26. 1 0
      src/Entity/Core/Notification.php
  27. 1 0
      src/Entity/Core/Tips.php
  28. 1 0
      src/Entity/Message/AbstractReport.php
  29. 1 0
      src/Entity/Message/Email.php
  30. 1 0
      src/Entity/Message/Mail.php
  31. 1 0
      src/Entity/Message/Sms.php
  32. 1 0
      src/Entity/Place/Place.php
  33. 1 0
      src/Entity/Place/PlaceControl.php
  34. 1 0
      src/Entity/Place/PlaceRepair.php
  35. 1 0
      src/Entity/Place/PlaceSystem.php
  36. 1 0
      src/Entity/Place/RoomControl.php
  37. 1 0
      src/Entity/Place/RoomRepair.php
  38. 1 0
      src/Entity/Product/EquipmentControl.php
  39. 1 0
      src/Entity/Product/EquipmentRepair.php
  40. 1 0
      src/Entity/Product/Intangible.php

+ 8 - 8
src/Entity/Access/Access.php

@@ -2392,48 +2392,48 @@ class Access implements UserInterface, PasswordAuthenticatedUserInterface
         return $this;
     }
 
-    public function getAccessSocial(): AccessSocial
+    public function getAccessSocial(): ?AccessSocial
     {
         return $this->accessSocial;
     }
 
-    public function setAccessSocial(AccessSocial $accessSocial): self
+    public function setAccessSocial(?AccessSocial $accessSocial): self
     {
         $this->accessSocial = $accessSocial;
 
         return $this;
     }
 
-    public function getAccessNetworkSetting(): AccessNetworkSetting
+    public function getAccessNetworkSetting(): ?AccessNetworkSetting
     {
         return $this->accessNetworkSetting;
     }
 
-    public function setAccessNetworkSetting(AccessNetworkSetting $accessNetworkSetting): self
+    public function setAccessNetworkSetting(?AccessNetworkSetting $accessNetworkSetting): self
     {
         $this->accessNetworkSetting = $accessNetworkSetting;
 
         return $this;
     }
 
-    public function getAccessCommunication(): AccessCommunication
+    public function getAccessCommunication(): ?AccessCommunication
     {
         return $this->accessCommunication;
     }
 
-    public function setAccessCommunication(AccessCommunication $accessCommunication): self
+    public function setAccessCommunication(?AccessCommunication $accessCommunication): self
     {
         $this->accessCommunication = $accessCommunication;
 
         return $this;
     }
 
-    public function getCalendarSynchro(): CalendarSynchro
+    public function getCalendarSynchro(): ?CalendarSynchro
     {
         return $this->calendarSynchro;
     }
 
-    public function setCalendarSynchro(CalendarSynchro $calendarSynchro): self
+    public function setCalendarSynchro(?CalendarSynchro $calendarSynchro): self
     {
         $this->calendarSynchro = $calendarSynchro;
 

+ 3 - 3
src/Entity/Billing/AbstractBillAccounting.php

@@ -55,7 +55,7 @@ abstract class AbstractBillAccounting
 
     #[ORM\ManyToOne(inversedBy: 'billCredits')]
     #[ORM\JoinColumn(nullable: true)]
-    protected ?AbstractBillAccounting $bill;
+    protected ?Bill $bill;
 
     /** @var Collection<int, BillingIntangibleExcludeDate> */
     #[ORM\OneToMany(targetEntity: BillingIntangibleExcludeDate::class, mappedBy: 'bill', cascade: ['persist'], orphanRemoval: true)]
@@ -223,12 +223,12 @@ abstract class AbstractBillAccounting
         return $this;
     }
 
-    public function getBill(): ?AbstractBillAccounting
+    public function getBill(): ?Bill
     {
         return $this->bill;
     }
 
-    public function setBill(?AbstractBillAccounting $bill): self
+    public function setBill(?Bill $bill): self
     {
         $this->bill = $bill;
 

+ 1 - 0
src/Entity/Billing/AccessIntangible.php

@@ -18,6 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity(repositoryClass: AccessIntangibleRepository::class)]
+#[ORM\Table(name: 'BillingIntangible')]
 class AccessIntangible extends AbstractBillingIntangible
 {
     #[ORM\ManyToOne(inversedBy: 'accessIntangibles')]

+ 1 - 0
src/Entity/Billing/AccessPayer.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
  * Fais le lien entre l'Access qui règle la facture et l'Access concerné
  */
 #[ApiResource(operations: [])]
+#[ORM\Table(name: 'BillingPayer')]
 // #[Auditable]
 #[ORM\Entity(repositoryClass: AccessPayerRepository::class)]
 class AccessPayer extends AbstractBillingPayer

+ 1 - 0
src/Entity/Billing/AdvancePayment.php

@@ -13,6 +13,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'BillAccounting')]
 class AdvancePayment extends AbstractBillAccounting
 {
 }

+ 1 - 0
src/Entity/Billing/Bill.php

@@ -13,6 +13,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'BillAccounting')]
 class Bill extends AbstractBillAccounting
 {
 }

+ 1 - 0
src/Entity/Billing/BillAccounting.php

@@ -13,6 +13,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'BillAccounting')]
 #[ORM\InheritanceType('SINGLE_TABLE')]
 class BillAccounting extends AbstractBillAccounting
 {

+ 1 - 0
src/Entity/Billing/BillCredit.php

@@ -13,6 +13,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'BillAccounting')]
 class BillCredit extends AbstractBillAccounting
 {
 }

+ 3 - 3
src/Entity/Billing/BillLine.php

@@ -28,7 +28,7 @@ class BillLine
 
     #[ORM\ManyToOne(inversedBy: 'billLines')]
     #[ORM\JoinColumn(nullable: false)]
-    private AbstractBillAccounting $bill;
+    private Bill $bill;
 
     #[ORM\ManyToOne(inversedBy: 'billLines')]
     private ?Access $access = null;
@@ -44,12 +44,12 @@ class BillLine
         return $this->id;
     }
 
-    public function getBill(): AbstractBillAccounting
+    public function getBill(): Bill
     {
         return $this->bill;
     }
 
-    public function setBill(AbstractBillAccounting $bill): self
+    public function setBill(Bill $bill): self
     {
         $this->bill = $bill;
 

+ 3 - 3
src/Entity/Billing/BillPayment.php

@@ -27,7 +27,7 @@ class BillPayment
 
     #[ORM\ManyToOne(cascade: ['persist'], inversedBy: 'billPayments')]
     #[ORM\JoinColumn(nullable: true)]
-    private ?AbstractBillAccounting $bill = null;
+    private ?Bill $bill = null;
 
     #[ORM\ManyToOne(cascade: ['persist'], inversedBy: 'billDetachedPayments')]
     #[ORM\JoinColumn(nullable: true)]
@@ -68,12 +68,12 @@ class BillPayment
         return $this->id;
     }
 
-    public function getBill(): ?AbstractBillAccounting
+    public function getBill(): ?Bill
     {
         return $this->bill;
     }
 
-    public function setBill(?AbstractBillAccounting $bill): self
+    public function setBill(?Bill $bill): self
     {
         $this->bill = $bill;
 

+ 1 - 0
src/Entity/Billing/EducationalProjectIntangible.php

@@ -17,6 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'BillingIntangible')]
 class EducationalProjectIntangible extends AbstractBillingIntangible
 {
     #[ORM\ManyToOne(inversedBy: 'educationalProjectIntangibles')]

+ 1 - 0
src/Entity/Billing/EducationalProjectPayer.php

@@ -18,6 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'BillingPayer')]
 class EducationalProjectPayer extends AbstractBillingPayer
 {
     #[ORM\ManyToOne(cascade: ['persist'], inversedBy: 'billingEducationalProjectPayers')]

+ 1 - 0
src/Entity/Booking/AbstractBooking.php

@@ -48,6 +48,7 @@ abstract class AbstractBooking
 
     /** @var Collection<int, Access> */
     #[ORM\ManyToMany(targetEntity: Access::class, inversedBy: 'educationalProjectOrganizers')]
+    #[ORM\JoinTable(name: 'booking_organizer')]
     #[ORM\JoinColumn(name: 'booking_id', referencedColumnName: 'id')]
     #[ORM\InverseJoinColumn(name: 'organizer_id', referencedColumnName: 'id')]
     protected Collection $organizer;

+ 1 - 0
src/Entity/Booking/Course.php

@@ -31,6 +31,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity(repositoryClass: CourseRepository::class)]
+#[ORM\Table(name: 'Booking')]
 class Course extends AbstractBooking
 {
     /** @var Collection<int, CourseRecur> */

+ 1 - 0
src/Entity/Booking/CourseRecur.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'BookingRecur')]
 class CourseRecur extends AbstractBookingRecur
 {
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]

+ 1 - 0
src/Entity/Booking/EducationalProject.php

@@ -26,6 +26,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Booking')]
 class EducationalProject extends AbstractBooking
 {
     /** @var Collection<int, EducationalProjectRecur> */

+ 1 - 0
src/Entity/Booking/EducationalProjectRecur.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'BookingRecur')]
 class EducationalProjectRecur extends AbstractBookingRecur
 {
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]

+ 1 - 0
src/Entity/Booking/Event.php

@@ -26,6 +26,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Booking')]
 class Event extends AbstractBooking
 {
     #[ORM\ManyToOne(inversedBy: 'events')]

+ 1 - 0
src/Entity/Booking/EventRecur.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'BookingRecur')]
 class EventRecur extends AbstractBookingRecur
 {
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]

+ 1 - 0
src/Entity/Booking/Examen.php

@@ -26,6 +26,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Booking')]
 class Examen extends AbstractBooking
 {
     #[ORM\ManyToOne(inversedBy: 'examens')]

+ 1 - 0
src/Entity/Booking/ExamenRecur.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'BookingRecur')]
 class ExamenRecur extends AbstractBookingRecur
 {
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]

+ 1 - 0
src/Entity/Booking/OrganizationHoliday.php

@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Booking')]
 class OrganizationHoliday extends AbstractBooking
 {
     /** @var Collection<int, OrganizationHolidayRecur> */

+ 1 - 0
src/Entity/Booking/OrganizationHolidayRecur.php

@@ -14,6 +14,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'BookingRecur')]
 class OrganizationHolidayRecur extends AbstractBookingRecur
 {
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]

+ 1 - 0
src/Entity/Booking/PersonHoliday.php

@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Booking')]
 class PersonHoliday extends AbstractBooking
 {
     #[ORM\ManyToOne(inversedBy: 'holidays')]

+ 1 - 0
src/Entity/Booking/PersonHolidayRecur.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'BookingRecur')]
 class PersonHolidayRecur extends AbstractBookingRecur
 {
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]

+ 1 - 0
src/Entity/Core/Notification.php

@@ -34,6 +34,7 @@ use Doctrine\ORM\Mapping as ORM;
 )]
 // #[Auditable]
 #[ORM\Entity(repositoryClass: NotificationRepository::class)]
+#[ORM\Table(name: 'Information')]
 class Notification extends AbstractInformation
 {
     #[ORM\ManyToOne(inversedBy: 'notifications')]

+ 1 - 0
src/Entity/Core/Tips.php

@@ -15,6 +15,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Information')]
 class Tips extends AbstractInformation
 {
 }

+ 1 - 0
src/Entity/Message/AbstractReport.php

@@ -13,6 +13,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * TODO: documenter.
  */
+#[ORM\MappedSuperclass]
 #[ORM\Table(name: 'ReportMessage')]
 class AbstractReport
 {

+ 1 - 0
src/Entity/Message/Email.php

@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Message')]
 class Email extends AbstractMessage
 {
     #[ORM\Column(type: 'boolean', options: ['default' => false])]

+ 1 - 0
src/Entity/Message/Mail.php

@@ -17,6 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Message')]
 class Mail extends AbstractMessage
 {
 }

+ 1 - 0
src/Entity/Message/Sms.php

@@ -17,6 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Message')]
 class Sms extends AbstractMessage
 {
 }

+ 1 - 0
src/Entity/Place/Place.php

@@ -23,6 +23,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Place')]
 class Place extends AbstractPlace
 {
     /** @var Collection<int, Event> */

+ 1 - 0
src/Entity/Place/PlaceControl.php

@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Control')]
 class PlaceControl extends AbstractControl
 {
     #[ORM\ManyToOne(inversedBy: 'controls')]

+ 1 - 0
src/Entity/Place/PlaceRepair.php

@@ -20,6 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Repair')]
 class PlaceRepair extends AbstractRepair
 {
     #[ORM\ManyToOne(inversedBy: 'placeRepairProviders')]

+ 1 - 0
src/Entity/Place/PlaceSystem.php

@@ -15,6 +15,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Place')]
 class PlaceSystem extends AbstractPlace
 {
 }

+ 1 - 0
src/Entity/Place/RoomControl.php

@@ -17,6 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Control')]
 class RoomControl extends AbstractControl
 {
     #[ORM\ManyToOne(inversedBy: 'controls')]

+ 1 - 0
src/Entity/Place/RoomRepair.php

@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Repair')]
 class RoomRepair extends AbstractRepair
 {
     #[ORM\ManyToOne(inversedBy: 'repairs')]

+ 1 - 0
src/Entity/Product/EquipmentControl.php

@@ -18,6 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Control')]
 class EquipmentControl extends AbstractControl
 {
     #[ORM\ManyToOne(inversedBy: 'equipmentControl')]

+ 1 - 0
src/Entity/Product/EquipmentRepair.php

@@ -20,6 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
 // #[Auditable]
 #[ApiResource(operations: [])]
 #[ORM\Entity]
+#[ORM\Table(name: 'Repair')]
 class EquipmentRepair extends AbstractRepair
 {
     #[ORM\ManyToOne(inversedBy: 'equipmentRepairProviders')]

+ 1 - 0
src/Entity/Product/Intangible.php

@@ -23,6 +23,7 @@ use Doctrine\ORM\Mapping as ORM;
 #[ApiResource(operations: [])]
 // #[Auditable]
 #[ORM\Entity]
+#[ORM\Table(name: 'Product')]
 class Intangible extends AbstractProduct
 {
     #[ORM\ManyToOne(inversedBy: 'intangibles')]