User authentication

backend/app/Http/Controllers/Auth/LoginController.php

@@ -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]);
+    }
+}

backend/app/Http/Controllers/Auth/LogoutController.php

@@ -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();
+    }
+}

backend/app/Http/Controllers/Auth/RegistrationController.php

@@ -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]);
+    }
+}

backend/app/Http/Controllers/ReviewController.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class ReviewController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

backend/app/Http/Controllers/UserController.php

@@ -2,62 +2,29 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use App\Http\Requests\UpdateUserRequest;
+use App\Http\Resources\UserResource;
 
 class UserController extends Controller
 {
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \App\Http\Resources\UserResource
      */
-    public function index()
+    public function index(): UserResource
     {
-        //
+        return new UserResource(auth()->user());
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
     }
 
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \App\Http\Requests\UpdateUserRequest $request
-     * @param  int  $id
+     * @return void
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdateUserRequest $request): void
     {
-        //
+        auth()->user()->update($request->validated());
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
     }
 }

backend/app/Http/Kernel.php

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

backend/app/Http/Requests/Auth/LoginRequest.php

@@ -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'],
+        ];
+    }
+}

backend/app/Http/Requests/Auth/RegistrationRequest.php

@@ -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'],
+        ];
+    }
+}

backend/app/Http/Requests/StoreOfferRequest.php

@@ -15,11 +15,12 @@ class StoreOfferRequest extends BaseRequest
     public function rules(): array
     {
         return [
-            'owner_id' => ['required', 'numeric', 'exists:users,id'],
+            'user_id' => ['required', 'numeric', 'exists:users,id'],
             'name' => ['required', 'string'],
             'type' => ['required', new Enum(OrderTypesEnum::class)],
-            'price' => ['required', 'numeric'],
+            'price' => ['required', 'numeric', 'min:0.1'],
-            'rooms' => ['required', 'numeric'],
+            'rooms' => ['required', 'numeric', 'min:1'],
+            'space' => ['required', 'numeric', 'min:1'],
             'yandex_mark' => ['string'],
             'location' => ['required', 'string'],
             'description' => ['required', 'string'],

backend/app/Http/Requests/StoreOrderRequest.php

@@ -14,8 +14,6 @@ class StoreOrderRequest extends BaseRequest
         return [
             'offer_id' => ['required', 'numeric', 'exists:offers,id'],
             'user_id' => ['required', 'numeric', 'exists:users,id'],
-            'start_date' => ['required', 'date', 'after_or_equal:today'],
-            'end_date' => ['required', 'date', 'after_or_equal:tomorrow'],
             'price' => ['required', 'numeric', 'min:0.1'],
             'discount' => ['required', 'numeric', 'min:0'],
         ];

backend/app/Http/Requests/UpdateOfferRequest.php

@@ -15,11 +15,12 @@ class UpdateOfferRequest extends BaseRequest
     public function rules(): array
     {
         return [
-            'owner_id' => ['numeric', 'exists:users,id'],
+            'user_id' => ['numeric', 'exists:users,id'],
             'name' => ['string'],
             'type' => [new Enum(OrderTypesEnum::class)],
-            'price' => ['numeric'],
+            'price' => ['numeric', 'min:0.1'],
-            'rooms' => ['numeric'],
+            'rooms' => ['numeric', 'min:1'],
+            'space' => ['numeric', 'min:1'],
             'yandex_mark' => ['string'],
             'location' => ['string'],
             'description' => ['string'],

backend/app/Http/Requests/UpdateOrderRequest.php

@@ -14,8 +14,6 @@ class UpdateOrderRequest extends BaseRequest
         return [
             'offer_id' => ['numeric', 'exists:offers,id'],
             'user_id' => ['numeric', 'exists:users,id'],
-            'start_date' => ['date'],
-            'end_date' => ['date'],
             'price' => ['numeric', 'min:0.1'],
             'discount' => ['numeric', 'min:0.1'],
         ];

backend/app/Http/Requests/UpdateUserRequest.php

@@ -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'],
+        ];
+    }
+}

backend/app/Http/Resources/UserResource.php

@@ -4,7 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class ReviewResource extends JsonResource
+class UserResource extends JsonResource
 {
     /**
      * Transform the resource into an array.

backend/app/Models/Feedback.php

@@ -5,7 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
-class Review extends Model
+class Feedback extends Model
 {
     use HasFactory;
 
@@ -15,7 +15,6 @@ class Review extends Model
      * @var array<int, string>
      */
     protected $fillable = [
-        'offer_id',
         'user_id',
         'comment',
         'rating',

backend/app/Models/Offer.php

@@ -16,11 +16,12 @@ class Offer extends Model
      * @var array<int, string>
      */
     protected $fillable = [
-        'owner_id',
+        'user_id',
         'name',
         'type',
         'price',
         'rooms',
+        'space',
         'yandex_mark',
         'location',
         'description',
@@ -34,6 +35,7 @@ class Offer extends Model
      */
     protected $casts = [
         'type' => OrderTypesEnum::class,
+        'space' => 'double',
         'price' => 'double',
         'is_group' => 'boolean',
     ];

backend/app/Models/Order.php

@@ -17,8 +17,6 @@ class Order extends Model
     protected $fillable = [
         'offer_id',
         'user_id',
-        'start_date',
-        'end_date',
         'price',
         'discount',
     ];
@@ -29,8 +27,6 @@ class Order extends Model
      * @var array<string, string>
      */
     protected $casts = [
-        'start_date' => 'datetime',
-        'end_date' => 'datetime',
         'price' => 'double',
         'discount' => 'double',
     ];

backend/app/Models/User.php

@@ -34,13 +34,4 @@ class User extends Authenticatable
     protected $hidden = [
         'password',
     ];
-
-    /**
-     * The attributes that should be cast.
-     *
-     * @var array<string, string>
-     */
-//    protected $casts = [
-//        'email_verified_at' => 'datetime',
-//    ];
 }

backend/database/migrations/2014_10_12_000000_create_users_table.php

@@ -15,8 +15,8 @@ return new class extends Migration
     {
         Schema::create('users', function (Blueprint $table) {
             $table->id();
-            $table->string('first_name');
+            $table->string('first_name')->nullable();
-            $table->string('last_name');
+            $table->string('last_name')->nullable();
             $table->string('middle_name')->nullable();
             $table->string('email')->unique();
             $table->string('phone')->unique()->nullable();

backend/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePersonalAccessTokensTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('personal_access_tokens', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->morphs('tokenable');
+            $table->string('name');
+            $table->string('token', 64)->unique();
+            $table->text('abilities')->nullable();
+            $table->timestamp('last_used_at')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('personal_access_tokens');
+    }
+}

backend/database/migrations/2022_05_26_030738_create_offers_table.php

@@ -16,16 +16,22 @@ return new class extends Migration
     {
         Schema::create('offers', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('owner_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');
         });
     }
 

backend/database/migrations/2022_05_26_035738_create_offer_photos_table.php

@@ -15,9 +15,13 @@ return new class extends Migration
     {
         Schema::create('offer_photos', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('offer_id');
             $table->string('file');
             $table->timestamps();
+
+            $table
+                ->foreignId('offer_id')
+                ->constrained()
+                ->onUpdate('cascade');
         });
     }
 

backend/database/migrations/2022_05_26_035905_create_feedback_table.php

@@ -13,13 +13,17 @@ return new class extends Migration
      */
     public function up()
     {
-        Schema::create('reviews', function (Blueprint $table) {
+        Schema::create('feedback', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('offer_id');
-            $table->foreignId('user_id');
             $table->text('comment');
             $table->unsignedFloat('rating');
             $table->timestamps();
+
+            $table
+                ->foreignId('user_id')
+                ->constrained()
+                ->onDelete('cascade')
+                ->onUpdate('cascade');
         });
     }
 
@@ -30,6 +34,6 @@ return new class extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('reviews');
+        Schema::dropIfExists('feedback');
     }
 };

backend/database/migrations/2022_05_26_035920_create_orders_table.php

@@ -15,13 +15,21 @@ return new class extends Migration
     {
         Schema::create('orders', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('offer_id');
-            $table->foreignId('user_id');
-            $table->date('start_date');
-            $table->date('end_date');
             $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');
         });
     }
 

backend/routes/api.php

@@ -1,7 +1,11 @@
 <?php
 
+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;
 
 /*
@@ -15,5 +19,29 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
-Route::apiResource('/offers', OfferController::class);
+Route::prefix('auth')->group(function() {
-Route::apiResource('/orders', OrderController::class);
+
+    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: Последние добавленные квартиры + фильтры