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

5 files changed, 26 insertions, 22 deletions

diff --git a/tests/integration/fixtures/feedfixture.php b/tests/integration/fixtures/feedfixture.php
index cc8e2e159..25c1cbf46 100644
--- a/tests/integration/fixtures/feedfixture.php
+++ b/tests/integration/fixtures/feedfixture.php
@@ -33,8 +33,9 @@ class FeedFixture extends Feed {
             'preventUpdate' => false,
             'deletedAt' => 0,
             'articlesPerUpdate' => 40,
-            'lastModified' => 10,
-            'etag' => '',
+            'httpLastModified' => 10,
+            'httpEtag' => '',
+            'lastModified' => 9,
             'location' => 'http://feed.com/rss',
             'ordering' => 0,
             'fullTextEnabled' => false,
diff --git a/tests/integration/fixtures/folderfixture.php b/tests/integration/fixtures/folderfixture.php
index 2c884c6ed..2dc6b3a44 100644
--- a/tests/integration/fixtures/folderfixture.php
+++ b/tests/integration/fixtures/folderfixture.php
@@ -26,7 +26,7 @@ class FolderFixture extends Folder {
             'userId' => 'test',
             'opened' => true,
             'deletedAt' => 0,
-
+            'lastModified' => 9
         ], $defaults);
         unset($defaults['feeds']);
         $this->fillDefaults($defaults);
diff --git a/tests/unit/db/FeedTest.php b/tests/unit/db/FeedTest.php
index d5f101c09..fdcdc3c53 100644
--- a/tests/unit/db/FeedTest.php
+++ b/tests/unit/db/FeedTest.php
@@ -20,8 +20,9 @@ class FeedTest extends \PHPUnit_Framework_TestCase {
     private function createFeed() {
         $feed = new Feed();
         $feed->setId(3);
-        $feed->setLastModified(44);
-        $feed->setEtag(45);
+        $feed->setLastModified(43);
+        $feed->setHttpLastModified(44);
+        $feed->setHttpEtag(45);
         $feed->setUrl('http://google.com/some/weird/path');
         $feed->setTitle('title');
         $feed->setFaviconLink('favicon');
@@ -55,6 +56,7 @@ class FeedTest extends \PHPUnit_Framework_TestCase {
             'ordering' => 2,
             'pinned' => true,
             'link' => 'https://www.google.com/some/weird/path',
+            'lastModified' => 43
         ], $feed->toAPI());
     }
 
@@ -85,7 +87,8 @@ class FeedTest extends \PHPUnit_Framework_TestCase {
             'updateErrorCount' => 2,
             'lastUpdateError' => 'hi',
             'basicAuthUser' => 'user',
-            'basicAuthPassword' => 'password'
+            'basicAuthPassword' => 'password',
+            'lastModified' => 43
         ], $feed->jsonSerialize());
     }
 
diff --git a/tests/unit/fetcher/FeedFetcherTest.php b/tests/unit/fetcher/FeedFetcherTest.php
index f6a03afa2..33383910e 100644
--- a/tests/unit/fetcher/FeedFetcherTest.php
+++ b/tests/unit/fetcher/FeedFetcherTest.php
@@ -249,8 +249,8 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
         $feed->setUrl($this->url);
         $feed->setLink($this->feedLink);
         $feed->setAdded($this->time);
-        $feed->setLastModified($this->modified);
-        $feed->setEtag($this->etag);
+        $feed->setHttpLastModified($this->modified);
+        $feed->setHttpEtag($this->etag);
         $feed->setLocation($this->location);
 
         if($hasFavicon) {
diff --git a/tests/unit/service/FeedServiceTest.php b/tests/unit/service/FeedServiceTest.php
index a6cee6159..efd7e5f33 100644
--- a/tests/unit/service/FeedServiceTest.php
+++ b/tests/unit/service/FeedServiceTest.php
@@ -252,8 +252,8 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
         $feed->setLink('http://test');
         $feed->setUrl('http://test');
         $feed->setUrlHash('yo');
-        $feed->setLastModified(3);
-        $feed->setEtag(4);
+        $feed->setHttpLastModified(3);
+        $feed->setHttpEtag(4);
 
         $item = new Item();
         $item->setGuidHash(md5('hi'));
@@ -313,8 +313,8 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
         $feed->setLink('http://test');
         $feed->setUrl('http://test');
         $feed->setUrlHash('yo');
-        $feed->setLastModified(3);
-        $feed->setEtag(4);
+        $feed->setHttpLastModified(3);
+        $feed->setHttpEtag(4);
 
         $item = new Item();
         $item->setGuidHash(md5('hi'));
@@ -374,8 +374,8 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
         $feed->setLink('http://test');
         $feed->setUrl('http://test');
         $feed->setUrlHash('yo');
-        $feed->setLastModified(3);
-        $feed->setEtag(4);
+        $feed->setHttpLastModified(3);
+        $feed->setHttpEtag(4);
         return $feed;
     }
 
@@ -574,8 +574,8 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
         $feed = new Feed();
         $feed->setId(3);
         $feed->setUrl('https://goo.com');
-        $feed->setEtag('abc');
-        $feed->setLastModified(123);
+        $feed->setHttpEtag('abc');
+        $feed->setHttpLastModified(123);
         $feed->setFullTextEnabled(true);
 
         $ex = new DoesNotExistException('');
@@ -590,8 +590,8 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
             ->method('fetch')
             ->with($this->equalTo($feed->getUrl()),
                    $this->equalTo(false),
-                   $this->equalTo($feed->getLastModified()),
-                   $this->equalTo($feed->getEtag()),
+                   $this->equalTo($feed->getHttpLastModified()),
+                   $this->equalTo($feed->getHttpEtag()),
                    $this->equalTo($feed->getFullTextEnabled()))
             ->will($this->throwException($ex));
 
@@ -997,8 +997,8 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
     public function testPatchEnableFullText() {
         $feed = Feed::fromRow([
             'id' => 3,
-            'etag' => 'a',
-            'last_modified' => 1,
+            'http_etag' => 'a',
+            'http_last_modified' => 1,
             'full_text_enabled' => false
         ]);
         $feed2 = Feed::fromRow(['id' => 3]);
@@ -1009,8 +1009,8 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
             ->will($this->returnValue($feed));
 
         $feed2->setFullTextEnabled(true);
-        $feed2->setEtag('');
-        $feed2->setLastModified(0);
+        $feed2->setHttpEtag('');
+        $feed2->setHttpLastModified(0);
         $this->feedMapper->expects($this->at(1))
             ->method('update')
             ->with($this->equalTo($feed2));