WIP

Author: Matthew Garde

Controller/Adminhtml/Login/Index.php

@@ -24,6 +24,7 @@ public function execute() {
         $accCode = $this->getRequest()->getParam('account_code');
         $accTok = $this->getRequest()->getParam('account_token');
         $settings = $this->settingsDataFactory->create();
+        
         try 
         {
             $settingsData = $settings->load(1);
@@ -33,7 +34,7 @@ public function execute() {
         }
         catch(\Exception $ex) 
         {
-            return $result->setData(['success' => false]);
+            return $result->setData(['success' => false, 'exception' => $ex->getMessage()]);
         }
 
 		return $result->setData(['success' => true]);

Model/ResourceModel/SettingsData.php

@@ -8,6 +8,6 @@ class SettingsData extends AbstractDb
 {
     protected function _construct()
     {
-        $this->_init('pcapredict_tag_settingsdata','pcapredict_tag_settingsdata_id');
+        $this->_init('pcapredict_tag_settingsdata','id');
     }
 }

README.md

@@ -16,7 +16,7 @@ e.g. ``` git clone https://github.com/pcapredict/magento2.git Tag```
 
 ### If your using Composer
 - Integrated with Packagist, so you should be able to get the latest version with:
-```composer require pcapredict/tag:^2.0.1```
+```composer require pcapredict/tag:^2.0.7```
 
 ### Magento Setup
 - Make sure you have the correct file and folder permissions set on your magento installation so that the magnento store can install the app.

Setup/InstallData.php

@@ -10,16 +10,15 @@
 class InstallSchema implements InstallSchemaInterface
 {
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
+    {        
+        $setup->startSetup();
 
-        $tableName = $installer->getTable('pcapredict_tag_settingsdata');
-
-        $table = $installer->getConnection()
-            ->newTable($tableName)
+        $table = $setup->getConnection()
+        ->newTable(
+            $setup->getTable('pcapredict_tag_settingsdata')
+            )
             ->addColumn(
-                'pcapredict_tag_settingsdata_id',
+                'id',
                 Table::TYPE_INTEGER,
                 null,
                 [ 'identity' => true, 'nullable' => false, 'primary' => true, 'unsigned' => true ],
@@ -61,14 +60,15 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'Creation Time'
             )
             ->addColumn(
-                'update_time',
-                Table::TYPE_TIMESTAMP,
-                null,
-                [ 'nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE ],
-                'Modification Time'
+                'module_version',
+                Table::TYPE_TEXT,
+                16,
+                [ 'nullable' => true ],
+                'Created With App Version'
             );
 
-        $installer->getConnection()->createTable($table);
-        $installer->endSetup();
+        $setup->getConnection()->createTable($table);
+
+        $setup->endSetup();
     }
 }

Setup/InstallSchema.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace PCAPredict\Tag\Setup;
+
+use Magento\Framework\Setup\UninstallInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+
+class Uninstall implements UninstallInterface
+{
+    /**
+     * Module uninstall code.
+     * This will only run if uninstalled via composer.
+     *
+     * @param SchemaSetupInterface $setup
+     * @param ModuleContextInterface $context
+     * @return void
+     */
+    public function uninstall(SchemaSetupInterface $setup, ModuleContextInterface $context) {
+        
+        $setup->startSetup();
+        $setup->getConnection()->dropTable($connection->getTableName('pcapredict_tag_settingsdata'));
+        $setup->endSetup();
+    }
+}

Setup/Uninstall.php

@@ -0,0 +1,46 @@
+<?php 
+
+namespace PCAPredict\Tag\Setup;
+ 
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+
+// Upgrade will only trigger if the setup_version in the module.xml is increased.
+class UpgradeData implements UpgradeDataInterface {
+ 
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context ) {
+        
+        // Take all current records and set the current version of the app as the module_version.
+        // Tidy up by taking either the row which has id 1 as this was what the old logic looked for.
+        // If there is id=1 then simply keep the row with the latest creation time as this logic is what will 
+        // be used when checking for credentials, even though one record will still only be needed.
+        if (version_compare($context->getVersion(), '2.0.7') < 0) {
+
+            $tableName = $setup->getTable('pcapredict_tag_settingsdata');
+
+            $select = $setup->getConnection()->select()->from($tableName);
+
+            $result = $setup->getConnection()->fetchAll($select);
+
+            foreach ($result as $row) 
+            {
+                // Set the new module_version column with the current of the app.
+                // Because we do not know what vesion they logged in under set to the last version will have to do.
+                $setup->updateTableRow($tableName, 'id', $row['id'], 'module_version', $context->getVersion());
+            }
+
+            $select = $setup->getConnection()->select()->from($tableName)->where('id = 1');
+
+            $row = $this->setup->getConnection()->fetchOne($select);
+
+            var_dump($row);
+
+            $select2 = $setup->getConnection()->select()->from($tableName)->where('id = 2');
+
+            $row2 = $this->setup->getConnection()->fetchOne($select2);
+
+            var_dump($row2);
+        }
+    }
+}

Setup/UpgradeData.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace PCAPredict\Tag\Setup;
+
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\DB\Ddl\Table;
+
+// Upgrade will only trigger if the setup_version in the module.xml is increased.
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context){
+        
+        $setup->startSetup();
+  
+        if(!$context->getVersion()) {
+            // No previous version found.
+        }
+ 
+        if (version_compare($context->getVersion(), '2.0.7') < 0) {
+
+            // Get module table
+            $tableName = $setup->getTable('pcapredict_tag_settingsdata');
+
+            // Check if the table already exists
+            if ($setup->getConnection()->isTableExists($tableName) == true) {
+
+                // Alter the id name, to long for no reason at the moment.
+                $setup->getConnection()->changeColumn($tableName, 'pcapredict_tag_settingsdata_id', 'id', 
+                [
+                    'type' => Table::TYPE_INTEGER,
+                    'nullable' => false,
+                    'identity' => true,
+                    'primary' => true, 
+                    'unsigned' => true
+                ], false);
+
+                // Remove any columns we don't need.
+                $setup->getConnection()->dropColumn($tableName, 'update_time');
+
+                // Add the version column so we can record what version of the app the creds were created from.
+                // In UpgradeData we set this column to the current version.
+                $setup->getConnection()->addColumn($tableName, 'module_version',
+                [
+                    'type' => Table::TYPE_TEXT,
+                    'length' => 16,
+                    'nullable' => true,
+                    'comment' => 'Created With App Version'
+                ]);
+            }
+        }
+
+        $setup->endSetup();
+    }
+}

Setup/UpgradeSchema.php

@@ -19,7 +19,7 @@
         ]
     },
     "type": "magento2-module",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "authors": [
         {
             "name": "PCA Predict",

composer.json

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="PCAPredict_Tag" setup_version="2.0.6">
+    <module name="PCAPredict_Tag" setup_version="2.0.7">
         <sequence>
             <module name="Magento_Store"/>
         </sequence>