Revert "Merge branch 'signature-app/wp-576-restorestored-object-version' into 'master'"

This reverts merge request !586

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -25,12 +25,14 @@ use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -41,12 +43,25 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Class Activity.
+ *
+ * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
+ *
+ * @ORM\Table(name="activity")
+ *
+ * @ORM\HasLifecycleCallbacks
+ *
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *     "activity": Activity::class
+ * })
+ *
+ * @ActivityValidator\ActivityValidity
+ *
+ * TODO see if necessary
+ * UserCircleConsistency(
+ *     "CHILL_ACTIVITY_SEE_DETAILS",
+ *     getUserFunction="getUser",
+ * path="scope")
  */
-#[DiscriminatorMap(typeProperty: 'type', mapping: ['activity' => Activity::class])]
-#[ORM\Entity(repositoryClass: \Chill\ActivityBundle\Repository\ActivityRepository::class)]
-#[ORM\HasLifecycleCallbacks]
-#[ORM\Table(name: 'activity')]
-#[ActivityValidator\ActivityValidity] // TODO see if necessary
 class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
@@ -57,115 +72,176 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     final public const SENTRECEIVED_SENT = 'sent';
 
-    #[Groups(['read'])]
-    #[ORM\ManyToOne(targetEntity: AccompanyingPeriod::class)]
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     *
+     * @Groups({"read"})
+     */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
-    #[Groups(['read', 'docgen:read'])]
-    #[SerializedName('activityType')]
-    #[ORM\ManyToOne(targetEntity: ActivityType::class)]
-    #[ORM\JoinColumn(name: 'type_id')]
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
+     *
+     * @Groups({"read", "docgen:read"})
+     *
+     * @SerializedName("activityType")
+     *
+     * @ORM\JoinColumn(name="type_id")
+     */
     private ActivityType $activityType;
 
-    #[Groups(['docgen:read'])]
-    #[ORM\ManyToOne(targetEntity: ActivityPresence::class)]
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+     *
+     * @Groups({"docgen:read"})
+     */
     private ?ActivityPresence $attendee = null;
 
-    #[Groups(['docgen:read'])]
-    #[ORM\Embedded(class: CommentEmbeddable::class, columnPrefix: 'comment_')]
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     *
+     * @Groups({"docgen:read"})
+     */
     private CommentEmbeddable $comment;
 
-    #[Groups(['docgen:read'])]
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_MUTABLE)]
+    /**
+     * @ORM\Column(type="datetime")
+     *
+     * @Groups({"docgen:read"})
+     */
     private \DateTime $date;
 
     /**
-     * @var Collection<int, StoredObject>
+     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
+     *
+     * @Assert\Valid(traverse=true)
+     *
+     * @var Collection<StoredObject>
      */
-    #[Assert\Valid(traverse: true)]
-    #[ORM\ManyToMany(targetEntity: StoredObject::class, cascade: ['persist'])]
     private Collection $documents;
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TIME_MUTABLE, nullable: true)]
+    /**
+     * @ORM\Column(type="time", nullable=true)
+     */
     private ?\DateTime $durationTime = null;
 
-    #[Groups(['docgen:read'])]
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => false])]
+    /**
+     * @ORM\Column(type="boolean", options={"default": false})
+     *
+     * @Groups({"docgen:read"})
+     */
     private bool $emergency = false;
 
-    #[Groups(['read', 'docgen:read'])]
-    #[ORM\Id]
-    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    /**
+     * @ORM\Id
+     *
+     * @ORM\Column(name="id", type="integer")
+     *
+     * @ORM\GeneratedValue(strategy="AUTO")
+     *
+     * @Groups({"read", "docgen:read"})
+     */
     private ?int $id = null;
 
-    #[Groups(['read', 'docgen:read'])]
-    #[ORM\ManyToOne(targetEntity: Location::class)]
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     *
+     * @groups({"read", "docgen:read"})
+     */
     private ?Location $location = null;
 
-    #[ORM\ManyToOne(targetEntity: Person::class)]
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     */
     private ?Person $person = null;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\Person>
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     *
+     * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<Person>
      */
-    #[Groups(['read', 'docgen:read'])]
-    #[ORM\ManyToMany(targetEntity: Person::class)]
     private Collection $persons;
 
-    #[ORM\Embedded(class: PrivateCommentEmbeddable::class, columnPrefix: 'privateComment_')]
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     */
     private PrivateCommentEmbeddable $privateComment;
 
     /**
-     * @var Collection<int, ActivityReason>
+     * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
+     *
+     * @Groups({"docgen:read"})
+     *
+     * @var Collection<ActivityReason>
      */
-    #[Groups(['docgen:read'])]
-    #[ORM\ManyToMany(targetEntity: ActivityReason::class)]
     private Collection $reasons;
 
-    #[Groups(['docgen:read'])]
-    #[ORM\ManyToOne(targetEntity: Scope::class)]
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     *
+     * @Groups({"docgen:read"})
+     */
     private ?Scope $scope = null;
 
-    #[Groups(['docgen:read'])]
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, options: ['default' => ''])]
+    /**
+     * @ORM\Column(type="string", options={"default": ""})
+     *
+     * @Groups({"docgen:read"})
+     */
     private string $sentReceived = '';
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\SocialWork\SocialAction>
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
+     *
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
+     *
+     * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<SocialAction>
      */
-    #[Groups(['read', 'docgen:read'])]
-    #[ORM\ManyToMany(targetEntity: SocialAction::class)]
-    #[ORM\JoinTable(name: 'chill_activity_activity_chill_person_socialaction')]
     private Collection $socialActions;
 
     /**
-     * @var Collection<int, SocialIssue>
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
+     *
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
+     *
+     * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<SocialIssue>
      */
-    #[Groups(['read', 'docgen:read'])]
-    #[ORM\ManyToMany(targetEntity: SocialIssue::class)]
-    #[ORM\JoinTable(name: 'chill_activity_activity_chill_person_socialissue')]
     private Collection $socialIssues;
 
     /**
-     * @var Collection<int, ThirdParty>
+     * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     *
+     * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<ThirdParty>
      */
-    #[Groups(['read', 'docgen:read'])]
-    #[ORM\ManyToMany(targetEntity: ThirdParty::class)]
     private Collection $thirdParties;
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TIME_MUTABLE, nullable: true)]
+    /**
+     * @ORM\Column(type="time", nullable=true)
+     */
     private ?\DateTime $travelTime = null;
 
-    #[Groups(['docgen:read'])]
-    #[ORM\ManyToOne(targetEntity: User::class)]
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
+     * @Groups({"docgen:read"})
+     */
     private ?User $user = null;
 
     /**
-     * @var Collection<int, User>
+     * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
+     *
+     * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<User>
      */
-    #[Groups(['read', 'docgen:read'])]
-    #[ORM\ManyToMany(targetEntity: User::class)]
     private Collection $users;
 
     public function __construct()
@@ -309,7 +385,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->documents;
     }
 
-    #[Groups(['docgen:read'])]
+    /**
+     * @Groups({"docgen:read"})
+     */
     public function getDurationMinute(): int
     {
         if (null === $this->durationTime) {
@@ -437,7 +515,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->travelTime;
     }
 
-    #[Groups(['docgen:read'])]
+    /**
+     * @Groups({"docgen:read"})
+     */
     public function getTravelTimeMinute(): int
     {
         if (null === $this->travelTime) {