From 745baf3a031ca936a6392c09d7c6fb79c6b19338 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 22:07:18 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/MeetingsController.php    | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php
index aebf0012..be4da3ff 100644
--- a/backend/app/Http/Controllers/Api/MeetingsController.php
+++ b/backend/app/Http/Controllers/Api/MeetingsController.php
@@ -117,6 +117,16 @@ class MeetingsController extends Controller {
             }
             /////////////////////////
 
+            foreach ($r->children as $child) {
+                $insert_approval = [
+                    'child_id' => $child,
+                    'meeting_id' => (int)$id,
+                    'approval_at' => date('Y-m-d H:i:s'),
+                ];
+
+                MeetingApprovals::create($insert_approval);
+            }
+
             $params = ['meeting_id' => $id];
         } catch (\Throwable $e) {
             // 失敗
@@ -639,14 +649,26 @@ class MeetingsController extends Controller {
         }
 
         // ミームタイプ
-        Validator::extend('pdf_meme', function ($attribute, $value, $params, $validator) {
-            try {
-                return mime_content_type($value) == 'application/pdf';
-            } catch (\Throwable $e) {
-                Log::critical($e->getMessage());
-                return false;
-            }
-        });
+        if (substr($r->pdf, -4) != '.pdf') {
+            Validator::extend('pdf_meme', function ($attribute, $value, $params, $validator) {
+                try {
+                    return mime_content_type($value) == 'application/pdf';
+                } catch (\Throwable $e) {
+                    Log::critical($e->getMessage());
+                    return false;
+                }
+            });
+        }
+        else {
+            Validator::extend('pdf_meme', function ($attribute, $value, $params, $validator) {
+                try {
+                    return substr($value, -4) == '.pdf';
+                } catch (\Throwable $e) {
+                    Log::critical($e->getMessage());
+                    return false;
+                }
+            });
+        }
 
         $validate = Validator::make($r->all(), [
             'title' => 'required|max:100',

From 3fd89b495f6a7d6f1a546e2477cbdf0ed57fe50b 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 22:28:11 +0900
Subject: [PATCH 2/2] =?UTF-8?q?r=E3=81=AF=E4=B8=8D=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/Http/Controllers/Api/FatherRelationsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/app/Http/Controllers/Api/FatherRelationsController.php b/backend/app/Http/Controllers/Api/FatherRelationsController.php
index bef293de..4a8629cc 100644
--- a/backend/app/Http/Controllers/Api/FatherRelationsController.php
+++ b/backend/app/Http/Controllers/Api/FatherRelationsController.php
@@ -64,7 +64,7 @@ class FatherRelationsController extends Controller {
         }
 
         try {
-            FatherRelation::where('father_id', $r->session()->get('fathers')->id)->where('child_id', $child_id)->delete();
+            FatherRelation::where('father_id', session()->get('fathers')->id)->where('child_id', $child_id)->delete();
         } catch (\Throwable $e) {
             // 失敗
             Log::critical($e->getMessage());