From cba9d37cdbc5fa9afed1d38b08fde2e182499b24 Mon Sep 17 00:00:00 2001
From: fakz9 <fakc445@gmail.com>
Date: Thu, 9 Nov 2023 05:48:03 +0300
Subject: [PATCH] ebanutsya

---
 routes/assembly.py  | 27 +++++++++++++++++++++++++++
 routes/orders.py    |  6 +++---
 sipro/api/orders.py |  4 ++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/routes/assembly.py b/routes/assembly.py
index 521cd90..70af522 100644
--- a/routes/assembly.py
+++ b/routes/assembly.py
@@ -85,6 +85,33 @@ def close_assembly():
     return sipro.api.orders.close_order(order_id)
 
 
+@assembly_blueprint.post('/cancel')
+def cancel_assembly():
+    try:
+        user_id = get_jwt_identity()
+        assembly = database.Assembly.query.filter(database.Assembly.user_id == user_id,
+                                                  database.Assembly.is_active == True).first()
+        if not assembly:
+            response = {
+                'ok': False,
+                'message': 'У вас нет активных сборок'
+            }
+            return jsonify(response)
+        database.db.session.delete(assembly)
+        database.db.session.commit()
+        response = {
+            'ok': True,
+            'message': 'Сборка успешно отменена!'
+        }
+        return jsonify(response)
+    except Exception as e:
+        response = {
+            'ok': False,
+            'message': f'Неизвестная ошибка: {e}'
+        }
+        return jsonify(response)
+
+
 @assembly_blueprint.get('/hasActive')
 def user_has_active_assembly():
     user_id = get_jwt_identity()
diff --git a/routes/orders.py b/routes/orders.py
index 6fd56de..dc58ad0 100644
--- a/routes/orders.py
+++ b/routes/orders.py
@@ -28,11 +28,11 @@ def get_orders():
     return jsonify(response)
 
 
-@orders_blueprint.get('/getBySupplierProductId')
+@orders_blueprint.get('/getByProductId')
 def get_orders_by_supplier_product_id():
     args = request.args
-    supplier_product_id = args.get('supplierProductId')
-    return sipro.api.orders.get_orders_by_supplier_product_id(supplier_product_id)
+    product_id = args.get('productId')
+    return sipro.api.orders.get_orders_by_product_id(product_id)
 
 
 @orders_blueprint.get('/getOrderById')
diff --git a/sipro/api/orders.py b/sipro/api/orders.py
index 19eea43..4259fed 100644
--- a/sipro/api/orders.py
+++ b/sipro/api/orders.py
@@ -4,8 +4,8 @@ client = get_client()
 router = '/orders'
 
 
-def get_orders_by_supplier_product_id(supplier_product_id: str) -> list[dict]:
-    method = f'{router}/getBySupplierProductId?supplierProductId={supplier_product_id}'
+def get_orders_by_product_id(supplier_product_id: str) -> list[dict]:
+    method = f'{router}/getByProductId?productId={supplier_product_id}'
     response = client.method('GET', method)
     return response