Fix minor issues, prepare for foreign keys and check feeds

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

2 files changed, 85 insertions, 3 deletions

diff --git a/lib/Migration/MigrateConfig.php b/lib/Migration/MigrateConfig.php
index 50d335892..9f3b32291 100644
--- a/lib/Migration/MigrateConfig.php
+++ b/lib/Migration/MigrateConfig.php
@@ -31,6 +31,13 @@ class MigrateConfig implements IRepairStep
     private $iConfig;
 
     /**
+     * Array of defaults
+     *
+     * @var array
+     */
+    private $defaults;
+
+    /**
      * @param LegacyConfig $config
      * @param IConfig      $iConfig
      * @param Application  $application To make sure the class is found below
@@ -39,6 +46,7 @@ class MigrateConfig implements IRepairStep
     {
         $this->config = $config;
         $this->iConfig = $iConfig;
+        $this->defaults = $application::DEFAULT_SETTINGS;
     }
 
     public function getName()
@@ -53,15 +61,15 @@ class MigrateConfig implements IRepairStep
             return;
         }
 
-        $app_keys = $this->iConfig->getAppKeys(Application::NAME);
+        $app_keys = $this->iConfig->getAppKeys('news');
         foreach ($this->config as $key => $value) {
-            if (!isset(Application::DEFAULT_SETTINGS[$key])) {
+            if (!isset($this->defaults[$key])) {
                 continue;
             }
             if (in_array($key, $app_keys)) {
                 continue;
             }
-            $this->iConfig->setAppValue(Application::NAME, $key, $value);
+            $this->iConfig->setAppValue('news', $key, $value);
         }
     }
 }
diff --git a/lib/Migration/Version150004Date20201009183830.php b/lib/Migration/Version150004Date20201009183830.php
new file mode 100644
index 000000000..c6267ac04
--- /dev/null
+++ b/lib/Migration/Version150004Date20201009183830.php
@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\News\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Auto-generated migration step: Please modify to your needs!
+ */
+class Version150004Date20201009183830 extends SimpleMigrationStep {
+
+    protected $connection;
+
+    public function __construct(IDBConnection $connection)
+    {
+        $this->connection = $connection;
+    }
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('news_items') &&
+            $schema->getTable('news_items')->hasColumn('feed_id')) {
+            $schema->getTable('news_items')
+                ->getColumn('feed_id')
+                ->setNotnull(true)
+                ->setUnsigned(true);
+        }
+        if ($schema->hasTable('news_feeds') &&
+            $schema->getTable('news_feeds')->hasColumn('folder_id')) {
+            $schema->getTable('news_feeds')
+                ->getColumn('folder_id')
+                ->setUnsigned(true)
+                ->setNotnull(false)
+                ->setDefault(null);
+        }
+
+        return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+	    $item_name = $this->connection->getQueryBuilder()->getTableName('news_items');
+	    $feed_name = $this->connection->getQueryBuilder()->getTableName('news_feeds');
+
+	    $items_query = "DELETE FROM ${item_name} WHERE ${item_name}.`feed_id` NOT IN (SELECT DISTINCT id FROM ${feed_name})";
+        $this->connection->executeQuery($items_query);
+	}
+}