Merge pull request #71 from RGBOARD/item-reorder

Item Reorder Rework

Author: PinkSylvie

app.py

@@ -318,11 +318,13 @@ def schedule_image():
     handler = RotationSystem(email=get_jwt_identity(), json_data=request.json)
     return handler.schedule_image()
 
-@app.route("/rotation/reorder", methods=['POST'])
+@app.route("/rotation/<int:item_id>/reorder", methods=['PUT'])
 @jwt_required()
-def reorder_images():
-    handler = RotationSystem(email=get_jwt_identity(), json_data=request.json)
-    return handler.reorder_images()
+def reorder_images(item_id):
+    data = request.get_json()
+    new_order = data.get('new_order')
+    handler = RotationSystem(email=get_jwt_identity())
+    return handler.reorder_images(item_id=item_id, new_order=new_order)
 
 @app.route("/rotation/rotate", methods=['POST'])
 @jwt_required()

controller/rotation_system.py

@@ -2,6 +2,7 @@
 from datetime import datetime, timedelta
 from model.rotation_system import RotationSystemDAO
 from utilities.validators import validate_required_fields
+from controller.user import User
 
 class RotationSystem:
     """
@@ -12,6 +13,8 @@ class RotationSystem:
     def __init__(self, email=None, json_data=None):
         """Initialize the handler with user email and request data."""
         self.email = email
+        if email:
+            self.user = User(email=email)
         self.json_data = json_data
         self.dao = RotationSystemDAO()
 
@@ -149,36 +152,22 @@ def schedule_image(self):
         except Exception as e:
             return jsonify({"error": str(e)}), 500
 
-    def reorder_images(self):
+    def reorder_images(self, item_id, new_order):
         """Set a custom display order for images in the rotation."""
-        try:
-            # Validate required fields
-            required_fields = ['order']
-            validation_result = validate_required_fields(self.json_data, required_fields)
-            if validation_result:
-                return validation_result
-            
-            order = self.json_data.get('order')
-            
-            # Validate order is a list
-            if not isinstance(order, list):
-                return jsonify({"error": "Order must be a list of design IDs"}), 400
-            
-            # Reorder images
-            success = self.dao.reorder_images(order)
-            
-            if success:
-                return jsonify({
-                    "success": True,
-                    "message": "Images reordered successfully"
-                }), 200
+
+        if item_id is None:
+            return jsonify(error="No id provided."), 400
+        if self.email is not None:
+            if self.user.is_admin():
+                response = self.dao.reorder_images(item_id, new_order)
+                if response == 0:
+                    return jsonify("Order updated"), 200
+                else:
+                    return jsonify(error="Couldn't update Order"), 500
             else:
-                return jsonify({
-                    "error": "Failed to reorder images"
-                }), 500
-                
-        except Exception as e:
-            return jsonify({"error": str(e)}), 500
+                return jsonify(error="Unauthorized."),
+
+        return jsonify(error="Unauthorized. No token."), 401
 
     def rotate_to_next(self):
         """Manually rotate to the next image."""

model/rotation_system.py

@@ -20,6 +20,16 @@ def _get_connection(self):
         conn.execute("PRAGMA foreign_keys = ON")
         conn.execute("PRAGMA busy_timeout = 5000;")
         return conn
+
+    def get_rotation_item_byid(self, item_id):
+        conn = self._get_connection()
+        cursor = conn.cursor()
+
+        query = "select * from rotation_queue where item_id = ?;"
+        cursor.execute(query, (item_id,))
+        result = cursor.fetchone()
+        cursor.close()
+        return result
 
     def get_active_image(self) -> Optional[Dict]:
         """
@@ -420,90 +430,31 @@ def _get_image_info_by_id(self, item_id: int) -> Optional[Dict]:
             if 'conn' in locals() and conn:
                 conn.close()
 
-    def reorder_images(self, ordered_design_ids: List[int]) -> bool:
-        """
-        Set a custom display order for images in the rotation.
-        
-        Args:
-            ordered_design_ids: List of design IDs in the desired order
-                
-        Returns:
-            Success status
-        """
-        if not ordered_design_ids:
-            print("Cannot reorder: empty list provided")
-            return False
-        
-        # Ensure no duplicate IDs in the input list
-        if len(ordered_design_ids) != len(set(ordered_design_ids)):
-            print("Cannot reorder: duplicate design IDs in the list")
-            return False
-        
-        conn = None
-        cur = None
-        
+    def reorder_images(self, item_id: int, new_order: int):
+
+        status = 1
+        query = None
+        conn = self._get_connection()
+        cursor = conn.cursor()
+        old_order = self.get_rotation_item_byid(item_id)[3]
+        now = datetime.now()
+        if new_order < old_order:
+            query = "UPDATE rotation_queue SET display_order = display_order + 1, updated_at = ? WHERE display_order >= ? AND display_order < ?"
+        elif new_order > old_order:
+            query = "UPDATE rotation_queue SET display_order = display_order - 1, updated_at = ? WHERE display_order <= ? AND display_order > ?"
         try:
-            conn = self._get_connection()
-            cur = conn.cursor()
-            
-            # Start a transaction
-            cur.execute("BEGIN TRANSACTION")
-            
-            # First, get all items
-            cur.execute("SELECT item_id, design_id FROM rotation_queue")
-            all_items = cur.fetchall()
-            
-            if not all_items:
-                print("No items found in rotation queue")
-                return False
-                
-            items = {row['design_id']: row['item_id'] for row in all_items}
-            
-            # Validate that all design IDs in the ordered list exist in the database
-            missing_designs = [design_id for design_id in ordered_design_ids if design_id not in items]
-            if missing_designs:
-                print(f"Some design IDs not found in database: {missing_designs}")
-                return False
-            
-            # Create a timestamp once for all updates
-            now = datetime.now()
-            
-            # Now update display_order for each item in the ordered list
-            for i, design_id in enumerate(ordered_design_ids):
-                cur.execute("""
-                UPDATE rotation_queue
-                SET display_order = ?, updated_at = ?
-                WHERE item_id = ?
-                """, (i+1, now, items[design_id]))
-            
-            # Update any remaining items with higher order values
-            remaining_designs = set(items.keys()) - set(ordered_design_ids)
-            next_order = len(ordered_design_ids) + 1
-            
-            for design_id in remaining_designs:
-                cur.execute("""
-                UPDATE rotation_queue
-                SET display_order = ?, updated_at = ?
-                WHERE item_id = ?
-                """, (next_order, now, items[design_id]))
-                next_order += 1
-            
+            if query:
+                cursor.execute(query, (now, new_order, old_order))
+            shift = "UPDATE rotation_queue SET display_order = ?, updated_at = ? WHERE item_id = ?"
+            cursor.execute(shift,(new_order, now, item_id))
             conn.commit()
-            print(f"Successfully reordered {len(ordered_design_ids)} images")
-            return True
-                    
-        except Exception as e:
-            if conn:
-                conn.rollback()
-            print(f"Error reordering images: {e}")
-            return False
-            
+            status = 0
+        except sqlite3.Error:
+            status = 1
         finally:
-            if cur:
-                cur.close()
-            if conn:
-                conn.close()
-    
+            cursor.close()
+            return status
+
     def get_time_left_for_current(self) -> Optional[float]:
         """
         Get the number of seconds left for the current active image.
@@ -633,8 +584,15 @@ def remove_item_from_rotation(self, item_id: int) -> bool:
             # If we deleted the active item, select a new one
             if success and item_id == active_item_id:
                 self._select_new_active_item(conn)
-            
-            # TODO: update order numbering
+
+
+            cur.execute("SELECT item_id FROM rotation_queue ORDER BY display_order ASC")
+            items = cur.fetchall()
+            for index, item in enumerate(items):
+                cur.execute(
+                "UPDATE rotation_queue SET display_order = ? WHERE item_id = ?",
+                (index + 1, item[0])
+                )
 
             conn.commit()
             return success

utilities/create.py

@@ -1,6 +1,6 @@
 import sqlite3
 
-con = sqlite3.connect('data.db')
+con = sqlite3.connect('../data.db')
 cur = con.cursor()
 
 cur.execute("""

view/src/auth/AuthProvider.jsx

@@ -297,57 +297,16 @@ export const AuthProvider = ({ children }) => {
   // Update rotation order for an item
   const updateRotationOrder = async (itemId, newOrder) => {
     try {
-      // We'll reuse the reorder endpoint with a custom order array
-      const response = await axios.get('/rotation/items', {
-        headers: {
-          'Authorization': `Bearer ${getToken()}`
-        }
-      });
-      
-      if (response.data && Array.isArray(response.data.items)) {
-        // Get all design IDs in current order
-        const currentItems = response.data.items;
-        
-        // Find the item we want to move
-        const targetItem = currentItems.find(item => item.item_id === itemId);
-        if (!targetItem) {
-          throw new Error('Item not found');
-        }
-        
-        // Remove the item from its current position
-        const filteredItems = currentItems.filter(item => item.item_id !== itemId);
-        
-        // Create a new array with the item at the new position
-        const newOrderedItems = [
-          ...filteredItems.slice(0, newOrder - 1),
-          targetItem,
-          ...filteredItems.slice(newOrder - 1)
-        ];
-        
-        // Extract just the design IDs in the new order
-        const orderedDesignIds = newOrderedItems.map(item => item.design_id);
-        
-        // Make the reorder request
-        await axios.post('/rotation/reorder', { 
-          order: orderedDesignIds 
-        }, {
-          headers: {
-            'Authorization': `Bearer ${getToken()}`
-          }
-        });
-        
-        return { success: true };
-      } else {
-        throw new Error('Failed to get current rotation items');
-      }
+      await axios.put(`/rotation/${itemId}/reorder`, {new_order: newOrder});
+      return {success: true};
     } catch (error) {
-      console.error('Update rotation order error:', error);
+      console.error('Order update error:', error);
       return {
         success: false,
-        error: error.response?.data?.error || 'Failed to update rotation order'
+        error: error.response?.data?.error || 'Failed to update item order'
       };
     }
-  };
+  }
 
   // Auth context value
   const value = {