Merge 3a4f18d into f4fa58e

spira · Jan 28, 2016 · 5ccc07a · 5ccc07a
2 parents f4fa58e + 3a4f18d
commit 5ccc07a
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 132 deletions.
diff --git a/api/app/Http/Controllers/AbstractSectionController.php b/api/app/Http/Controllers/AbstractSectionController.php
@@ -10,42 +10,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Section;
 use Spira\Core\Controllers\ChildEntityController;
-use Spira\Core\Model\Model\BaseModel;
 
 class AbstractSectionController extends ChildEntityController
 {
     protected $relationName = 'sections';
-
-    /**
-     * @param $requestEntity
-     * @param array $validationRules
-     * @param BaseModel $existingModel
-     * @param bool $limitToKeysPresent
-     * @return bool
-     */
-    public function validateRequest($requestEntity, $validationRules, BaseModel $existingModel = null, $limitToKeysPresent = false)
-    {
-        $contentRules = $this->getContentRules($requestEntity);
-
-        foreach ($contentRules as $attribute => $rule) {
-            $validationRules['content.'.$attribute] = $rule;
-        }
-
-        return parent::validateRequest($requestEntity, $validationRules, $existingModel, $limitToKeysPresent);
-    }
-
-    /**
-     * @param $requestEntity
-     * @return array
-     */
-    protected function getContentRules($requestEntity)
-    {
-        if (! isset(Section::$contentTypeMap[$requestEntity['type']])) {
-            return [];
-        }
-
-        return with(new Section::$contentTypeMap[$requestEntity['type']])->getValidationRules();
-    }
 }
diff --git a/api/app/Models/Section.php b/api/app/Models/Section.php
@@ -43,12 +43,6 @@ class Section extends BaseModel implements LocalizableModelInterface
         Article::class,
     ];
 
-    protected static $validationRules = [
-        'section_id' => 'required|uuid',
-        'content' => 'required_if:type,'.RichTextContent::CONTENT_TYPE.','.BlockquoteContent::CONTENT_TYPE.','.MediaContent::CONTENT_TYPE,
-        'type' => 'required|section_type',
-    ];
-
     protected $casts = [
         self::CREATED_AT => 'datetime',
         self::UPDATED_AT => 'datetime',
@@ -66,8 +60,11 @@ public static function getValidationRules($entityId = null, array $requestEntity
     {
         return [
             'section_id' => 'required|uuid',
-            'content' => 'required_if:type,'.RichTextContent::CONTENT_TYPE.','.BlockquoteContent::CONTENT_TYPE.','.MediaContent::CONTENT_TYPE,
+            'content' => 'required_if:type,'.RichTextContent::CONTENT_TYPE.','.BlockquoteContent::CONTENT_TYPE.','.MediaContent::CONTENT_TYPE.'|array',
             'type' => 'required|in:'.implode(',', static::getContentTypes()),
+            'content.body' => 'required_if:type,'.RichTextContent::CONTENT_TYPE.','.BlockquoteContent::CONTENT_TYPE.'|string',
+            'content.author' => 'required_if:type,'.BlockquoteContent::CONTENT_TYPE.'|string',
+            'content.media' => 'required_if:type,'.MediaContent::CONTENT_TYPE.'|array',
         ];
     }
 

diff --git a/api/app/Models/Sections/BlockquoteContent.php b/api/app/Models/Sections/BlockquoteContent.php
@@ -25,9 +25,4 @@ class BlockquoteContent extends VirtualModel
         'body',
         'author',
     ];
-
-    protected static $validationRules = [
-        'body' => 'required|string',
-        'author' => 'required|string',
-    ];
 }
diff --git a/api/app/Models/Sections/MediaContent.php b/api/app/Models/Sections/MediaContent.php
@@ -46,8 +46,4 @@ class MediaContent extends VirtualModel
     protected $fillable = [
         'media',
     ];
-
-    protected static $validationRules = [
-        'media' => 'required|array',
-    ];
 }
diff --git a/api/app/Models/Sections/PromoContent.php b/api/app/Models/Sections/PromoContent.php
@@ -23,7 +23,4 @@ class PromoContent extends VirtualModel
      */
     protected $fillable = [
     ];
-
-    protected static $validationRules = [
-    ];
 }
diff --git a/api/app/Models/Sections/RichTextContent.php b/api/app/Models/Sections/RichTextContent.php
@@ -24,8 +24,4 @@ class RichTextContent extends VirtualModel
     protected $fillable = [
         'body',
     ];
-
-    protected static $validationRules = [
-        'body' => 'required|string',
-    ];
 }