Merge branch 'main' into fix/BillingDetailCard

Author: tyyttty

backend/app/lib/algorithm2.py

@@ -174,10 +174,10 @@ def process_warikan_json(input_data: Dict[str, Any]) -> List[Dict[str, Any]]:
         if amount == 0 or paid_by_user is None or paid_for_user is None:
             continue
 
-        #支払った人は貸しだから残高をマイナス
-        sagaku[paid_by_user] -= amount
-        #支払ってもらった人は借りだから残高をプラス
-        sagaku[paid_for_user] += amount
+        #支払った人は貸しだから残高をプラス
+        sagaku[paid_by_user] += amount
+        #支払ってもらった人は借りだから残高をマイナス
+        sagaku[paid_for_user] -= amount
 
     solve_input_data = [
         {"user": user_id, "amount": int(round(amount))}
@@ -196,7 +196,7 @@ def process_warikan_json(input_data: Dict[str, Any]) -> List[Dict[str, Any]]:
         output_json_list.append({
             "id": j,
             "amount": amnt,
-            "paid_by": from_user,
-            "paid_for": to_user
+            "paid_by": to_user,
+            "paid_for": from_user
         })
     return output_json_list

backend/poetry.lock

@@ -16,8 +16,8 @@
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@radix-ui/react-select": "^2.2.6",
-    "@radix-ui/react-separator": "^1.1.7",
-    "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-separator": "^1.1.8",
+    "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-tabs": "^1.1.13",
     "@tailwindcss/vite": "^4.1.16",
     "class-variance-authority": "^0.7.1",
@@ -31,7 +31,7 @@
     "tailwindcss": "^4.1.16"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.3",
+    "@biomejs/biome": "2.3.4",
     "@types/node": "^24.10.0",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
@@ -41,7 +41,7 @@
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.9.3",
     "vite": "npm:rolldown-vite@7.1.14",
-    "vitest": "^4.0.6"
+    "vitest": "^4.0.7"
   },
   "pnpm": {
     "overrides": {