Merge pull request #425 from aadviksinghdebug/fix/storage-errors-i18n-and-trigger-draft

Fix/storage errors i18n and trigger draft

Author: ChaoLing140

.gitignore

@@ -50,8 +50,11 @@ __pycache__/
 *.so
 .Python
 venv/
+.venv/
 env/
 ENV/
+.coverage
+coverage.xml
 
 # Docker
 .dockerignore

backend/src/errors.py

@@ -75,7 +75,7 @@ def __init__(self, detail: str = "Invalid or expired storage token"):
 
 class FileTooLargeError(StellarInsureError):
     def __init__(self, detail: str = "File size exceeds limit"):
-        super().__init__(status.HTTP_400_BAD_REQUEST, detail, "STORAGE_003")
+        super().__init__(status.HTTP_413_CONTENT_TOO_LARGE, detail, "STORAGE_003")
 
 class InvalidFileTypeError(StellarInsureError):
     def __init__(self, detail: str = "File type not allowed"):

backend/src/services/storage_service.py

@@ -8,6 +8,7 @@
 from typing import Optional, List
 from fastapi import UploadFile, HTTPException, status
 from ..config import get_settings
+from ..errors import InvalidFileTypeError, FileTooLargeError
 
 settings = get_settings()
 logger = logging.getLogger(__name__)
@@ -28,15 +29,13 @@ def validate_file(self, file: UploadFile):
         # Validate extension
         ext = os.path.splitext(file.filename)[1].lower() if file.filename else ""
         if ext not in self.allowed_extensions:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
+            raise InvalidFileTypeError(
                 detail=f"File extension {ext} not allowed. Allowed: {', '.join(self.allowed_extensions)}"
             )
 
         # Validate content type
         if file.content_type not in self.allowed_content_types:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
+            raise InvalidFileTypeError(
                 detail=f"Content type {file.content_type} not allowed. Allowed: {', '.join(self.allowed_content_types)}"
             )
 
@@ -46,8 +45,7 @@ async def upload_file(self, file: UploadFile, folder: str = "general") -> str:
         # Read content to check size
         content = await file.read()
         if len(content) > self.max_size:
-            raise HTTPException(
-                status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
+            raise FileTooLargeError(
                 detail=f"File size exceeds limit of {self.max_size / (1024 * 1024):.1f}MB"
             )
 

backend/tests/test_storage.py

@@ -5,8 +5,8 @@
 from io import BytesIO
 from fastapi import UploadFile, HTTPException
 from fastapi.testclient import TestClient
+from src.errors import InvalidFileTypeError, FileTooLargeError
 from src.services.storage_service import StorageService
-from src.main import app
 
 class TestStorageService:
     @pytest.fixture
@@ -45,18 +45,20 @@ async def test_upload_invalid_type(self, storage_service):
         content = b"test content"
         file = UploadFile(filename="test.exe", file=BytesIO(content), headers={"content-type": "application/x-msdownload"})
 
-        with pytest.raises(HTTPException) as exc:
+        with pytest.raises(InvalidFileTypeError) as exc:
             await storage_service.upload_file(file)
         assert exc.value.status_code == 400
+        assert exc.value.error_code == "STORAGE_004"
 
     @pytest.mark.asyncio
     async def test_upload_too_large(self, storage_service):
         content = b"a" * 2000  # 2KB > 1KB limit
         file = UploadFile(filename="large.png", file=BytesIO(content), headers={"content-type": "image/png"})
 
-        with pytest.raises(HTTPException) as exc:
+        with pytest.raises(FileTooLargeError) as exc:
             await storage_service.upload_file(file)
         assert exc.value.status_code == 413
+        assert exc.value.error_code == "STORAGE_003"
 
     def test_secure_url_generation_and_validation(self, storage_service):
         file_path = "test/file.png"
@@ -100,6 +102,7 @@ def test_invalid_token_signature(self, storage_service):
 
 class TestStorageIntegration:
     def test_storage_route_access(self):
+        from src.main import app
         client = TestClient(app)
         # Unauthorized access or invalid token should return 403
         response = client.get("/storage/files/invalid-token")

frontend/src/app/create/create-page-client.test.tsx

@@ -18,9 +18,20 @@ vi.mock("@stellar/freighter-api", () => ({
 }));
 
 vi.mock("@/components/trigger-condition-builder", () => ({
-  TriggerConditionBuilder: ({ onChange }: { onChange: (value: string) => void }) => (
+  TriggerConditionBuilder: ({
+    initialRules,
+    onChange,
+  }: {
+    initialRules?: { field: string; operator: string; value: string }[];
+    onChange: (value: string) => void;
+  }) => (
     <input
       aria-label="Trigger mock input"
+      defaultValue={
+        initialRules
+          ? initialRules.map((r) => `${r.field} ${r.operator} ${r.value}`).join(" AND ")
+          : ""
+      }
       onChange={(event) => onChange(event.target.value)}
       placeholder="Trigger mock input"
       type="text"
@@ -114,4 +125,28 @@ describe("CreatePolicyPageClient", () => {
 
     expect(screen.getByText(/policy created successfully/i)).toBeInTheDocument();
   });
+
+  it("restores trigger condition builder rules from draft when going back to configure step", () => {
+    localStorage.setItem(
+      "stellarinsure-policy-draft",
+      JSON.stringify({
+        policyType: "weather",
+        coverageAmount: "5000",
+        premium: "120",
+        triggerCondition: "temperature > 25 AND rainfall > 50",
+        duration: "90",
+        oracleProvider: "weatherlink-prime",
+      }),
+    );
+    render(<CreatePolicyPageClient />);
+
+    expect(screen.getByRole("heading", { name: /review your policy/i })).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("button", { name: /back/i }));
+
+    expect(screen.getByRole("heading", { name: /configure your policy/i })).toBeInTheDocument();
+
+    const triggerInput = screen.getByPlaceholderText("Trigger mock input") as HTMLInputElement;
+    expect(triggerInput.value).toBe("temperature > 25 AND rainfall > 50");
+  });
 });

frontend/src/app/create/create-page-client.tsx

@@ -19,7 +19,7 @@ import {
 import { useWallet } from "@/components/wallet-provider";
 import { useAutosave } from "@/hooks/use-autosave";
 import { useAppTranslation } from "@/i18n/provider";
-import { TriggerConditionBuilder } from "@/components/trigger-condition-builder";
+import { TriggerConditionBuilder, type ConditionRule, type Operator } from "@/components/trigger-condition-builder";
 import { PremiumEstimate, type PremiumBreakdown } from "@/components/premium-estimate";
 import { ValidationSummary, type ValidationError } from "@/components/validation-summary";
 import { signTransaction } from "@stellar/freighter-api";
@@ -58,6 +58,22 @@ const INITIAL_DRAFT: PolicyDraft = {
 
 
 
+function parseConditionString(condition: string): ConditionRule[] | undefined {
+  if (!condition || condition.trim() === "") return undefined;
+  const parts = condition.split(" AND ").map((p) => p.trim()).filter(Boolean);
+  if (parts.length === 0) return undefined;
+  const rules: ConditionRule[] = [];
+  const pattern = /^(\w+)\s*(>=|<=|>|<|=)\s*(.+)$/;
+  for (const part of parts) {
+    const match = part.match(pattern);
+    if (!match) return undefined;
+    const operator = match[2] as Operator;
+    if (![">", "<", "=", ">=", "<="].includes(operator)) return undefined;
+    rules.push({ field: match[1], operator, value: match[3].trim() });
+  }
+  return rules.length > 0 ? rules : undefined;
+}
+
 const MAX_COVERAGE_AMOUNT = 1_000_000;
 
 const ORACLE_PROVIDER_MAP: Record<PolicyType, OracleProvider[]> = {
@@ -523,6 +539,11 @@ export default function CreatePolicyPageClient() {
     oracleState === "ready" &&
     draft.oracleProvider.trim() !== "";
 
+  const triggerInitialRules = useMemo(
+    () => parseConditionString(draft.triggerCondition),
+    [draft.triggerCondition],
+  );
+
   const isWalletReady = isConnected && walletStatus !== "checking" && walletStatus !== "connecting";
 
   return (
@@ -624,6 +645,7 @@ export default function CreatePolicyPageClient() {
             <div className="field field--full" id="trigger-input">
               <span className="field__label">{t("createPolicy.configSection.triggerLabel")}</span>
               <TriggerConditionBuilder
+                initialRules={triggerInitialRules}
                 onChange={(val) => updateDraft("triggerCondition", val)}
               />
               <span className="field__hint">