From 00c757c15ead17b2c4f1c4b0b09b90482fb5fd05 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: Wed, 17 Nov 2021 01:20:01 +0900
Subject: [PATCH] =?UTF-8?q?=E8=A6=AA=E5=AD=90=E4=B8=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/Http/Controllers/Api/ChildrenController.php   | 5 +++++
 .../Http/Controllers/Api/FatherRelationsController.php    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/app/Http/Controllers/Api/ChildrenController.php b/backend/app/Http/Controllers/Api/ChildrenController.php
index 408b01c6..d4f53477 100644
--- a/backend/app/Http/Controllers/Api/ChildrenController.php
+++ b/backend/app/Http/Controllers/Api/ChildrenController.php
@@ -340,12 +340,17 @@ KIKI承知システムを使って「聞いてない！」「言ってない！
         }
 
         $child_select = ['email', 'tel', 'last_name', 'first_name', 'identity', 'image', 'company'];
+        $father_relations_select = ['hire_at'];
 
         // 親詳細の取得に成功
         if (null === ($params = Child::select($child_select)->where('id', (int)$child_id)->first())) {
             return ['status_code' => 400];
         }
 
+        if (null === ($params->father_relations = FatherRelation::select($father_relations_select)->where('child_id', (int)$child_id)->first())) {
+            return ['status_code' => 400];
+        }
+
         return ['status_code' => 200, 'params' => $params];
     }
 
diff --git a/backend/app/Http/Controllers/Api/FatherRelationsController.php b/backend/app/Http/Controllers/Api/FatherRelationsController.php
index c40bd98c..486250bd 100644
--- a/backend/app/Http/Controllers/Api/FatherRelationsController.php
+++ b/backend/app/Http/Controllers/Api/FatherRelationsController.php
@@ -40,7 +40,7 @@ class FatherRelationsController extends Controller {
 
     public function updateHireDate (Request $r, $child_id) {
         if (!isset($child_id) || !isset($r->father_id) || !isset($r->hire_at)) {
-            return ['status_code' => 400, 'success_messages' => ['子の入社日の更新に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['子の入社日の更新に失敗しました。']];
         }
 
         $update = [
@@ -52,7 +52,7 @@ class FatherRelationsController extends Controller {
         } catch (\Throwable $e) {
             // 失敗
             Log::critical($e->getMessage());
-            return ['status_code' => 400, 'success_messages' => ['子の入社日の更新に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['子の入社日の更新に失敗しました。']];
         }
 
         return ['status_code' => 200, 'success_messages' => ['子の入社日の更新に成功しました。']];
@@ -60,7 +60,7 @@ class FatherRelationsController extends Controller {
 
     public function deleteRelationChild ($child_id) {
         if (!isset($child_id)) {
-            return ['status_code' => 400, 'success_messages' => ['子の削除に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['子の削除に失敗しました。']];
         }
 
         try {
@@ -68,7 +68,7 @@ class FatherRelationsController extends Controller {
         } catch (\Throwable $e) {
             // 失敗
             Log::critical($e->getMessage());
-            return ['status_code' => 400, 'success_messages' => ['子の削除に失敗しました。']];
+            return ['status_code' => 400, 'error_messages' => ['子の削除に失敗しました。']];
         }
 
         return ['status_code' => 200, 'success_messages' => ['子の削除に成功しました。']];