fix: fix attributes with mutator being omitted when skipping null

src/App/Audit/Concern/HasAudits.php

@@ -43,7 +43,11 @@ public function addAudit(string $action, ?string $type = null, ?array $arguments
      */
     protected function getAuditsAttribute(): AuditCollection
     {
-        return Audits::allByModel(static::class, $this->getAttribute($this->auditIdentifier));
+        $identifier = $this->getAttribute($this->auditIdentifier);
+
+        return $identifier
+            ? Audits::allByModel(static::class, $identifier)
+            : new AuditCollection();
     }
 
     /**

src/App/Order/Model/PdkOrder.php

@@ -213,7 +213,7 @@ public function createShipment(bool $store = true): Shipment
     public function getNotesAttribute(): PdkOrderNoteCollection
     {
         if (isset($this->attributes['notes'])) {
-            return $this->getCastAttribute('notes');
+            return $this->getCastAttributeValue('notes');
         }
 
         /** @var \MyParcelNL\Pdk\App\Order\Contract\PdkOrderNoteRepositoryInterface $orderNoteRepository */

src/Base/Concern/HasAttributes.php

@@ -209,8 +209,8 @@ public function getAttributes(?int $flags = null): array
 
         if ($flags) {
             if ($flags & Arrayable::SKIP_NULL) {
-                $attributes = array_filter($attributes, static function ($value) {
-                    return null !== $value;
+                $attributes = Arr::where($attributes, function ($value, $key) {
+                    return null !== $value || $this->hasGetMutator($key);
                 });
             }
 
@@ -536,9 +536,9 @@ protected function createArrayFromAttributes(array $attributes, ?int $flags): ar
     {
         $mutatedAttributes = $this->getMutatedAttributes();
 
-        $attributes = $this->addMutatedAttributesToArray($attributes, $mutatedAttributes, $flags);
+        $addedAttributes = $this->addMutatedAttributesToArray($attributes, $mutatedAttributes, $flags);
 
-        return $this->addCastAttributesToArray($attributes, $mutatedAttributes, $flags);
+        return $this->addCastAttributesToArray($addedAttributes, $mutatedAttributes, $flags);
     }
 
     /**
@@ -566,8 +566,11 @@ protected function getAttributeValue(string $key)
     }
 
     /**
+     * @param  string $string
+     *
+     * @return mixed
      */
-    protected function getCastAttribute(string $string)
+    protected function getCastAttributeValue(string $string)
     {
         return $this->castAttribute($string, $this->attributes[$string]);
     }

src/Context/Model/OrderDataContext.php

@@ -92,14 +92,14 @@ protected function getInheritedDeliveryOptionsAttribute(): Collection
 
             $clonedOrder->deliveryOptions->carrier = $newCarrier;
 
-            $clonedOrder = $service->calculateShipmentOptions(
+            $calculatedOrder = $service->calculateShipmentOptions(
                 $clonedOrder,
                 PdkOrderOptionsServiceInterface::EXCLUDE_SHIPMENT_OPTIONS
             );
 
-            $clonedOrder->deliveryOptions->offsetUnset('carrier');
+            $calculatedOrder->deliveryOptions->offsetUnset('carrier');
 
-            return [$carrier->externalIdentifier => $clonedOrder->deliveryOptions->toArrayWithoutNull()];
+            return [$carrier->externalIdentifier => $calculatedOrder->deliveryOptions->toArrayWithoutNull()];
         });
     }
 }

src/Settings/Model/ProductSettings.php

@@ -18,6 +18,7 @@
  * @property int<-1|0|1>    $exportOnlyRecipient
  * @property int<-1|0|1>    $exportReturn
  * @property int<-1|0|1>    $exportSignature
+ * @property int<-1|0|1>    $exportTracked
  * @property int            $fitInDigitalStamp
  * @property int            $fitInMailbox
  * @property int<-1>|string $packageType
@@ -55,6 +56,7 @@ class ProductSettings extends AbstractSettingsModel
         self::EXPORT_ONLY_RECIPIENT    => TriStateService::INHERIT,
         self::EXPORT_RETURN            => TriStateService::INHERIT,
         self::EXPORT_SIGNATURE         => TriStateService::INHERIT,
+        self::EXPORT_TRACKED           => TriStateService::INHERIT,
         self::FIT_IN_DIGITAL_STAMP     => TriStateService::INHERIT,
         self::FIT_IN_MAILBOX           => TriStateService::INHERIT,
         self::PACKAGE_TYPE             => TriStateService::INHERIT,
@@ -72,6 +74,7 @@ class ProductSettings extends AbstractSettingsModel
         self::EXPORT_ONLY_RECIPIENT    => TriStateService::TYPE_STRICT,
         self::EXPORT_RETURN            => TriStateService::TYPE_STRICT,
         self::EXPORT_SIGNATURE         => TriStateService::TYPE_STRICT,
+        self::EXPORT_TRACKED           => TriStateService::TYPE_STRICT,
         self::FIT_IN_DIGITAL_STAMP     => 'int',
         self::FIT_IN_MAILBOX           => 'int',
         self::PACKAGE_TYPE             => TriStateService::TYPE_COERCED,

src/Shipment/Model/DeliveryOptions.php

@@ -167,7 +167,7 @@ public function getDateAsString(): ?string
      */
     public function getDateAttribute(): ?DateTimeInterface
     {
-        $date = $this->getCastAttribute(self::DATE);
+        $date = $this->getCastAttributeValue(self::DATE);
 
         if (! $date || $date < new DateTime('now')) {
             return null;

tests/__snapshots__/CarrierTest__it_instantiates_carriers_from_name_with_(belgie)__1.json

@@ -1,5 +1,6 @@
 [
   {
+    "externalIdentifier": "postnl",
     "id": 1,
     "name": "postnl",
     "human": "PostNL",
@@ -32,6 +33,7 @@
     }
   },
   {
+    "externalIdentifier": "bpost",
     "id": 2,
     "name": "bpost",
     "human": "bpost",
@@ -55,6 +57,7 @@
     }
   },
   {
+    "externalIdentifier": "dpd",
     "id": 4,
     "name": "dpd",
     "human": "DPD",

tests/__snapshots__/CarrierTest__it_instantiates_carriers_from_name_with_(flespakket)__1.json

@@ -1,5 +1,6 @@
 [
   {
+    "externalIdentifier": "postnl",
     "id": 1,
     "name": "postnl",
     "human": "PostNL",

tests/__snapshots__/CarrierTest__it_instantiates_carriers_from_name_with_(myparcel)__1.json

@@ -1,5 +1,6 @@
 [
   {
+    "externalIdentifier": "postnl",
     "id": 1,
     "name": "postnl",
     "human": "PostNL",
@@ -44,6 +45,7 @@
     }
   },
   {
+    "externalIdentifier": "dpd",
     "id": 4,
     "name": "dpd",
     "human": "DPD",
@@ -67,6 +69,7 @@
     }
   },
   {
+    "externalIdentifier": "ups",
     "id": 8,
     "name": "ups",
     "human": "UPS",
@@ -89,6 +92,7 @@
     }
   },
   {
+    "externalIdentifier": "dhlforyou",
     "id": 9,
     "name": "dhlforyou",
     "human": "DHL For You",
@@ -133,6 +137,7 @@
     }
   },
   {
+    "externalIdentifier": "dhlparcelconnect",
     "id": 10,
     "name": "dhlparcelconnect",
     "human": "DHL Parcel Connect",
@@ -176,6 +181,7 @@
     }
   },
   {
+    "externalIdentifier": "dhleuroplus",
     "id": 11,
     "name": "dhleuroplus",
     "human": "DHL Europlus",

tests/__snapshots__/ContextServiceTest__it_gets_context_data_with_data_set_multiple_orders__1.json

@@ -86,6 +86,24 @@
       "totalPrice": 0,
       "totalVat": 0,
       "totalPriceAfterVat": 0,
+      "inheritedDeliveryOptions": {
+        "postnl": {
+          "labelAmount": 1,
+          "shipmentOptions": {
+            "insurance": 0,
+            "ageCheck": 0,
+            "hideSender": 0,
+            "largeFormat": 0,
+            "onlyRecipient": 0,
+            "return": 0,
+            "sameDayDelivery": 0,
+            "signature": 0,
+            "tracked": 0
+          },
+          "deliveryType": "standard",
+          "packageType": "package"
+        }
+      },
       "digitalStampRanges": [
         {
           "min": 0,
@@ -195,6 +213,24 @@
       "totalPrice": 0,
       "totalVat": 0,
       "totalPriceAfterVat": 0,
+      "inheritedDeliveryOptions": {
+        "postnl": {
+          "labelAmount": 1,
+          "shipmentOptions": {
+            "insurance": 0,
+            "ageCheck": 0,
+            "hideSender": 0,
+            "largeFormat": 0,
+            "onlyRecipient": 0,
+            "return": 0,
+            "sameDayDelivery": 0,
+            "signature": 0,
+            "tracked": 0
+          },
+          "deliveryType": "standard",
+          "packageType": "package"
+        }
+      },
       "digitalStampRanges": [
         {
           "min": 0,

tests/__snapshots__/ContextServiceTest__it_gets_context_data_with_data_set_multiple_products__1.json

@@ -20,6 +20,7 @@
         "exportOnlyRecipient": -1,
         "exportReturn": -1,
         "exportSignature": -1,
+        "exportTracked": -1,
         "fitInDigitalStamp": -1,
         "fitInMailbox": -1,
         "packageType": -1
@@ -37,6 +38,7 @@
         "exportOnlyRecipient": -1,
         "exportReturn": -1,
         "exportSignature": -1,
+        "exportTracked": -1,
         "fitInDigitalStamp": -1,
         "fitInMailbox": -1,
         "packageType": -1
@@ -62,6 +64,7 @@
         "exportOnlyRecipient": -1,
         "exportReturn": -1,
         "exportSignature": -1,
+        "exportTracked": -1,
         "fitInDigitalStamp": -1,
         "fitInMailbox": -1,
         "packageType": -1
@@ -79,6 +82,7 @@
         "exportOnlyRecipient": -1,
         "exportReturn": -1,
         "exportSignature": -1,
+        "exportTracked": -1,
         "fitInDigitalStamp": -1,
         "fitInMailbox": -1,
         "packageType": -1

tests/__snapshots__/ContextServiceTest__it_gets_context_data_with_data_set_single_order__1.json

@@ -86,6 +86,24 @@
       "totalPrice": 0,
       "totalVat": 0,
       "totalPriceAfterVat": 0,
+      "inheritedDeliveryOptions": {
+        "postnl": {
+          "labelAmount": 1,
+          "shipmentOptions": {
+            "insurance": 0,
+            "ageCheck": 0,
+            "hideSender": 0,
+            "largeFormat": 0,
+            "onlyRecipient": 0,
+            "return": 0,
+            "sameDayDelivery": 0,
+            "signature": 0,
+            "tracked": 0
+          },
+          "deliveryType": "standard",
+          "packageType": "package"
+        }
+      },
       "digitalStampRanges": [
         {
           "min": 0,

tests/__snapshots__/ContextServiceTest__it_gets_context_data_with_data_set_single_product__1.json

@@ -20,6 +20,7 @@
         "exportOnlyRecipient": -1,
         "exportReturn": -1,
         "exportSignature": -1,
+        "exportTracked": -1,
         "fitInDigitalStamp": -1,
         "fitInMailbox": -1,
         "packageType": -1
@@ -37,6 +38,7 @@
         "exportOnlyRecipient": -1,
         "exportReturn": -1,
         "exportSignature": -1,
+        "exportTracked": -1,
         "fitInDigitalStamp": -1,
         "fitInMailbox": -1,
         "packageType": -1

tests/__snapshots__/CreateReturnShipmentsTest__it_creates_return_shipment_with_data_set_simple_domestic_shipment__1.json

@@ -7,6 +7,7 @@
     "externalIdentifier": "CV515676839NL",
     "barcode": "CV515676839NL",
     "carrier": {
+      "externalIdentifier": "postnl",
       "id": 1,
       "name": "postnl",
       "human": "PostNL",

tests/__snapshots__/ExportReturnActionTest__it_exports_return_with_data_set_insurance__1.json

@@ -5,6 +5,7 @@
         "externalIdentifier": "701",
         "deliveryOptions": {
           "carrier": {
+            "externalIdentifier": "postnl",
             "id": 1,
             "name": "postnl",
             "human": "PostNL",
@@ -230,6 +231,7 @@
                 "exportOnlyRecipient": -1,
                 "exportReturn": -1,
                 "exportSignature": -1,
+                "exportTracked": -1,
                 "fitInDigitalStamp": -1,
                 "fitInMailbox": -1,
                 "packageType": -1
@@ -247,13 +249,15 @@
                 "exportOnlyRecipient": -1,
                 "exportReturn": -1,
                 "exportSignature": -1,
+                "exportTracked": -1,
                 "fitInDigitalStamp": -1,
                 "fitInMailbox": -1,
                 "packageType": -1
               }
             }
           }
         ],
+        "notes": [],
         "orderDate": "2030-01-01 12:00:00",
         "exported": false,
         "shipmentPrice": 100,
@@ -264,12 +268,14 @@
         "orderVat": 0,
         "totalPrice": 100,
         "totalVat": 21,
-        "totalPriceAfterVat": 121
+        "totalPriceAfterVat": 121,
+        "audits": []
       },
       {
         "externalIdentifier": "247",
         "deliveryOptions": {
           "carrier": {
+            "externalIdentifier": "postnl",
             "id": 1,
             "name": "postnl",
             "human": "PostNL",
@@ -340,6 +346,7 @@
           "totalWeight": 0
         },
         "lines": [],
+        "notes": [],
         "exported": false,
         "shipmentPrice": 0,
         "shipmentPriceAfterVat": 0,
@@ -349,7 +356,8 @@
         "orderVat": 0,
         "totalPrice": 0,
         "totalVat": 0,
-        "totalPriceAfterVat": 0
+        "totalPriceAfterVat": 0,
+        "audits": []
       }
     ]
   }