always include identifier_property in mapSingle result

Author: ngaspari

src/App/Http/Controllers/RemoteCustomFieldController.php

@@ -52,8 +52,9 @@ public function index(): JsonResponse
      *
      * @append remote RemoteType
      *
-     * @param  RemoteCustomFieldRequest  $request
+     * @param RemoteCustomFieldRequest $request
      * @return JsonResponse
+     * @throws \Throwable
      */
     public function store(RemoteCustomFieldRequest $request): JsonResponse
     {
@@ -107,7 +108,7 @@ public function resolve(RemoteType $remoteType): JsonResponse
         $data = $remoteType->getRemoteData();
 
         $data = $remoteType->data_path ? Arr::get($data, $remoteType->data_path) : $data;
-        $transformed = $this->transform($data, $remoteType->mappings);
+        $transformed = $this->transform($data, $remoteType->mappings, $remoteType->identifier_property);
 
         return response()->json($transformed);
     }
@@ -127,7 +128,7 @@ public function resolveByIdentifierValue(RemoteType $remoteType, string $identif
 
         $data = collect($data)->where($remoteType->identifier_property, $identifierValue)->first();
 
-        $transformed = is_array($data) ? $this->mapSingle($remoteType->mappings, $data) : $data;
+        $transformed = is_array($data) ? $this->mapSingle($remoteType->mappings, $data, $remoteType->identifier_property) : $data;
 
         return response()->json($transformed);
     }
@@ -143,7 +144,7 @@ public function search(Request $request, RemoteType $remoteType, string $q = '')
         }
 
         $data = $remoteType->data_path ? Arr::get($data, $remoteType->data_path) : $data;
-        $transformed = $this->transform($data, $remoteType->mappings);
+        $transformed = $this->transform($data, $remoteType->mappings, $remoteType->identifier_property);
 
         return response()->json($transformed);
     }

src/App/Models/RemoteType.php

@@ -80,13 +80,17 @@ private function fetchData(?string $value = null, bool $search = false)
 
     public function getRemoteData(?string $identifierValue = null)
     {
-        $cacheKey = 'remote_custom_field_' . $this->id . '_' . $identifierValue;
+        $cacheKey = 'remote_custom_field_' . $this->id;
         if (config('asseco-custom-fields.should_cache_remote') && Cache::has($cacheKey)) {
             return Cache::get($cacheKey);
         }
 
         $response = $this->fetchData($identifierValue, false);
-        Cache::put($cacheKey, $response, config('asseco-custom-fields.remote_cache_ttl'));
+
+        if (!$identifierValue) {
+            // cache only all
+            Cache::put($cacheKey, $response, config('asseco-custom-fields.remote_cache_ttl'));
+        }
 
         return $response;
     }

src/App/Traits/TransformsOutput.php

@@ -6,26 +6,27 @@
 
 trait TransformsOutput
 {
-    protected function transform(array $response, ?array $mappings): array
+    protected function transform(array $response, ?array $mappings, ?string $idProperty = null): array
     {
         if (!$mappings) {
             return $response;
         }
 
         $transformed = [];
         foreach ($response as $item) {
-            $transformed[] = $this->mapSingle($mappings, $item);
+            $transformed[] = $this->mapSingle($mappings, $item, $idProperty);
         }
 
         return $transformed;
     }
 
     /**
-     * @param  array  $mappings
-     * @param  array  $item
+     * @param array $mappings
+     * @param array $item
+     * @param string|null $idProperty
      * @return array
      */
-    protected function mapSingle(array $mappings, array $item): array
+    protected function mapSingle(array $mappings, array $item, ?string $idProperty = null): array
     {
         $data = [];
         foreach ($mappings as $remoteKey => $localKey) {
@@ -38,6 +39,10 @@ protected function mapSingle(array $mappings, array $item): array
             ]);
         }
 
+        if ($idProperty) {
+            $data[ $idProperty] = $item[ $idProperty ] ?? null;
+        }
+
         return $data;
     }
 }