[files] when getting files add a last_modified flag telling the brows…

…er to get the file from its cache + refactoring
EvanBldy · Jul 15, 2024 · 0a76ba1 · 0a76ba1
1 parent 9745413
commit 0a76ba1
Show file tree

Hide file tree

Showing 8 changed files with 225 additions and 250 deletions.
diff --git a/zou/app/blueprints/comments/resources.py b/zou/app/blueprints/comments/resources.py
@@ -5,7 +5,7 @@
 from flask_jwt_extended import jwt_required
 
 from zou.app.mixin import ArgsMixin
-from zou.app.utils import permissions
+from zou.app.utils import permissions, date_helpers
 
 from zou.app.services import (
     chats_service,
@@ -80,6 +80,9 @@ def get(self, attachment_file_id, file_name):
                 as_attachment=False,
                 download_name=attachment_file["name"],
                 max_age=config.CLIENT_CACHE_MAX_AGE,
+                last_modified=date_helpers.get_datetime_from_string(
+                    self.preview_file["updated_at"]
+                ),
             )
         except Exception:
             current_app.logger.error(

diff --git a/zou/app/blueprints/crud/entity.py b/zou/app/blueprints/crud/entity.py
@@ -23,7 +23,7 @@
     user_service,
     concepts_service,
 )
-from zou.app.utils import events, fields, date_helpers
+from zou.app.utils import events, date_helpers
 
 from werkzeug.exceptions import NotFound
 
@@ -187,11 +187,11 @@ def save_version_if_needed(self, shot, previous_shot):
         version = None
         if frame_in != pframe_in or frame_out != pframe_out or name != pname:
             current_user_id = persons_service.get_current_user()["id"]
-            previous_updated_at = fields.get_date_object(
-                previous_shot["updated_at"], date_format="%Y-%m-%dT%H:%M:%S"
+            previous_updated_at = date_helpers.get_datetime_from_string(
+                previous_shot["updated_at"]
             )
-            updated_at = fields.get_date_object(
-                shot["updated_at"], date_format="%Y-%m-%dT%H:%M:%S"
+            updated_at = date_helpers.get_datetime_from_string(
+                shot["updated_at"]
             )
             if (
                 date_helpers.get_date_diff(previous_updated_at, updated_at)

diff --git a/zou/app/blueprints/events/resources.py b/zou/app/blueprints/events/resources.py
@@ -2,7 +2,7 @@
 from flask_jwt_extended import jwt_required
 
 from zou.app.mixin import ArgsMixin
-from zou.app.utils import fields, permissions
+from zou.app.utils import fields, permissions, date_helpers
 
 from zou.app.services import events_service
 from zou.app.services.exception import WrongParameterException
@@ -105,8 +105,6 @@ def get(self):
         permissions.check_manager_permissions()
         before = None
         if args["before"] is not None:
-            before = fields.get_date_object(
-                args["before"], "%Y-%m-%dT%H:%M:%S"
-            )
+            before = date_helpers.get_datetime_from_string(args["before"])
         page_size = args["page_size"]
         return events_service.get_last_login_logs(before, page_size)
diff --git a/zou/app/blueprints/files/resources.py b/zou/app/blueprints/files/resources.py
@@ -32,7 +32,10 @@
 
 
 def send_storage_file(
-    working_file_id, as_attachment=False, max_age=config.CLIENT_CACHE_MAX_AGE
+    working_file_id,
+    as_attachment=False,
+    max_age=config.CLIENT_CACHE_MAX_AGE,
+    last_modified=None,
 ):
     """
     Send file from storage. If it's not a local storage, cache the file in
@@ -60,6 +63,7 @@ def send_storage_file(
             as_attachment=as_attachment,
             download_name=download_name,
             max_age=max_age,
+            last_modified=last_modified,
         )
     except IOError as e:
         current_app.logger.error(e)
@@ -125,8 +129,13 @@ def get(self, working_file_id):
               schema:
                 type: file
         """
-        self.check_access(working_file_id)
-        return send_storage_file(working_file_id)
+        working_file = self.check_access(working_file_id)
+        return send_storage_file(
+            working_file_id,
+            last_modified=date_helpers.get_datetime_from_string(
+                working_file["updated_at"]
+            ),
+        )
 
     @jwt_required()
     def post(self, working_file_id):

diff --git a/zou/app/blueprints/previews/__init__.py b/zou/app/blueprints/previews/__init__.py
@@ -14,14 +14,13 @@
     PreviewFilePreviewResource,
     PreviewFileOriginalResource,
     PreviewFileTileResource,
-    CreateOrganisationThumbnailResource,
     OrganisationThumbnailResource,
-    CreateProjectThumbnailResource,
+    CreateOrganisationThumbnailResource,
     ProjectThumbnailResource,
-    CreatePersonThumbnailResource,
+    CreateProjectThumbnailResource,
     PersonThumbnailResource,
+    CreatePersonThumbnailResource,
     RunningPreviewFiles,
-    LegacySetMainPreviewResource,
     SetMainPreviewResource,
     UpdateAnnotationsResource,
     UpdatePreviewPositionResource,
@@ -118,10 +117,6 @@
         "/pictures/preview-background-files/<instance_id>.<extension>",
         PreviewBackgroundFileResource,
     ),
-    (
-        "/actions/entities/<entity_id>/set-main-preview/<preview_file_id>",
-        LegacySetMainPreviewResource,
-    ),
     (
         "/actions/preview-files/<preview_file_id>/set-main-preview",
         SetMainPreviewResource,