Update app.py

app.py

@@ -45,7 +45,7 @@ def api():
                     users.append("others")
                 print(users)
 
-                matrix = [[0 for _ in range(len(users))] for _ in range(len(users))]
+                matrix = [[0.0 for _ in range(len(users))] for _ in range(len(users))]
 
                 should_checkout = True
 
@@ -85,9 +85,6 @@ def api():
                         if i < j:
                             matrix_copy[i][j] = matrix[i][j] - matrix[j][i]
 
-                for r in matrix_copy:
-                    print(r)
-
                 result = []
 
                 for i in range(len(matrix_copy)):
@@ -100,12 +97,9 @@ def api():
 
                 if result:
                     sorted_result = sorted(result, key=lambda x: x["from"])
-
-                    for r in sorted_result:
-                        print(r)
-
                     bubble = get_checkout_bubble(sorted_result)
                     send_flex_text(payload.get("token"), bubble)
+                    message_list = {}
 
             raise ValueError("Action Success")
 
@@ -223,17 +217,21 @@ def get_amount(text: str) -> float | None:
     try:
         after_dollar = text.split("$")[1]
         rows = after_dollar.split("\n")
-        number_string = rows[0]
+        number = float(simple_eval(rows[0]))
         divisor = 1
         if len(rows) > 1 and "/" in rows[1]:
             divisor = int(rows[1].replace("/", ""))
-        return round(float(simple_eval(number_string))/divisor, 2)
+        if divisor % 3 == 0:
+            number += 1
+        if divisor == 0:
+            raise ValueError("divisor = 0")
+        return round(number/divisor, 2)
     except:
         return None
 
 
 def get_summary_bubble(title: str, payer: str, borrowers: list):
-    total = 0
+    total = 0.0
     borrower_contents = []
 
     for borrower in borrowers:
@@ -278,6 +276,7 @@ def get_summary_bubble(title: str, payer: str, borrowers: list):
                     "text": title,
                     "weight": "bold",
                     "size": "xxl",
+                    "wrap": True,
                     "margin": "md"
                 },
                 {
@@ -335,11 +334,106 @@ def get_summary_bubble(title: str, payer: str, borrowers: list):
 
 
 def get_checkout_bubble(checkout_list: list):
+    carousel_contents = []
+
+    checkout_total = 0.0
+    checkout_contents = []
+    checkout_items = {key: value for key, value in message_list.items() if not value.get("quoted_msg_id")}
+    for _, value in checkout_items.items:
+        msg_text = value.get("msg_text")
+        amount = round(float(value.get("amount")), 2)
+        checkout_total += amount
+
+        if msg_text:
+            msg_text = msg_text.split("$")[0]
+
+        checkout_contents.append({
+            "type": "box",
+            "layout": "vertical",
+            "contents": [
+                    {
+                        "type": "text",
+                        "text": msg_text,
+                        "size": "sm",
+                        "color": "#555555",
+                        "flex": 0
+                    },
+                {
+                        "type": "text",
+                        "text": f"${amount}",
+                        "size": "sm",
+                        "color": "#111111",
+                        "align": "end"
+                    }
+            ],
+            "margin": "sm"
+        })
+
+    carousel_contents.append({
+        "type": "bubble",
+        "body": {
+                "type": "box",
+                "layout": "vertical",
+                "contents": [
+                    {
+                        "type": "text",
+                        "text": "結算明細",
+                        "weight": "bold",
+                        "color": "#1DB446",
+                        "size": "sm"
+                    },
+                    {
+                        "type": "text",
+                        "text": "此次結算包含：",
+                        "size": "sm",
+                        "color": "#aaaaaa",
+                        "wrap": True,
+                        "margin": "lg"
+                    },
+                    {
+                        "type": "box",
+                        "layout": "vertical",
+                        "margin": "md",
+                        "spacing": "sm",
+                        "contents": checkout_contents},
+                    {
+                        "type": "separator",
+                        "margin": "lg"
+                    },
+                    {
+                        "type": "box",
+                        "layout": "horizontal",
+                        "contents": [
+                            {
+                                "type": "text",
+                                "text": "合計",
+                                "size": "sm",
+                                "color": "#555555"
+                            },
+                            {
+                                "type": "text",
+                                "text": f"${round(checkout_total,2)}",
+                                "size": "sm",
+                                "color": "#111111",
+                                "align": "end",
+                                "weight": "bold"
+                            }
+                        ],
+                        "margin": "lg"
+                    }
+                ]
+        },
+        "styles": {
+            "footer": {
+                "separator": True
+            }
+        }
+    }
+    )
 
     current_user = checkout_list[0].get("from")
-    current_total = 0
+    current_total = 0.0
     current_pay_to_contents = []
-    carousel_contents = []
 
     checkout_list.append({"from": None, "to": None, "amount": 0})
 
@@ -364,6 +458,7 @@ def get_checkout_bubble(checkout_list: list):
                             "text": current_user,
                             "weight": "bold",
                             "size": "xxl",
+                            "wrap": True,
                             "margin": "md"
                         },
                         {
@@ -416,10 +511,10 @@ def get_checkout_bubble(checkout_list: list):
             )
 
             current_user = item.get("from")
-            current_total = 0
+            current_total = 0.0
             current_pay_to_contents = []
 
-        amount = float(item.get("amount"))
+        amount = round(float(item.get("amount")), 2)
         current_total += amount
 
         current_pay_to_contents.append({
@@ -435,7 +530,7 @@ def get_checkout_bubble(checkout_list: list):
                 },
                 {
                     "type": "text",
-                    "text": f"${round(amount,2)}",
+                    "text": f"${amount}",
                     "size": "sm",
                     "color": "#111111",
                     "align": "end"