Skip to content

Commit 550b4fc

Browse files
authored
wip commit (#14)
1 parent d8e690e commit 550b4fc

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ RUN install-php-extensions \
1313

1414
COPY . /app
1515

16-
RUN composer install
16+
RUN composer install --no-dev
1717

1818
ENTRYPOINT ["php", "artisan", "octane:frankenphp"]

app/Http/Controllers/Api/V1/SiteController.php

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace App\Http\Controllers\Api\V1;
44

55
use App\Http\Controllers\Controller;
6+
use App\Http\Requests\SiteRequest;
67
use App\Http\Traits\ApiResponse;
78
use App\Jobs\CheckSiteHealth;
89
use App\Models\Site;
@@ -11,7 +12,6 @@
1112
use GuzzleHttp\Exception\ClientException;
1213
use GuzzleHttp\Exception\ServerException;
1314
use Illuminate\Http\JsonResponse;
14-
use Illuminate\Http\Request;
1515

1616
/**
1717
* Class SiteController
@@ -23,20 +23,16 @@ class SiteController extends Controller
2323
use ApiResponse;
2424

2525
/**
26-
* @param Request $request
26+
* @param SiteRequest $request
2727
*
2828
* @return JsonResponse
2929
* @throws \Exception
3030
*/
31-
public function register(Request $request): JsonResponse
31+
public function register(SiteRequest $request): JsonResponse
3232
{
3333
$url = $request->string('url');
3434
$key = $request->string('key');
3535

36-
if ($url->isEmpty() || $key->isEmpty()) {
37-
return $this->error('BadRequest');
38-
}
39-
4036
$connectionService = new Connection($url, $key);
4137

4238
// Do a health check
@@ -66,19 +62,15 @@ public function register(Request $request): JsonResponse
6662
}
6763

6864
/**
69-
* @param Request $request
65+
* @param SiteRequest $request
7066
*
7167
* @return JsonResponse
7268
*/
73-
public function check(Request $request): JsonResponse
69+
public function check(SiteRequest $request): JsonResponse
7470
{
7571
$url = $request->string('url');
7672
$key = $request->string('key');
7773

78-
if ($url->isEmpty() || $key->isEmpty()) {
79-
return $this->error('BadRequest');
80-
}
81-
8274
$connectionService = new Connection($url, $key);
8375

8476
// Do a health check
@@ -94,19 +86,15 @@ public function check(Request $request): JsonResponse
9486
}
9587

9688
/**
97-
* @param Request $request
89+
* @param SiteRequest $request
9890
*
9991
* @return JsonResponse
10092
*/
101-
public function delete(Request $request): JsonResponse
93+
public function delete(SiteRequest $request): JsonResponse
10294
{
10395
$url = $request->string('url');
10496
$key = $request->string('key');
10597

106-
if ($url->isEmpty() || $key->isEmpty()) {
107-
return $this->error('BadRequest');
108-
}
109-
11098
try {
11199
Site::where('url', $url)->where('key', $key)->delete();
112100
} catch (\Exception $e) {

app/Http/Requests/SiteRequest.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
namespace App\Http\Requests;
4+
5+
use Illuminate\Foundation\Http\FormRequest;
6+
7+
class SiteRequest extends FormRequest
8+
{
9+
public function rules(): array
10+
{
11+
return [
12+
'url' => 'required|url',
13+
'key' => 'required|string|min:32|max:64',
14+
];
15+
}
16+
}

0 commit comments

Comments
 (0)