Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#8 ریفکتور کد کنترل ها و سرویس ها #37

Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,8 @@ public function menu()

public function showItem(int $categoryId, int $itemId)
{
// dd('jknkjn');
$business = $this->business;
$item = Item::where('id', $itemId)
->first();
$item = $this->businessService->getMenuItemById($itemId);
abort_if(!$item, 404);
return view('main_domain.business.menu.item', compact([
'business',
Expand All @@ -85,10 +83,7 @@ public function conditionalDiscountsList()
public function eventsList()
{
$business = $this->business;
$events = Event::where('cafe_restaurant_id', $business->id)
// todo
->where('date', '>=', now()->subDay())
->get();
$events = $this->businessService->getFutureEvents($business);
return view('main_domain.business.events.list', compact([
'business',
'events',
Expand Down
85 changes: 85 additions & 0 deletions app/Http/Controllers/Web/MainDomain/MenumaController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?php

namespace App\Http\Controllers\Web\MainDomain;

use App\Http\Controllers\Controller;
use App\Models\CafeRestaurant;
use App\Models\ConditionalDiscount as Discount;
use App\Models\Event;
use App\Models\SearchLog;
use Illuminate\Http\Request;

class MenumaController extends Controller
{
public function index()
{
$pinnedBusinesses = CafeRestaurant::where('is_pinned', '1')->get();

$businessesDiscounts = Discount::query()
->with(['cafeRestaurant' => function ($query) {
return $query->select(['id', 'logo_path', 'slug', 'name']);
}])
// ->where('is_pinned', '1')
->get();

$businessesEvents = Event::with('cafeRestaurant')
// todo
->where('date', '>=', now()->subDay())
// ->where('is_pinned', '1')
->orderBy('date')
->get();

return view('main_domain.index', compact([
'pinnedBusinesses',
'businessesDiscounts',
'businessesEvents',
])
);
}

public function search(Request $request)
{
SearchLog::create(['request' => $request->all()]);

$distance = intval($request->distance) ?: 3000;
$userLat = floatval($request->lat);
$userLong = floatval($request->long);

$businesses = CafeRestaurant::query()
->selectRaw('*, (6371000 * ACOS(COS(RADIANS(?)) * COS(RADIANS(location_lat)) * COS(RADIANS(location_long - ?)) + SIN(RADIANS(?)) * SIN(RADIANS(location_lat)))) AS distance')
->having('distance', '<', $distance)
->addBinding($userLat, 'select')
->addBinding($userLong, 'select')
->addBinding($userLat, 'select')
->orderBy('distance')
->get();


return view('main_domain.search.index', compact([
'businesses'
]));
}

public function catalogPage()
{
$catalogs = \App\Models\Catalog::all();
return view('main_domain.catalog.index', compact([
'catalogs',
]));
}

public function qrCodeRedirector(string $slug)
{
if ($slug == '_A1') {
return redirect()->away('https://kamakancafe.ir/menu');
}
if ($slug == '_A2') {
return redirect()->away('https://cafeinjast.ir/menu');

}
if ($slug == '_A3') {
return redirect()->away('https://tourismcafe.ir/');
}
abort(404);
}
}
118 changes: 39 additions & 79 deletions app/Http/Controllers/Web/MainDomain/Tst.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,78 +12,62 @@
use App\Models\Item;
use App\Models\SearchLog;
use App\Models\WorkingHour;
use App\Services\Business\BusinessServiceInterface;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;

// todo refactor
class Tst extends Controller
{
public function index()
public function __construct(
private readonly BusinessServiceInterface $businessService,
//todo
// private CafeRestaurant|null $business,
// Request $request,

)
{
$pinnedBusinesses = CafeRestaurant::where('is_pinned', '1')->get();

$businessesDiscounts = Discount::query()
->with(['cafeRestaurant' => function ($query) {
return $query->select(['id', 'logo_path', 'slug', 'name']);
}])
// ->where('is_pinned', '1')
->get();

$businessesEvents = Event::with('cafeRestaurant')
// todo
->where('date', '>=', now()->subDay())
// ->where('is_pinned', '1')
->orderBy('date')
->get();

return view('main_domain.index', compact([
'pinnedBusinesses',
'businessesDiscounts',
'businessesEvents',
])
);
// todo

// $this->business = $this->businessService->findByDomain($request->host());
// if (!$this->business) {
// todo redirect to main domain
// abort(404);
// }
}

private function getBusinessBySlug(string $slug)
{
$business = $this->businessService->findBySlug($slug);
if (!$business) {
abort(404);
}
return $business;
}

public function profile(string $slug)
{
$business = CafeModel::query()->where('slug', $slug)->firstOrFail();
// $cafe = $this->findBySlug($slug);
$business = $this->getBusinessBySlug($slug);
$business->load('workingHours');
// dd($business->workingHours);
// TODO optimize
$todayName = strtolower(now()->format('l'));
$workingHours = WorkingHour::where('cafe_restaurant_id', $business->id)
->where('weekday', $todayName)
->orderBy('from')
->get();
$hasWorkingTime = boolval(WorkingHour::where('cafe_restaurant_id', $business->id)
->count());

// $business->loadExists(['conditionalDiscounts', 'events']);
// todo
$countOfConditionalDiscounts = ConditionalDiscount::where('cafe_restaurant_id', $business->id)
->count();

$countOfEvents = Event::where('cafe_restaurant_id', $business->id)
->count();
$workingHours = $this->businessService->getTodayWorkingHours($business);
$hasWorkingTime = $this->businessService->hasAnyWorkingTime($business);
return view('main_domain.business.profile', compact([
'business',
'workingHours',
'hasWorkingTime',
'countOfConditionalDiscounts',
'countOfEvents',

])
);
}

public function menu(string $slug)
{
$business = CafeModel::query()->where('slug', $slug)->firstOrFail();
$business = $this->getBusinessBySlug($slug);
$menu = $business->visibleCategories->load('visibleItems');
$dayOffers = Item::where('cafe_restaurant_id', $business->id)
->whereJsonContains('tags', 'day_offer')
->get();
$dayOffers = $this->businessService->getDayOffers($business);

return view('main_domain.business.menu', compact([
'business',
'menu',
Expand All @@ -93,7 +77,7 @@ public function menu(string $slug)

public function registerInCustomerClub(string $slug)
{
$business = CafeModel::query()->where('slug', $slug)->firstOrFail();
$business = $this->getBusinessBySlug($slug);
return view('main_domain.business.customer-club.register', compact([
'business'
]));
Expand All @@ -102,8 +86,8 @@ public function registerInCustomerClub(string $slug)

public function conditionalDiscountsList(string $slug)
{
$business = CafeModel::query()->where('slug', $slug)->firstOrFail();
$conditionalDiscounts = ConditionalDiscount::where('cafe_restaurant_id', $business->id)->get();
$business = $this->getBusinessBySlug($slug);
$conditionalDiscounts = $this->businessService->getConditionalDiscounts($business);
return view('main_domain.business.conditional-discounts.list', compact([
'business',
'conditionalDiscounts',
Expand All @@ -112,11 +96,8 @@ public function conditionalDiscountsList(string $slug)

public function eventsList(string $slug)
{
$business = CafeModel::query()->where('slug', $slug)->firstOrFail();
$events = Event::where('cafe_restaurant_id', $business->id)
// todo
->where('date', '>=', now()->subDay())
->get();
$business = $this->getBusinessBySlug($slug);
$events = $this->businessService->getFutureEvents($business);
return view('main_domain.business.events.list', compact([
'business',
'events',
Expand All @@ -125,35 +106,14 @@ public function eventsList(string $slug)

public function showItem(string $slug, int $categoryId, int $itemId)
{
$business = CafeModel::query()->where('slug', $slug)->firstOrFail();
$item = Item::where('id', $itemId)
->first();
$business = $this->getBusinessBySlug($slug);
$item = $this->businessService->getMenuItemById($itemId);
abort_if(!$item, 404);
return view('main_domain.business.menu.item', compact([
'business',
'item',
]));
}

public function search(Request $request)
{
SearchLog::create(['request' => $request->all()]);

$distance = intval($request->distance) ?: 3000;
$userLat = floatval($request->lat);
$userLong = floatval($request->long);

$businesses = CafeRestaurant::query()
->selectRaw('*, (6371000 * ACOS(COS(RADIANS(?)) * COS(RADIANS(location_lat)) * COS(RADIANS(location_long - ?)) + SIN(RADIANS(?)) * SIN(RADIANS(location_lat)))) AS distance')
->having('distance', '<', $distance)
->addBinding($userLat, 'select')
->addBinding($userLong, 'select')
->addBinding($userLat, 'select')
->orderBy('distance')
->get();

return view('main_domain.search.index', compact([
'businesses'
]));
}

}
14 changes: 14 additions & 0 deletions app/Services/Business/BusinessService.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,18 @@ public function getConditionalDiscounts(CafeModel $business)
return ConditionalDiscount::where('cafe_restaurant_id', $business->id)->get();
}

public function getFutureEvents(CafeModel $business)
{
return Event::where('cafe_restaurant_id', $business->id)
// todo
->where('date', '>=', now()->subDay())
->get();
}

public function getMenuItemById(int $id)
{
return Item::where('id', $id)
->first();
}

}
34 changes: 9 additions & 25 deletions routes/web/main_domain.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,26 @@


Route::get('/',
[MainDomain\Tst::class, 'index'])
[MainDomain\MenumaController::class, 'index'])
->name('home');

// todo
Route::get('/catalog', function () {
$catalogs = \App\Models\Catalog::all();
return view('main_domain.catalog.index', compact([
'catalogs',
]));
})
Route::get('/catalog',
[MainDomain\MenumaController::class, 'catalogPage'])
->name('catalog');

// todo
//Route::get('/catalog/{catalogId}', function ($catalogId) {
//});

Route::get('/register-form', \App\Livewire\MainDomain\RegisterForm::class)
Route::get('/register-form',
\App\Livewire\MainDomain\RegisterForm::class)
->name('register-form');

//todo
Route::get('/q/{slug}', function ($slug) {
if ($slug == '_A1') {
return redirect()->away('https://kamakancafe.ir/menu');
}
if ($slug == '_A2') {
return redirect()->away('https://cafeinjast.ir/menu');

}
if ($slug == '_A3') {
return redirect()->away('https://tourismcafe.ir/');
}
abort(404);
});
Route::get('/q/{slug}',
[MainDomain\MenumaController::class, 'qrCodeRedirector']);

//todo
Route::get('/search',[MainDomain\Tst::class,'search']);
Route::get('/search',
[MainDomain\MenumaController::class, 'search']);
//
Route::name('business.')
->prefix('/{slug}')
Expand Down
Loading