Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Backend/.php-cs-fixer.cache

This file was deleted.

2 changes: 0 additions & 2 deletions Backend/app/Http/Controllers/KebabController.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ public function getAllKebabs()

public function addKebab(KebabRequest $request)
{
$data = $request->validated();

try {
$kebab = new Kebab($request->all());

Expand Down
2 changes: 1 addition & 1 deletion Backend/app/Http/Requests/KebabRequests/KebabRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function authorize(): bool
public function rules(): array
{
return [
"logo" => "required",
"logo" => "required|file|image|mimes:jpeg,png,jpg,gif|max:10240",
"name" => "required",
"address" => "required|string|max:255",
"coordinates" => "required|array",
Expand Down
42 changes: 42 additions & 0 deletions Backend/database/factories/KebabFactory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

declare(strict_types=1);

namespace Database\Factories;

use App\Models\Kebab;
use Illuminate\Database\Eloquent\Factories\Factory;

class KebabFactory extends Factory
{
protected $model = Kebab::class;

public function definition(): array
{
return [
"logo" => $this->faker->imageUrl(),
"name" => $this->faker->company,
"address" => $this->faker->address,
"coordinates" => json_encode([
["lat" => $this->faker->latitude, "lng" => $this->faker->longitude],
]),
"sauces" => json_encode([$this->faker->word, $this->faker->word]),
"meats" => json_encode([$this->faker->word, $this->faker->word]),
"status" => $this->faker->randomElement(["exists", "closed", "planned"]),
"opening_hours" => json_encode([
["day" => "monday", "hours" => "10:00-20:00"],
["day" => "tuesday", "hours" => "10:00-20:00"],
]),
"opening_year" => $this->faker->year(),
"closing_year" => $this->faker->optional()->year(),
"is_crafted" => $this->faker->boolean,
"is_premises" => $this->faker->boolean,
"is_chainstore" => $this->faker->boolean,
"ordering_options" => $this->faker->randomElement(["delivery", "pickup"]),
"pages" => json_encode([
"pyszne.pl" => $this->faker->url,
"ubereats" => $this->faker->url,
]),
];
}
}
2 changes: 0 additions & 2 deletions Backend/routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
Route::delete("/kebabs/{kebabId}/comments", [KebabController::class, "removeComment"]);
});

Route::get("/documentation", fn() => view("vendor.scribe.index"));

Route::middleware(["auth:sanctum", "admin"])->group(function (): void {
Route::put("/changeUserRole/{id}", [UserController::class, "changeUserRole"]);
Route::delete("/deleteUser/{id}", [UserController::class, "deleteUser"]);
Expand Down
15 changes: 10 additions & 5 deletions Backend/tests/Arch/ModelArchTest.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?php

arch('Models should be inside correct folder')
declare(strict_types=1);

use App\Models\Kebab;
use Illuminate\Database\Eloquent\Model;

arch("Models should be inside correct folder")
->expect('App\Models')
->toBeClasses()
->toHaveSuffix('')
->toExtend(\Illuminate\Database\Eloquent\Model::class);
->toHaveSuffix("")
->toExtend(Model::class);

arch('Kebab model should follow conventions')
->expect('App\Models\Kebab')
arch("Kebab model should follow conventions")
->expect(Kebab::class)
->toBeClasses();
18 changes: 11 additions & 7 deletions Backend/tests/Arch/RequestsArchTest.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
<?php

arch('Requests should be inside correct folder')
declare(strict_types=1);

use Illuminate\Foundation\Http\FormRequest;

arch("Requests should be inside correct folder")
->expect('App\Http\Requests')
->toBeClasses()
->toHaveSuffix('Request');
->toHaveSuffix("Request");

arch('Kebab requests should be in thier folder')
arch("Kebab requests should be in thier folder")
->expect('App\Http\Requests\KebabRequests')
->toBeClasses()
->toHaveSuffix('Request');
->toHaveSuffix("Request");

arch('UserRequests should have proper architecture')
arch("UserRequests should have proper architecture")
->expect('App\Http\Requests\UserRequests')
->toBeClasses()
->toHaveSuffix('Request')
->toExtend(\Illuminate\Foundation\Http\FormRequest::class);
->toHaveSuffix("Request")
->toExtend(FormRequest::class);
Loading
Loading