From 086ce82c0458b4ff550d1c45fdf7b539689c75a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Wed, 22 Dec 2021 00:03:39 +0900 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E7=94=BB=E5=83=8F=E3=81=AE=E7=B7=A8=E9=9B=86=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/ChildrenController.php | 12 ++++++---- .../Controllers/Api/FathersController.php | 16 +++++++------ backend/routes/api.php | 24 +++++++++---------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/backend/app/Http/Controllers/Api/ChildrenController.php b/backend/app/Http/Controllers/Api/ChildrenController.php index ae20ae79..2f0f7546 100644 --- a/backend/app/Http/Controllers/Api/ChildrenController.php +++ b/backend/app/Http/Controllers/Api/ChildrenController.php @@ -439,11 +439,13 @@ class ChildrenController extends Controller { $child->image = '/files/'.$filename; $child->save(); - $get = Child::where('id', (int)$child_id)->first(); - $login_user_datum = $get->toArray(); - unset($login_user_datum['password']); - // セッションに保存する - session()->put('children', $login_user_datum); + if (request()->route()->action['as'] == 'cic') { + $login_user_datum = $child->toArray(); + unset($login_user_datum['password']); + + // セッションに保存する + session()->put('children', $login_user_datum); + } DB::commit(); } catch (\Throwable $e) { diff --git a/backend/app/Http/Controllers/Api/FathersController.php b/backend/app/Http/Controllers/Api/FathersController.php index ce4e9f2d..8aa72591 100644 --- a/backend/app/Http/Controllers/Api/FathersController.php +++ b/backend/app/Http/Controllers/Api/FathersController.php @@ -379,11 +379,13 @@ class FathersController extends Controller { $father->image = '/files/'.$filename; $father->save(); - $login_user_datum = $father->toArray(); - unset($login_user_datum['password']); - - // セッションに保存する - session()->put('fathers', $login_user_datum); + if (request()->route()->action['as'] == 'pip') { + $login_user_datum = $father->toArray(); + unset($login_user_datum['password']); + + // セッションに保存する + session()->put('fathers', $login_user_datum); + } DB::commit(); } catch (\Throwable $e) { @@ -424,7 +426,7 @@ class FathersController extends Controller { 'profile' => 'max:1000', ]; - if (request()->route()->action['as'] == 'fua') { + if (request()->route()->action['as'] == 'pua') { $vali['relation_limit'] = 'required|numeric'; } @@ -434,7 +436,7 @@ class FathersController extends Controller { return ['status_code' => 422, 'error_messages' => $validate->errors()]; } - if (request()->route()->action['as'] == 'fua') { + if (request()->route()->action['as'] == 'pua') { $rel = FatherRelation::select('id')->where('father_id', (int)$father_id)->count(); if ($rel > (int)$r->relation_limit) { return ['status_code' => 401, 'error_messages' => '既に設定しているリレーション以下には変更できません。']; diff --git a/backend/routes/api.php b/backend/routes/api.php index 644fbc95..085675f6 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -26,9 +26,9 @@ Route::group(['prefix' => 'admin'], function () { Route::group(['prefix' => 'fathers'], function () { Route::get('/list', '\App\Http\Controllers\Api\FathersController@list'); Route::get('/search', '\App\Http\Controllers\Api\FathersController@search'); - Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage'); - Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('fua'); - Route::put('/updatePassword/{father_id}', '\App\Http\Controllers\Api\FathersController@updatePassword'); + Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage')->name('pia'); + Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('pua'); + Route::put('/updatePassword/{father_id}', '\App\Http\Controllers\Api\FathersController@updatePassword')->name('ppa'); Route::get('/detail/{father_id}', '\App\Http\Controllers\Api\FathersController@detail')->name('pda'); Route::delete('/delete/{father_id}', '\App\Http\Controllers\Api\FathersController@withdrawal'); Route::post('/registerTemporary', '\App\Http\Controllers\Api\FathersController@registerTemporary'); @@ -38,9 +38,9 @@ Route::group(['prefix' => 'admin'], function () { Route::group(['prefix' => 'children'], function () { Route::get('/list', '\App\Http\Controllers\Api\ChildrenController@list'); Route::get('/search', '\App\Http\Controllers\Api\ChildrenController@search'); - Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile'); - Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage'); - Route::put('/updatePassword/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updatePassword'); + Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile')->name('cua'); + Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage')->name('cia'); + Route::put('/updatePassword/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updatePassword')->name('cpa'); Route::get('/detail/{child_id}', '\App\Http\Controllers\Api\ChildrenController@detail')->name('cda'); Route::delete('/delete/{child_id}', '\App\Http\Controllers\Api\ChildrenController@withdrawal'); }); @@ -79,11 +79,11 @@ Route::group(['prefix' => 'fathers'], function () { Route::post('/registerMain', '\App\Http\Controllers\Api\FathersController@registerMain'); Route::post('/requestPassword', '\App\Http\Controllers\Api\FathersController@requestPassword'); Route::post('/login', '\App\Http\Controllers\Api\FathersController@login'); - Route::put('/updatePassword/{father_id?}', '\App\Http\Controllers\Api\FathersController@updatePassword'); + Route::put('/updatePassword/{father_id?}', '\App\Http\Controllers\Api\FathersController@updatePassword')->name('ppp'); Route::group(['middleware' => ['auth:fathers', 'notice.incomplete']], function () { - Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage'); - Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('fup'); + Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage')->name('pip'); + Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile')->name('pup'); Route::delete('/withdrawal', '\App\Http\Controllers\Api\FathersController@withdrawal'); Route::get('/detail/{father_id}', '\App\Http\Controllers\Api\FathersController@detail')->name('pdp'); Route::post('/meetingNotification', '\App\Http\Controllers\Api\FathersController@approvalNotification')->name('cmnotifynew'); @@ -149,12 +149,12 @@ Route::group(['prefix' => 'children'], function () { Route::post('/registerMain', '\App\Http\Controllers\Api\ChildrenController@registerMain'); Route::post('/requestPassword', '\App\Http\Controllers\Api\ChildrenController@requestPassword'); Route::post('/login', '\App\Http\Controllers\Api\ChildrenController@login'); - Route::put('/updatePassword/{child_id?}', '\App\Http\Controllers\Api\ChildrenController@updatePassword'); + Route::put('/updatePassword/{child_id?}', '\App\Http\Controllers\Api\ChildrenController@updatePassword')->name('cpc'); Route::group(['middleware' => ['auth:children', 'notice.nonapproval']], function () { Route::get('/detail/{child_id}', '\App\Http\Controllers\Api\ChildrenController@detail')->name('cdc'); - Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage'); - Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile'); + Route::put('/updateImage/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateImage')->name('cuc'); + Route::put('/updateProfile/{child_id}', '\App\Http\Controllers\Api\ChildrenController@updateProfile')->name('cpc'); Route::delete('/withdrawal', '\App\Http\Controllers\Api\ChildrenController@withdrawal'); // FathersController