diff --git a/backend/app/Http/Controllers/Api/ChildrenController.php b/backend/app/Http/Controllers/Api/ChildrenController.php index acd90d2d..290df9ad 100644 --- a/backend/app/Http/Controllers/Api/ChildrenController.php +++ b/backend/app/Http/Controllers/Api/ChildrenController.php @@ -12,7 +12,7 @@ use Illuminate\Support\Facades\Storage; use App\Models\Child; use App\Models\FatherRelation; use App\Models\MeetingApprovals; -use App\Models\TelActivations; +use App\Models\TelActivation; class ChildrenController extends Controller { use AuthenticationTrait; @@ -35,7 +35,7 @@ class ChildrenController extends Controller { return ['status_code' => 422, 'error_messages' => $validate->errors()]; } - if ($get = TelActivations::where('tel', $r->tel)->first()) { + if ($get = TelActivation::where('tel', $r->tel)->first()) { // すでにDBに登録されている場合 return ['status_code' => 400, 'error_messages' => ['既に使用されている電話番号です。']]; } @@ -44,6 +44,7 @@ class ChildrenController extends Controller { $insert = ['tel' => $r->tel, 'token' => $token]; try { + // DBに入ります。 Child::create($insert); } catch (\Throwable $e) { // 失敗 @@ -87,11 +88,12 @@ class ChildrenController extends Controller { $password = Hash::make($r->password); // 有効期限が切れている場合 - if ($get = TelActivations::where('token', $r->token)->first() && strtotime($get->ttl) > time()) { + if ($get = TelActivation::where('token', $r->token)->first() && strtotime($get->ttl) > time()) { return ['status_code' => 400, 'error_messages' => ['仮登録の有効期限が切れました。改めて親にお問い合わせいただき、再登録の手続きを行ってください。']]; } $insert = [ + 'identity' => 'hogehoge', 'email' => $r->email, 'tel' => $get->tel, 'password' => $password, @@ -124,7 +126,7 @@ class ChildrenController extends Controller { return ['status_code' => 422, 'error_messages' => $validate->errors()]; } - if ($result = Child::select('id')->where('tel', $r->tel)->first()) { + if (null === ($result = Child::select('id')->where('tel', $r->tel)->first())) { // メールアドレス照合に失敗 return ['status_code' => 400, 'error_messages' => ['電話番号が未登録です。入力した情報を確認してください。']]; } @@ -323,7 +325,7 @@ class ChildrenController extends Controller { Storage::disk('public')->put($filename, $image); $update = [ - 'image' => $r->image, + 'image' => '/storage/'.$filename ]; Child::where('id', (int)$child_id)->update($update);