bugfix conversation are not overwritten

Author: MBoretto

src/Conversation.php

@@ -101,7 +101,7 @@ protected function conversationExist()
         if ($this->is_fetched) {
             return true;
         }
-
+        //select an active conversation
         $conversation = ConversationDB::selectConversation($this->user_id, $this->chat_id, 1);
         $this->is_fetched = true;
 
@@ -114,14 +114,14 @@ protected function conversationExist()
                 return true;
             }
 
-            //a track with the same name was already opened store the data
+            //a track with the same name was already opened, store the data inside the class
             if ($this->conversation['conversation_name'] == $this->group_name) {
                 $this->data = json_decode($this->conversation['data'], true);
                 return true;
             }
 
-            //a  with a differet name has been opened unsetting the DB one and reacreatea a new one
-            ConversationDB::updateConversation(['is_active' => 0], ['chat_id' => $this->chat_id, 'user_id' => $this->user_id]);
+            //a conversation  with a differet name has been opened unsetting the DB one and reacreatea a new one
+            ConversationDB::updateConversation(['status' => 'cancelled'], ['chat_id' => $this->chat_id, 'user_id' => $this->user_id, 'status' => 'active']);
             return false;
         }
 
@@ -156,7 +156,7 @@ public function update($data)
         if ($this->conversationExist()) {
             $fields['data'] = json_encode($data);
 
-            ConversationDB::updateConversation($fields, ['chat_id' => $this->chat_id, 'user_id' => $this->user_id]);
+            ConversationDB::updateConversation($fields, ['chat_id' => $this->chat_id, 'user_id' => $this->user_id, 'status' => 'active']);
             //TODO verify query success before convert the private var
             $this->data = $data;
         }
@@ -174,7 +174,7 @@ public function update($data)
     public function stop()
     {
         if ($this->conversationExist()) {
-            ConversationDB::updateConversation(['is_active' => 0], ['chat_id' => $this->chat_id, 'user_id' => $this->user_id]);
+            ConversationDB::updateConversation(['status' => 'stopped'], ['chat_id' => $this->chat_id, 'user_id' => $this->user_id, 'status' => 'active']);
         }
     }
 

src/ConversationDB.php

@@ -44,7 +44,7 @@ public static function selectConversation($user_id, $chat_id, $limit = null)
 
         try {
             $query = 'SELECT * FROM `' . TB_CONVERSATION . '` ';
-            $query .= 'WHERE `is_active` = 1 ';
+            $query .= 'WHERE `status` = :status ';
             $query .= 'AND `chat_id` = :chat_id ';
             $query .= 'AND `user_id` = :user_id ';
 
@@ -54,6 +54,8 @@ public static function selectConversation($user_id, $chat_id, $limit = null)
             }
             $sth = self::$pdo->prepare($query);
 
+            $active = 'active';
+            $sth->bindParam(':status', $active, \PDO::PARAM_STR);
             $sth->bindParam(':user_id', $user_id, \PDO::PARAM_INT);
             $sth->bindParam(':chat_id', $chat_id, \PDO::PARAM_INT);
             $sth->bindParam(':limit', $limit, \PDO::PARAM_INT);
@@ -86,18 +88,17 @@ public static function insertConversation($conversation_command, $conversation_g
         try {
             $sth = self::$pdo->prepare('INSERT INTO `' . TB_CONVERSATION . '`
                 (
-                `is_active`, `conversation_command`, `conversation_name`, `user_id`, `chat_id`, `data`, `created_at`, `updated_at`
+                `status`, `conversation_command`, `conversation_name`, `user_id`, `chat_id`, `data`, `created_at`, `updated_at`
                 )
                 VALUES (
-                :is_active, :conversation_command, :conversation_name, :user_id, :chat_id, :data, :date, :date
+                :status, :conversation_command, :conversation_name, :user_id, :chat_id, :data, :date, :date
                 )
                ');
-
-            $active = 1;
+            $active = 'active';
             $data = json_encode('');
             $created_at = self::getTimestamp();
 
-            $sth->bindParam(':is_active', $active);
+            $sth->bindParam(':status', $active);
             $sth->bindParam(':conversation_command', $conversation_command);
             $sth->bindParam(':conversation_name', $conversation_group_name);
             $sth->bindParam(':user_id', $user_id);
@@ -147,14 +148,16 @@ public static function update($table, array $fields_values, array $where_fields_
         //Values
         $update = '';
         $tokens = [];
+        $tokens_counter = 0;
         $a = 0;
         foreach ($fields_values as $field => $value) {
             if ($a) {
                 $update .= ', ';
             }
             ++$a;
-            $update .= '`'.$field.'` = :'.$a;
-            $tokens[':'.$a] = $value;
+            ++$tokens_counter;
+            $update .= '`'.$field.'` = :'.$tokens_counter;
+            $tokens[':'.$tokens_counter] = $value;
         }
 
         //Where
@@ -167,7 +170,9 @@ public static function update($table, array $fields_values, array $where_fields_
                 ++$a;
                 $where  .= 'WHERE ';
             }
-            $where  .= '`'.$field .'`='.$value ;
+            ++$tokens_counter;
+            $where  .= '`'.$field .'`= :'.$tokens_counter ;
+            $tokens[':'.$tokens_counter] = $value;
         }
 
         $query = 'UPDATE `'.$table.'` SET '.$update.' '.$where;

src/Entities/User.php

@@ -30,7 +30,7 @@ public function __construct(array $data)
 
         $this->first_name = isset($data['first_name']) ? $data['first_name'] : null;
         if (empty($this->first_name)) {
-            throw new TelegramException('first_name is empty!');
+//            throw new TelegramException('first_name is empty!');
         }
 
         $this->last_name = isset($data['last_name']) ? $data['last_name'] : null;

structure.sql

@@ -135,12 +135,11 @@ CREATE TABLE IF NOT EXISTS `telegram_update` (
   REFERENCES `chosen_inline_query` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
-
 CREATE TABLE IF NOT EXISTS `conversation` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Row unique id',
   `user_id` bigint NULL DEFAULT NULL COMMENT 'User id',
   `chat_id` bigint NULL DEFAULT NULL COMMENT 'Telegram chat_id can be a the user id or the chat id ',
-  `is_active` tinyint(1) NOT NULL DEFAULT '1' COMMENT '1 conversation is active 0 conversation has been deactivated',
+  `status` ENUM('active', 'cancelled', 'stopped') NOT NULL DEFAULT 'active' COMMENT 'active conversation is active, cancelled conversation has been truncated before end, stopped conversation has end',
   `conversation_command` varchar(160) DEFAULT '' COMMENT 'Default Command to execute',
   `conversation_name` varchar(160) NOT NULL DEFAULT '' COMMENT 'Name of the conversation can be the command name or a generic name for conversation between multiple commands',
   `data` varchar(1000) DEFAULT 'NULL' COMMENT 'Data stored from command',
@@ -150,7 +149,7 @@ CREATE TABLE IF NOT EXISTS `conversation` (
   PRIMARY KEY (`id`), 
   KEY `user_id` (`user_id`),
   KEY `chat_id` (`chat_id`),
-  KEY `is_active` (`is_active`),
+  KEY `status` (`status`),
   KEY `conversation_name` (`conversation_name`), 
 
   FOREIGN KEY (`user_id`)