From 2a56362fef239879acc8c79d3277dfe472123ca6 Mon Sep 17 00:00:00 2001
From: Timon de Groot <timon@mooore.nl>
Date: Fri, 16 Oct 2020 14:54:28 +0200
Subject: [PATCH 1/3] Refactor schema setup into db_schema.xml and
 db_schema_whitelist.json

---
 Setup/InstallSchema.php      | 137 -----------------------------------
 etc/db_schema.xml            |  28 +++++++
 etc/db_schema_whitelist.json |  34 +++++++++
 etc/module.xml               |   2 +-
 4 files changed, 63 insertions(+), 138 deletions(-)
 delete mode 100644 Setup/InstallSchema.php
 create mode 100644 etc/db_schema.xml
 create mode 100644 etc/db_schema_whitelist.json

diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
deleted file mode 100644
index 1adfdd4..0000000
--- a/Setup/InstallSchema.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-namespace Wuunder\Wuunderconnector\Setup;
-
-use Magento\Framework\Setup\InstallSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Ddl\Table;
-
-class InstallSchema implements InstallSchemaInterface
-{
-    /**
-     * install tables
-     *
-     * @param \Magento\Framework\Setup\SchemaSetupInterface $setup
-     * @param \Magento\Framework\Setup\ModuleContextInterface $context
-     * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-        if (!$installer->tableExists('wuunder_shipment')) {
-            $table = $installer->getConnection()->newTable(
-                $installer->getTable('wuunder_shipment')
-            )
-                ->addColumn(
-                    'shipment_id',
-                    Table::TYPE_INTEGER,
-                    null,
-                    [
-                        'identity' => true,
-                        'nullable' => false,
-                        'primary'  => true,
-                        'unsigned' => true,
-                    ],
-                    'Shipment ID'
-                )
-                ->addColumn(
-                    'order_id',
-                    Table::TYPE_INTEGER,
-                    null,
-                    ['nullable => false'],
-                    'Shipment Name'
-                )
-                ->addColumn(
-                    'label_id',
-                    Table::TYPE_INTEGER,
-                    null,
-                    ['nullable => true'],
-                    'Shipment label id'
-                )
-                ->addColumn(
-                    'label_url',
-                    Table::TYPE_TEXT,
-                    '64k',
-                    ['nullable => true'],
-                    'Shipment label url'
-                )
-                ->addColumn(
-                    'tt_url',
-                    Table::TYPE_TEXT,
-                    '64k',
-                    ['nullable => true'],
-                    'Shipment T&T url'
-                )
-                ->addColumn(
-                    'booking_url',
-                    Table::TYPE_TEXT,
-                    '64k',
-                    ['nullable => true'],
-                    'Shipment booking url'
-                )
-                ->addColumn(
-                    'booking_token',
-                    Table::TYPE_TEXT,
-                    '64k',
-                    ['nullable => false'],
-                    'Shipment booking token'
-                )
-                ->setComment('Wuunder shipment table');
-            $installer->getConnection()->createTable($table);
-        }
-
-        if (!$installer->tableExists('wuunder_quote_id')) {
-            $table = $installer->getConnection()->newTable(
-                $installer->getTable('wuunder_quote_id')
-            )
-                ->addColumn(
-                    'id',
-                    Table::TYPE_INTEGER,
-                    null,
-                    [
-                        'identity' => true,
-                        'nullable' => false,
-                        'primary'  => true,
-                        'unsigned' => true,
-                    ],
-                    'ID'
-                )
-                ->addColumn(
-                    'quote_id',
-                    Table::TYPE_INTEGER,
-                    null,
-                    ['nullable => false'],
-                    'Quote Info'
-                )
-                ->addColumn(
-                    'parcelshop_id',
-                    Table::TYPE_TEXT,
-                    null,
-                    ['nullable => true'],
-                    'Parcelshop id'
-                )
-                ->setComment('Wuunder shipment table');
-            $installer->getConnection()->createTable($table);
-
-        }
-
-        $orderTable = 'sales_order';
-
-        //Order table
-        $setup->getConnection()
-            ->addColumn(
-                $setup->getTable($orderTable),
-                'wuunder_parcelshop_id',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 255,
-                    'comment' =>'Custom Attribute'
-                ]
-            );
-
-        $setup->endSetup();
-    }
-}
\ No newline at end of file
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
new file mode 100644
index 0000000..cfc64b6
--- /dev/null
+++ b/etc/db_schema.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="wuunder_shipment" resource="default" engine="innodb" comment="Wuunder Shipment Table">
+        <column xsi:type="int" name="shipment_id" padding="11" unsigned="true" nullable="false" identity="true" comment="Shipment ID"/>
+        <column xsi:type="int" name="order_id" padding="11" unsigned="true" nullable="false" comment="Order ID"/>
+        <column xsi:type="int" name="label_id" padding="11" unsigned="true" nullable="true" comment="Shipment Label ID"/>
+        <column xsi:type="text" name="label_url" nullable="true" comment="Shipment Label URL"/>
+        <column xsi:type="text" name="tt_url" nullable="true" comment="Shipment Track and Trace URL"/>
+        <column xsi:type="text" name="booking_url" nullable="true" comment="Shipment Booking URL"/>
+        <column xsi:type="text" name="booking_token" nullable="false" comment="Shipment Booking Token"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="shipment_id"/>
+        </constraint>
+    </table>
+
+    <table name="wuunder_quote_id" resource="default" engine="innodb" comment="Wuunder Shipment Table">
+        <column xsi:type="int" name="id" padding="11" unsigned="true" nullable="false" identity="true" comment="ID"/>
+        <column xsi:type="int" name="quote_id" padding="11" unsigned="true" nullable="false" comment="Quote ID"/>
+        <column xsi:type="text" name="parcelshop_id" nullable="true" comment="Parcelshop ID"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+    </table>
+
+    <table name="sales_order">
+        <column xsi:type="varchar" name="wuunder_parcelshop_id" nullable="false" length="255" comment="Wuunder Parcelshop ID"/>
+    </table>
+</schema>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
new file mode 100644
index 0000000..5dbcb19
--- /dev/null
+++ b/etc/db_schema_whitelist.json
@@ -0,0 +1,34 @@
+{
+    "wuunder_shipment": {
+        "column": {
+            "shipment_id": true,
+            "order_id": true,
+            "label_id": true,
+            "label_url": true,
+            "tt_url": true,
+            "booking_url": true,
+            "booking_token": true
+        },
+        "index": {
+            "WUUNDER_SHIPMENT_ORDER_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "wuunder_quote_id": {
+        "column": {
+            "id": true,
+            "quote_id": true,
+            "parcelshop_id": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "sales_order": {
+        "column": {
+            "wuunder_parcelshop_id": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/etc/module.xml b/etc/module.xml
index b5814ff..9b4940b 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,7 +1,7 @@
 <?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="Wuunder_Wuunderconnector" setup_version="2.2.0" active="true">
+    <module name="Wuunder_Wuunderconnector" setup_version="2.2.1" active="true">
         <sequence>
             <module name="Magento_Checkout"/>
         </sequence>

From aa37897a68f1a400db40dc33cfb06ca246182cd3 Mon Sep 17 00:00:00 2001
From: Timon de Groot <timon@mooore.nl>
Date: Fri, 16 Oct 2020 14:54:42 +0200
Subject: [PATCH 2/3] Add index on wuunder_shipment.order_id

---
 etc/db_schema.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/db_schema.xml b/etc/db_schema.xml
index cfc64b6..6729f93 100644
--- a/etc/db_schema.xml
+++ b/etc/db_schema.xml
@@ -11,6 +11,9 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="shipment_id"/>
         </constraint>
+        <index referenceId="INDEX_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
     </table>
 
     <table name="wuunder_quote_id" resource="default" engine="innodb" comment="Wuunder Shipment Table">

From bc593d9ce3024a6fa29073418929b33c13d9e89e Mon Sep 17 00:00:00 2001
From: Timon de Groot <timon@mooore.nl>
Date: Fri, 16 Oct 2020 14:58:02 +0200
Subject: [PATCH 3/3] Add EOF newline

---
 etc/db_schema_whitelist.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
index 5dbcb19..b6d04e8 100644
--- a/etc/db_schema_whitelist.json
+++ b/etc/db_schema_whitelist.json
@@ -31,4 +31,4 @@
             "wuunder_parcelshop_id": true
         }
     }
-}
\ No newline at end of file
+}