1
0
mirror of https://github.com/robonen/metr.git synced 2026-03-20 02:44:42 +00:00

Merge pull request #9 from robonen/backend

Backend
This commit is contained in:
2022-05-29 00:08:32 +07:00
committed by GitHub
39 changed files with 852 additions and 53 deletions

View File

@@ -0,0 +1,14 @@
<?php
namespace App\Enums;
trait Arrayable
{
/**
* @return array
*/
public static function values(): array
{
return array_column(self::cases(), 'value');
}
}

View File

@@ -0,0 +1,13 @@
<?php
namespace App\Enums;
enum OrderTypesEnum: string
{
use Arrayable;
case HOUSE = 'House';
case FLAT = 'Flat';
case GUEST_HOUSE = 'Guest';
case HOTEL = 'Hotel';
}

View File

@@ -0,0 +1,26 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\LoginRequest;
use App\Http\Resources\UserResource;
class LoginController extends Controller
{
/**
*
* @param \App\Http\Requests\Auth\LoginRequest $request
* @return \App\Http\Resources\UserResource
*/
public function __invoke(LoginRequest $request): UserResource
{
if (!auth()->attempt($request->validated()))
abort(401);
$token = auth()->user()->createToken('web')->plainTextToken;
return (new UserResource(auth()->user()))
->additional(['token' => $token]);
}
}

View File

@@ -0,0 +1,17 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
class LogoutController extends Controller
{
/**
*
* @return void
*/
public function __invoke(): void
{
auth()->user()->currentAccessToken()->delete();
}
}

View File

@@ -0,0 +1,30 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\RegistrationRequest;
use App\Http\Resources\UserResource;
use App\Models\User;
use Illuminate\Support\Facades\Hash;
class RegistrationController extends Controller
{
/**
*
* @param \App\Http\Requests\Auth\RegistrationRequest $request
* @return \App\Http\Resources\UserResource
*/
public function __invoke(RegistrationRequest $request): UserResource
{
$credentials = $request->validated();
$credentials['password'] = Hash::make($credentials['password']);
auth()->login(User::create($credentials));
$token = auth()->user()->createToken('web')->plainTextToken;
return (new UserResource(auth()->user()))
->additional(['token' => $token]);
}
}

View File

@@ -0,0 +1,70 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\StoreOfferRequest;
use App\Http\Requests\UpdateOfferRequest;
use App\Http\Resources\OfferResource;
use App\Models\Offer;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
class OfferController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function index(): AnonymousResourceCollection
{
return OfferResource::collection(Offer::all());
}
/**
* Display the specified resource.
*
* @param int $id
* @return \App\Http\Resources\OfferResource
*/
public function show(int $id): OfferResource
{
$offer = Offer::findOrFail($id);
return new OfferResource($offer);
}
/**
* Store a newly created resource in storage.
*
* @param \App\Http\Requests\StoreOfferRequest $request
* @return \App\Http\Resources\OfferResource
*/
public function store(StoreOfferRequest $request): OfferResource
{
return new OfferResource(Offer::create($request->validated()));
}
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\UpdateOfferRequest $request
* @param int $id
* @return void
*/
public function update(UpdateOfferRequest $request, int $id): void
{
$offer = Offer::findOrFail($id);
$offer->update($request->validated());
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return void
*/
public function destroy(int $id): void
{
$offer = Offer::findOrFail($id);
$offer->delete();
}
}

View File

@@ -0,0 +1,70 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\StoreOrderRequest;
use App\Http\Requests\UpdateOfferRequest;
use App\Http\Resources\OrderResource;
use App\Models\Order;
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
class OrderController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/
public function index(): AnonymousResourceCollection
{
return OrderResource::collection(Order::all());
}
/**
* Display the specified resource.
*
* @param int $id
* @return \App\Http\Resources\OrderResource
*/
public function show(int $id): OrderResource
{
$order = Order::findOrFail($id);
return new OrderResource($order);
}
/**
* Store a newly created resource in storage.
*
* @param \App\Http\Requests\StoreOrderRequest $request
* @return \App\Http\Resources\OrderResource
*/
public function store(StoreOrderRequest $request): OrderResource
{
return new OrderResource(Order::create($request->validated()));
}
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\UpdateOfferRequest $request
* @param int $id
* @return void
*/
public function update(UpdateOfferRequest $request, int $id): void
{
$order = Order::findOrFail($id);
$order->update($request->validated());
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return void
*/
public function destroy(int $id): void
{
$order = Order::findOrFail($id);
$order->delete();
}
}

View File

@@ -0,0 +1,30 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\UpdateUserRequest;
use App\Http\Resources\UserResource;
class UserController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \App\Http\Resources\UserResource
*/
public function index(): UserResource
{
return new UserResource(auth()->user());
}
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\UpdateUserRequest $request
* @return void
*/
public function update(UpdateUserRequest $request): void
{
auth()->user()->update($request->validated());
}
}

View File

@@ -39,7 +39,7 @@ class Kernel extends HttpKernel
], ],
'api' => [ 'api' => [
// \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
'throttle:api', 'throttle:api',
\Illuminate\Routing\Middleware\SubstituteBindings::class, \Illuminate\Routing\Middleware\SubstituteBindings::class,
], ],

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Http\Requests\Auth;
use App\Http\Requests\BaseRequest;
class LoginRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'email' => ['required', 'string', 'email', 'exists:users'],
'password' => ['required', 'string'],
];
}
}

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Http\Requests\Auth;
use App\Http\Requests\BaseRequest;
class RegistrationRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'email' => ['required', 'string', 'email', 'unique:users'],
'password' => ['required', 'string'],
];
}
}

View File

@@ -0,0 +1,18 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
abstract class BaseRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize(): bool
{
return true;
}
}

View File

@@ -0,0 +1,30 @@
<?php
namespace App\Http\Requests;
use App\Enums\OrderTypesEnum;
use Illuminate\Validation\Rules\Enum;
class StoreOfferRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'user_id' => ['required', 'numeric', 'exists:users,id'],
'name' => ['required', 'string'],
'type' => ['required', new Enum(OrderTypesEnum::class)],
'price' => ['required', 'numeric', 'min:0.1'],
'rooms' => ['required', 'numeric', 'min:1'],
'space' => ['required', 'numeric', 'min:1'],
'yandex_mark' => ['string'],
'location' => ['required', 'string'],
'description' => ['required', 'string'],
'is_group' => ['required', 'boolean'],
];
}
}

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Http\Requests;
class StoreOrderRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'offer_id' => ['required', 'numeric', 'exists:offers,id'],
'user_id' => ['required', 'numeric', 'exists:users,id'],
'price' => ['required', 'numeric', 'min:0.1'],
'discount' => ['required', 'numeric', 'min:0'],
];
}
}

View File

@@ -0,0 +1,30 @@
<?php
namespace App\Http\Requests;
use App\Enums\OrderTypesEnum;
use Illuminate\Validation\Rules\Enum;
class UpdateOfferRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'user_id' => ['numeric', 'exists:users,id'],
'name' => ['string'],
'type' => [new Enum(OrderTypesEnum::class)],
'price' => ['numeric', 'min:0.1'],
'rooms' => ['numeric', 'min:1'],
'space' => ['numeric', 'min:1'],
'yandex_mark' => ['string'],
'location' => ['string'],
'description' => ['string'],
'is_group' => ['boolean'],
];
}
}

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Http\Requests;
class UpdateOrderRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'offer_id' => ['numeric', 'exists:offers,id'],
'user_id' => ['numeric', 'exists:users,id'],
'price' => ['numeric', 'min:0.1'],
'discount' => ['numeric', 'min:0.1'],
];
}
}

View File

@@ -0,0 +1,22 @@
<?php
namespace App\Http\Requests;
class UpdateUserRequest extends BaseRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules()
{
return [
'first_name' => ['string'],
'last_name' => ['string'],
'middle_name' => ['string'],
'email' => ['string', 'email', 'unique:users'],
'phone' => ['string'],
];
}
}

View File

@@ -0,0 +1,19 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class OfferResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
*/
public function toArray($request)
{
return parent::toArray($request);
}
}

View File

@@ -0,0 +1,19 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class OrderResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
*/
public function toArray($request)
{
return parent::toArray($request);
}
}

View File

@@ -0,0 +1,19 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class UserResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
*/
public function toArray($request)
{
return parent::toArray($request);
}
}

View File

@@ -0,0 +1,22 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Feedback extends Model
{
use HasFactory;
/**
* The attributes that are mass assignable.
*
* @var array<int, string>
*/
protected $fillable = [
'user_id',
'comment',
'rating',
];
}

View File

@@ -0,0 +1,42 @@
<?php
namespace App\Models;
use App\Enums\OrderTypesEnum;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Offer extends Model
{
use HasFactory;
/**
* The attributes that are mass assignable.
*
* @var array<int, string>
*/
protected $fillable = [
'user_id',
'name',
'type',
'price',
'rooms',
'space',
'yandex_mark',
'location',
'description',
'is_group',
];
/**
* The attributes that should be cast.
*
* @var array<string, string>
*/
protected $casts = [
'type' => OrderTypesEnum::class,
'space' => 'double',
'price' => 'double',
'is_group' => 'boolean',
];
}

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class OfferPhoto extends Model
{
use HasFactory;
/**
* The attributes that are mass assignable.
*
* @var array<int, string>
*/
protected $fillable = [
'offer_id',
'file',
];
}

View File

@@ -0,0 +1,33 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Order extends Model
{
use HasFactory;
/**
* The attributes that are mass assignable.
*
* @var array<int, string>
*/
protected $fillable = [
'offer_id',
'user_id',
'price',
'discount',
];
/**
* The attributes that should be cast.
*
* @var array<string, string>
*/
protected $casts = [
'price' => 'double',
'discount' => 'double',
];
}

View File

@@ -2,7 +2,6 @@
namespace App\Models; namespace App\Models;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
@@ -18,8 +17,12 @@ class User extends Authenticatable
* @var array<int, string> * @var array<int, string>
*/ */
protected $fillable = [ protected $fillable = [
'name', 'first_name',
'last_name',
'middle_name',
'email', 'email',
'phone',
'photo',
'password', 'password',
]; ];
@@ -30,15 +33,5 @@ class User extends Authenticatable
*/ */
protected $hidden = [ protected $hidden = [
'password', 'password',
'remember_token',
];
/**
* The attributes that should be cast.
*
* @var array<string, string>
*/
protected $casts = [
'email_verified_at' => 'datetime',
]; ];
} }

View File

@@ -24,7 +24,5 @@ class AuthServiceProvider extends ServiceProvider
public function boot() public function boot()
{ {
$this->registerPolicies(); $this->registerPolicies();
//
} }
} }

View File

@@ -13,7 +13,7 @@
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.0.1", "laravel/sail": "^1.14",
"mockery/mockery": "^1.4.4", "mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1", "nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.5.10", "phpunit/phpunit": "^9.5.10",

2
backend/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1abc7822bd9f28e9a62986817bf04f76", "content-hash": "3c9da13e09c625e7ca22f1d572bd7f2d",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",

View File

@@ -64,11 +64,6 @@ return [
'driver' => 'eloquent', 'driver' => 'eloquent',
'model' => App\Models\User::class, 'model' => App\Models\User::class,
], ],
// 'users' => [
// 'driver' => 'database',
// 'table' => 'users',
// ],
], ],
/* /*

View File

@@ -18,25 +18,11 @@ class UserFactory extends Factory
public function definition() public function definition()
{ {
return [ return [
'name' => $this->faker->name(), 'first_name' => $this->faker->firstName(),
'last_name' => $this->faker->lastName(),
'email' => $this->faker->unique()->safeEmail(), 'email' => $this->faker->unique()->safeEmail(),
'email_verified_at' => now(), 'phone' => $this->faker->unique()->e164PhoneNumber(),
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
'remember_token' => Str::random(10),
]; ];
} }
/**
* Indicate that the model's email address should be unverified.
*
* @return static
*/
public function unverified()
{
return $this->state(function (array $attributes) {
return [
'email_verified_at' => null,
];
});
}
} }

View File

@@ -15,11 +15,13 @@ return new class extends Migration
{ {
Schema::create('users', function (Blueprint $table) { Schema::create('users', function (Blueprint $table) {
$table->id(); $table->id();
$table->string('name'); $table->string('first_name')->nullable();
$table->string('last_name')->nullable();
$table->string('middle_name')->nullable();
$table->string('email')->unique(); $table->string('email')->unique();
$table->timestamp('email_verified_at')->nullable(); $table->string('phone')->unique()->nullable();
$table->string('photo')->nullable();
$table->string('password'); $table->string('password');
$table->rememberToken();
$table->timestamps(); $table->timestamps();
}); });
} }

View File

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class extends Migration class CreatePersonalAccessTokensTable extends Migration
{ {
/** /**
* Run the migrations. * Run the migrations.
@@ -14,7 +14,7 @@ return new class extends Migration
public function up() public function up()
{ {
Schema::create('personal_access_tokens', function (Blueprint $table) { Schema::create('personal_access_tokens', function (Blueprint $table) {
$table->id(); $table->bigIncrements('id');
$table->morphs('tokenable'); $table->morphs('tokenable');
$table->string('name'); $table->string('name');
$table->string('token', 64)->unique(); $table->string('token', 64)->unique();
@@ -33,4 +33,4 @@ return new class extends Migration
{ {
Schema::dropIfExists('personal_access_tokens'); Schema::dropIfExists('personal_access_tokens');
} }
}; }

View File

@@ -0,0 +1,47 @@
<?php
use App\Enums\OrderTypesEnum;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('offers', function (Blueprint $table) {
$table->id();
$table->string('name');
$table->enum('type', OrderTypesEnum::values());
$table->decimal('price');
$table->unsignedSmallInteger('rooms');
$table->decimal('space');
$table->string('yandex_mark')->nullable();
$table->string('location');
$table->text('description');
$table->boolean('is_group');
$table->timestamps();
$table
->foreignId('user_id')
->constrained()
->onDelete('set null')
->onUpdate('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('offers');
}
};

View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('offer_photos', function (Blueprint $table) {
$table->id();
$table->string('file');
$table->timestamps();
$table
->foreignId('offer_id')
->constrained()
->onUpdate('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('offer_photos');
}
};

View File

@@ -0,0 +1,39 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('feedback', function (Blueprint $table) {
$table->id();
$table->text('comment');
$table->unsignedFloat('rating');
$table->timestamps();
$table
->foreignId('user_id')
->constrained()
->onDelete('cascade')
->onUpdate('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('feedback');
}
};

View File

@@ -0,0 +1,45 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('orders', function (Blueprint $table) {
$table->id();
$table->decimal('price');
$table->decimal('discount');
$table->timestamps();
$table
->foreignId('offer_id')
->constrained()
->onDelete('set null')
->onUpdate('cascade');
$table
->foreignId('user_id')
->constrained()
->onDelete('set null')
->onUpdate('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('orders');
}
};

View File

@@ -2,7 +2,7 @@
namespace Database\Seeders; namespace Database\Seeders;
use Illuminate\Database\Console\Seeds\WithoutModelEvents; use App\Models\User;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder class DatabaseSeeder extends Seeder
@@ -14,7 +14,7 @@ class DatabaseSeeder extends Seeder
*/ */
public function run() public function run()
{ {
// \App\Models\User::factory(10)->create(); User::factory(10)->create();
// \App\Models\User::factory()->create([ // \App\Models\User::factory()->create([
// 'name' => 'Test User', // 'name' => 'Test User',

View File

@@ -1,6 +1,11 @@
<?php <?php
use Illuminate\Http\Request; use App\Http\Controllers\Auth\LoginController;
use App\Http\Controllers\Auth\LogoutController;
use App\Http\Controllers\Auth\RegistrationController;
use App\Http\Controllers\OfferController;
use App\Http\Controllers\OrderController;
use App\Http\Controllers\UserController;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
/* /*
@@ -14,6 +19,29 @@ use Illuminate\Support\Facades\Route;
| |
*/ */
Route::middleware('auth:sanctum')->get('/user', function (Request $request) { Route::prefix('auth')->group(function() {
return $request->user();
Route::post('registration', RegistrationController::class);
Route::post('login', LoginController::class);
Route::middleware('auth:sanctum')->group(function() {
Route::post('logout', LogoutController::class);
}); });
});
Route::middleware('auth:sanctum')->group(function() {
Route::prefix('user')->group(function() {
Route::get('', [UserController::class, 'index']);
Route::put('', [UserController::class, 'update']);
});
Route::apiResource('orders', OrderController::class);
});
Route::apiResource('offers', OfferController::class);
// TODO: На главной странице 6 самых дорогих квартир
// TODO: Последние добавленные квартиры + фильтры

View File

@@ -13,6 +13,6 @@ use Illuminate\Support\Facades\Route;
| |
*/ */
Route::get('/', function () { //Route::get('/', function () {
return view('welcome'); // return view('welcome');
}); //});