Commit 65a7ed1

josip-miloticJosip Milotić

and

Josip Milotić

authored

Throw exception on failed request, extracted fetching headers to separate method to make overrideable (#82)

Co-authored-by: Josip Milotić <josip.milotic@asseco-see.hr>

1 parent 10ab2d5 commit 65a7ed1Copy full SHA for 65a7ed1

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function resolveByIdentifierValue(RemoteType $remoteType, string $identif`
`126`	`126`
`127`	`127`	`$data = collect($data)->where($remoteType->identifier_property, $identifierValue)->first();`
`128`	`128`
`129`		`- $transformed = $this->mapSingle($remoteType->mappings, $data);`
	`129`	`+ $transformed = is_array($data) ? $this->mapSingle($remoteType->mappings, $data) : $data;`
`130`	`130`
`131`	`131`	`return response()->json($transformed);`
`132`	`132`	`}`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,17 @@ public function getRemoteData()`
`52`	`52`	`return Cache::get($cacheKey);`
`53`	`53`	`}`
`54`	`54`
`55`		`- $response = Http::withHeaders($this->headers ?: [])`
	`55`	`+ $response = Http::withHeaders($this->getHeaders() ?: [])`
`56`	`56`	`->withBody($this->body, 'application/json')`
`57`		`- ->{$this->method}($this->url)->json();`
	`57`	`+ ->{$this->method}($this->url)->throw()->json();`
`58`	`58`
`59`	`59`	`Cache::put($cacheKey, $response, config('asseco-custom-fields.remote_cache_ttl'));`
`60`	`60`
`61`	`61`	`return $response;`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ protected function getHeaders()`
	`65`	`+ {`
	`66`	`+ return $this->headers;`
	`67`	`+ }`
`63`	`68`	`}`

Comments

(0)