From 6ff0175ae69a458e63747f596b0030798f1a18e9 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 3 Aug 2023 21:59:58 +0500 Subject: [PATCH] from server --- .../api/BlogPostsApiController.php | 2 +- .../controllers/api/ProductsApiController.php | 9 +++++++-- plugins/ahmadfatoni/apigenerator/routes.php | 20 +++++-------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/plugins/ahmadfatoni/apigenerator/controllers/api/BlogPostsApiController.php b/plugins/ahmadfatoni/apigenerator/controllers/api/BlogPostsApiController.php index 11931a8..47d7c06 100644 --- a/plugins/ahmadfatoni/apigenerator/controllers/api/BlogPostsApiController.php +++ b/plugins/ahmadfatoni/apigenerator/controllers/api/BlogPostsApiController.php @@ -59,7 +59,7 @@ class BlogPostsApiController extends Controller 'translations:locale,model_id,attribute_data' ])->paginate(9); - return $this->helpers->apiArrayResponseBuilder(200, 'ok', [$data]); + return response()->json($data, 200); } diff --git a/plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php b/plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php index 583514b..0ad97f5 100644 --- a/plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php +++ b/plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php @@ -134,8 +134,13 @@ class ProductsAPIController extends Controller 'translations:locale,model_id,attribute_data', 'images:attachment_id,attachment_type,disk_name,file_name', 'vendor:id,name,surname,email,username,logo,banner', - 'files', 'place' - ])->find($id); + 'files', 'place', + ]) + ->withCount('comments')->withAvg('comments', 'rating') + // ->withCount(['comments as comments_avg_votes' => function($query) { + // $query->select(DB::raw('avg(rating)')); + // }]) + ->find($id); $data->main_path = 'http://78.111.88.8:9086' . \Config::get('cms.storage.media.path'); diff --git a/plugins/ahmadfatoni/apigenerator/routes.php b/plugins/ahmadfatoni/apigenerator/routes.php index 1c685e6..5afd1ee 100644 --- a/plugins/ahmadfatoni/apigenerator/routes.php +++ b/plugins/ahmadfatoni/apigenerator/routes.php @@ -32,11 +32,13 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro Route::get('get/product/comments', 'BlogPostsApiController@getProductComment'); + Route::get('notifications', 'BlogPostsApiController@getNotifications'); + // Route::get('account/{id}/sliders', 'BlogPostsApiController@getAccountSliders')->where(['id' => '[0-9]+']); Route::get('account/{id}/products', 'BlogPostsApiController@getAccountProducts')->where(['id' => '[0-9]+']); Route::get('account/{id}/datas', 'BlogPostsApiController@getAccountDatas'); - Route::get('notifications', 'BlogPostsApiController@getNotifications'); + Route::middleware(['\Tymon\JWTAuth\Middleware\GetUserFromToken'])->group(function () { Route::post('update/vendor/data', 'VendorApiController@updateVendor'); @@ -74,22 +76,10 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro ->where('seller_id', '[0-9]+'); //Balance - Route::post('balance_update','TransactionsApiController@updateBalance'); + // Route::post('balance_bank_transfer','BalanceController@createBankTransfer'); - Route::get('notifications', 'NotificationsApiController@index'); - Route::post('notifications/{id}/read', 'NotificationsApiController@markAsRead') - ->where('id', '^(?=.*[a-z])(?=.*[\-])(?=.*\d)[a-z\d\-]{36,}$'); - - Route::get('transactions', 'TransactionsApiController@index'); - Route::get('my-balance', 'TransactionsApiController@myBalance'); - - Route::post('withdraw-from-balance', 'ExchangeRequestsController@withdrawFromBalance'); - - Route::post('send-sms-code', 'SmsController@sendSmsCode'); - Route::post('check-sms-code', 'SmsController@checkSmsCode'); - - Route::post('send-email-verification-link', 'EmailVerificationController@sendEmailVerificationLink'); +