fixed permissions (rules) in controllers

Mihail
1 parent 07a132f4
Showing 9 changed files with 88 additions and 112 deletions Show diff stats
backend/controllers/CartController.php
backend/controllers/CrossingUploadController.php
backend/controllers/DetailsDescriptionController.php
backend/controllers/ParserController.php
backend/controllers/RgGrupController.php
backend/models/DetailsCrosses.php
tests/_support/_generated/UnitTesterActions.php
tests/unit/BaseConverterTest.php
tests/unit/CrossesParsingTest.php
@@ -8,7 +8,6 @@ use common\models\CartBillsSearch;
 use backend\components\base\BaseController;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
 /**
  * CartController implements the CRUD actions for CartBills model.
@@ -16,34 +15,7 @@ use yii\filters\AccessControl;
 class CartController extends BaseController
 {
     public $layout = "/column";
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
-            ],
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
-        ];
-    }
+
     /**
      * Lists all CartBills models.
      * @return mixed
@@ -8,10 +8,13 @@
 namespace backend\controllers;
+use backend\components\base\BaseActiveRecord;
 use backend\components\base\BaseController;
 use common\components\CustomArrayHelper;
 use common\components\CustomVarDamp;
+use yii\base\Model;
 use yii\data\ArrayDataProvider;
+use yii\db\ActiveRecord;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use backend\models\UploadFileCrossingForm;
@@ -82,7 +85,7 @@ class CrossingUploadController extends BaseController
                 //запускаем парсинг
                 $data = $model->readFile();
                 // сохраняем в кеш отпарсенные даные
-               $this->cacheHandler( true, $data, $model );
+               $this->cacheHandler( 1, $data, $model );
             } else if (Yii::$app->getCache()->get('parser_data')) {
                 $data = json_decode(Yii::$app->getCache()->get('parser_data'), true);
             }
@@ -128,7 +131,7 @@ class CrossingUploadController extends BaseController
             $arr = $model->toArray();
             // получим данные из кеша
-            $this->cacheHandler( false, $data, $configuration );
+            $this->cacheHandler( 0, $data, $configuration );
             // соотнесем отпарсенные данные с соответствием полученным от пользователя
             // для этого преобразуем массив отпарсенных данных - назначим ключи согласно соответствию
@@ -138,16 +141,20 @@ class CrossingUploadController extends BaseController
             $data = $this->convertDataByConfiguration( $data, $configuration );
             $crosses_model = new DetailsCrosses();
-            $crosses_model->ManualInsertWithIgnore($data);
-            Yii::$app->session->setFlash('success', 'Файл кроссов успешно загружен');
-            // все прошло успешно - очищаем кеш
-            Yii::$app->getCache()->delete('parser_data');
-            Yii::$app->getCache()->delete('parser_configuration');
+            if ( $this->validateModel( $crosses_model , $data ) && $crosses_model->ManualInsertWithIgnore( $data ) ) {
+
+                Yii::$app->session->setFlash('success', 'Файл кроссов успешно загружен');
+
+                // очистим кеш
+                $this->cacheHandler( 2 );
+
+                if (file_exists($configuration['file_path']))
+                    unlink($configuration['file_path']);
+                return $this->render('index', ['model' => $configuration]);
+
+            }
-            if (file_exists($configuration['file_path']))
-                unlink($configuration['file_path']);
-            return $this->render('index', ['model' => $configuration]);
         } else {
             // не прошла валидация форма загрузки файлов
@@ -188,8 +195,8 @@ class CrossingUploadController extends BaseController
             $options ['configuration'] =  ["string" => ['ARTICLE', 'CROSS_ARTICLE'],];
         }
-        foreach ($data as &$row) {
-            $row = Yii::$app->converter->convertByConfiguration($row, $options);
+        foreach ( $data as &$row ) {
+            $row = Yii::$app->converter->convertByConfiguration( $row, $options );
         }
         return $data;
@@ -197,30 +204,47 @@ class CrossingUploadController extends BaseController
     }
     /**
-     * @param $mode - bool - true - put in cache, otherwise - fetch from cache
+     * @param $mode - int: 0 - fetch from cache, - 1 - put in cache,  <2 - delete from cache
      * @param $data - array
      * @param $configuration - array
      * @throws \ErrorException
      */
-    protected function cacheHandler( $mode, &$data, &$configuration ){
-
-        if ( $mode ) {
-
-            Yii::$app->getCache()->set('parser_data', json_encode($data), 1800);
-            // сохраняем в кеш модель - в ней настройки для дальнейшей обработки данных
-            Yii::$app->getCache()->set('parser_configuration', serialize($configuration), 1800);
+    protected function cacheHandler( $mode, &$data = [], &$configuration = [] ){
+        switch ( $mode ) {
+            case 0:
+                if (Yii::$app->getCache()->get('parser_data') && Yii::$app->getCache()->get('parser_configuration')) {
+                    $data = json_decode(Yii::$app->getCache()->get('parser_data'), true);
+                    $configuration = unserialize(Yii::$app->getCache()->get('parser_configuration'));
+                } else {
+                    throw new \ErrorException('Ошибка кеша');
+                }
+                break;
+
+            case 1:
+                Yii::$app->getCache()->set('parser_data', json_encode($data), 1800);
+                // сохраняем в кеш модель - в ней настройки для дальнейшей обработки данных
+                Yii::$app->getCache()->set('parser_configuration', serialize($configuration), 1800);
+                break;
+
+            default:
+                if( Yii::$app->getCache()->exists('parser_data') )
+                    Yii::$app->getCache()->delete('parser_data');
+
+                if( Yii::$app->getCache()->exists('parser_configuration') )
+                    Yii::$app->getCache()->delete('parser_configuration');
+        }
-        } else {
+    }
-            if (Yii::$app->getCache()->get('parser_data') && Yii::$app->getCache()->get('parser_configuration')) {
-                $data = json_decode(Yii::$app->getCache()->get('parser_data'), true);
-                $configuration = unserialize(Yii::$app->getCache()->get('parser_configuration'));
-            } else {
-                throw new \ErrorException('Ошибка кеша');
-            }
+    protected function validateModel( BaseActiveRecord $model, array $data ){
+        foreach ( $data as $row ) {
+            if ( !$model->validate( $row ) ) {
+                $model->throwStringErrorException( key( $data ) );
+            };
         }
+        return true;
     }
 }
 \ No newline at end of file
@@ -11,7 +11,6 @@ use yii\data\ActiveDataProvider;
 use yii\web\HttpException;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
 /**
  * DetailsDescriptionController implements the CRUD actions for DetailsDescription model.
@@ -20,30 +19,13 @@ class DetailsDescriptionController extends BaseController
 {
     public $layout = "/column";
-    /**
-     * @inheritdoc
-     */
     public function behaviors()
     {
         return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
-            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
-                    'logout' => ['post'],
+                    'delete' => ['post'],
                 ],
             ],
         ];
@@ -38,22 +38,17 @@ class ParserController extends BaseController
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
                 ],
             ],
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
+//            'verbs' => [
+//                'class' => VerbFilter::className(),
+//                'actions' => [
+//                    'logout' => ['post'],
+//                ],
+//            ],
         ];
     }
@@ -14,7 +14,6 @@ use common\components\CustomVarDamp;
 use common\components\parsers\MailAttachmentsSaver;
 use common\models\Margins;
 use common\models\MarginsGroups;
-use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use Yii;
 use yii\web\UploadedFile;
@@ -36,22 +35,17 @@ class RgGrupController extends BaseController
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
                 ],
             ],
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
+//            'verbs' => [
+//                'class' => VerbFilter::className(),
+//                'actions' => [
+//                    'logout' => ['post'],
+//                ],
+//            ],
         ];
     }
@@ -78,8 +78,16 @@ class DetailsCrosses extends \backend\components\base\BaseActiveRecord
             $query = Yii::$app->db->createCommand()->batchInsert($table_name, $keys_arr, $current_batch_array)->sql;
             // добавим ключевое слово - ignore
             $query = preg_replace('/INSERT/','INSERT IGNORE', $query);
-            Yii::$app->db->createCommand($query)->execute();
+            $rows = Yii::$app->db->createCommand($query)->execute();
+
+            // если нет результата вернемся с ошибкой
+            if ( $rows == 0 ) {
+                return false;
+            }
         }
+
+        return true;
+
     }
 }
-<?php  //[STAMP] 76e040407b5f5ec0a4bfcf45c4064e51
+<?php  //[STAMP] 6943f83782f0ac615ed36fefe0f4d3a8
 namespace _generated;
 // This class was automatically generated by build task
@@ -21,18 +21,19 @@ class BaseConverterTest extends \Codeception\TestCase\Test
     {
         $this->converter = new Converter();
-        $this->configuration = ['configuration' =>
-            ["encode"   => 'encode',
-            "string"   => ['string1', 'string2' ],
-            "float"   => 'float',
-            "integer"   => ['integer1', 'integer2' ],
+        $this->configuration = ['hasKey' => true,
+            'configuration' =>
+            ['encode'   => 'encode',
+            'string'   => ['string1', 'string2' ],
+            'float'   => 'float',
+            'integer'   => ['integer1', 'integer2' ],
          ]];
         $this->wrong_configuration = ['config' =>
-            ["encode"   => 'encode',
-            "string"   => 'string',
-            "float"   => 'float',
-            "integer"   => 'integer',
+            ['encode'   => 'encode',
+            'string'   => 'string',
+            'float'   => 'float',
+            'integer'   => 'integer',
          ]];
         $this->data_in = [
@@ -49,7 +50,7 @@ class BaseConverterTest extends \Codeception\TestCase\Test
     public function testConvertByConfig(){
-        $this->data_out = $this->converter->convertByConfiguration($this->data_in, $this->configuration );
+        $this->data_out = $this->converter->convertByConfiguration( $this->data_in, $this->configuration );
         $this->assertEquals( $this->data_out['encode'], iconv( 'windows-1251', 'UTF-8', 'test encode string' ), 'Encoding failed' );
         $this->assertInternalType( 'float', $this->data_out['float'], 'Convert to float is failed' );
@@ -58,7 +59,7 @@ class BaseConverterTest extends \Codeception\TestCase\Test
     public function testConvertToException(){
         $this->setExpectedException('\Exception');
-        $this->data_out = $this->converter->convertByConfiguration($this->data_in, $this->wrong_configuration );
+        $this->data_out = $this->converter->convertByConfiguration( $this->data_in, $this->wrong_configuration );
     }
@@ -17,7 +17,7 @@ class CrossesParsingTest extends \Codeception\TestCase\Test
     public function _before()
     {
         $this->options[ 'mode' ] = 'crosses';
-        $this->options[ 'converter_conf' ] = [ 'configuration' => [ "string"   => ['ARTICLE', 'CROSS_ARTICLE'], ] ];
+        $this->options[ 'converter_conf' ] = [ 'configuration' => [ "string"   => ['ARTICLE', 'CROSS_ARTICLE'] ], 'hasKey' => 1 ];
         $this->file_path = Yii::getAlias('@data_parser') . '\crosses\test1.csv';
     }