From 2626c984752feb0b6b9786ad1cf8c245b139110b 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?= <renraku@076.ne.jp>
Date: Tue, 16 Nov 2021 02:32:48 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=BE=E3=81=81=E3=81=84=E3=81=A3=E3=81=8B?=
 =?UTF-8?q?=E3=83=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/Api/FathersController.php    | 15 +++++++++++----
 .../Http/Controllers/Api/MeetingsController.php   |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend/app/Http/Controllers/Api/FathersController.php b/backend/app/Http/Controllers/Api/FathersController.php
index 99bbeb11..68507984 100644
--- a/backend/app/Http/Controllers/Api/FathersController.php
+++ b/backend/app/Http/Controllers/Api/FathersController.php
@@ -463,13 +463,20 @@ class FathersController extends Controller {
             return ['status_code' => 400];
         }
 
-        foreach (json_decode($r->tel) as $tel) {
-            // SMSを送ります。
-            $message = '未承知のミーティングがあります。
+        try {
+            foreach (json_decode($r->tel) as $tel) {
+                // SMSを送ります。
+                $message = '未承知のミーティングがあります。
 以下より確認してください。
 '.url('/').'/c-account/meeting/detail/'.$r->meeting_id;
 
-            \Notification::route('nexmo', '81'.substr($tel, 1))->notify(new SmsNotification($message));
+                \Notification::route('nexmo', '81'.substr($tel, 1))->notify(new SmsNotification($message));
+            }
+        }
+        catch (\Throwable $e) {
+            // 失敗
+            Log::critical($e->getMessage());
+            return ['status_code' => 400];
         }
 
         return ['status_code' => 200];
diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php
index 7f11b642..ff80ac58 100644
--- a/backend/app/Http/Controllers/Api/MeetingsController.php
+++ b/backend/app/Http/Controllers/Api/MeetingsController.php
@@ -236,6 +236,7 @@ class MeetingsController extends Controller {
         if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->get())) {
             return ['status_code' => 400];
         }
+
         foreach ($list as $i => $l) {
             if (null !== ($l->approvals = MeetingApprovals::select($meeting_approvals_select)->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->get())) {
                 foreach ($l->approvals as $ii => $ll) {