test
/
megahunt.test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: with pint

This commit is contained in:
b1ek 2024-08-30 17:40:57 +10:00
parent 9922ebbc39
commit c67c96cf92
Signed by: blek
GPG Key ID: 14546221E3595D0C
23 changed files with 67 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Facade/Filters/Filter.php
View File

@ -5,6 +5,8 @@ namespace App\Facade\Filters;
class Filter
{
public FilterTypeEnum $type;
public string $column;
public mixed $filter;
}

12
app/Facade/Filters/Filters.php
View File

@ -2,11 +2,9 @@
namespace App\Facade\Filters;
use App\Facade\Filters\Pagination;
use Error;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Exceptions\HttpResponseException;
use Error;
use JsonMapper;
class Filters
@ -23,9 +21,9 @@ class Filters
public ?Pagination $pagination;
public static function fromArrayOrObject(array | object $data): Filters
public static function fromArrayOrObject(array|object $data): Filters
{
$mapper = new JsonMapper();
$mapper = new JsonMapper;
if (is_array($data)) {
$data = json_decode(json_encode($data), false);
}
@ -37,7 +35,7 @@ class Filters
try {
return $mapper->map($data, \App\Facade\Filters\Filters::class);
} catch (Error $err) {
throw new HttpResponseException(response()->json([ 'unknown' => $err->getMessage() ], 422));
throw new HttpResponseException(response()->json(['unknown' => $err->getMessage()], 422));
}
}
@ -61,7 +59,7 @@ class Filters
$builder->orderBy($order->by, $order->sort->value);
}
if (!is_null($this->pagination)) {
if (! is_null($this->pagination)) {
$builder->paginate($this->pagination->size, ['*'], 'page', $this->pagination->page);
}
}

1
app/Facade/Filters/Order.php
View File

@ -5,5 +5,6 @@ namespace App\Facade\Filters;
class Order
{
public string $by;
public OrderTypeEnum $sort;
}

1
app/Facade/Filters/Pagination.php
View File

@ -5,5 +5,6 @@ namespace App\Facade\Filters;
class Pagination
{
public int $size;
public int $page;
}

4
app/Http/Controllers/PrivateUserController.php
View File

@ -11,8 +11,7 @@ class PrivateUserController extends Controller
{
public function __construct(
private UserService $userService
) {
}
) {}
public function list(AuthorizedRequest $request)
{
@ -22,6 +21,7 @@ class PrivateUserController extends Controller
public function listFilters(AuthorizedRequest $request)
{
$filters = Filters::fromArrayOrObject($request->all());
return $this->userService->listAll($filters);
}

5
app/Http/Controllers/PublicUserController.php
View File

@ -10,8 +10,7 @@ class PublicUserController extends Controller
{
public function __construct(
private UserService $userService
) {
}
) {}
public function register(RegisterRequest $request)
{
@ -20,7 +19,7 @@ class PublicUserController extends Controller
public function login(LoginRequest $request)
{
if (!$this->userService->login($request->all())) {
if (! $this->userService->login($request->all())) {
return response()
->json('bad_password', 400);
}

5
app/Http/Controllers/TrashUserController.php
View File

@ -2,7 +2,6 @@
namespace App\Http\Controllers;
use App\Http\Requests\AuthorizedRequest;
use App\Http\Requests\TrashGroupRequest;
use App\Services\UserTrashService;
@ -10,9 +9,7 @@ class TrashUserController extends Controller
{
public function __construct(
private UserTrashService $userTrashService
) {
}
) {}
public function addMultiple(TrashGroupRequest $request)
{

3
app/Http/Requests/LoginRequest.php
View File

@ -3,7 +3,6 @@
namespace App\Http\Requests;
use App\Rules\ZxcvbnRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\Password;
class LoginRequest extends RestRequest
@ -25,7 +24,7 @@ class LoginRequest extends RestRequest
{
return [
'email' => ['required', 'email'],
'password' => ['required', Password::min(1)->rules([ new ZxcvbnRule() ])],
'password' => ['required', Password::min(1)->rules([new ZxcvbnRule])],
];
}
}

5
app/Http/Requests/RegisterRequest.php
View File

@ -4,7 +4,6 @@ namespace App\Http\Requests;
use App\Models\User;
use App\Rules\ZxcvbnRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\Password;
class RegisterRequest extends RestRequest
@ -29,8 +28,8 @@ class RegisterRequest extends RestRequest
'name' => ['required', 'string'],
'middle_name' => ['required', 'string'],
'email' => ['required', 'email'],
'phone' => ['required', 'regex:' . User::PHONE_REGEX ],
'password' => ['required', Password::min(1)->rules([ new ZxcvbnRule() ])],
'phone' => ['required', 'regex:'.User::PHONE_REGEX],
'password' => ['required', Password::min(1)->rules([new ZxcvbnRule])],
];
}
}

5
app/Http/Requests/TrashGroupRequest.php
View File

@ -10,14 +10,15 @@ class TrashGroupRequest extends AuthorizedRequest
{
$ids = explode(',', $this->query('ids'));
$validator = validator([
'ids' => $ids
'ids' => $ids,
], [
'ids' => 'required|array|min:1',
'ids.*' => 'required|uuid|distinct'
'ids.*' => 'required|uuid|distinct',
]);
if ($validator->fails()) {
throw new HttpResponseException(response()->json($validator->errors(), 422));
}
return $ids;
}
}

13
app/Http/Requests/UserEditRequest.php
View File

@ -4,7 +4,6 @@ namespace App\Http\Requests;
use App\Models\User;
use App\Rules\ZxcvbnRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\Password;
class UserEditRequest extends AuthorizedRequest
@ -17,13 +16,13 @@ class UserEditRequest extends AuthorizedRequest
public function rules(): array
{
return [
'user.last_name' => [ 'string' ],
'user.name' => [ 'string' ],
'user.middle_name' => [ 'string' ],
'user.email' => [ 'email' ],
'user.phone' => [ 'string', 'regex:' . User::PHONE_REGEX ],
'user.last_name' => ['string'],
'user.name' => ['string'],
'user.middle_name' => ['string'],
'user.email' => ['email'],
'user.phone' => ['string', 'regex:'.User::PHONE_REGEX],
'user' => 'required',
'password' => [ Password::min(1)->rules([ new ZxcvbnRule() ]) ],
'password' => [Password::min(1)->rules([new ZxcvbnRule])],
'user.email_verified_at' => 'prohibited',
'user.created_at' => 'prohibited',

2
app/Models/User.php
View File

@ -12,9 +12,9 @@ use Illuminate\Notifications\Notifiable;
class User extends Authenticatable
{
use HasFactory;
use HasHistory;
use Notifiable;
use UuidId;
use HasHistory;
public const PHONE_REGEX = '/^\+\d+$/';

2
app/Rules/ZxcvbnRule.php
View File

@ -16,7 +16,7 @@ class ZxcvbnRule implements ValidationRule
public function validate(string $attribute, mixed $value, Closure $fail): void
{
$value = (string) $value;
$zxcvbn = new Zxcvbn();
$zxcvbn = new Zxcvbn;
if ($zxcvbn->passwordStrength($value)['score'] < 3) {
$fail('Password is not secure enough!');
}

28
app/Services/UserService.php
View File

@ -12,12 +12,12 @@ class UserService
{
/**
* Create(register) new user
* @param array $data This is expected to be validated already
* @return User
*
* @param array $data This is expected to be validated already
*/
public function create($data, $autoLogin = true): User
{
if (User::where([ 'email' => $data['email'] ])->count() !== 0) {
if (User::where(['email' => $data['email']])->count() !== 0) {
throw new HttpResponseException(response()->json('email_taken', 400));
}
@ -27,26 +27,30 @@ class UserService
if ($autoLogin) {
Auth::login($user);
}
return $user;
}
/**
* Login to user
* @param array $data This is expected to be validated already
*
* @param array $data This is expected to be validated already
* @return User
*/
public function login($data): bool
{
if (Auth::attempt($data)) {
request()->session()->regenerate();
return true;
}
return false;
}
public function setPassword($data)
{
$user = User::where([ 'email' => $data['email'] ])->first();
$user = User::where(['email' => $data['email']])->first();
if ($user === null) {
return;
}
@ -62,18 +66,19 @@ class UserService
}
$builder = User::query();
$filters->apply($builder);
return $builder->get()->toArray();
}
public function getOneById(string $id): User | null
public function getOneById(string $id): ?User
{
return User::where([ 'id' => $id ])->first();
return User::where(['id' => $id])->first();
}
/**
* Will return `null` if failed
*/
public function editUser(array $data, string $id): User | null
public function editUser(array $data, string $id): ?User
{
$user = $this->getOneById($id);
if ($user === null) {
@ -81,15 +86,16 @@ class UserService
}
if (array_key_exists('password', $data)) {
$this->setPassword([ 'email' => $user['email'], 'password' => $data['password'] ]);
$this->setPassword(['email' => $user['email'], 'password' => $data['password']]);
}
$user->fill($data['user']);
$user->save();
return $user;
}
public function getUnexistingIds(array $ids): null | array
public function getUnexistingIds(array $ids): ?array
{
$users = User::whereIn('id', $ids)->get();
if ($users->count() != count($ids)) {
@ -98,8 +104,10 @@ class UserService
return $model->id;
}
)->toArray();
return array_diff($ids, $existingIds);
}
return null;
}
}

14
app/Services/UserTrashService.php
View File

@ -8,31 +8,29 @@ class UserTrashService
{
public function __construct(
private UserService $userService
) {
) {}
}
public function moveUsersToTrash(array $ids): bool | array
public function moveUsersToTrash(array $ids): bool|array
{
$unexisting = $this->userService->getUnexistingIds($ids);
if (is_array($unexisting)) {
return $unexisting;
}
return User::whereIn('id', $ids)->update([ 'deleted_at' => now()->toDateTimeImmutable() ]);
return User::whereIn('id', $ids)->update(['deleted_at' => now()->toDateTimeImmutable()]);
}
public function moveUsersFromTrash(array $ids): bool | array
public function moveUsersFromTrash(array $ids): bool|array
{
$unexisting = $this->userService->getUnexistingIds($ids);
if (is_array($unexisting)) {
return $unexisting;
}
return User::whereIn('id', $ids)->update([ 'deleted_at' => null ]);
return User::whereIn('id', $ids)->update(['deleted_at' => null]);
}
public function cleanUsersFromTrash(array $ids): bool | null | array
public function cleanUsersFromTrash(array $ids): bool|null|array
{
$unexisting = $this->userService->getUnexistingIds($ids);
if (is_array($unexisting)) {

2
app/UuidId.php
View File

@ -13,10 +13,12 @@ trait UuidId
$model->id = Uuid::uuid6()->toString();
});
}
public function getIncrementing(): bool
{
return false;
}
public function getKeyType(): string
{
return 'string';

2
bootstrap/app.php
View File

@ -12,7 +12,7 @@ return Application::configure(basePath: dirname(__DIR__))
)
->withMiddleware(function (Middleware $middleware) {
// https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Axillary_Crutches.jpg/90px-Axillary_Crutches.jpg
$middleware->validateCsrfTokens([ '*' ]);
$middleware->validateCsrfTokens(['*']);
})
->withExceptions(function (Exceptions $exceptions) {
//

2
database/factories/UserFactory.php
View File

@ -30,7 +30,7 @@ class UserFactory extends Factory
'phone' => fake()->unique()->phoneNumber,
'email' => fake()->unique()->safeEmail,
'password' => Hash::make('password'),
'remember_token' => Str::random()
'remember_token' => Str::random(),
];
}

3
database/migrations/0001_01_01_000000_create_users_table.php
View File

@ -5,7 +5,8 @@ use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Schema\Builder;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/0001_01_01_000001_create_cache_table.php
View File

@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

3
database/migrations/0001_01_01_000002_create_jobs_table.php
View File

@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/

5
database/migrations/2024_08_29_211556_create_histories_table.php
View File

@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/
@ -16,7 +17,7 @@ return new class () extends Migration {
$table->string('model_name', 250);
$table->jsonb('before');
$table->jsonb('after');
$table->enum('action', [ 'insert', 'update', 'delete' ]);
$table->enum('action', ['insert', 'update', 'delete']);
$table->timestamps();
});
}

3
database/migrations/2024_08_30_013415_add_deleted_at_to_users.php
View File

@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/