Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into p_account

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());

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',