From 8f86c07f5af4d6d9953f4e4eb986378ba855df8a Mon Sep 17 00:00:00 2001 From: Mark Hester Date: Sun, 2 Sep 2018 12:07:21 +0100 Subject: [PATCH 1/7] refresh database on test. --- tests/Article/ArticleBackendTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Article/ArticleBackendTest.php b/tests/Article/ArticleBackendTest.php index 49b50c9b..8f1fddde 100644 --- a/tests/Article/ArticleBackendTest.php +++ b/tests/Article/ArticleBackendTest.php @@ -12,7 +12,7 @@ class ArticleBackendTest extends TestCase { - //use RefreshDatabase; + use RefreshDatabase; /** * @test From e1da358eb1084d666b168bbbdb323fc2a9e0fc1b Mon Sep 17 00:00:00 2001 From: Mark Hester Date: Mon, 3 Sep 2018 15:37:24 +0100 Subject: [PATCH 2/7] refresh database on test. --- app/Model/Categories.php | 12 ++++- app/Modules/Articles/BackendController.php | 38 +--------------- app/Modules/Articles/Routes/backend.php | 8 ++-- database/factories/UserFactory.php | 1 - tests/Article/ArticleBackendTest.php | 51 ++++++++++++++++++++++ 5 files changed, 68 insertions(+), 42 deletions(-) diff --git a/app/Model/Categories.php b/app/Model/Categories.php index 448d1175..d0ed5b48 100644 --- a/app/Model/Categories.php +++ b/app/Model/Categories.php @@ -67,7 +67,7 @@ class Categories extends Model /** * Undocumented function. * - * @return void + * @return string */ public function getRouteKeyName() { @@ -101,4 +101,14 @@ public function editor() { return $this->belongsTo(Account::class, 'editor_id', 'id'); } + + /** + * @param string $slug + * @return + * @throws \Exception + */ + public static function deleteCategory(string $slug) + { + return Categories::query()->where('slug', $slug)->first()->delete(); + } } diff --git a/app/Modules/Articles/BackendController.php b/app/Modules/Articles/BackendController.php index 30bb8b7d..ca902774 100644 --- a/app/Modules/Articles/BackendController.php +++ b/app/Modules/Articles/BackendController.php @@ -64,7 +64,7 @@ public function create() * Generate a form for editing or creating a model. * * @param Article $article model to be used. - * @return void + * @return \Illuminate\Contracts\View\View */ public function form(Article $article) { @@ -89,17 +89,6 @@ public function store(Request $request) return redirect()->route('admin.articles.index'); } - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - // - } - /** * Show the form for editing the specified resource. * @@ -148,31 +137,6 @@ public function destroy($slug) return response()->json(['status' => 'true', 'redirect' => route('admin.articles.index')]); } - /** - * Category Index. - * @param ArticleCategoryRepository $categoryRepository - * @return \Illuminate\Contracts\View\View - */ - public function categories(ArticleCategoryRepository $categoryRepository) - { - return $this->make('categories')->with('categories', $categoryRepository->all()); - } - - /** - * @param Request $request - * @return \Illuminate\Http\RedirectResponse - */ - public function categories_store(Request $request) - { - $this->validate($request, ['unique:title']); - - $category = new Categories; - $category->title = $request['name']; - $category->save(); - - return redirect()->route('admin.articles.categories.index'); - } - /** * @param int $id * @param ArticleCategoryRepository $categoryRepository diff --git a/app/Modules/Articles/Routes/backend.php b/app/Modules/Articles/Routes/backend.php index a4b7625a..a814a629 100644 --- a/app/Modules/Articles/Routes/backend.php +++ b/app/Modules/Articles/Routes/backend.php @@ -12,6 +12,8 @@ | allowing these to be loading one time per update. | */ - Route::get('admin/articles/categories')->uses('BackendController@categories')->name('admin.articles.categories.index'); - Route::post('admin/articles/categories')->uses('BackendController@categories_store')->name('admin.articles.categories.store'); - Route::resource('admin/articles', 'BackendController', ['as' => 'admin']); + //Route::get('admin/articles/categories')->uses('BackendController@categories')->name('admin.articles.categories.index'); + //Route::post('admin/articles/categories')->uses('BackendController@categories_store')->name('admin.articles.categories.store'); + + Route::resource('admin/articles', 'BackendController', ['as' => 'admin'])->except(['show']); + Route::resource('admin/articles/categories', 'CategoryController', ['as' => 'admin.articles'])->except(['show']); diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index a224241c..8bec436b 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -88,7 +88,6 @@ $factory->define(App\Model\Categories::class, function (Faker $faker) { $title = $faker->word; $creator = factory('App\Model\Account')->create()->id; - return [ 'title' => $title, 'status' => $faker->boolean, diff --git a/tests/Article/ArticleBackendTest.php b/tests/Article/ArticleBackendTest.php index 8f1fddde..98e03b5e 100644 --- a/tests/Article/ArticleBackendTest.php +++ b/tests/Article/ArticleBackendTest.php @@ -14,6 +14,57 @@ class ArticleBackendTest extends TestCase { use RefreshDatabase; + /** + * @test + */ + public function index_should_return_an_article_listing() + { + // the database should have an article. + $article = factory('App\Model\Article')->create(); + + // so that when a user signs in. + $this->signIn(); + + // and visits the articles listing. + $response = $this->visit('admin/articles'); + + // they should see the article in the database on the page. + $response->assertSee(ucwords($article->title)); + } + + /** + * @test + */ + public function a_form_can_be_used_to_create_articles() + { + // when a user signs in. + $this->signIn(); + + // they can visit a url. + $response = $this->visit('admin/articles/create'); + + // and see a form. + $response->assertSee(''); + } + + /** + * @test + */ + public function a_form_can_be_used_to_edit_articles() + { + // when a user signs in. + $this->signIn(); + + // looks up an already existing article. + $article = factory('App\Model\Article')->create(); + + // and attempts to edit. + $response = $this->get("admin/articles/{$article->slug}/edit"); + + // they should see a form. + $response->assertSee(''); + } + /** * @test * @throws \Exception From 81c1a2e3e7728706289e296e93eca287c5ce1229 Mon Sep 17 00:00:00 2001 From: Mark Hester Date: Mon, 3 Sep 2018 16:34:38 +0100 Subject: [PATCH 3/7] Category index now works like it should. --- tests/Article/ArticleCategoryBackendTest.php | 60 ++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/Article/ArticleCategoryBackendTest.php diff --git a/tests/Article/ArticleCategoryBackendTest.php b/tests/Article/ArticleCategoryBackendTest.php new file mode 100644 index 00000000..f1e63ed4 --- /dev/null +++ b/tests/Article/ArticleCategoryBackendTest.php @@ -0,0 +1,60 @@ +signIn(); + + $category = factory('App\Model\Categories')->create(); + + $response = $this->visit('admin/articles/categories'); + + $response->assertSee($category->title); + } + + /** + * @test + * @var Categories $category + */ + public function a_category_can_be_created_and_stored() + { + $this->signIn(); + + $this->post('admin/articles/categories', ['title' => 'foo']); + + $this->assertDatabaseHas('article_categories', ['title' => 'foo', 'slug' => 'foo']); + } + + /** + * @test + */ + public function an_exiting_category_can_be_deleted() + { + $this->signIn(); + + $category = factory('App\Model\Categories')->create(); + + $this->delete("admin/articles/categories/{$category->slug}"); + + $this->assertDatabaseHas('article_categories', ['title' => $category->title, 'deleted_at' => now()]); + } +} From 763c6311d3de5e0fac02aeabd3d9a95634b8e09c Mon Sep 17 00:00:00 2001 From: Mark Hester Date: Mon, 3 Sep 2018 16:34:53 +0100 Subject: [PATCH 4/7] Category index now works like it should. --- app/Modules/Articles/BackendController.php | 16 ----- .../Articles/Blade/categories.blade.php | 10 +-- app/Modules/Articles/CategoryController.php | 61 +++++++++++++++++++ 3 files changed, 63 insertions(+), 24 deletions(-) create mode 100644 app/Modules/Articles/CategoryController.php diff --git a/app/Modules/Articles/BackendController.php b/app/Modules/Articles/BackendController.php index ca902774..39df1ce8 100644 --- a/app/Modules/Articles/BackendController.php +++ b/app/Modules/Articles/BackendController.php @@ -137,22 +137,6 @@ public function destroy($slug) return response()->json(['status' => 'true', 'redirect' => route('admin.articles.index')]); } - /** - * @param int $id - * @param ArticleCategoryRepository $categoryRepository - * @return \Illuminate\Http\RedirectResponse - * - * @throws \Exception - */ - public function categories_destroy(int $id, ArticleCategoryRepository $categoryRepository) - { - $category = $categoryRepository->whereID($id); - - $category->delete(); - - return redirect()->route('admin.articles.categories.index'); - } - /** * Save the data for the menu to the database. * diff --git a/app/Modules/Articles/Blade/categories.blade.php b/app/Modules/Articles/Blade/categories.blade.php index a3664059..fd036140 100644 --- a/app/Modules/Articles/Blade/categories.blade.php +++ b/app/Modules/Articles/Blade/categories.blade.php @@ -19,7 +19,7 @@
- +
@@ -30,8 +30,6 @@
- - @foreach($categories as $category)
@@ -46,11 +44,7 @@
    - {{--
  • {!! css()->link->edit(route('admin.articles.edit', $article->slug)) !!}
    • --}} - {{--
  • {!! css()->status->sitemap($article->sitemap) !!}
    • --}} - {{--
  • {!! css()->status->status($article->status) !!}
    • --}} -
  • {!! css()->link->destroy(route('admin.articles.categories.destroy', $category->id)) !!}
    • - {{--
  • {!! css()->link->view(url($article->route())) !!}
    • --}} +
  • Delete
diff --git a/app/Modules/Articles/CategoryController.php b/app/Modules/Articles/CategoryController.php new file mode 100644 index 00000000..9c544cfd --- /dev/null +++ b/app/Modules/Articles/CategoryController.php @@ -0,0 +1,61 @@ +make('categories')->with('categories',Categories::all()); + } + + /** + * Store a new category created by the form. + * + * @param Request $request + * @param Categories $category + * @return \Illuminate\Http\RedirectResponse + */ + public function store(Request $request, Categories $category) + { + $this->validate($request, ['unique:title']); + + $category->fill([ + 'title' => $request->get('title'), + 'slug' => str_slug($request->get('title')), + ])->save(); + + return redirect()->route('admin.articles.categories.index'); + } + + /** + * Destroy or delete an exiting category. + * + * @param string $slug + * @return \Illuminate\Http\RedirectResponse + * @throws \Exception + */ + public function destroy(string $slug) + { + Categories::deleteCategory($slug); + + return response()->json(['status' => 'true', 'redirect' => route('admin.articles.categories.index')]); + } +} From 60ff97cfb0a29a1e60c8232ea7517f7b43912641 Mon Sep 17 00:00:00 2001 From: Mark Hester Date: Mon, 3 Sep 2018 18:45:46 +0100 Subject: [PATCH 5/7] Categories cannot be deleted if articles are attached. --- app/Model/Concerns/Publishers.php | 26 ++++++++++++-------- app/Modules/Articles/CategoryController.php | 6 ++++- tests/Article/ArticleCategoryBackendTest.php | 16 ++++++++++++ 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/app/Model/Concerns/Publishers.php b/app/Model/Concerns/Publishers.php index 0bcea49e..70bfca6f 100644 --- a/app/Model/Concerns/Publishers.php +++ b/app/Model/Concerns/Publishers.php @@ -14,19 +14,25 @@ trait Publishers */ public static function bootPublishers() { - if (auth()->check()) { - static::creating(function ($model) { - $model->setAttribute('creator_id', auth()->id()); - $model->setAttribute('editor_id', auth()->id()); - }); + static::creating(function ($model) { + if (auth()->check()) { + $model->fill([ + 'creator_id' => auth()->id(), + 'editor_id' => auth()->id(), + ]); + } + }); - static::deleting(function ($model) { + static::deleting(function ($model) { + if(auth()->check()) { return $model->setAttribute('editor_id', auth()->id()); - }); + } + }); - static::updating(function ($model) { + static::updating(function ($model) { + if(auth()->check()) { return $model->setAttribute('editor_id', auth()->id()); - }); - } + } + }); } } diff --git a/app/Modules/Articles/CategoryController.php b/app/Modules/Articles/CategoryController.php index 9c544cfd..fc94c94f 100644 --- a/app/Modules/Articles/CategoryController.php +++ b/app/Modules/Articles/CategoryController.php @@ -54,7 +54,11 @@ public function store(Request $request, Categories $category) */ public function destroy(string $slug) { - Categories::deleteCategory($slug); + $category = Categories::query()->where('slug', $slug)->first(); + + if (count($category->articles) == 0) { + Categories::deleteCategory($slug); + } return response()->json(['status' => 'true', 'redirect' => route('admin.articles.categories.index')]); } diff --git a/tests/Article/ArticleCategoryBackendTest.php b/tests/Article/ArticleCategoryBackendTest.php index f1e63ed4..746e612e 100644 --- a/tests/Article/ArticleCategoryBackendTest.php +++ b/tests/Article/ArticleCategoryBackendTest.php @@ -57,4 +57,20 @@ public function an_exiting_category_can_be_deleted() $this->assertDatabaseHas('article_categories', ['title' => $category->title, 'deleted_at' => now()]); } + + /** + * @test + */ + public function an_category_cannot_be_deleted_when_articles_belong_to_it() + { + $this->signIn(); + + $category = factory('App\Model\Categories')->create(); + + factory('App\Model\Article')->create(['category_id'=>$category->id]); + + $this->delete("admin/articles/categories/{$category->slug}"); + + $this->assertDatabaseHas('article_categories', ['title' => $category->title, 'deleted_at' => NULL]); + } } From c25d8d41672efd8f0225466dec51967380dc46a0 Mon Sep 17 00:00:00 2001 From: Mark Hester Date: Mon, 3 Sep 2018 18:52:51 +0100 Subject: [PATCH 6/7] Better naming refactoring. --- app/Model/Categories.php | 7 +++---- app/Modules/Articles/CategoryController.php | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/Model/Categories.php b/app/Model/Categories.php index d0ed5b48..e1610f77 100644 --- a/app/Model/Categories.php +++ b/app/Model/Categories.php @@ -104,11 +104,10 @@ public function editor() /** * @param string $slug - * @return - * @throws \Exception + * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|null|object */ - public static function deleteCategory(string $slug) + public static function firstWhereSlug(string $slug) { - return Categories::query()->where('slug', $slug)->first()->delete(); + return Categories::query()->where('slug', '=', $slug)->first(); } } diff --git a/app/Modules/Articles/CategoryController.php b/app/Modules/Articles/CategoryController.php index fc94c94f..a8145a9c 100644 --- a/app/Modules/Articles/CategoryController.php +++ b/app/Modules/Articles/CategoryController.php @@ -54,10 +54,10 @@ public function store(Request $request, Categories $category) */ public function destroy(string $slug) { - $category = Categories::query()->where('slug', $slug)->first(); + $category = Categories::firstWhereSlug($slug); if (count($category->articles) == 0) { - Categories::deleteCategory($slug); + $category->delete(); } return response()->json(['status' => 'true', 'redirect' => route('admin.articles.categories.index')]); From b9c1b074118651cfc69a4a8020b3227114881364 Mon Sep 17 00:00:00 2001 From: Mark Hester Date: Mon, 3 Sep 2018 17:54:59 +0000 Subject: [PATCH 7/7] Apply fixes from StyleCI [ci skip] [skip ci] --- app/Model/Categories.php | 2 +- app/Model/Concerns/Publishers.php | 4 ++-- app/Modules/Articles/BackendController.php | 2 +- app/Modules/Articles/CategoryController.php | 8 +++----- database/factories/UserFactory.php | 1 + tests/Article/ArticleCategoryBackendTest.php | 12 ++++-------- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/Model/Categories.php b/app/Model/Categories.php index e1610f77..5b2a42b3 100644 --- a/app/Model/Categories.php +++ b/app/Model/Categories.php @@ -108,6 +108,6 @@ public function editor() */ public static function firstWhereSlug(string $slug) { - return Categories::query()->where('slug', '=', $slug)->first(); + return self::query()->where('slug', '=', $slug)->first(); } } diff --git a/app/Model/Concerns/Publishers.php b/app/Model/Concerns/Publishers.php index 70bfca6f..48358bb8 100644 --- a/app/Model/Concerns/Publishers.php +++ b/app/Model/Concerns/Publishers.php @@ -24,13 +24,13 @@ public static function bootPublishers() }); static::deleting(function ($model) { - if(auth()->check()) { + if (auth()->check()) { return $model->setAttribute('editor_id', auth()->id()); } }); static::updating(function ($model) { - if(auth()->check()) { + if (auth()->check()) { return $model->setAttribute('editor_id', auth()->id()); } }); diff --git a/app/Modules/Articles/BackendController.php b/app/Modules/Articles/BackendController.php index 39df1ce8..94dd1077 100644 --- a/app/Modules/Articles/BackendController.php +++ b/app/Modules/Articles/BackendController.php @@ -2,7 +2,6 @@ namespace App\Modules\Articles; -use App\Modules\Articles\Events\ArticleDeleted; use Carbon\Carbon; use App\Model\Article; use App\Model\Categories; @@ -10,6 +9,7 @@ use App\Modules\ModuleEngine; use App\Classes\Repositories\ArticleRepository; use App\Modules\Articles\Events\ArticleCreated; +use App\Modules\Articles\Events\ArticleDeleted; use App\Modules\Articles\Events\ArticleUpdated; use App\Classes\Repositories\ArticleCategoryRepository; diff --git a/app/Modules/Articles/CategoryController.php b/app/Modules/Articles/CategoryController.php index a8145a9c..7248b843 100644 --- a/app/Modules/Articles/CategoryController.php +++ b/app/Modules/Articles/CategoryController.php @@ -3,14 +3,12 @@ namespace App\Modules\Articles; use App\Model\Categories; +use Illuminate\Http\Request; use App\Modules\ModuleEngine; use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Http\Request; /** - * Class CategoryController - * - * @package App\Modules\Articles + * Class CategoryController. */ class CategoryController extends ModuleEngine { @@ -23,7 +21,7 @@ class CategoryController extends ModuleEngine */ public function index() { - return $this->make('categories')->with('categories',Categories::all()); + return $this->make('categories')->with('categories', Categories::all()); } /** diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 8bec436b..a224241c 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -88,6 +88,7 @@ $factory->define(App\Model\Categories::class, function (Faker $faker) { $title = $faker->word; $creator = factory('App\Model\Account')->create()->id; + return [ 'title' => $title, 'status' => $faker->boolean, diff --git a/tests/Article/ArticleCategoryBackendTest.php b/tests/Article/ArticleCategoryBackendTest.php index 746e612e..faa9b337 100644 --- a/tests/Article/ArticleCategoryBackendTest.php +++ b/tests/Article/ArticleCategoryBackendTest.php @@ -2,19 +2,15 @@ namespace Tests\Article; -use App\Model\Categories; use Tests\TestCase; -use Illuminate\Foundation\Testing\WithFaker; +use App\Model\Categories; use Illuminate\Foundation\Testing\RefreshDatabase; /** - * Class ArticleCategoryBackendTest - * - * @package Tests\Article + * Class ArticleCategoryBackendTest. */ class ArticleCategoryBackendTest extends TestCase { - use RefreshDatabase; /** @@ -33,7 +29,7 @@ public function a_category_listing_index_is_shown() /** * @test - * @var Categories $category + * @var Categories */ public function a_category_can_be_created_and_stored() { @@ -71,6 +67,6 @@ public function an_category_cannot_be_deleted_when_articles_belong_to_it() $this->delete("admin/articles/categories/{$category->slug}"); - $this->assertDatabaseHas('article_categories', ['title' => $category->title, 'deleted_at' => NULL]); + $this->assertDatabaseHas('article_categories', ['title' => $category->title, 'deleted_at' => null]); } }