Merge branch 'main' into history-page

Author: Jandel7

app.py

@@ -35,6 +35,7 @@ def get_all_users():
     handler = User(email=get_jwt_identity())
     return handler.get_all_users()
 
+
 @app.route("/user/pagination", methods=['GET'])
 @jwt_required()
 def get_users_paginated():
@@ -50,6 +51,7 @@ def get_users_paginated():
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 
+
 @app.route("/user", methods=['POST'])
 def create_user():
     handler = User(json_data=request.json)
@@ -119,7 +121,7 @@ def handleUserById(user_id):
 def upload_design():
     handler = Design(email=get_jwt_identity())
     return handler.add_new_design(
-        title=request.form.get('title'), 
+        title=request.form.get('title'),
         pixel_data=request.form.get('pixel_data')
     )
 
@@ -129,7 +131,7 @@ def upload_design():
 def update_design_image(design_id):
     handler = Design(email=get_jwt_identity())
     return handler.update_design_image(
-        design_id=design_id, 
+        design_id=design_id,
         pixel_data=request.form.get('pixel_data')
     )
 
@@ -147,6 +149,16 @@ def get_design(design_id):
     # Use the URL param, not request.form
     return handler.get_design(design_id=design_id)
 
+@app.route("/designs", methods=['GET'])
+@jwt_required()
+def get_designs():
+    page = int(request.args.get('page', 1))  # default 1
+    page_size = int(request.args.get('page_size', 10))  # default 10
+
+    handler = Design(email=get_jwt_identity())
+    return handler.get_user_designs(page=page, page_size=page_size)
+
+
 @app.route("/design/<int:design_id>/title", methods=['PUT'])
 @jwt_required()
 def update_design_title():
@@ -178,7 +190,15 @@ def get_approved_designs():
     return jsonify(approved), 200
 
 
-#AdminAction-----------------------------------------------------------------------------------------------------------
+@app.route("/design", methods=['DELETE'])
+@jwt_required()
+def delete_design():
+    data = request.get_json()
+    handler = Design(email=get_jwt_identity())
+    return handler.delete_design(design_id=data.get('design_id'))
+
+
+# AdminAction-----------------------------------------------------------------------------------------------------------
 @app.route("/admin_action", methods=['GET', 'POST'])
 def handleAdminAction():
     if request.method == 'GET':
@@ -268,6 +288,7 @@ def get_queue_paginated():
 
     except Exception as e:
         return jsonify({'error': str(e)}), 500
+
 
 
 @app.route("/queue_item", methods=['GET'])
@@ -276,6 +297,18 @@ def handleGetQueueItems():
     items = handler.getAllQueueItem()
     return jsonify(items), 200
 
+
+
+@app.route("/queue_item/<int:queue_id>/order", methods=['PUT'])
+@jwt_required()
+def update_item_order(queue_id):
+    data = request.get_json()
+    new_order = data.get('new_order')
+    handler = QueueItem(email=get_jwt_identity())
+    return handler.update_item_order(queue_id=queue_id, new_order=new_order)
+
+
+
 @app.route("/queue_item", methods=['POST'])
 @jwt_required()
 def handleCreateQueueItem():
@@ -328,7 +361,6 @@ def handleQueueItemById(queue_id):
             return jsonify("Can not delete record because it is referenced by other records"), 400
 
 
-
 @app.route("/queue_item/scheduled", methods=['GET'])
 @jwt_required()
 def get_scheduled_designs():
@@ -391,5 +423,6 @@ def authorize():
 def callback():
     return authorize_callback()
 
+
 if __name__ == '__main__':
     app.run()

controller/design.py

@@ -1,7 +1,10 @@
 import json
-from flask import jsonify, request
+
+from flask import jsonify
+
 from controller.user import User
 from model.design import DesignDAO
+from model.queue_item import QueueItemDAO
 
 
 def serialize_design(t):
@@ -25,6 +28,11 @@ def make_json_one(t):
     return serialize_design(t)
 
 
+def is_scheduled(design_id):
+    queue_item_dao = QueueItemDAO()
+    return queue_item_dao.is_design_scheduled(design_id)
+
+
 class Design:
 
     def __init__(self, email=None):
@@ -41,14 +49,14 @@ def add_new_design(self, title=None, pixel_data=None):
             json.loads(pixel_data)
         except json.JSONDecodeError:
             return jsonify(error="Invalid pixel data format"), 400
-        
+
         if not title:
             title = "Untitled Design"
 
         user_id = self.user.get_user_id()
         if user_id is None:
             return jsonify(error='User not found'), 404
-        
+
         dao = DesignDAO()
         new_id = dao.add_new_design(user_id, title, pixel_data)
 
@@ -84,6 +92,27 @@ def get_design(self, design_id=None):
 
         return design, 200
 
+    def get_user_designs(self, user_id: int = None, page=1, page_size=10):
+        requesting_user_id = self.user.get_user_id()
+
+        if requesting_user_id is None:
+            return jsonify(error="Couldn't verify user."), 500
+
+        if user_id is None:
+            user_id = requesting_user_id
+
+        # admin can see everything, user has restrictions
+        if requesting_user_id != user_id and not self.user.is_admin():
+            return jsonify(error="Unauthorized."), 403
+
+        design_dao = DesignDAO()
+        designs = design_dao.get_designs_by_id(user_id, page, page_size)
+
+        if designs is None or len(designs) == 0:
+            return jsonify(error="No designs found."), 404
+
+        return jsonify(designs), 200
+
     def update_design_title(self, design_id, title):
         if design_id is None:
             return jsonify(error="No id provided."), 400
@@ -107,10 +136,13 @@ def update_design_title(self, design_id, title):
     def update_design_image(self, design_id, pixel_data=None):
         if design_id is None:
             return jsonify(error="No id provided."), 400
-            
+
+        if is_scheduled(design_id):
+            return jsonify(error="Design  image can't be updated when already in queue."), 400
+
         if not pixel_data:
             return jsonify(error="No pixel data provided"), 400
-            
+
         # Validate pixel_data is valid JSON
         try:
             # Parse the JSON to validate it, but store as string
@@ -179,6 +211,9 @@ def delete_design(self, design_id):
         if user_id is None:
             return jsonify(error="Couldn't verify user"), 500
 
+        if design_id is None:
+            return jsonify(error="No design id provided"), 400
+
         design_dao = DesignDAO()
         design_user_id = design_dao.get_user_id(design_id)
 
@@ -196,4 +231,3 @@ def getApprovedDesigns(self):
         approved_records = dao.getApprovedDesigns()
         answer = [serialize_design(record) for record in approved_records]
         return answer
-

controller/queue_item.py

@@ -90,6 +90,23 @@ def updateQueueItemById(self, queue_id, data):
                 result = self.make_json_one(queue_item)
                 return result
 
+        def update_item_order(self, queue_id, new_order):
+
+            if queue_id is None:
+                return jsonify(error="No id provided."), 400
+            if self.email is not None:
+                if self.user.is_admin():
+                    queue_dao = QueueItemDAO()
+                    response = queue_dao.update_item_order(queue_id, new_order)
+                    if response == 0:
+                        return jsonify("Order updated"), 200
+                    else:
+                        return jsonify(error="Couldn't update Order"), 500
+                else:
+                    return jsonify(error="Unauthorized."),
+
+            return jsonify(error="Unauthorized. No token."), 401
+
         def deleteQueueItemById(self, queue_id):
             dao = QueueItemDAO()
             queue_item = dao.deleteQueueItemById(queue_id)

model/design.py

@@ -21,6 +21,30 @@ def get_design_by_id(self, design_id: int):
         finally:
             cursor.close()
 
+    def get_designs_by_id(self, user_id: int, page: int, page_size: int):
+        cursor = self.conn.cursor()
+        query = (
+            "SELECT d.*, "
+            "CASE WHEN q.scheduled THEN 1 ELSE 0 END AS is_scheduled, "
+            "CASE WHEN q.queue_id IS NOT NULL THEN 1 ELSE 0 END AS is_in_queue "
+            "FROM design d "
+            "LEFT JOIN queue_item q ON d.design_id = q.design_id "
+            "WHERE d.user_id = ? "
+            "ORDER BY d.updated_at DESC "
+            "LIMIT ? OFFSET ?;"
+        )
+
+        try:
+            cursor.execute(query, (user_id, page_size, (page - 1) * page_size))
+            columns = [col[0] for col in cursor.description]
+            rows = cursor.fetchall()
+            result = [dict(zip(columns, row)) for row in rows]
+            return result
+        except sqlite3.Error:
+            return None
+        finally:
+            cursor.close()
+
     def get_user_id(self, design_id: int):
         """
         This so we can verify the user corresponding to the image in a small transaction.
@@ -114,24 +138,19 @@ def update_design_status(self, design_id: int, design_status: int):
             return status
 
     def delete_design(self, design_id):
-        status = 1
         cursor = self.conn.cursor()
         query = "DELETE FROM design WHERE design_id = ?"
 
         try:
             cursor.execute(query, (design_id,))
             self.conn.commit()
-            status = 0
+            if cursor.rowcount == 0:
+                return 1  # No row deleted
+            return 0
         except sqlite3.Error:
-            status = 1
-
+            return 1
         finally:
             cursor.close()
-            return status
-
-            return result
-
-    import logging
 
     def getApprovedDesigns(self):
         cursor = self.conn.cursor()
@@ -146,4 +165,3 @@ def getApprovedDesigns(self):
             return []  # Return an empty list on error
         finally:
             cursor.close()
-