Merge pull request #166 from nakazawakan/backend

「親のrel_limが0の際、画面を遷移するだけで「失敗しました」とアラートが出てしまいます。」

backend/app/Http/Controllers/Api/ChildrenController.php

@@ -87,6 +87,16 @@ class ChildrenController extends Controller {
         return ['status_code' => 200, 'params' => ['tel' => $r->tel]];
     }
 
+    public function checkRegisterMain (Request $r) {
+        // トークンの確認
+        if (null === ($get = TelActivation::where('token', $r->token)->first())) {
+            return ['status_code' => 400, 'error_messages' => ['不正な登録トークン。']];
+        }
+
+        // 本登録に成功
+        return ['status_code' => 200];
+    }
+
     public function registerMain (Request $r) {
         // トークンの確認
         if (null === ($get = TelActivation::where('token', $r->token)->first())) {
@@ -163,12 +173,11 @@ class ChildrenController extends Controller {
             $child->fill($insert);
             $child->push();
 
-            $telact->child_id = $child->id;
-            $telact->save();
+            $telact->delete();
 
             // SMSを送ります。
-            $message = view('sms.children.register.main', ['tel' => $r->tel, 'password' => $r->password]);
-            \Notification::route('nexmo', '81'.substr($r->tel, 1))->notify(new SmsNotification($message));
+            $message = view('sms.children.register.main', ['tel' => $get->tel, 'password' => $r->password]);
+            \Notification::route('nexmo', '81'.substr($get->tel, 1))->notify(new SmsNotification($message));
 
             DB::commit();
         } catch (\Throwable $e) {

backend/app/Http/Controllers/Api/FatherRelationsController.php

@@ -15,6 +15,14 @@ use App\Models\Meeting;
 use App\Models\MeetingApprovals;
 
 class FatherRelationsController extends Controller {
+    public function check () {
+        if (FatherRelation::select('id')->where('father_id', (int)session()->get('fathers')['id'])->count() == 0) {
+            return ['status_code' => 401, 'error_messages' => ['契約上限数に達した為、メンバー追加できません。']];
+        }
+
+        return ['status_code' => 200];
+    }
+
     public function register (Request $r) {
         if (!isset($r->father_id)) {
             return ['status_code' => 400, 'error_messages' => ['子の追加に失敗しました。']];

backend/app/Http/Controllers/Api/FathersController.php

@@ -132,6 +132,16 @@ class FathersController extends Controller {
         return ['status_code' => 200, 'token' => $token, 'success_messages' => ['親の仮登録に成功しました。8時間以内に本登録を完了させてください。']];
     }
 
+    public function checkRegisterMain (Request $r) {
+        // トークンの確認
+        if (null === ($get = EmailActivation::where('token', $r->token)->first())) {
+            return ['status_code' => 400, 'error_messages' => ['不正な登録トークン。']];
+        }
+
+        // 本登録に成功
+        return ['status_code' => 200];
+    }
+
     public function registerMain (Request $r) {
         if ($r->image == 'null') $r->image = null;
 

backend/app/Notifications/SmsNotification.php

@@ -43,6 +43,7 @@ class SmsNotification extends Notification
     {
         return (new NexmoMessage())
             ->content($this->message)
+            ->from('KIKI')
             ->unicode();
     }
 

backend/composer.json

@@ -12,7 +12,8 @@
         "intervention/image": "^2.7",
         "laravel/framework": "^8.12",
         "laravel/nexmo-notification-channel": "^2.5",
-        "laravel/tinker": "^2.5"
+        "laravel/tinker": "^2.5",
+        "nexmo/laravel": "^2.4"
     },
     "require-dev": {
         "facade/ignition": "^2.5",

backend/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9c7f3f3ae06176c13a2e71065d0491b6",
+    "content-hash": "04ab94d1f04d3f8c89e2f15bc4e9af74",
     "packages": [
         {
             "name": "asm89/stack-cors",

backend/config/services.php

@@ -33,7 +33,7 @@ return [
     'nexmo' => [
         'key' => env('NEXMO_KEY'),
         'secret' => env('NEXMO_SECRET'),
-        'sms_from' => '819012345678',
+        'sms_from' => 'KIKI',
     ],
 
 ];

backend/routes/api.php

@@ -75,6 +75,7 @@ Route::post('/contacts/register', '\App\Http\Controllers\Api\ContactsController@
 
 Route::group(['prefix' => 'fathers'], function () {
     // FathersController
+    Route::get('/checkRegisterMain', '\App\Http\Controllers\Api\FathersController@checkRegisterMain');
     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');
@@ -133,6 +134,7 @@ Route::group(['prefix' => 'fathers'], function () {
 
         // FatherRelationsController
         Route::group(['prefix' => 'relations'], function () {
+            Route::get('/check', '\App\Http\Controllers\Api\FatherRelationsController@check');
             Route::post('/register', '\App\Http\Controllers\Api\FatherRelationsController@register');
             Route::put('/updateHireDate/{child_id}', '\App\Http\Controllers\Api\FatherRelationsController@updateHireDate');
             Route::delete('/deleteRelationChild/{child_id}', '\App\Http\Controllers\Api\FatherRelationsController@deleteRelationChild');
@@ -143,6 +145,7 @@ Route::group(['prefix' => 'fathers'], function () {
 // ChildrenController
 Route::group(['prefix' => 'children'], function () {
     Route::post('/registerTemporary', '\App\Http\Controllers\Api\ChildrenController@registerTemporary');
+    Route::get('/checkRegisterMain', '\App\Http\Controllers\Api\ChildrenController@checkRegisterMain');
     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');