From 2bd56a8606e24aa92c3148443ee387bf25e8faba Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sat, 6 Jan 2018 00:35:04 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=AA=E3=82=AB=E3=82=BA=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=AF=E3=82=92=E5=90=AB=E3=82=80=E3=83=81=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=82=A4=E3=83=B3=E3=81=AE=E3=81=BF=E3=82=92=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=99=E3=82=8B=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE?=
 =?UTF-8?q?=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserController.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 268a309..572ef8b 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -99,6 +99,25 @@ SQL
             abort(404);
         }
 
-        return view('user.okazu')->with(compact('user'));
+        // チェックインの取得
+        $query = Ejaculation::select(DB::raw(<<<'SQL'
+id,
+ejaculated_date,
+note,
+is_private,
+link,
+to_char(lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC), 'YYYY/MM/DD HH24:MI') AS before_date,
+to_char(ejaculated_date - (lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)), 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span
+SQL
+        ))
+            ->where('user_id', $user->id)
+            ->where('link', '<>', '');
+        if (!Auth::check() || $user->id !== Auth::id()) {
+            $query = $query->where('is_private', false);
+        }
+        $ejaculations = $query->orderBy('ejaculated_date', 'desc')
+            ->paginate(20);
+
+        return view('user.profile')->with(compact('user', 'ejaculations'));
     }
 }