Improved TransferDocument Request

Author: StanBarrows

src/DTO/General/UserManagement/GetUsers/OutOfOffice.php

@@ -12,26 +12,28 @@ public static function fromJson(array $data): self
     {
         $startDateTime = Arr::get($data, 'StartDateTime');
 
+        $timeZone = config('app.timezone', 'UTC');
+
         if (filled($startDateTime)) {
             $startDateTime = Str::of($startDateTime)->after('(')->before(')');
             $milliseconds = (int) (string) $startDateTime;
-            $startDateTime = Carbon::createFromTimestampMs($milliseconds, 'UTC');
+            $startDateTime = Carbon::createFromTimestampMs($milliseconds, $timeZone);
         }
 
         $endDateTime = Arr::get($data, 'EndDateTime');
 
         if (filled($endDateTime)) {
             $endDateTime = Str::of($endDateTime)->after('(')->before(')');
             $milliseconds = (int) (string) $endDateTime;
-            $endDateTime = Carbon::createFromTimestampMs($milliseconds, 'UTC');
+            $endDateTime = Carbon::createFromTimestampMs($milliseconds, $timeZone);
         }
 
         return new self(
             isOutOfOffice: Arr::get($data, 'IsOutOfOffice'),
             startDateTime: $startDateTime,
             startDateTimeSpecified: Arr::get($data, 'StartDateTimeSpecified'),
             endDateTime: $endDateTime,
-            endDateTimeSpecified: Arr::get($data, key: 'EndDateTimeSpecified'),
+            endDateTimeSpecified: Arr::get($data, 'EndDateTimeSpecified'),
         );
     }
 

src/Requests/Documents/ModifyDocuments/TransferDocument.php

@@ -2,6 +2,7 @@
 
 namespace CodebarAg\DocuWare\Requests\Documents\ModifyDocuments;
 
+use Arr;
 use CodebarAg\DocuWare\DTO\Documents\DocumentIndex\PrepareDTO;
 use CodebarAg\DocuWare\Responses\Documents\ModifyDocuments\TransferDocumentResponse;
 use Illuminate\Support\Collection;
@@ -30,7 +31,13 @@ public function __construct(
 
     public function resolveEndpoint(): string
     {
-        return '/FileCabinets/'.$this->destinationFileCabinetId.'/Task/Transfer';
+        $endpoint = '/FileCabinets/'.$this->destinationFileCabinetId.'/Task/Transfer';
+
+        if ($this->storeDialogId) {
+            $endpoint .= '?StoreDialogId='.$this->storeDialogId;
+        }
+
+        return $endpoint;
     }
 
     protected function defaultHeaders(): array
@@ -49,22 +56,14 @@ protected function defaultBody(): array
             'Documents' => [
                 [
                     'Id' => $this->documentId,
+                    'Fields' => $this->fields ? Arr::get(PrepareDTO::makeField($this->fields), 'Field') : null,
                 ],
             ],
             'KeepSource' => $this->keepSource,
             'FillIntellix' => $this->fillIntellix,
             'UseDefaultDialog' => $this->useDefaultDialog,
         ];
 
-        if ($this->storeDialogId) {
-            $body['StoreDialogId'] = $this->storeDialogId;
-        }
-
-        if ($this->fields) {
-            $fieldData = PrepareDTO::makeField($this->fields);
-            $body['Documents'][0]['Fields'] = $fieldData['Field'];
-        }
-
         return $body;
     }