Compare commits
1 Commits
feature/Au
...
264ed1ecb9
| Author | SHA1 | Date | |
|---|---|---|---|
| 264ed1ecb9 |
67
backend/app/Facades/DataTable/DataTable.php
Normal file
67
backend/app/Facades/DataTable/DataTable.php
Normal file
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
|
||||
namespace App\Facades\DataTable;
|
||||
|
||||
use App\Services\DataTable\DataTableInput;
|
||||
use App\Services\DataTable\DataTableService;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Services\DataTable\Exceptions\InvalidParameterInterface;
|
||||
|
||||
class DataTable
|
||||
{
|
||||
/**
|
||||
* Extracts data from request, passes to datatable service and prepares data for response.
|
||||
* @param Model|Builder $mixed
|
||||
* @param Request $request
|
||||
* @param array $allowedFilters
|
||||
* @param array $allowedRelations
|
||||
* @param array $allowedSortings
|
||||
* @param array $allowedSelects
|
||||
* @return array
|
||||
* @throws InvalidParameterInterface if input parameters are invalid.
|
||||
*/
|
||||
public function run(
|
||||
Model|Builder $mixed,
|
||||
Request $request,
|
||||
array $allowedFilters = [],
|
||||
array $allowedRelations = [],
|
||||
array $allowedSortings = [],
|
||||
array $allowedSelects = [],
|
||||
array $allowedGroupBy = []
|
||||
): array
|
||||
{
|
||||
|
||||
$filters = json_decode($request->filters);
|
||||
$sorting = json_decode($request->sorting);
|
||||
$rels = $request->rels ?: array();
|
||||
|
||||
$dataTableInput = new DataTableInput(
|
||||
$request->start,
|
||||
$request->size,
|
||||
$filters,
|
||||
$sorting,
|
||||
$rels,
|
||||
$allowedFilters,
|
||||
$allowedSortings,
|
||||
$allowedGroupBy
|
||||
);
|
||||
|
||||
$query = $this->makeQueryFromModel($mixed);
|
||||
|
||||
$dataTableService = (new DataTableService($query, $dataTableInput))
|
||||
->setAllowedFilters($allowedFilters)
|
||||
->setAllowedRelations($allowedRelations)
|
||||
->setAllowedSortings($allowedSortings)
|
||||
->setAllowedSelects($allowedSelects)
|
||||
->setAllowedGroupBy($allowedGroupBy);
|
||||
|
||||
return $dataTableService->getData();
|
||||
}
|
||||
|
||||
protected function makeQueryFromModel(Model|Builder $mixed): Builder
|
||||
{
|
||||
return ($mixed instanceof Model) ? $mixed->query() : $mixed;
|
||||
}
|
||||
}
|
||||
13
backend/app/Facades/DataTable/DataTableFacade.php
Normal file
13
backend/app/Facades/DataTable/DataTableFacade.php
Normal file
@@ -0,0 +1,13 @@
|
||||
<?php
|
||||
|
||||
namespace App\Facades\DataTable;
|
||||
|
||||
use Illuminate\Support\Facades\Facade;
|
||||
|
||||
class DataTableFacade extends Facade
|
||||
{
|
||||
protected static function getFacadeAccessor(): string
|
||||
{
|
||||
return DataTable::class;
|
||||
}
|
||||
}
|
||||
19
backend/app/Models/User.php
Executable file → Normal file
19
backend/app/Models/User.php
Executable file → Normal file
@@ -5,18 +5,29 @@ namespace App\Models;
|
||||
// use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Database\Factories\UserFactory;
|
||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||
use Illuminate\Database\Eloquent\Attributes\Guarded;
|
||||
use Illuminate\Database\Eloquent\Attributes\Hidden;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Laravel\Passport\HasApiTokens;
|
||||
|
||||
#[Guarded(['id'])]
|
||||
#[Hidden(['password'])]
|
||||
#[Fillable(['name', 'email', 'password'])]
|
||||
#[Hidden(['password', 'remember_token'])]
|
||||
class User extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<UserFactory> */
|
||||
use HasFactory, Notifiable, HasApiTokens;
|
||||
protected $guarded = ['id'];
|
||||
|
||||
/**
|
||||
* Get the attributes that should be cast.
|
||||
*
|
||||
* @return array<string, string>
|
||||
*/
|
||||
protected function casts(): array
|
||||
{
|
||||
return [
|
||||
'email_verified_at' => 'datetime',
|
||||
'password' => 'hashed',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
2
backend/app/Providers/AppServiceProvider.php
Executable file → Normal file
2
backend/app/Providers/AppServiceProvider.php
Executable file → Normal file
@@ -4,7 +4,6 @@ namespace App\Providers;
|
||||
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Laravel\Passport\Passport;
|
||||
use Carbon\CarbonInterval;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
{
|
||||
@@ -22,6 +21,5 @@ class AppServiceProvider extends ServiceProvider
|
||||
public function boot(): void
|
||||
{
|
||||
Passport::enablePasswordGrant();
|
||||
Passport::personalAccessTokensExpireIn(CarbonInterval::minutes(1));
|
||||
}
|
||||
}
|
||||
|
||||
27
backend/app/Providers/DataTableServiceProvider.php
Normal file
27
backend/app/Providers/DataTableServiceProvider.php
Normal file
@@ -0,0 +1,27 @@
|
||||
<?php
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use App\Facades\DataTable\DataTable;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
class DataTableServiceProvider extends ServiceProvider
|
||||
{
|
||||
/**
|
||||
* Register services.
|
||||
*/
|
||||
public function register(): void
|
||||
{
|
||||
$this->app->bind('datatable', function () {
|
||||
return new DataTable();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Bootstrap services.
|
||||
*/
|
||||
public function boot(): void
|
||||
{
|
||||
//
|
||||
}
|
||||
}
|
||||
83
backend/app/Services/DataTable/DataTableInput.php
Normal file
83
backend/app/Services/DataTable/DataTableInput.php
Normal file
@@ -0,0 +1,83 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable;
|
||||
|
||||
use App\Services\DataTable\Filter\Filter;
|
||||
use App\Services\DataTable\Sort\Sort;
|
||||
|
||||
class DataTableInput
|
||||
{
|
||||
/**
|
||||
* @param int $start
|
||||
* @param int $size
|
||||
* @param array $filters
|
||||
* @param array $sorting
|
||||
* @param array $rels
|
||||
*/
|
||||
public function __construct(
|
||||
private ?int $start,
|
||||
private ?int $size,
|
||||
private array $filters,
|
||||
private ?array $sorting,
|
||||
private array $rels,
|
||||
private array $allowedFilters,
|
||||
private array $allowedSortings,
|
||||
private ?array $GroupBy,
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public function getStart(): ?int
|
||||
{
|
||||
return $this->start;
|
||||
}
|
||||
|
||||
public function getSize(): ?int
|
||||
{
|
||||
return $this->size;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array returns an array of Filter objects
|
||||
*/
|
||||
public function getFilters(): array
|
||||
{
|
||||
$filters = array();
|
||||
|
||||
foreach ($this->filters as $filter) {
|
||||
$filters[] = new Filter(
|
||||
$filter->id,
|
||||
$filter->value,
|
||||
$filter->fn,
|
||||
$filter->datatype,
|
||||
$this->allowedFilters
|
||||
);
|
||||
}
|
||||
|
||||
return $filters;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function getSorting(): ?array
|
||||
{
|
||||
$sorts = [];
|
||||
if (!empty($this->sorting)){
|
||||
foreach ($this->sorting as $sort) {
|
||||
$sorts[] = new Sort($sort->id, $sort->desc, $this->allowedSortings);
|
||||
}
|
||||
}
|
||||
return $sorts;
|
||||
}
|
||||
|
||||
public function getRelations(): array
|
||||
{
|
||||
return $this->rels;
|
||||
}
|
||||
|
||||
public function getGroupBy(): ?array
|
||||
{
|
||||
return $this->GroupBy;
|
||||
}
|
||||
}
|
||||
128
backend/app/Services/DataTable/DataTableService.php
Normal file
128
backend/app/Services/DataTable/DataTableService.php
Normal file
@@ -0,0 +1,128 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable;
|
||||
|
||||
use App\Services\DataTable\Filter\ApplyFilter;
|
||||
use App\Services\DataTable\Sort\ApplySort;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class DataTableService
|
||||
{
|
||||
|
||||
protected array $allowedFilters;
|
||||
protected array $allowedRelations;
|
||||
protected array $allowedSortings;
|
||||
protected array $allowedSelects;
|
||||
protected array $allowedGroupBy;
|
||||
private int $totalRowCount;
|
||||
|
||||
public function __construct(
|
||||
protected Builder $query,
|
||||
private DataTableInput $dataTableInput
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public function setAllowedFilters(array $allowedFilters): DataTableService
|
||||
{
|
||||
$this->allowedFilters = $allowedFilters;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function setAllowedRelations(array $allowedRelations): DataTableService
|
||||
{
|
||||
$this->allowedRelations = $allowedRelations;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function setAllowedSortings(array $allowedSortings): DataTableService
|
||||
{
|
||||
$this->allowedSortings = $allowedSortings;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function setAllowedSelects(array $allowedSelects): DataTableService
|
||||
{
|
||||
$this->allowedSelects = $allowedSelects;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function setAllowedGroupBy(array $allowedGroupBy): DataTableService
|
||||
{
|
||||
$this->allowedGroupBy = $allowedGroupBy;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle 'getData' operations
|
||||
* @return array
|
||||
*/
|
||||
public function getData(): array
|
||||
{
|
||||
$query = $this->buildQuery();
|
||||
$data = $query->get();
|
||||
|
||||
return array(
|
||||
'data' => $data,
|
||||
'meta' => [
|
||||
'totalRowCount' => $this->totalRowCount
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
protected function buildQuery(): Builder
|
||||
{
|
||||
$query = $this->query;
|
||||
|
||||
foreach ($this->dataTableInput->getFilters() as $filter) {
|
||||
$query = (new ApplyFilter($query, $filter))->apply();
|
||||
}
|
||||
|
||||
$query = $this->applySelect($query, $this->allowedSelects);
|
||||
$query = $this->includeRelationsInQuery($query, $this->allowedRelations);
|
||||
$query = $this->applyGroupBy($query, $this->allowedGroupBy);
|
||||
|
||||
$this->totalRowCount = $query->count();
|
||||
|
||||
if (!is_null($this->dataTableInput->getStart())) {
|
||||
$query->offset($this->dataTableInput->getStart());
|
||||
}
|
||||
|
||||
if(!is_null($this->dataTableInput->getSize())){
|
||||
$query->limit($this->dataTableInput->getSize());
|
||||
}
|
||||
|
||||
$sorting = $this->dataTableInput->getSorting();
|
||||
foreach ($sorting as $sort){
|
||||
$query = (new ApplySort($query, $sort))->apply();
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
protected function applySelect(Builder $query, array $selectedFields): Builder
|
||||
{
|
||||
if (!empty($selectedFields)) {
|
||||
$query->select($selectedFields);
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
protected function applyGroupBy(Builder $query, array $groupBy): Builder
|
||||
{
|
||||
return empty($groupBy) ? $query : $query->groupBy($groupBy);
|
||||
}
|
||||
|
||||
protected function includeRelationsInQuery(Builder $query, array $rels): Builder
|
||||
{
|
||||
if (!empty($rels)) {
|
||||
$query->with($rels);
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
// (later) define mapping of relation names to prevent relation name expose.
|
||||
// (later) define mapping of column names to prevent column name expose.
|
||||
}
|
||||
15
backend/app/Services/DataTable/Enums/DataType.php
Normal file
15
backend/app/Services/DataTable/Enums/DataType.php
Normal file
@@ -0,0 +1,15 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Enums;
|
||||
|
||||
enum DataType: string
|
||||
{
|
||||
case NUMERIC = 'numeric';
|
||||
case TEXT = 'text';
|
||||
case DATE = 'date';
|
||||
|
||||
public static function values(): array
|
||||
{
|
||||
return array_column(self::cases(), 'value');
|
||||
}
|
||||
}
|
||||
19
backend/app/Services/DataTable/Enums/SearchType.php
Normal file
19
backend/app/Services/DataTable/Enums/SearchType.php
Normal file
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Enums;
|
||||
|
||||
enum SearchType: string
|
||||
{
|
||||
case CONTAINS = 'contains';
|
||||
case EQUALS = 'equals';
|
||||
case NOT_EQUALS = 'notEquals';
|
||||
case BETWEEN = 'between';
|
||||
case GREATER_THAN = 'greaterThan';
|
||||
case LESS_THAN = 'lessThan';
|
||||
case FUZZY = 'fuzzy';
|
||||
|
||||
public static function values(): array
|
||||
{
|
||||
return array_column(self::cases(), 'value');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Exceptions;
|
||||
|
||||
use Exception;
|
||||
|
||||
class InvalidFilterException extends Exception implements InvalidParameterInterface
|
||||
{
|
||||
protected $fieldName;
|
||||
|
||||
public function __construct($fieldName, $message = "", $code = 400, \Throwable $previous = null)
|
||||
{
|
||||
$this->fieldName = $fieldName;
|
||||
parent::__construct($message, $code, $previous);
|
||||
}
|
||||
|
||||
public function getFieldName()
|
||||
{
|
||||
return $this->fieldName;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Exceptions;
|
||||
|
||||
interface InvalidParameterInterface
|
||||
{
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Exceptions;
|
||||
|
||||
use Exception;
|
||||
|
||||
class InvalidRelationException extends Exception implements InvalidParameterInterface
|
||||
{
|
||||
protected $fieldName;
|
||||
|
||||
public function __construct($fieldName, $message = "", $code = 400, \Throwable $previous = null)
|
||||
{
|
||||
$this->fieldName = $fieldName;
|
||||
parent::__construct($message, $code, $previous);
|
||||
}
|
||||
|
||||
public function getFieldName()
|
||||
{
|
||||
return $this->fieldName;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Exceptions;
|
||||
|
||||
use Exception;
|
||||
|
||||
class InvalidSortingException extends Exception implements InvalidParameterInterface
|
||||
{
|
||||
protected $fieldName;
|
||||
|
||||
public function __construct($fieldName, $message = "", $code = 400, \Throwable $previous = null)
|
||||
{
|
||||
$this->fieldName = $fieldName;
|
||||
parent::__construct($message, $code, $previous);
|
||||
}
|
||||
|
||||
public function getFieldName()
|
||||
{
|
||||
return $this->fieldName;
|
||||
}
|
||||
}
|
||||
84
backend/app/Services/DataTable/Filter/ApplyFilter.php
Normal file
84
backend/app/Services/DataTable/Filter/ApplyFilter.php
Normal file
@@ -0,0 +1,84 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter;
|
||||
|
||||
use App\Services\DataTable\Enums\SearchType;
|
||||
use App\Services\DataTable\Exceptions\InvalidFilterException;
|
||||
use App\Services\DataTable\Filter\SearchFunctions\FilterBetween;
|
||||
use App\Services\DataTable\Filter\SearchFunctions\FilterContains;
|
||||
use App\Services\DataTable\Filter\SearchFunctions\FilterEquals;
|
||||
use App\Services\DataTable\Filter\SearchFunctions\FilterGreaterThan;
|
||||
use App\Services\DataTable\Filter\SearchFunctions\FilterLessThan;
|
||||
use App\Services\DataTable\Filter\SearchFunctions\FilterNotEquals;
|
||||
use App\Services\DataTable\Filter\SearchFunctions\SearchFilter;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class ApplyFilter
|
||||
{
|
||||
private SearchFilter $searchFilter;
|
||||
|
||||
/**
|
||||
* @param Builder $query
|
||||
* @param Filter $filter
|
||||
*/
|
||||
public function __construct(
|
||||
private Builder $query,
|
||||
private Filter $filter,
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$filter = $this->filter;
|
||||
$query = $this->query;
|
||||
|
||||
$searchType = SearchType::from($filter->getFn());
|
||||
switch ($searchType) {
|
||||
case SearchType::CONTAINS:
|
||||
$this->searchFilter = new FilterContains($query, $filter);
|
||||
break;
|
||||
|
||||
case SearchType::EQUALS:
|
||||
$this->searchFilter = new FilterEquals($query, $filter);
|
||||
break;
|
||||
|
||||
case SearchType::NOT_EQUALS:
|
||||
$this->searchFilter = new FilterNotEquals($query, $filter);
|
||||
break;
|
||||
|
||||
case SearchType::BETWEEN:
|
||||
$this->searchFilter = new FilterBetween($query, $filter);
|
||||
break;
|
||||
|
||||
case SearchType::GREATER_THAN:
|
||||
$this->searchFilter = new FilterGreaterThan($query, $filter);
|
||||
break;
|
||||
|
||||
case SearchType::LESS_THAN:
|
||||
$this->searchFilter = new FilterLessThan($query, $filter);
|
||||
break;
|
||||
|
||||
default:
|
||||
$searchFunction = $filter->getFn();
|
||||
throw new InvalidFilterException($searchFunction, "search function `$searchFunction` is invalid.");
|
||||
|
||||
}
|
||||
|
||||
$relation = $this->filter->getRelation();
|
||||
return method_exists($this->query->getModel(), $relation) ? $this->applyFilterToRelation($relation) : $this->searchFilter->apply();
|
||||
}
|
||||
|
||||
protected function applyFilterToRelation(string $relation): Builder
|
||||
{
|
||||
return $this->query->whereHas($relation, function (Builder $query) {
|
||||
$this->filter->removeRelationFromId();
|
||||
$this->applyFilter($query, $this->filter);
|
||||
});
|
||||
}
|
||||
|
||||
private function applyFilter(Builder $query, Filter $filter): Builder
|
||||
{
|
||||
return (new ApplyFilter($query, $filter))->apply();
|
||||
}
|
||||
}
|
||||
73
backend/app/Services/DataTable/Filter/Filter.php
Normal file
73
backend/app/Services/DataTable/Filter/Filter.php
Normal file
@@ -0,0 +1,73 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter;
|
||||
|
||||
use App\Services\DataTable\Validators\FilterValidator;
|
||||
|
||||
class Filter
|
||||
{
|
||||
private static FilterValidator $filterValidator;
|
||||
|
||||
/**
|
||||
* @param string $id
|
||||
* @param string|int|array $value
|
||||
* @param string $fn
|
||||
* @param string $datatype
|
||||
* @param array $allowedFilters
|
||||
* @throws \App\Services\DataTable\Exceptions\InvalidFilterException
|
||||
*/
|
||||
public function __construct(
|
||||
private string $id,
|
||||
private string|int|array $value,
|
||||
private string $fn,
|
||||
private string $datatype,
|
||||
private array $allowedFilters
|
||||
)
|
||||
{
|
||||
self::$filterValidator = FilterValidator::getInstance();
|
||||
self::$filterValidator->isValid($this, $this->allowedFilters);
|
||||
}
|
||||
|
||||
public function getId(): string
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getValue(): array|int|string
|
||||
{
|
||||
return $this->value;
|
||||
}
|
||||
|
||||
public function getFn(): string
|
||||
{
|
||||
return $this->fn;
|
||||
}
|
||||
|
||||
public function getDatatype(): string
|
||||
{
|
||||
return $this->datatype;
|
||||
}
|
||||
|
||||
public function getRelation(): string
|
||||
{
|
||||
$fieldArray = explode('.', $this->id);
|
||||
return count($fieldArray) > 1 ? $fieldArray[0] : '';
|
||||
}
|
||||
|
||||
public function getColumn(): string
|
||||
{
|
||||
$fieldArray = explode('.', $this->id);
|
||||
return array_pop($fieldArray);
|
||||
}
|
||||
|
||||
public function removeRelationFromId(): void
|
||||
{
|
||||
$this->id = $this->getColumn();
|
||||
}
|
||||
|
||||
public function setValue(int|array|string $value): void
|
||||
{
|
||||
$this->value = $value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterBetween extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$query = $this->query;
|
||||
[$minVal, $maxVal] = $this->filter->getValue();
|
||||
|
||||
if ($minVal) {
|
||||
if ($this->filter->getDatatype() == "date") {
|
||||
$minVal = $minVal . " 00:00:00";
|
||||
}
|
||||
$this->filter->setValue($minVal);
|
||||
$query = (new FilterGreaterThanOrEqual($this->query, $this->filter))->apply();
|
||||
}
|
||||
|
||||
if ($maxVal) {
|
||||
if ($this->filter->getDatatype() == "date") {
|
||||
$maxVal = $maxVal . " 23:59:59";
|
||||
}
|
||||
$this->filter->setValue($maxVal);
|
||||
$query = (new FilterLessThanOrEqual($this->query, $this->filter))->apply();
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use App\Services\DataTable\Enums\DataType;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterContains extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$column = $this->filter->getId();
|
||||
$value = '%' . $this->filter->getValue() . '%';
|
||||
|
||||
if ($this->filter->getDatatype() == DataType::TEXT->value) {
|
||||
$query = $this->searchIgnoreCase($column, $value);
|
||||
|
||||
} else {
|
||||
$query = $this->query->where($column, 'LIKE', $value);
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
private function searchIgnoreCase(string $column, string $value): Builder
|
||||
{
|
||||
$value = strtolower($value);
|
||||
return $this->query->whereRaw("LOWER($column) LIKE ?", [$value]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use App\Services\DataTable\Enums\DataType;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterEquals extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$column = $this->filter->getId();
|
||||
$value = $this->filter->getValue();
|
||||
|
||||
if ($this->filter->getDatatype() == DataType::TEXT->value) {
|
||||
$query = $this->searchIgnoreCase($column, $value);
|
||||
} else {
|
||||
$query = $this->query->where($column, $value);
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
private function searchIgnoreCase(string $column, string $value): Builder
|
||||
{
|
||||
$value = strtolower($value);
|
||||
return $this->query->whereRaw("LOWER($column) = ?", [$value]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use App\Services\DataTable\Enums\DataType;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterGreaterThan extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$value = ($this->filter->getDatatype() == DataType::NUMERIC) ?
|
||||
(float)$this->filter->getValue() : $this->filter->getValue();
|
||||
|
||||
return $this->query->where($this->filter->getId(), '>', $value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use App\Services\DataTable\Enums\DataType;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterGreaterThanOrEqual extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$value = ($this->filter->getDatatype() == DataType::NUMERIC) ?
|
||||
(float)$this->filter->getValue() : $this->filter->getValue();
|
||||
|
||||
return $this->query->where($this->filter->getId(), '>=', $value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use App\Services\DataTable\Enums\DataType;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterLessThan extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$value = ($this->filter->getDatatype() == DataType::NUMERIC) ?
|
||||
(float)$this->filter->getValue() : $this->filter->getValue();
|
||||
|
||||
return $this->query->where($this->filter->getId(), '<', $value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use App\Services\DataTable\Enums\DataType;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterLessThanOrEqual extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$value = ($this->filter->getDatatype() == DataType::NUMERIC) ?
|
||||
(float)$this->filter->getValue() : $this->filter->getValue();
|
||||
|
||||
return $this->query->where($this->filter->getId(), '<=', $value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class FilterNotEquals extends SearchFilter
|
||||
{
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$column = $this->filter->getId();
|
||||
$value = $this->filter->getValue();
|
||||
|
||||
return $this->query->whereNot($column, $value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Filter\SearchFunctions;
|
||||
|
||||
use App\Services\DataTable\Filter\Filter;
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
abstract class SearchFilter
|
||||
{
|
||||
/**
|
||||
* @param Builder $query
|
||||
* @param Filter $filter
|
||||
*/
|
||||
public function __construct(
|
||||
protected Builder $query,
|
||||
protected Filter $filter,
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
abstract public function apply(): Builder;
|
||||
}
|
||||
31
backend/app/Services/DataTable/Sort/ApplySort.php
Normal file
31
backend/app/Services/DataTable/Sort/ApplySort.php
Normal file
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Sort;
|
||||
|
||||
use Illuminate\Contracts\Database\Query\Builder;
|
||||
|
||||
class ApplySort
|
||||
{
|
||||
|
||||
/**
|
||||
* @param Builder $query
|
||||
* @param ?Sort $sort
|
||||
*/
|
||||
public function __construct(
|
||||
private Builder $query,
|
||||
private ?Sort $sort,
|
||||
)
|
||||
{
|
||||
}
|
||||
|
||||
public function apply(): Builder
|
||||
{
|
||||
$query = $this->query;
|
||||
|
||||
if (!is_null($this->sort)) {
|
||||
$query->orderBy($this->sort->getId(), $this->sort->getDirection());
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
}
|
||||
39
backend/app/Services/DataTable/Sort/Sort.php
Normal file
39
backend/app/Services/DataTable/Sort/Sort.php
Normal file
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Sort;
|
||||
|
||||
use App\Services\DataTable\Validators\SortingValidator;
|
||||
|
||||
class Sort
|
||||
{
|
||||
private static SortingValidator $sortingValidator;
|
||||
|
||||
/**
|
||||
* @param string $id
|
||||
* @param bool $desc
|
||||
* @param array $allowedSortings
|
||||
* @throws \App\Services\DataTable\Exceptions\InvalidSortingException
|
||||
*/
|
||||
public function __construct(
|
||||
private string $id,
|
||||
private bool $desc,
|
||||
private array $allowedSortings,
|
||||
)
|
||||
{
|
||||
self::$sortingValidator = SortingValidator::getInstance();
|
||||
self::$sortingValidator->isValid($this, $this->allowedSortings);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getId(): string
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getDirection(): string
|
||||
{
|
||||
return $this->desc === true ? 'desc' : 'asc';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Validators;
|
||||
|
||||
use App\Services\DataTable\Enums\SearchType;
|
||||
use App\Services\DataTable\Enums\DataType;
|
||||
use App\Services\DataTable\Exceptions\InvalidFilterException;
|
||||
use App\Services\DataTable\Filter\Filter;
|
||||
|
||||
class FilterValidator
|
||||
{
|
||||
private static $instance;
|
||||
|
||||
private function __construct()
|
||||
{
|
||||
}
|
||||
|
||||
public static function getInstance(): FilterValidator
|
||||
{
|
||||
if (!isset(self::$instance)) {
|
||||
self::$instance = new static();
|
||||
}
|
||||
|
||||
return self::$instance;
|
||||
}
|
||||
|
||||
public function isValid(Filter $filter, array $allowedFilters): bool
|
||||
{
|
||||
if (!$this->isAllowed($filter, $allowedFilters)) {
|
||||
$filterId = $filter->getId();
|
||||
throw new InvalidFilterException($filter->getId(), "filtering field `$filterId` is not allowed.");
|
||||
}
|
||||
|
||||
if (!$this->isValidSearchFunction($filter)) {
|
||||
$searchFunction = $filter->getFn();
|
||||
throw new InvalidFilterException($searchFunction, "search function `$searchFunction` is invalid.");
|
||||
}
|
||||
|
||||
if ($this->isValidDataType($filter) == -1) {
|
||||
throw new InvalidFilterException(null, "datatype property is not set in `filters` array.");
|
||||
}
|
||||
|
||||
if (!$this->isValidDataType($filter)) {
|
||||
$datatype = $filter->getDatatype();
|
||||
throw new InvalidFilterException($datatype, "datatype `$datatype` is invalid.");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
protected function isAllowed(Filter $filter, array $allowedFilters): bool
|
||||
{
|
||||
return $allowedFilters == ['*'] || in_array($filter->getId(), $allowedFilters);
|
||||
}
|
||||
|
||||
protected function isValidSearchFunction(Filter $filter): bool
|
||||
{
|
||||
$searchFunction = $filter->getFn();
|
||||
return isset($searchFunction) && in_array($searchFunction, SearchType::values());
|
||||
}
|
||||
|
||||
protected function isValidDataType(Filter $filter): int
|
||||
{
|
||||
if (!property_exists($filter, 'datatype'))
|
||||
return -1;
|
||||
|
||||
return $filter->getDatatype() && in_array($filter->getDatatype(), DataType::values()) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Validators;
|
||||
|
||||
use App\Services\DataTable\Exceptions\InvalidRelationException;
|
||||
|
||||
class RelationValidator
|
||||
{
|
||||
public static function validate(?array $rels, array $allowedRelations): bool
|
||||
{
|
||||
foreach ($rels as $relation) {
|
||||
|
||||
if (!self::isAllowed($relation, $allowedRelations)) {
|
||||
throw new InvalidRelationException($relation, "relation `$relation` is not allowed.");
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public static function isAllowed(string $relation, array $allowedRelations): bool
|
||||
{
|
||||
return !$relation || in_array($relation, $allowedRelations);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services\DataTable\Validators;
|
||||
|
||||
use App\Services\DataTable\Exceptions\InvalidSortingException;
|
||||
use App\Services\DataTable\Sort\Sort;
|
||||
|
||||
class SortingValidator
|
||||
{
|
||||
private static $instance;
|
||||
|
||||
private function __construct()
|
||||
{
|
||||
}
|
||||
|
||||
public static function getInstance(): SortingValidator
|
||||
{
|
||||
if (!isset(self::$instance)) {
|
||||
self::$instance = new static();
|
||||
}
|
||||
|
||||
return self::$instance;
|
||||
}
|
||||
|
||||
public function isValid(Sort $sorting, array $allowedSortings): bool
|
||||
{
|
||||
if (!$this->isAllowed($sorting, $allowedSortings)) {
|
||||
$sortId = $sorting->getId();
|
||||
throw new InvalidSortingException($sortId, "sorting field `$sortId` is not allowed.");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
protected function isAllowed(Sort $sorting, array $allowedSortings): bool
|
||||
{
|
||||
return $allowedSortings == ['*'] || in_array($sorting->getId(), $allowedSortings);
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Traits;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
|
||||
trait ApiResponse
|
||||
{
|
||||
public function successResponse(mixed $data = null, string $message = null, int $statusCode = 200): JsonResponse
|
||||
{
|
||||
if (!is_null($data)) {
|
||||
return response()->json([
|
||||
'data' => $data
|
||||
], $statusCode);
|
||||
}
|
||||
|
||||
$message = $message ?? __('messages.successful');
|
||||
|
||||
return response()->json([
|
||||
'message' => $message
|
||||
], $statusCode);
|
||||
}
|
||||
|
||||
public function errorResponse(string $message, string $type = 'logical_exception', int $statusCode = 422): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
'type' => $type,
|
||||
'message' => $message
|
||||
], $statusCode);
|
||||
}
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Controller\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\User;
|
||||
use App\Traits\ApiResponse;
|
||||
use App\User\Requests\Auth\LoginRequest;
|
||||
use App\User\Requests\Auth\RegisterRequest;
|
||||
use App\User\Resources\UserResource;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
||||
class AuthController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function register(RegisterRequest $request): JsonResponse
|
||||
{
|
||||
User::query()->create([
|
||||
'username' => $request->username,
|
||||
'email' => $request->email,
|
||||
'password' => Hash::make($request->password),
|
||||
]);
|
||||
|
||||
$request->session()->regenerate();
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function login(LoginRequest $request): JsonResponse
|
||||
{
|
||||
$credentials = ['password' => $request->password,];
|
||||
|
||||
if (filter_var($request->login, FILTER_VALIDATE_EMAIL)) {
|
||||
$credentials['email'] = $request->login;
|
||||
} else {
|
||||
$credentials['username'] = $request->login;
|
||||
}
|
||||
|
||||
if (Auth::attempt($credentials))
|
||||
{
|
||||
$request->session()->regenerate();
|
||||
|
||||
$user = Auth::user();
|
||||
|
||||
return $this->successResponse(new UserResource($user));
|
||||
}
|
||||
|
||||
return $this->errorResponse(__('messages.incorrect_or_username_password'));
|
||||
}
|
||||
|
||||
public function logout(Request $request): JsonResponse
|
||||
{
|
||||
Auth::logout();
|
||||
|
||||
$request->session()->invalidate();
|
||||
|
||||
$request->session()->regenerateToken();
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Controller;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Traits\ApiResponse;
|
||||
use App\User\Requests\Profile\ChangePasswordRequest;
|
||||
use App\User\Requests\Profile\EditRequest;
|
||||
use App\User\Resources\UserResource;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
||||
class ProfileController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function info(): JsonResponse
|
||||
{
|
||||
return $this->successResponse(new UserResource(Auth::user()));
|
||||
}
|
||||
|
||||
public function edit(EditRequest $request): JsonResponse
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
$user->update([
|
||||
'first_name' => $request->first_name,
|
||||
'last_name' => $request->last_name,
|
||||
'national_id' => $request->national_id,
|
||||
'address' => $request->address,
|
||||
'postal_code' => $request->postal_code,
|
||||
'account_number' => $request->account_number,
|
||||
'phone_number' => $request->phone_number,
|
||||
'province_id' => $request->province_id,
|
||||
'city_id' => $request->city_id,
|
||||
]);
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function changePassword(ChangePasswordRequest $request): JsonResponse
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
if (! Hash::check($request->current_password, $user->password)) {
|
||||
return $this->errorResponse(__('messages.incorrect_current_password'));
|
||||
}
|
||||
|
||||
$user->update([
|
||||
'password' => Hash::make($request->new_password),
|
||||
]);
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Requests\Auth;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class LoginRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'login' => 'required|string',
|
||||
'password' => 'required|string',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Requests\Auth;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class RegisterRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'username' => 'required|unique:users,username',
|
||||
'email' => 'required|email|unique:users,email',
|
||||
'password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6|confirmed:',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Requests\Profile;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class ChangePasswordRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, ValidationRule|array|string>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'current_password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6',
|
||||
'new_password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Requests\Profile;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class EditRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, ValidationRule|array|string>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'first_name' => 'required|string',
|
||||
'last_name' => 'required|string',
|
||||
'national_id' => 'required',
|
||||
'address' => 'required',
|
||||
'postal_code' => 'required',
|
||||
'account_number' => 'required',
|
||||
'phone_number' => 'required|regex:/^964\d{9}$/|numeric|digits:11',
|
||||
'province_id' => 'required',
|
||||
'city_id' => 'required',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\User\Resources;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
class UserResource extends JsonResource
|
||||
{
|
||||
/**
|
||||
* Transform the resource into an array.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function toArray(Request $request): array
|
||||
{
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'username' => $this->username,
|
||||
'email' => $this->email,
|
||||
];
|
||||
}
|
||||
}
|
||||
2
backend/bootstrap/app.php
Executable file → Normal file
2
backend/bootstrap/app.php
Executable file → Normal file
@@ -12,7 +12,7 @@ return Application::configure(basePath: dirname(__DIR__))
|
||||
health: '/up',
|
||||
)
|
||||
->withMiddleware(function (Middleware $middleware): void {
|
||||
$middleware->web()->validateCsrfTokens(['*']);
|
||||
//
|
||||
})
|
||||
->withExceptions(function (Exceptions $exceptions): void {
|
||||
//
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
|
||||
use App\Providers\AppServiceProvider;
|
||||
|
||||
return [
|
||||
AppServiceProvider::class,
|
||||
App\Providers\AppServiceProvider::class,
|
||||
App\Providers\DataTableServiceProvider::class,
|
||||
];
|
||||
|
||||
0
backend/config/auth.php
Executable file → Normal file
0
backend/config/auth.php
Executable file → Normal file
@@ -1,34 +0,0 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Cross-Origin Resource Sharing (CORS) Configuration
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here you may configure your settings for cross-origin resource sharing
|
||||
| or "CORS". This determines what cross-origin operations may execute
|
||||
| in web browsers. You are free to adjust these settings as needed.
|
||||
|
|
||||
| To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
|
||||
|
|
||||
*/
|
||||
|
||||
'paths' => ['*'],
|
||||
|
||||
'allowed_methods' => ['*'],
|
||||
|
||||
'allowed_origins' => ['*'],
|
||||
|
||||
'allowed_origins_patterns' => [],
|
||||
|
||||
'allowed_headers' => ['*'],
|
||||
|
||||
'exposed_headers' => [],
|
||||
|
||||
'max_age' => 0,
|
||||
|
||||
'supports_credentials' => true,
|
||||
|
||||
];
|
||||
0
backend/config/session.php
Executable file → Normal file
0
backend/config/session.php
Executable file → Normal file
2
backend/database/factories/UserFactory.php
Executable file → Normal file
2
backend/database/factories/UserFactory.php
Executable file → Normal file
@@ -25,7 +25,7 @@ class UserFactory extends Factory
|
||||
public function definition(): array
|
||||
{
|
||||
return [
|
||||
'username' => fake()->name(),
|
||||
'name' => fake()->name(),
|
||||
'email' => fake()->unique()->safeEmail(),
|
||||
'email_verified_at' => now(),
|
||||
'password' => static::$password ??= Hash::make('password'),
|
||||
|
||||
24
backend/database/migrations/0001_01_01_000000_create_users_table.php
Executable file → Normal file
24
backend/database/migrations/0001_01_01_000000_create_users_table.php
Executable file → Normal file
@@ -13,25 +13,20 @@ return new class extends Migration
|
||||
{
|
||||
Schema::create('users', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->string('username');
|
||||
$table->string('first_name')->nullable();
|
||||
$table->string('last_name')->nullable();
|
||||
$table->string('name');
|
||||
$table->string('email')->unique();
|
||||
$table->timestamp('email_verified_at')->nullable();
|
||||
$table->string('password');
|
||||
$table->tinyInteger('status')->default(0);
|
||||
$table->string('national_id')->nullable();
|
||||
$table->string('address')->nullable();
|
||||
$table->string('postal_code')->nullable();
|
||||
$table->string('account_number')->nullable();
|
||||
$table->string('phone_number')->nullable();
|
||||
$table->string('province_id')->nullable();
|
||||
$table->string('province_name')->nullable();
|
||||
$table->string('city_id')->nullable();
|
||||
$table->string('city_name')->nullable();
|
||||
|
||||
$table->rememberToken();
|
||||
$table->timestamps();
|
||||
});
|
||||
|
||||
Schema::create('password_reset_tokens', function (Blueprint $table) {
|
||||
$table->string('email')->primary();
|
||||
$table->string('token');
|
||||
$table->timestamp('created_at')->nullable();
|
||||
});
|
||||
|
||||
Schema::create('sessions', function (Blueprint $table) {
|
||||
$table->string('id')->primary();
|
||||
$table->foreignId('user_id')->nullable()->index();
|
||||
@@ -48,6 +43,7 @@ return new class extends Migration
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('users');
|
||||
Schema::dropIfExists('password_reset_tokens');
|
||||
Schema::dropIfExists('sessions');
|
||||
}
|
||||
};
|
||||
|
||||
3
backend/database/seeders/DatabaseSeeder.php
Executable file → Normal file
3
backend/database/seeders/DatabaseSeeder.php
Executable file → Normal file
@@ -18,9 +18,8 @@ class DatabaseSeeder extends Seeder
|
||||
// User::factory(10)->create();
|
||||
|
||||
User::factory()->create([
|
||||
'username' => 'Test User',
|
||||
'name' => 'Test User',
|
||||
'email' => 'test@example.com',
|
||||
'password' => 'password123@',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
2
backend/routes/api.php
Executable file → Normal file
2
backend/routes/api.php
Executable file → Normal file
@@ -1,10 +1,8 @@
|
||||
<?php
|
||||
|
||||
use App\User\Controller\Auth\AuthController;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::get('/user', function (Request $request) {
|
||||
return $request->user();
|
||||
})->middleware('auth:api');
|
||||
|
||||
|
||||
23
backend/routes/web.php
Executable file → Normal file
23
backend/routes/web.php
Executable file → Normal file
@@ -1,24 +1,7 @@
|
||||
<?php
|
||||
|
||||
use App\User\Controller\Auth\AuthController;
|
||||
use App\User\Controller\ProfileController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::prefix('auth')
|
||||
->name('Auth.')
|
||||
->controller(AuthController::class)
|
||||
->group(function () {
|
||||
Route::post('register', 'register')->name('register');
|
||||
Route::post('login', 'login')->name('login');
|
||||
Route::post('logout', 'logout')->name('logout');
|
||||
});
|
||||
|
||||
Route::prefix('profile')
|
||||
->name('profile.')
|
||||
->middleware('auth')
|
||||
->controller(ProfileController::class)
|
||||
->group(function () {
|
||||
Route::get('info', 'info')->name('info');
|
||||
Route::post('edit', 'edit')->name('edit');
|
||||
Route::post('change_password', 'changePassword')->name('changePassword');
|
||||
});
|
||||
Route::get('/', function () {
|
||||
return view('welcome');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user