diff --git a/app/Http/Controllers/News/NewsController.php b/app/Http/Controllers/News/NewsController.php index c8e419c..61b9583 100644 --- a/app/Http/Controllers/News/NewsController.php +++ b/app/Http/Controllers/News/NewsController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\News; use App\Http\Controllers\Controller; +use App\Models\NewsFile; use Illuminate\Http\Request; use App\Models\News; @@ -34,7 +35,10 @@ class NewsController extends Controller public function show(News $news) { - return response()->json($news, 200); + return response()->json([ + $news, + 'photo_id' => NewsFile::where('news_id', '=', $news->id)->get(['id']) + ], 200); } public function edit(News $news, Request $request) { diff --git a/app/Http/Controllers/News/NewsFileController.php b/app/Http/Controllers/News/NewsFileController.php index 299545e..1ba8439 100644 --- a/app/Http/Controllers/News/NewsFileController.php +++ b/app/Http/Controllers/News/NewsFileController.php @@ -40,6 +40,7 @@ class NewsFileController extends Controller $request->name . $ext ]); $news->photo_uri = '/storage/news' . '/' . $newsId . '/' . $type . '/' . $request->name; + $news->save(); return true; } return false; @@ -51,7 +52,7 @@ class NewsFileController extends Controller public function delete(NewsFile $file) { - if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name )) { + if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) { if (Storage::disk('local')->delete('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) { return response()->json($file->delete(), 204); } diff --git a/app/Models/BankTaskFile.php b/app/Models/BankTaskFile.php index 7e47209..78f5a3b 100644 --- a/app/Models/BankTaskFile.php +++ b/app/Models/BankTaskFile.php @@ -8,6 +8,6 @@ use Illuminate\Database\Eloquent\Model; class BankTaskFile extends Model { use HasFactory; - protected $table = 'bank_tasks_files'; + protected $table = 'bank_task_files'; protected $fillable = ['name', 'type', 'extension', 'url', 'banktask_id']; } diff --git a/app/Models/NewsFile.php b/app/Models/NewsFile.php index 955b9de..30c6d14 100644 --- a/app/Models/NewsFile.php +++ b/app/Models/NewsFile.php @@ -9,4 +9,5 @@ class NewsFile extends Model { use HasFactory; protected $table = 'news_files'; + protected $fillable = ['name', 'type', 'extension', 'url', 'news_id']; } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 4283423..a77527c 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -57,7 +57,7 @@ class RouteServiceProvider extends ServiceProvider protected function configureRateLimiting() { RateLimiter::for('api', function (Request $request) { - return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip()); + return Limit::perMinute(100)->by(optional($request->user())->id ?: $request->ip()); }); } } diff --git a/database/migrations/2020_12_03_104028_create_bank_task_files_table.php b/database/migrations/2020_12_03_104028_create_bank_task_files_table.php index a87b324..82b8c38 100644 --- a/database/migrations/2020_12_03_104028_create_bank_task_files_table.php +++ b/database/migrations/2020_12_03_104028_create_bank_task_files_table.php @@ -13,7 +13,7 @@ class CreateBankTaskFilesTable extends Migration */ public function up() { - Schema::create('bank_tasks_files', function (Blueprint $table) { + Schema::create('bank_task_files', function (Blueprint $table) { $table->bigIncrements('id'); $table->string('name'); $table->string('type'); @@ -23,7 +23,7 @@ class CreateBankTaskFilesTable extends Migration $table->unsignedInteger('banktask_id'); $table->foreign('banktask_id') ->references('id')->on('bank_tasks') - ->onDelete('no action'); + ->onDelete('cascade'); }); } @@ -35,6 +35,6 @@ class CreateBankTaskFilesTable extends Migration */ public function down() { - Schema::dropIfExists('bank_tasks_files'); + Schema::dropIfExists('bank_task_files'); } } diff --git a/database/migrations/2020_12_15_092036_create_news_files_table.php b/database/migrations/2020_12_15_092036_create_news_files_table.php index faf08a0..0b2e63d 100644 --- a/database/migrations/2020_12_15_092036_create_news_files_table.php +++ b/database/migrations/2020_12_15_092036_create_news_files_table.php @@ -22,7 +22,7 @@ class CreateNewsFilesTable extends Migration $table->unsignedInteger('news_id'); $table->foreign('news_id') ->references('id')->on('news') - ->onDelete('no action'); + ->onDelete('cascade'); }); } diff --git a/routes/api.php b/routes/api.php index 4f6a33d..cd965d1 100644 --- a/routes/api.php +++ b/routes/api.php @@ -50,5 +50,5 @@ Route::group(['prefix' => 'news'], function () { Route::put('/{news}', 'News\NewsController@edit'); Route::delete('/{news}', 'News\NewsController@delete'); Route::post('/{news}/addphoto', 'News\NewsFileController@store'); - Route::delete('/{file}', 'News\NewsFileController@delete'); + Route::delete('/photo/{file}', 'News\NewsFileController@delete'); }); \ No newline at end of file