Add timestamps for all entities in milisecond unix time format

3 files changed, 14 insertions, 16 deletions

diff --git a/service/feedservice.php b/service/feedservice.php
index 88087a874..2d9bc6728 100644
--- a/service/feedservice.php
+++ b/service/feedservice.php
@@ -18,7 +18,6 @@ use HTMLPurifier;
 use OCP\ILogger;
 use OCP\IL10N;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Utility\ITimeFactory;
 
 use OCA\News\Db\Feed;
 use OCA\News\Db\Item;
@@ -27,6 +26,7 @@ use OCA\News\Db\ItemMapper;
 use OCA\News\Fetcher\Fetcher;
 use OCA\News\Fetcher\FetcherException;
 use OCA\News\Config\Config;
+use OCA\News\Utility\Time;
 
 
 class FeedService extends Service {
@@ -46,7 +46,7 @@ class FeedService extends Service {
                                 ItemMapper $itemMapper,
                                 ILogger $logger,
                                 IL10N $l10n,
-                                ITimeFactory $timeFactory,
+                                Time $timeFactory,
                                 Config $config,
                                 HTMLPurifier $purifier,
                                 $LoggerParameters){
@@ -315,7 +315,6 @@ class FeedService extends Service {
         // if the feed does not exist, create a separate feed for them
         foreach ($json as $entry) {
             $item = Item::fromImport($entry);
-            $item->setLastModified($this->timeFactory->getTime());
             $feedLink = $entry['feedLink'];  // this is not set on the item yet
 
             if(array_key_exists($feedLink, $feedsDict)) {
diff --git a/service/folderservice.php b/service/folderservice.php
index 0212c682c..e7daf836e 100644
--- a/service/folderservice.php
+++ b/service/folderservice.php
@@ -13,11 +13,11 @@
 
 namespace OCA\News\Service;
 
-use \OCP\IL10N;
-use \OCP\AppFramework\Utility\ITimeFactory;
-use \OCA\News\Db\Folder;
-use \OCA\News\Db\FolderMapper;
-use \OCA\News\Config\Config;
+use OCP\IL10N;
+use OCA\News\Db\Folder;
+use OCA\News\Db\FolderMapper;
+use OCA\News\Config\Config;
+use OCA\News\Utility\Time;
 
 
 class FolderService extends Service {
@@ -29,7 +29,7 @@ class FolderService extends Service {
 
     public function __construct(FolderMapper $folderMapper,
                                 IL10N $l10n,
-                                ITimeFactory $timeFactory,
+                                Time $timeFactory,
                                 Config $config){
         parent::__construct($folderMapper);
         $this->l10n = $l10n;
diff --git a/service/itemservice.php b/service/itemservice.php
index a571c15ac..8bbb54d49 100644
--- a/service/itemservice.php
+++ b/service/itemservice.php
@@ -15,12 +15,12 @@ namespace OCA\News\Service;
 
 use OCP\IConfig;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Utility\ITimeFactory;
 
 use OCA\News\Db\ItemMapper;
 use OCA\News\Db\StatusFlag;
 use OCA\News\Db\FeedType;
 use OCA\News\Config\Config;
+use OCA\News\Utility\Time;
 
 
 class ItemService extends Service {
@@ -33,7 +33,7 @@ class ItemService extends Service {
 
     public function __construct(ItemMapper $itemMapper,
                                 StatusFlag $statusFlag,
-                                ITimeFactory $timeFactory,
+                                Time $timeFactory,
                                 Config $config,
                                 IConfig $systemConfig){
         parent::__construct($itemMapper);
@@ -126,7 +126,6 @@ class ItemService extends Service {
                 $guidHash, $feedId, $userId
             );
 
-            $item->setLastModified($this->timeFactory->getTime());
             if($isStarred){
                 $item->setStarred();
             } else {
@@ -148,7 +147,7 @@ class ItemService extends Service {
      * @throws ServiceNotFoundException if the item does not exist
      */
     public function read($itemId, $isRead, $userId){
-        $lastModified = $this->timeFactory->getTime();
+        $lastModified = $this->timeFactory->getMicroTime();
         $this->itemMapper->readItem($itemId, $isRead, $lastModified, $userId);
     }
 
@@ -160,7 +159,7 @@ class ItemService extends Service {
      * @param string $userId the name of the user
      */
     public function readAll($highestItemId, $userId){
-        $time = $this->timeFactory->getTime();
+        $time = $this->timeFactory->getMicroTime();
         $this->itemMapper->readAll($highestItemId, $time, $userId);
     }
 
@@ -173,7 +172,7 @@ class ItemService extends Service {
      * @param string $userId the name of the user
      */
     public function readFolder($folderId, $highestItemId, $userId){
-        $time = $this->timeFactory->getTime();
+        $time = $this->timeFactory->getMicroTime();
         $this->itemMapper->readFolder(
             $folderId, $highestItemId, $time, $userId
         );
@@ -188,7 +187,7 @@ class ItemService extends Service {
      * @param string $userId the name of the user
      */
     public function readFeed($feedId, $highestItemId, $userId){
-        $time = $this->timeFactory->getTime();
+        $time = $this->timeFactory->getMicroTime();
         $this->itemMapper->readFeed($feedId, $highestItemId, $time, $userId);
     }