Add new field nextUpdateTime to feed

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>

Author: Grotax

lib/Db/Feed.php

@@ -83,6 +83,8 @@ class Feed extends Entity implements IAPI, \JsonSerializable
     protected $basicAuthUser = '';
     /** @var string|null */
     protected $basicAuthPassword = '';
+    /** @var string|null */
+    protected $nextUpdateTime = '';
     /** @var Item[] */
     public $items = [];
 
@@ -110,6 +112,7 @@ public function __construct()
         $this->addType('lastUpdateError', 'string');
         $this->addType('basicAuthUser', 'string');
         $this->addType('basicAuthPassword', 'string');
+        $this->addType('nextUpdateTime', 'string');
     }
 
     /**
@@ -296,6 +299,14 @@ public function getUserId(): string
         return $this->userId;
     }
 
+    /**
+     * @return string
+     */
+    public function getNextUpdateTime(): string
+    {
+        return $this->nextUpdateTime;
+    }
+
     /**
      * Turns entity attributes into an array
      */
@@ -323,7 +334,8 @@ public function jsonSerialize(): array
             'updateErrorCount',
             'lastUpdateError',
             'basicAuthUser',
-            'basicAuthPassword'
+            'basicAuthPassword',
+            'nextUpdateTime'
         ]);
 
         if (is_null($this->link)) {
@@ -648,6 +660,15 @@ public function setUserId(string $userId): Feed
         return $this;
     }
 
+    /**
+     * @param string $nextUpdateTime
+     */
+    public function setNextUpdateTime(string $nextUpdateTime): void
+    {
+        $this->nextUpdateTime = $nextUpdateTime;
+        $this->markFieldUpdated('nextUpdateTime');
+    }
+
     public function toAPI(): array
     {
         return $this->serializeFields(
@@ -664,7 +685,8 @@ public function toAPI(): array
                 'pinned',
                 'updateErrorCount',
                 'lastUpdateError',
-                'items'
+                'items',
+                'nextUpdateTime'
             ]
         );
     }
@@ -679,7 +701,8 @@ public function toAPI2(bool $reduced = false): array
             'ordering' => $this->getOrdering(),
             'fullTextEnabled' => $this->getFullTextEnabled(),
             'updateMode' => $this->getUpdateMode(),
-            'isPinned' => $this->getPinned()
+            'isPinned' => $this->getPinned(),
+            'nextUpdateTime' => $this->getNextUpdateTime(),
         ];
 
         if (!is_null($this->getLastUpdateError()) || trim($this->getLastUpdateError()) !== '') {

lib/Fetcher/FeedFetcher.php

@@ -145,6 +145,8 @@ public function fetch(
             $location
         );
 
+        $feed->setNextUpdateTime($resource->getNextUpdate()->getTimestamp());
+
         if (!is_null($resource->getResponse()->getLastModified())) {
             $feed->setHttpLastModified($resource->getResponse()->getLastModified()->format(DateTime::RSS));
         } elseif (!is_null($lastModified)) {

lib/Migration/Version250000Date20240817095614.php

@@ -32,7 +32,7 @@
 use OCP\Migration\SimpleMigrationStep;
 
 /**
- * FIXME Auto-generated migration step: Please modify to your needs!
+ * allows the title of a news feed to be null
  */
 class Version250000Date20240817095614 extends SimpleMigrationStep {
 

lib/Migration/Version250200Date20241219085150.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\News\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Adds the next_update_time column to the feeds table
+ */
+class Version250200Date20241219085150 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		$schema = $schemaClosure();
+
+        $table = $schema->getTable('news_feeds');
+        if (!$table->hasColumn('next_update_time')) {
+            $table->addColumn('next_update_time', 'string', [
+                'notnull' => false
+            ]);
+        }
+
+        return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+	}
+}