diff --git a/app/Ejaculation.php b/app/Ejaculation.php index 8392469..a0e571a 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' ]; @@ -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) 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/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/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 @@ +string('source')->nullable(false)->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('ejaculations', function (Blueprint $table) { + $table->string('source')->nullable()->change(); + }); + } +} 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();