From 7252f835a001a5d4acaa849fb9f050fda262f7af Mon Sep 17 00:00:00 2001
From: Schneider Roland <roland.schneider@extern.a1.at>
Date: Sun, 18 Sep 2022 12:48:16 +0200
Subject: [PATCH] add doorlog version , improve DoorMoveForm.php required
 fields

---
 common/manager/DoorManager.php                |  1 +
 common/models/DoorLog.php                     |  1 +
 ...90701_alter_table_door_log_add_version.php | 42 +++++++++++++++++++
 rest/models/DoorMoveForm.php                  |  4 +-
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 console/migrations/m220803_190701_alter_table_door_log_add_version.php

diff --git a/common/manager/DoorManager.php b/common/manager/DoorManager.php
index 6e256f2..aaea916 100644
--- a/common/manager/DoorManager.php
+++ b/common/manager/DoorManager.php
@@ -64,6 +64,7 @@ class DoorManager extends BaseObject
             $dateStr = DateUtil::formatDateUtc($date);
 
             $doorLog = new DoorLog();
+            $doorLog->version = 2;
             if ( $device == 'E'){
                 $direction = DoorLog::$DIRECTION_ALL_EMERGENCY;
             }else{
diff --git a/common/models/DoorLog.php b/common/models/DoorLog.php
index 7feb93f..8592c13 100644
--- a/common/models/DoorLog.php
+++ b/common/models/DoorLog.php
@@ -22,6 +22,7 @@ use yii\helpers\ArrayHelper;
  * @property integer id_ticket_current
  * @property integer card_flag
  * @property integer flag_out
+ * @property integer version
  */
 class DoorLog extends \yii\db\ActiveRecord
 {
diff --git a/console/migrations/m220803_190701_alter_table_door_log_add_version.php b/console/migrations/m220803_190701_alter_table_door_log_add_version.php
new file mode 100644
index 0000000..401887c
--- /dev/null
+++ b/console/migrations/m220803_190701_alter_table_door_log_add_version.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m220803_190701_alter_table_door_log_add_version
+ */
+class m220803_190701_alter_table_door_log_add_version extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('door_log', 'version', $this->integer( )->notNull()->defaultValue(1) );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        echo "m220803_190701_alter_table_door_log_add_version cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use up()/down() to run migration code without a transaction.
+    public function up()
+    {
+
+    }
+
+    public function down()
+    {
+        echo "m220803_190701_alter_table_door_log_add_version cannot be reverted.\n";
+
+        return false;
+    }
+    */
+}
diff --git a/rest/models/DoorMoveForm.php b/rest/models/DoorMoveForm.php
index ed2bd9a..a9d1704 100644
--- a/rest/models/DoorMoveForm.php
+++ b/rest/models/DoorMoveForm.php
@@ -17,8 +17,8 @@ class DoorMoveForm extends Model
 
     public function rules( ) {
         return [
-            [ ['cardNumber', 'device', 'direction', 'validateOnly' ], 'required'],
-            [ ['createdAt', 'date' ], 'string']
+            [ [ 'device', 'validateOnly' ], 'required'],
+            [ [ 'cardNumber', 'device', 'direction', 'validateOnly' , 'createdAt', 'date' ], 'string']
         ];
     }