Commit af475db7 authored by Albina Biybolatova's avatar Albina Biybolatova
Browse files

Merge branch 'task_83383' into 'master' 

task_83383 | Improvements in brand content management |

See merge request !3
parents ed8ac13f 08988b6f

lib/Dto/Brand.php

+36 −6
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ class Brand implements ModelInterface, ArrayAccess 
        'is_active' => 'bool',

        'code' => 'string',

        'description' => 'string',

        'logo_url' => 'string'

        'logo_url' => 'string',

        'sort' => 'int',

    ];



    /**
@@ -82,7 +83,8 @@ class Brand implements ModelInterface, ArrayAccess 
        'is_active' => null,

        'code' => null,

        'description' => null,

        'logo_url' => null

        'logo_url' => null,

        'sort' => null,

    ];



    /**
@@ -99,7 +101,8 @@ class Brand implements ModelInterface, ArrayAccess 
        'is_active' => false,

        'code' => true,

        'description' => true,

        'logo_url' => true

        'logo_url' => true,

        'sort' => false,

    ];



    /**
@@ -197,7 +200,8 @@ class Brand implements ModelInterface, ArrayAccess 
        'is_active' => 'is_active',

        'code' => 'code',

        'description' => 'description',

        'logo_url' => 'logo_url'

        'logo_url' => 'logo_url',

        'sort' => 'sort',

    ];



    /**
@@ -214,7 +218,8 @@ class Brand implements ModelInterface, ArrayAccess 
        'is_active' => 'setIsActive',

        'code' => 'setCode',

        'description' => 'setDescription',

        'logo_url' => 'setLogoUrl'

        'logo_url' => 'setLogoUrl',

        'sort' => 'setSort',

    ];



    /**
@@ -231,7 +236,8 @@ class Brand implements ModelInterface, ArrayAccess 
        'is_active' => 'getIsActive',

        'code' => 'getCode',

        'description' => 'getDescription',

        'logo_url' => 'getLogoUrl'

        'logo_url' => 'getLogoUrl',

        'sort' => 'getSort',

    ];



    /**
@@ -303,6 +309,7 @@ class Brand implements ModelInterface, ArrayAccess 
        $this->setIfExists('code', $data, null);

        $this->setIfExists('description', $data, null);

        $this->setIfExists('logo_url', $data, null);

        $this->setIfExists('sort', $data, 0);

    }



    public function setIfExists(string $variableName, $fields, $defaultValue)
@@ -339,6 +346,29 @@ class Brand implements ModelInterface, ArrayAccess 
        return count($this->listInvalidProperties()) === 0;

    }



    /**

     * Gets sort

     *

     * @return int

     */

    public function getSort(): int

    {

        return $this->container['sort'];

    }



    /**

     * Sets sort

     *

     * @param int $sort

     *

     * @return $this

     */

    public function setSort(int $sort): Brand

    {

        $this->container['sort'] = $sort;



        return $this;

    }



    /**

     * Gets id

lib/Dto/BrandFillableProperties.php

+37 −6
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        'is_active' => 'bool',

        'code' => 'string',

        'description' => 'string',

        'logo_url' => 'string'

        'logo_url' => 'string',

        'sort' => 'int',

    ];



    /**
@@ -74,7 +75,8 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        'is_active' => null,

        'code' => null,

        'description' => null,

        'logo_url' => null

        'logo_url' => null,

        'sort' => null,

    ];



    /**
@@ -87,7 +89,8 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        'is_active' => false,

        'code' => true,

        'description' => true,

        'logo_url' => true

        'logo_url' => true,

        'sort' => false,

    ];



    /**
@@ -181,7 +184,8 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        'is_active' => 'is_active',

        'code' => 'code',

        'description' => 'description',

        'logo_url' => 'logo_url'

        'logo_url' => 'logo_url',

        'sort' => 'sort',

    ];



    /**
@@ -194,7 +198,8 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        'is_active' => 'setIsActive',

        'code' => 'setCode',

        'description' => 'setDescription',

        'logo_url' => 'setLogoUrl'

        'logo_url' => 'setLogoUrl',

        'sort' => 'setSort',

    ];



    /**
@@ -207,7 +212,8 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        'is_active' => 'getIsActive',

        'code' => 'getCode',

        'description' => 'getDescription',

        'logo_url' => 'getLogoUrl'

        'logo_url' => 'getLogoUrl',

        'sort' => 'getSort',

    ];



    /**
@@ -275,6 +281,7 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        $this->setIfExists('code', $data, null);

        $this->setIfExists('description', $data, null);

        $this->setIfExists('logo_url', $data, null);

        $this->setIfExists('sort', $data, 0);

    }



    public function setIfExists(string $variableName, $fields, $defaultValue)
@@ -311,6 +318,30 @@ class BrandFillableProperties implements ModelInterface, ArrayAccess 
        return count($this->listInvalidProperties()) === 0;

    }



    /**

     * Gets sort

     *

     * @return int

     */

    public function getSort(): int

    {

        return $this->container['sort'];

    }



    /**

     * Sets sort

     *

     * @param int $sort

     *

     * @return $this

     */

    public function setSort(int $sort): BrandFillableProperties

    {

        $this->container['sort'] = $sort;



        return $this;

    }





    /**

     * Gets name

lib/Dto/CreateBrandRequest.php

+36 −6
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'bool',

        'code' => 'string',

        'description' => 'string',

        'logo_url' => 'string'

        'logo_url' => 'string',

        'sort' => 'int',

    ];



    /**
@@ -74,7 +75,8 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => null,

        'code' => null,

        'description' => null,

        'logo_url' => null

        'logo_url' => null,

        'sort' => null,

    ];



    /**
@@ -87,7 +89,8 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => false,

        'code' => true,

        'description' => true,

        'logo_url' => true

        'logo_url' => true,

        'sort' => false,

    ];



    /**
@@ -181,7 +184,8 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'is_active',

        'code' => 'code',

        'description' => 'description',

        'logo_url' => 'logo_url'

        'logo_url' => 'logo_url',

        'sort' => 'sort',

    ];



    /**
@@ -194,7 +198,8 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'setIsActive',

        'code' => 'setCode',

        'description' => 'setDescription',

        'logo_url' => 'setLogoUrl'

        'logo_url' => 'setLogoUrl',

        'sort' => 'setSort',

    ];



    /**
@@ -207,7 +212,8 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'getIsActive',

        'code' => 'getCode',

        'description' => 'getDescription',

        'logo_url' => 'getLogoUrl'

        'logo_url' => 'getLogoUrl',

        'sort' => 'getSort',

    ];



    /**
@@ -275,6 +281,7 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        $this->setIfExists('code', $data, null);

        $this->setIfExists('description', $data, null);

        $this->setIfExists('logo_url', $data, null);

        $this->setIfExists('sort', $data, 0);

    }



    public function setIfExists(string $variableName, $fields, $defaultValue)
@@ -311,6 +318,29 @@ class CreateBrandRequest implements ModelInterface, ArrayAccess 
        return count($this->listInvalidProperties()) === 0;

    }



    /**

     * Gets sort

     *

     * @return int

     */

    public function getSort(): int

    {

        return $this->container['sort'];

    }



    /**

     * Sets sort

     *

     * @param int $sort

     *

     * @return $this

     */

    public function setSort(int $sort): CreateBrandRequest

    {

        $this->container['sort'] = $sort;



        return $this;

    }



    /**

     * Gets name

lib/Dto/ReplaceBrandRequest.php

+37 −6
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'bool',

        'code' => 'string',

        'description' => 'string',

        'logo_url' => 'string'

        'logo_url' => 'string',

        'sort' => 'int',

    ];



    /**
@@ -74,7 +75,8 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => null,

        'code' => null,

        'description' => null,

        'logo_url' => null

        'logo_url' => null,

        'sort' => null,

    ];



    /**
@@ -87,7 +89,8 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => false,

        'code' => true,

        'description' => true,

        'logo_url' => true

        'logo_url' => true,

        'sort' => false,

    ];



    /**
@@ -181,7 +184,8 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'is_active',

        'code' => 'code',

        'description' => 'description',

        'logo_url' => 'logo_url'

        'logo_url' => 'logo_url',

        'sort' => 'sort',

    ];



    /**
@@ -194,7 +198,8 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'setIsActive',

        'code' => 'setCode',

        'description' => 'setDescription',

        'logo_url' => 'setLogoUrl'

        'logo_url' => 'setLogoUrl',

        'sort' => 'setSort',

    ];



    /**
@@ -207,7 +212,8 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
        'is_active' => 'getIsActive',

        'code' => 'getCode',

        'description' => 'getDescription',

        'logo_url' => 'getLogoUrl'

        'logo_url' => 'getLogoUrl',

        'sort' => 'getSort',

    ];



    /**
@@ -275,6 +281,7 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
        $this->setIfExists('code', $data, null);

        $this->setIfExists('description', $data, null);

        $this->setIfExists('logo_url', $data, null);

        $this->setIfExists('sort', $data, 0);

    }



    public function setIfExists(string $variableName, $fields, $defaultValue)
@@ -312,6 +319,30 @@ class ReplaceBrandRequest implements ModelInterface, ArrayAccess 
    }





    /**

     * Gets sort

     *

     * @return int

     */

    public function getSort(): int

    {

        return $this->container['sort'];

    }



    /**

     * Sets sort

     *

     * @param int $sort

     *

     * @return $this

     */

    public function setSort(int $sort): ReplaceBrandRequest

    {

        $this->container['sort'] = $sort;



        return $this;

    }



    /**

     * Gets name

     *