wip: Heavily refactor Location, Address and Marker objects and factories

Author: jissereitsma

Location/Address.php

@@ -2,19 +2,26 @@
 
 namespace Loki\Components\Location;
 
-class Address
+use Magento\Framework\DataObject;
+
+class Address extends DataObject
 {
     public function __construct(
         private readonly AddressRenderer $addressRenderer,
         private readonly string $street,
         private readonly string $houseNumber,
+        private readonly string $houseNumberAddition,
         private readonly string $postcode,
         private readonly string $city,
         private readonly string $countryId,
         private readonly ?float $latitude = null,
         private readonly ?float $longitude = null,
+        private readonly string $phone = '',
         private readonly string $comment = '',
+        private readonly string $company = '',
+        array $data = []
     ) {
+        parent::__construct($data);
     }
 
     public function getStreet(): string
@@ -61,4 +68,19 @@ public function getInnerHtml(): string
     {
         return $this->addressRenderer->getHtml($this);
     }
+
+    public function getCompany(): string
+    {
+        return $this->company;
+    }
+
+    public function getHouseNumberAddition(): string
+    {
+        return $this->houseNumberAddition;
+    }
+
+    public function getPhone(): string
+    {
+        return $this->phone;
+    }
 }

Location/Address/BusinessHourSegment.php

@@ -2,14 +2,18 @@
 
 namespace Loki\Components\Location\Address;
 
-class BusinessHourSegment
+use Magento\Framework\DataObject;
+
+class BusinessHourSegment extends DataObject
 {
     public function __construct(
         private readonly string $day,
         private readonly string $openingHour,
         private readonly string $closingHour,
         private readonly string $comment = '',
+        array $data = [],
     ) {
+        parent::__construct($data);
     }
 
     public function getDay(): string

Location/Address/BusinessHours.php

@@ -2,13 +2,17 @@
 
 namespace Loki\Components\Location\Address;
 
-class BusinessHours
+use Magento\Framework\DataObject;
+
+class BusinessHours extends DataObject
 {
     private array $businessHourSegments = [];
 
     public function __construct(
-        private readonly BusinessHourSegmentFactory $businessHourSegmentFactory
+        private readonly BusinessHourSegmentFactory $businessHourSegmentFactory,
+        array $data = [],
     ) {
+        parent::__construct($data);
     }
 
     public function addSegment(BusinessHourSegment $businessHourSegment): void

Location/AddressFactory.php

@@ -14,22 +14,30 @@ public function __construct(
     public function create(
         string $street,
         string $houseNumber,
+        string $houseNumberAddition,
         string $postcode,
         string $city,
         string $countryId,
         ?float $latitude = null,
         ?float $longitude = null,
+        string $phone = '',
         string $comment = '',
+        string $company = '',
+        array $data = [],
     ): Address {
         return $this->objectManager->create(Address::class, [
             'street' => $street,
             'houseNumber' => $houseNumber,
+            'houseNumberAddition' => $houseNumberAddition,
             'postcode' => $postcode,
             'city' => $city,
             'countryId' => $countryId,
             'latitude' => $latitude,
             'longitude' => $longitude,
+            'phone' => $phone,
             'comment' => $comment,
+            'company' => $company,
+            'data' => $data,
         ]);
     }
 }

Location/Location.php

@@ -3,34 +3,37 @@
 namespace Loki\Components\Location;
 
 use Loki\Components\Location\Address\BusinessHours;
+use Magento\Framework\DataObject;
 
-class Location
+class Location extends DataObject
 {
     public function __construct(
-        private readonly string $id,
-        private readonly string $code,
-        private readonly string $label,
-        private readonly int $distance,
         private readonly Address $address,
         private readonly ?BusinessHours $businessHours = null,
+        private readonly string $id = '',
+        private readonly string $code = '',
+        private readonly string $label = '',
+        private readonly int $distance = 0,
         private readonly ?string $pickupFrom = null,
         private readonly ?int $price = null,
+        array $data = []
     ) {
+        parent::__construct($data);
     }
 
     public function getId(): string
     {
-        return $this->id;
+        return $this->id ?? $this->getLabel();
     }
 
     public function getCode(): string
     {
-        return $this->code;
+        return $this->code ?? $this->getId();
     }
 
     public function getLabel(): string
     {
-        return $this->label;
+        return $this->label ?? $this->address->getCompany();
     }
 
     public function getDistance(): int

Location/LocationFactory.php

@@ -13,24 +13,26 @@ public function __construct(
     }
 
     public function create(
-        string $id,
-        string $code,
-        string $label,
-        int $distance,
         Address $address,
         ?BusinessHours $businessHours = null,
+        string $id = '',
+        string $code = '',
+        string $label = '',
+        int $distance = 0,
         ?string $pickupFrom = null,
         ?int $price = null,
+        array $data = [],
     ): Location {
         return $this->objectManager->create(Location::class, [
+            'address' => $address,
+            'businessHours' => $businessHours,
             'id' => $id,
             'code' => $code,
             'label' => $label,
             'distance' => $distance,
-            'address' => $address,
-            'businessHours' => $businessHours,
             'pickupFrom' => $pickupFrom,
             'price' => $price,
+            'data' => $data
         ]);
     }
 }