add night filter for image redirects

aaronwmorris · Sep 3, 2024 · 88f7e9d · 88f7e9d
1 parent a436e31
commit 88f7e9d
Showing 1 changed file with 32 additions and 10 deletions.
diff --git a/indi_allsky/flask/views.py b/indi_allsky/flask/views.py
@@ -358,11 +358,22 @@ def dispatch_request(self):
 
 
     def getLatestImage(self, camera_id, night=None):
-        latest_image_entry = self.model.query\
-            .join(self.model.camera)\
-            .filter(IndiAllSkyDbCameraTable.id == camera_id)\
-            .order_by(self.model.createDate.desc())\
-            .first()
+        if isinstance(night, type(None)):
+            latest_image_entry = self.model.query\
+                .join(self.model.camera)\
+                .filter(IndiAllSkyDbCameraTable.id == camera_id)\
+                .order_by(self.model.createDate.desc())\
+                .first()
+        else:
+            # filter based on night
+            night_bool = bool(int(night))
+
+            latest_image_entry = self.model.query\
+                .join(self.model.camera)\
+                .filter(IndiAllSkyDbCameraTable.id == camera_id)\
+                .filter(self.model.night == night_bool)\
+                .order_by(self.model.createDate.desc())\
+                .first()
 
 
         return latest_image_entry
@@ -485,11 +496,22 @@ def dispatch_request(self):
 
 
     def getLatestImage(self, camera_id, night=None):
-        latest_image_entry = self.model.query\
-            .join(self.model.camera)\
-            .filter(IndiAllSkyDbCameraTable.id == camera_id)\
-            .order_by(self.model.createDate.desc())\
-            .first()
+        if isinstance(night, type(None)):
+            latest_image_entry = self.model.query\
+                .join(self.model.camera)\
+                .filter(IndiAllSkyDbCameraTable.id == camera_id)\
+                .order_by(self.model.createDate.desc())\
+                .first()
+        else:
+            # filter based on night
+            night_bool = bool(int(night))
+
+            latest_image_entry = self.model.query\
+                .join(self.model.camera)\
+                .filter(IndiAllSkyDbCameraTable.id == camera_id)\
+                .filter(self.model.night == night_bool)\
+                .order_by(self.model.createDate.desc())\
+                .first()
 
 
         return latest_image_entry