From 12d06dc88b0d1eaac6849b3b9847aba600da67fb Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sat, 9 Sep 2017 02:10:51 +0900
Subject: [PATCH] =?UTF-8?q?=E6=A6=82=E6=B3=81=E6=AC=84=E3=81=AE=E6=99=82?=
 =?UTF-8?q?=E9=96=93=E8=A1=A8=E8=A8=98=E3=81=8C=E7=8B=82=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=9F=E3=82=81=E3=80=81=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=81=AE=E6=8B=85=E5=BD=93?=
 =?UTF-8?q?=E3=82=92DB=E3=81=8B=E3=82=89PHP=E3=81=AB=E7=A7=BB=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Facades/Formatter.php                  | 13 +++++++++
 app/Http/Controllers/HomeController.php    | 10 +++----
 app/Http/Controllers/UserController.php    | 10 +++----
 app/Providers/FormatterServiceProvider.php | 31 ++++++++++++++++++++++
 app/Utilities/Formatter.php                | 19 +++++++++++++
 config/app.php                             |  1 +
 resources/views/home.blade.php             |  8 +++---
 resources/views/user/profile.blade.php     |  8 +++---
 8 files changed, 82 insertions(+), 18 deletions(-)
 create mode 100644 app/Facades/Formatter.php
 create mode 100644 app/Providers/FormatterServiceProvider.php
 create mode 100644 app/Utilities/Formatter.php

diff --git a/app/Facades/Formatter.php b/app/Facades/Formatter.php
new file mode 100644
index 0000000..ed43178
--- /dev/null
+++ b/app/Facades/Formatter.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Formatter extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return \App\Utilities\Formatter::class;
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 80f87bb..b7effe3 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -52,15 +52,15 @@ SQL
             // 概況欄のデータ取得
             $summary = DB::select(<<<'SQL'
 SELECT
-  to_char(avg(span), 'FMDDD日 FMHH24時間 FMMI分') AS average,
-  to_char(max(span), 'FMDDD日 FMHH24時間 FMMI分') AS longest,
-  to_char(min(span), 'FMDDD日 FMHH24時間 FMMI分') AS shortest,
-  to_char(sum(span), 'FMDDD日 FMHH24時間 FMMI分') AS total_times,
+  avg(span) AS average,
+  max(span) AS longest,
+  min(span) AS shortest,
+  sum(span) AS total_times,
   count(*) AS total_checkins
 FROM
   (
     SELECT
-      ejaculated_date - lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC) AS span
+      extract(epoch from ejaculated_date - lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)) AS span
     FROM
       ejaculations
     WHERE
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 6ee8ba0..8e07b63 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -48,15 +48,15 @@ SQL
         // 概況欄のデータ取得
         $summary = DB::select(<<<'SQL'
 SELECT
-  to_char(avg(span), 'FMDDD日 FMHH24時間 FMMI分') AS average,
-  to_char(max(span), 'FMDDD日 FMHH24時間 FMMI分') AS longest,
-  to_char(min(span), 'FMDDD日 FMHH24時間 FMMI分') AS shortest,
-  to_char(sum(span), 'FMDDD日 FMHH24時間 FMMI分') AS total_times,
+  avg(span) AS average,
+  max(span) AS longest,
+  min(span) AS shortest,
+  sum(span) AS total_times,
   count(*) AS total_checkins
 FROM
   (
     SELECT
-      ejaculated_date - lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC) AS span
+      extract(epoch from ejaculated_date - lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)) AS span
     FROM
       ejaculations
     WHERE
diff --git a/app/Providers/FormatterServiceProvider.php b/app/Providers/FormatterServiceProvider.php
new file mode 100644
index 0000000..d7f484f
--- /dev/null
+++ b/app/Providers/FormatterServiceProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Providers;
+
+use App\Utilities\Formatter;
+use Illuminate\Support\ServiceProvider;
+
+class FormatterServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap the application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register the application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->singleton(Formatter::class, function ($app) {
+            return new Formatter();
+        });
+    }
+}
diff --git a/app/Utilities/Formatter.php b/app/Utilities/Formatter.php
new file mode 100644
index 0000000..bb87a61
--- /dev/null
+++ b/app/Utilities/Formatter.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Utilities;
+
+class Formatter
+{
+    /**
+     * 通算秒数を日数と時分にフォーマットします。
+     * @param int|float $value 通算秒数
+     * @return string "xx日 xx時間 xx分" 形式でフォーマットされた文字列
+     */
+    public function formatInterval($value)
+    {
+        $days = floor($value / 86400);
+        $hours = floor($value % 86400 / 3600);
+        $minutes = floor($value % 3600 / 60);
+        return "{$days}日 {$hours}時間 {$minutes}分";
+    }
+}
\ No newline at end of file
diff --git a/config/app.php b/config/app.php
index e6ffad1..9f4a964 100644
--- a/config/app.php
+++ b/config/app.php
@@ -226,6 +226,7 @@ return [
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
 
+        'Formatter' => App\Facades\Formatter::class,
     ],
 
 ];
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index dcea823..e8b45e8 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -31,10 +31,10 @@
                     @if (isset($summary) && $summary[0]->total_checkins > 0)
                     <hr>
                     <p class="valign-wrapper"><i class="material-icons">assessment</i><b>概況</b></p>
-                    <p>平均記録: {{ $summary[0]->average }}</p>
-                    <p>最長記録: {{ $summary[0]->longest }}</p>
-                    <p>最短記録: {{ $summary[0]->shortest }}</p>
-                    <p>合計時間: {{ $summary[0]->total_times }}</p>
+                    <p>平均記録: {{ Formatter::formatInterval($summary[0]->average) }}</p>
+                    <p>最長記録: {{ Formatter::formatInterval($summary[0]->longest) }}</p>
+                    <p>最短記録: {{ Formatter::formatInterval($summary[0]->shortest) }}</p>
+                    <p>合計時間: {{ Formatter::formatInterval($summary[0]->total_times) }}</p>
                     <p>通算回数: {{ $summary[0]->total_checkins }}回</p>
                     @endif
                 </div>
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php
index 3c9bf4e..521aa4a 100644
--- a/resources/views/user/profile.blade.php
+++ b/resources/views/user/profile.blade.php
@@ -39,10 +39,10 @@
                     @if (isset($summary) && $summary[0]->total_checkins > 0)
                     <hr>
                     <p class="valign-wrapper"><i class="material-icons">assessment</i><b>概況</b></p>
-                    <p>平均記録: {{ $summary[0]->average }}</p>
-                    <p>最長記録: {{ $summary[0]->longest }}</p>
-                    <p>最短記録: {{ $summary[0]->shortest }}</p>
-                    <p>合計時間: {{ $summary[0]->total_times }}</p>
+                    <p>平均記録: {{ Formatter::formatInterval($summary[0]->average) }}</p>
+                    <p>最長記録: {{ Formatter::formatInterval($summary[0]->longest) }}</p>
+                    <p>最短記録: {{ Formatter::formatInterval($summary[0]->shortest) }}</p>
+                    <p>合計時間: {{ Formatter::formatInterval($summary[0]->total_times) }}</p>
                     <p>通算回数: {{ $summary[0]->total_checkins }}回</p>
                     @endif
                 </div>