minor fixes

ot_core/Classes/Domain/Model/Event.php

@@ -1007,7 +1007,7 @@ class Event extends AbstractEntity
     public function getFormattedDates(): string
     {
         $formattedDates = '';
-        if ($this->getDatetimeStart() & $this->getDatetimeEnd()) {
+        if ($this->getDatetimeStart() !== null & $this->getDatetimeEnd() !== null) {
             if ($this->getDatetimeStart()->format('d-m-Y') != $this->getDatetimeEnd()->format('d-m-Y')) {
                 $formattedDates = 'Du ' . $this->getDatetimeStart()->format('d/m/Y H\hi') . ' au ' . $this->getDatetimeEnd()->format('d/m/Y H\hi');
             } else {

ot_core/Classes/Domain/Model/Member.php

@@ -92,63 +92,6 @@ class Member extends AbstractEntity
      */
     protected $image = '';
 
-    /**
-     * addressCity
-     *
-     * @var string
-     */
-    protected $addressCity = '';
-
-    /**
-     * streetAddress
-     *
-     * @var string
-     */
-    protected $streetAddress = '';
-
-    /**
-     * streetAddressSecond
-     *
-     * @var string
-     */
-    protected $streetAddressSecond = '';
-
-    /**
-     * streetAddressThird
-     *
-     * @var string
-     */
-    protected $streetAddressThird = '';
-
-    /**
-     * postalCode
-     *
-     * @var string
-     */
-    protected $postalCode = '';
-
-    /**
-     * telphone
-     *
-     * @var string
-     */
-    protected $telphone = '';
-
-    /**
-     * mobilPhone
-     *
-     * @var string
-     */
-    protected $mobilPhone = '';
-
-    /**
-     * email
-     *
-     * @var string
-     */
-    protected $email = '';
-
-
     /**
      * @return int
      */
@@ -341,134 +284,6 @@ class Member extends AbstractEntity
         $this->image = $image;
     }
 
-    /**
-     * @return string
-     */
-    public function getAddressCity(): ?string
-    {
-        return $this->addressCity;
-    }
-
-    /**
-     * @param string|null $addressCity
-     */
-    public function setAddressCity(?string $addressCity)
-    {
-        $this->addressCity = $addressCity;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStreetAddress(): ?string
-    {
-        return $this->streetAddress;
-    }
-
-    /**
-     * @param string|null $streetAddress
-     */
-    public function setStreetAddress(?string $streetAddress)
-    {
-        $this->streetAddress = $streetAddress;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStreetAddressSecond(): ?string
-    {
-        return $this->streetAddressSecond;
-    }
-
-    /**
-     * @param string|null $streetAddressSecond
-     */
-    public function setStreetAddressSecond(?string $streetAddressSecond)
-    {
-        $this->streetAddressSecond = $streetAddressSecond;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStreetAddressThird(): ?string
-    {
-        return $this->streetAddressThird;
-    }
-
-    /**
-     * @param string|null $streetAddressThird
-     */
-    public function setStreetAddressThird(?string $streetAddressThird)
-    {
-        $this->streetAddressThird = $streetAddressThird;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPostalCode(): ?string
-    {
-        return $this->postalCode;
-    }
-
-    /**
-     * @param string|null $postalCode
-     */
-    public function setPostalCode(?string $postalCode)
-    {
-        $this->postalCode = $postalCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTelphone(): ?string
-    {
-        return $this->telphone;
-    }
-
-    /**
-     * @param string|null $telphone
-     */
-    public function setTelphone(?string $telphone)
-    {
-        $this->telphone = $telphone;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMobilPhone(): ?string
-    {
-        return $this->mobilPhone;
-    }
-
-    /**
-     * @param string|null $mobilPhone
-     */
-    public function setMobilPhone(?string $mobilPhone)
-    {
-        $this->mobilPhone = $mobilPhone;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): ?string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @param string|null $email
-     */
-    public function setEmail(?string $email)
-    {
-        $this->email = $email;
-    }
-
     /**
      * Return a full name for the member
      *

ot_core/Classes/Domain/Repository/MemberRepository.php

@@ -46,10 +46,10 @@ class MemberRepository extends BaseApiRepository
         $member->setGender($record['gender']);
         $member->setGivenName($record['givenName']);
         $member->setName($record['name']);
-        $dateStart = new \DateTime($record['datetimeStart']);
+        $dateStart = new \DateTime($record['startDate']);
         $dateStart->setTimezone(new \DateTimeZone('Europe/Paris'));
         $member->setStartDate($dateStart);
-        $dateEnd = new \DateTime($record['datetimeStart']);
+        $dateEnd = new \DateTime($record['endDate']);
         $dateEnd->setTimezone(new \DateTimeZone('Europe/Paris'));
         $member->setEndDate($dateEnd);
         $member->setInstrumentGroup($record['instrumentGroup']);
@@ -57,14 +57,6 @@ class MemberRepository extends BaseApiRepository
         $member->setMission($record['mission']);
         $member->setPersonId((int)$record['personId']);
         $member->setImage($record['image']);
-        $member->setAddressCity($record['addressCity']);
-        $member->setStreetAddress($record['streetAddress']);
-        $member->setStreetAddressSecond($record['streetAddressSecond']);
-        $member->setStreetAddressThird($record['streetAddressThird']);
-        $member->setPostalCode($record['postalCode']);
-        $member->setTelphone($record['telphone']);
-        $member->setMobilPhone($record['mobilPhone']);
-        $member->setEmail($record['email']);
 
         return $member;
     }

ot_core/Classes/Service/OpentalentApiService.php

@@ -148,12 +148,15 @@ class OpentalentApiService implements LoggerAwareInterface
     ): ?ResponseInterface
     {
         $parsedUrl = parse_url($uri);
-        $params += ($parsedUrl['query'] ?? []);
 
-        $path = http_build_query($params);
+        $query = http_build_query($params);
+        if (isset($parsedUrl['query'])) {
+            $query = '&' . $query;
+        }
+
         $uri = rtrim($uri, '/');
-        if ($path) {
-            $uri .= '?' . $path;
+        if ($query) {
+            $uri .= '?' . $query;
         }
 
         try {