Merge pull request #68 from NKUST-ITC/issue#66

修復最新消息在過期時間為負數的錯誤，以及顯示過期時間

src/news/news.py

@@ -156,12 +156,19 @@ def add_news(**kwargs):
         "weight": int(kwargs.get('weight', 0)),
         "imgUrl": kwargs.get('imgUrl', None),
         "url": kwargs.get('url', None),
-        "description": kwargs.get('description', None)
+        "description": kwargs.get('description', None),
+        "expireTime": None
     }
     expire_time_seconds = kwargs.get('expireTime', None)
     if kwargs.get('expireTime', False):
         utc = time_format(kwargs.get('expireTime', False))
-        expire_time_seconds = (utc-datetime.datetime.utcnow()).seconds
+        expire_time_seconds = int(
+            (utc-datetime.datetime.utcnow()).total_seconds())
+        if expire_time_seconds < 0:
+            expire_time_seconds = None
+        else:
+            news_data["expireTime"] = time_format(kwargs.get(
+                'expireTime', False)).isoformat(timespec="seconds")+"Z"
     data_dumps = json.dumps(news_data, ensure_ascii=False)
 
     red_news.set(name=news_name.format(news_id=news_id),
@@ -219,7 +226,13 @@ def update_news(news_id=None, **kwargs):
     if kwargs.get('expireTime', origin_news.get('expireTime', False)):
         utc = time_format(kwargs.get(
             'expireTime', origin_news.get('expireTime', False)))
-        expire_time_seconds = (utc-datetime.datetime.utcnow()).seconds
+        expire_time_seconds = int(
+            (utc-datetime.datetime.utcnow()).total_seconds())
+        if expire_time_seconds < 0:
+            expire_time_seconds = None
+        else:
+            news_data["expireTime"] = time_format(kwargs.get(
+                'expireTime', False)).isoformat(timespec="seconds")+"Z"
     data_dumps = json.dumps(news_data, ensure_ascii=False)
 
     red_news.set(name=news_name,