Tidied the find method to throw exceptions as expected, added seeder …

…and fixed the model factory published date.
spira · Jul 27, 2015 · 8f0df03 · Redjik · Jul 27, 2015 · 8f0df03
1 parent 7e3de39
commit 8f0df03
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/api/app/Repositories/ArticleRepository.php b/api/app/Repositories/ArticleRepository.php
@@ -22,18 +22,23 @@ class ArticleRepository extends BaseRepository
      */
     public function find($id, $columns = ['*'])
     {
-        $result = $this->model->where('permalink', '=', $id)->get()->first();
 
-        /** @var ArticlePermalink $permalink */
-        if (!$result && $permalink = ArticlePermalink::find($id)) {
-            $result = $permalink->article;
+        //if the id is a uuid, try that or fail.
+        if (Uuid::isValid($id)){
+            return $query = $this->model->findOrFail($id);
         }
 
-        if (!$result && Uuid::isValid($id)) {
-            $result = parent::find($id);
+        //otherwise attempt treat the id as a permalink and first try the model, then try the history
+        try {
+
+            return $this->model
+                ->where('permalink', '=', $id)
+                ->firstOrFail();
+
+        }catch(ModelNotFoundException $e){ //id or permalink not found, try permalink history
+            return ArticlePermalink::findOrFail($id)->article;
         }
 
-        return $result;
     }
 
 

diff --git a/api/database/factories/ModelFactory.php b/api/database/factories/ModelFactory.php
@@ -109,12 +109,12 @@
 });
 
 $factory->define(App\Models\Article::class, function ($faker) {
+    $publishedDatetime = $faker->optional(0.9)->dateTimeThisDecade();
+
     return [
         'article_id' => $faker->uuid,
         'title' => $faker->sentence,
         'content' => $content = implode("\n\n", $faker->paragraphs(3)),
-        // ErrorException: createFromFormat() expects parameter 2 to be string, object given 0_o
-        //'first_published' => $faker->optional(0.9)->dateTimeThisDecade(),
-        'first_published' => null,
+        'first_published' => $publishedDatetime ? $publishedDatetime->format('Y-m-d H:i:s') : null,
     ];
 });
diff --git a/api/database/seeds/ArticleSeeder.php b/api/database/seeds/ArticleSeeder.php
@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class ArticleSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        factory(App\Models\Article::class, 10)->create();
+
+//        factory(App\Models\Article::class)->create()
+//            ->permalink()->save(factory(App\Models\ArticlePermalink::class)->make())
+//        ;
+
+    }
+}
diff --git a/api/database/seeds/DatabaseSeeder.php b/api/database/seeds/DatabaseSeeder.php
@@ -12,8 +12,13 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
         $this->call('UserStorySeeder');
+        $this->command->info('User story seeded!');
+
         $this->call('TestEntitySeeder');
+        $this->command->info('Test entities seeded!');
+
+        $this->call('ArticleSeeder');
+        $this->command->info('Articles seeded!');
 
-        $this->command->info('User table seeded!');
     }
 }