Add column publication status for cloud (#72)

Added days parameter for flexibility.
Removed redundant elif. Handling future date at the beginning.
Used diff_days instead of timedelta comparison for clarity.
Used dict.update() for cleaner dictionary updates.
Used f-strings for better readability.

Author: garaimanoj

monitoring/publishing/templates/cloudsites.html

@@ -18,13 +18,15 @@ <h2>Sites publishing cloud accounting records in the last year</h2>
       <th class='tableheader'>VMsInLastUpdate</th>
       <th class='tableheader'>CloudType</th>
       <th class='tableheader'>LastUpdated</th>
+      <th class='tableheader'>Publication Status</th>
     </tr>
     {% for site in sites %}
     <tr onmouseover="this.className='highlight-row'" onmouseout="this.className='tabletext'" class="tabletext">
       <td>{{ site.SiteName }}</td>
       <td>{{ site.Vms }}</td>
       <td>{{ site.Script }}</td>
       <td>{{ site.updated|date:"Y-m-d H:i:s" }}</td>
+      <td>{{ site.stdout }}</td>
     </tr>
     {% endfor %}
   </table>

monitoring/publishing/views.py

@@ -26,20 +26,32 @@
     GridSiteSyncSubmitHSerializer
 )
 
+def update_dict_stdout_and_returncode(single_dict, date, days=7):
+    today = datetime.today()
+
+    # Handle future dates
+    if date > today:
+        single_dict.update({
+            'returncode': 3,
+            'stdout': "UNKNOWN"
+        })
+        return single_dict
+
+    diff_days = (today - date).days
+    formatted_date = date.strftime("%Y-%m-%d")
+
+    if diff_days <= days:
+        status = "OK"
+        returncode = 0
+    else:
+        status = "WARNING"
+        returncode = 1
 
-def update_dict_stdout_and_returncode(single_dict, date):
-    diff = datetime.today() - date
-    date = date.strftime("%Y-%m-%d")
+    single_dict.update({
+        'returncode': returncode,
+        'stdout': f"{status} [ last published {diff_days} days ago: {formatted_date} ]"
+    })
 
-    if diff <= timedelta(days=7):
-        single_dict['returncode'] = 0
-        single_dict['stdout'] = "OK [ last published %s days ago: %s ]" % (diff.days, date)
-    elif diff > timedelta(days=7):
-        single_dict['returncode'] = 1
-        single_dict['stdout'] = "WARNING [ last published %s days ago: %s ]" % (diff.days, date)
-    else:
-        single_dict['returncode'] = 3
-        single_dict['stdout'] = "UNKNOWN"
     return single_dict
 
 
@@ -203,11 +215,18 @@ def list(self, request):
         if last_fetched is not None:
             print(last_fetched.replace(tzinfo=None), datetime.today() - timedelta(hours=1, seconds=20))
 
+        final_response = []
         response = super(CloudSiteViewSet, self).list(request)
+
+        for single_dict in response.data:
+            date = single_dict.get('updated').replace(tzinfo=None)
+            single_dict = update_dict_stdout_and_returncode(single_dict, date)
+            final_response.append(single_dict)
+
         # Wrap data in a dict so that it can display in template.
         if type(request.accepted_renderer) is TemplateHTMLRenderer:
             response.data = {
-                'sites': response.data,
+                'sites': final_response,
                 'last_fetched': last_fetched
             }
         return response