From e2f01561a893df7fac3f5d2f3065a8da1a03d20e Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sun, 24 May 2020 19:39:24 +0900
Subject: [PATCH 1/3] =?UTF-8?q?ejaculations.source=E3=81=AFNULL=E9=9D=9E?=
 =?UTF-8?q?=E8=A8=B1=E5=AE=B9=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Ejaculation.php                           |  2 +-
 .../Controllers/EjaculationController.php     |  1 +
 ...ke_non_nullable_source_on_ejaculations.php | 34 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2020_05_24_193301_make_non_nullable_source_on_ejaculations.php

diff --git a/app/Ejaculation.php b/app/Ejaculation.php
index 8392469..4fa0111 100644
--- a/app/Ejaculation.php
+++ b/app/Ejaculation.php
@@ -17,7 +17,7 @@ class Ejaculation extends Model
 
     protected $fillable = [
         'user_id', 'ejaculated_date',
-        'note', 'geo_latitude', 'geo_longitude', 'link',
+        'note', 'geo_latitude', 'geo_longitude', 'link', 'source',
         'is_private', 'is_too_sensitive'
     ];
 
diff --git a/app/Http/Controllers/EjaculationController.php b/app/Http/Controllers/EjaculationController.php
index c0d6277..b20f5f4 100644
--- a/app/Http/Controllers/EjaculationController.php
+++ b/app/Http/Controllers/EjaculationController.php
@@ -57,6 +57,7 @@ class EjaculationController extends Controller
             'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']),
             'note' => $inputs['note'] ?? '',
             'link' => $inputs['link'] ?? '',
+            'source' => Ejaculation::SOURCE_WEB,
             'is_private' => $request->has('is_private') ?? false,
             'is_too_sensitive' => $request->has('is_too_sensitive') ?? false
         ]);
diff --git a/database/migrations/2020_05_24_193301_make_non_nullable_source_on_ejaculations.php b/database/migrations/2020_05_24_193301_make_non_nullable_source_on_ejaculations.php
new file mode 100644
index 0000000..c644313
--- /dev/null
+++ b/database/migrations/2020_05_24_193301_make_non_nullable_source_on_ejaculations.php
@@ -0,0 +1,34 @@
+<?php
+
+use App\Ejaculation;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class MakeNonNullableSourceOnEjaculations extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::statement('UPDATE ejaculations SET source = ? WHERE source IS NULL', [Ejaculation::SOURCE_WEB]);
+        Schema::table('ejaculations', function (Blueprint $table) {
+            $table->string('source')->nullable(false)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('ejaculations', function (Blueprint $table) {
+            $table->string('source')->nullable()->change();
+        });
+    }
+}

From f3a5644a3223aef0f42e9b376332a249e399c1ce Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sun, 24 May 2020 19:42:16 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=B9=E3=82=B3=E3=83=BC=E3=83=97?=
 =?UTF-8?q?=E3=81=AE=E7=B0=A1=E7=95=A5=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Ejaculation.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Ejaculation.php b/app/Ejaculation.php
index 4fa0111..a0e571a 100644
--- a/app/Ejaculation.php
+++ b/app/Ejaculation.php
@@ -49,8 +49,7 @@ class Ejaculation extends Model
 
     public function scopeOnlyWebCheckin(Builder $query)
     {
-        return $query->where('ejaculations.source', null)
-            ->orWhere('ejaculations.source', '<>', Ejaculation::SOURCE_CSV);
+        return $query->where('ejaculations.source', Ejaculation::SOURCE_WEB);
     }
 
     public function scopeWithLikes(Builder $query)

From 1a3cead9327e828bd2e922fb9236a05d3e9cf91d Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sun, 24 May 2020 19:50:51 +0900
Subject: [PATCH 3/3] fix test

---
 database/factories/EjaculationFactory.php | 1 +
 tests/Feature/SettingTest.php             | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/database/factories/EjaculationFactory.php b/database/factories/EjaculationFactory.php
index 65fbb6e..7beddc1 100644
--- a/database/factories/EjaculationFactory.php
+++ b/database/factories/EjaculationFactory.php
@@ -8,5 +8,6 @@ $factory->define(Ejaculation::class, function (Faker $faker) {
     return [
         'ejaculated_date' => $faker->date('Y-m-d H:i:s'),
         'note' => $faker->text,
+        'source' => Ejaculation::SOURCE_WEB,
     ];
 });
diff --git a/tests/Feature/SettingTest.php b/tests/Feature/SettingTest.php
index a7a79ec..85c1c9f 100644
--- a/tests/Feature/SettingTest.php
+++ b/tests/Feature/SettingTest.php
@@ -13,6 +13,14 @@ use Tests\TestCase;
 
 class SettingTest extends TestCase
 {
+    use RefreshDatabase;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->seed();
+    }
+
     public function testDestroyUser()
     {
         $user = factory(User::class)->create();