add last modified fields for feed and folder and move etag and lastmodified to http_etag and http_last_modified columns

2 files changed, 18 insertions, 7 deletions

diff --git a/db/feed.php b/db/feed.php
index f78b1f364..b339c2837 100644
--- a/db/feed.php
+++ b/db/feed.php
@@ -21,7 +21,7 @@ use \OCP\AppFramework\Db\Entity;
  * @method string getUserId()
  * @method void setUserId(string $value)
  * @method int getOrdering()
- * @method void setOrdering(int $value)
+ * @method void setOrdering(integer $value)
  * @method string getUrlHash()
  * @method void setUrlHash(string $value)
  * @method string getLocation()
@@ -30,9 +30,11 @@ use \OCP\AppFramework\Db\Entity;
  * @method string getTitle()
  * @method void setTitle(string $value)
  * @method string getLastModified()
- * @method void setLastModified(string $value)
- * @method string getEtag()
- * @method void setEtag(string $value)
+ * @method void setLastModified(integer $value)
+ * @method string getHttpLastModified()
+ * @method void setHttpLastModified(string $value)
+ * @method string getHttpEtag()
+ * @method void setHttpEtag(string $value)
  * @method string getFaviconLink()
  * @method void setFaviconLink(string $value)
  * @method integer getAdded()
@@ -78,7 +80,8 @@ class Feed extends Entity implements IAPI, \JsonSerializable {
     protected $deletedAt;
     protected $articlesPerUpdate;
     protected $lastModified;
-    protected $etag;
+    protected $httpLastModified;
+    protected $httpEtag;
     protected $location;
     protected $ordering;
     protected $fullTextEnabled;
@@ -102,6 +105,7 @@ class Feed extends Entity implements IAPI, \JsonSerializable {
         $this->addType('fullTextEnabled', 'boolean');
         $this->addType('updateMode', 'integer');
         $this->addType('updateErrorCount', 'integer');
+        $this->addType('lastModified', 'integer');
     }
 
 
@@ -131,7 +135,8 @@ class Feed extends Entity implements IAPI, \JsonSerializable {
             'updateErrorCount',
             'lastUpdateError',
             'basicAuthUser',
-            'basicAuthPassword'
+            'basicAuthPassword',
+            'lastModified'
         ]);
 
         $url = parse_url($this->link)['host'];
@@ -158,7 +163,8 @@ class Feed extends Entity implements IAPI, \JsonSerializable {
             'unreadCount',
             'ordering',
             'link',
-            'pinned'
+            'pinned',
+            'lastModified'
         ]);
     }
 
diff --git a/db/folder.php b/db/folder.php
index 6d4af1aa3..8d1432a73 100644
--- a/db/folder.php
+++ b/db/folder.php
@@ -28,6 +28,9 @@ use \OCP\AppFramework\Db\Entity;
  * @method void setOpened(boolean $value)
  * @method integer getDeletedAt()
  * @method void setDeletedAt(integer $value)
+ * @method integer getLastModified()
+ * @method void setLastModified(integer $value)
+
  */
 class Folder extends Entity implements IAPI, \JsonSerializable {
 
@@ -38,11 +41,13 @@ class Folder extends Entity implements IAPI, \JsonSerializable {
     protected $userId;
     protected $opened;
     protected $deletedAt;
+    protected $lastModified;
 
     public function __construct(){
         $this->addType('parentId', 'integer');
         $this->addType('opened', 'boolean');
         $this->addType('deletedAt', 'integer');
+        $this->addType('lastModified', 'integer');
     }
 
     /**