wip

Author: StanBarrows

src/DTO/Document.php

@@ -9,21 +9,21 @@
 final class DownloadedFile
 {
     public function __construct(
-        public readonly string $content,
         public readonly ?string $name,
         public readonly ?string $extension,
         public readonly ?int $size,
         public readonly ?string $contentType,
+        public readonly string $content,
     ) {}
 
     public static function fromArray(array $data): self
     {
         return new self(
-            content: Arr::get($data, 'content', ''),
             name: Arr::get($data, 'name'),
             extension: Arr::get($data, 'extension'),
-            size: Arr::get($data, 'size'),
+            size: Arr::get($data, 'size') !== null ? (int) Arr::get($data, 'size') : null,
             contentType: Arr::get($data, 'contentType'),
+            content: Arr::get($data, 'content', ''),
         );
     }
 

src/DTO/DownloadedFile.php

@@ -4,9 +4,9 @@
 
 namespace CodebarAg\MFiles\Requests;
 
-use CodebarAg\MFiles\DTO\Document;
+use CodebarAg\MFiles\DTO\ObjectProperties;
 use CodebarAg\MFiles\DTO\SetProperty;
-use CodebarAg\MFiles\Responses\CreateSingleFileDocumentResponse;
+use CodebarAg\MFiles\Responses\ObjectPropertiesResponse;
 use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
@@ -42,8 +42,8 @@ protected function defaultBody(): array
         ];
     }
 
-    public function createDtoFromResponse(Response $response): Document
+    public function createDtoFromResponse(Response $response): ObjectProperties
     {
-        return CreateSingleFileDocumentResponse::createDtoFromResponse($response);
+        return ObjectPropertiesResponse::createDtoFromResponse($response);
     }
 }

src/Requests/CreateSingleFileDocumentRequest.php

@@ -5,7 +5,7 @@
 namespace CodebarAg\MFiles\Requests;
 
 use CodebarAg\MFiles\DTO\ObjectProperties;
-use CodebarAg\MFiles\Responses\GetObjectInformationResponse;
+use CodebarAg\MFiles\Responses\ObjectPropertiesResponse;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
 use Saloon\Http\Response;
@@ -30,6 +30,6 @@ public function resolveEndpoint(): string
 
     public function createDtoFromResponse(Response $response): ObjectProperties
     {
-        return GetObjectInformationResponse::createDtoFromResponse($response);
+        return ObjectPropertiesResponse::createDtoFromResponse($response);
     }
 }

src/Requests/GetObjectInformationRequest.php

@@ -20,11 +20,11 @@ public static function createDtoFromResponse(Response $response): DownloadedFile
         $fileNameWithoutExtension = $fileName ? pathinfo($fileName, PATHINFO_FILENAME) : null;
 
         return new DownloadedFile(
-            content: $response->body(),
             name: $fileNameWithoutExtension,
             extension: $fileExtension,
             size: $fileSize,
             contentType: $fileContentType,
+            content: $response->body(),
         );
     }
 

src/Responses/CreateSingleFileDocumentResponse.php

@@ -7,7 +7,7 @@
 use CodebarAg\MFiles\DTO\ObjectProperties;
 use Saloon\Http\Response;
 
-final class GetObjectInformationResponse
+final class ObjectPropertiesResponse
 {
     public static function createDtoFromResponse(Response $response): ObjectProperties
     {

src/Responses/DownloadFileResponse.php

@@ -4,13 +4,14 @@
 
 use CodebarAg\MFiles\Connectors\MFilesConnector;
 use CodebarAg\MFiles\DTO\ConfigWithCredentials;
-use CodebarAg\MFiles\DTO\Document;
+use CodebarAg\MFiles\DTO\ObjectProperties;
 use CodebarAg\MFiles\DTO\SetProperty;
 use CodebarAg\MFiles\Enums\MFDataTypeEnum;
 use CodebarAg\MFiles\Requests\CreateSingleFileDocumentRequest;
 use CodebarAg\MFiles\Requests\LogInToVaultRequest;
 use CodebarAg\MFiles\Requests\UploadFileRequest;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Saloon\Http\Faking\MockResponse;
 use Saloon\Laravel\Facades\Saloon;
 
@@ -46,13 +47,16 @@
         new SetProperty(100, MFDataTypeEnum::LOOKUP, 207),
     ];
 
-    $document = $connector->send(new CreateSingleFileDocumentRequest(
+    $objecttProperty = $connector->send(new CreateSingleFileDocumentRequest(
         title: 'Custom Document',
         files: [$fileUpload],
         propertyValues: $propertyValues
     ))->dto();
 
-    expect($document)->toBeInstanceOf(Document::class);
-    expect($document->id)->toBe(1102);
-    expect($document->title)->toBe('test-1');
+    expect($objecttProperty)->toBeInstanceOf(ObjectProperties::class);
+    expect($objecttProperty->objectId)->toBe(1102);
+    expect($objecttProperty->objectTypeId)->toBe(0);
+    expect($objecttProperty->objectVersionId)->toBe(1);
+    expect($objecttProperty->properties)->toBeInstanceOf(Collection::class);
+    expect($objecttProperty->files)->toBeInstanceOf(Collection::class);
 })->group('create-single-file-document');

src/Responses/GetObjectInformationResponse.php renamed to src/Responses/ObjectPropertiesResponse.php

@@ -22,7 +22,12 @@
     $response = $request->send();
     $token = $response->dto();
 
+    // Test that the response is processed correctly
+    expect($response)->toBeInstanceOf(\Saloon\Http\Response::class);
+    expect($response->status())->toBe(200);
     expect($token)->toBeString();
     expect($token)->not->toBeEmpty();
+    // Verify the token format from LogInToVaultResponse processing
+    expect($token)->toContain('cTLaCmVUEnLy23IYT-NyZGRtzEvSOOANbJWkHH2G39Zep0wsjfm9ieBtz3M02bcPraJhXVapSm-SPJ5hPP7pcLg44jS1oTgPajc9uDcPtDqDTO4aqdK5Rddw8-VSUISptQwp-f2o8NcIwgfrJGGbXMNOR15uKJtm_Shzb86FwKAR41Nc1hLCJfcQaNxIEwSNhnl--2GDORGgRmhYxFXiMnO0D_BO_gVeBDoONORngMgno24aE5egN7Gp-qJ5ln2yNh4dCfWx5A6Oq8HJQq463Bdhy1OLpuTZ1oLqemE3llVm-WjIB4P-5W4mqwmuzaHbQ152FNtgtAtZVgOz_P1mTw');
 
 })->group('authentication', 'log-in-to-vault');