From 3203c62cc8ad21afc6693a68ee47f8b96d7ebce6 Mon Sep 17 00:00:00 2001
From: Dan Martin <93075337+Mingqwqqaq@users.noreply.github.com>
Date: Mon, 16 Mar 2026 21:38:59 +0800
Subject: [PATCH] Add forms route tests and register AppError handler

---
 api/main.py             |  4 +-
 api/routes/forms.py     |  5 +--
 tests/test_forms.py     | 84 +++++++++++++++++++++++++++++------------
 tests/test_templates.py | 16 +++++++-
 4 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/api/main.py b/api/main.py
index d0b8c79..4d39562 100644
--- a/api/main.py
+++ b/api/main.py
@@ -1,7 +1,9 @@
 from fastapi import FastAPI
+from api.errors.handlers import register_exception_handlers
 from api.routes import templates, forms
 
 app = FastAPI()
+register_exception_handlers(app)
 
 app.include_router(templates.router)
-app.include_router(forms.router)
\ No newline at end of file
+app.include_router(forms.router)
diff --git a/api/routes/forms.py b/api/routes/forms.py
index f3430ed..6989314 100644
--- a/api/routes/forms.py
+++ b/api/routes/forms.py
@@ -11,10 +11,9 @@
 
 @router.post("/fill", response_model=FormFillResponse)
 def fill_form(form: FormFill, db: Session = Depends(get_db)):
-    if not get_template(db, form.template_id):
-        raise AppError("Template not found", status_code=404)
-
     fetched_template = get_template(db, form.template_id)
+    if not fetched_template:
+        raise AppError("Template not found", status_code=404)
 
     controller = Controller()
     path = controller.fill_form(user_input=form.input_text, fields=fetched_template.fields, pdf_form_path=fetched_template.pdf_path)
diff --git a/tests/test_forms.py b/tests/test_forms.py
index 8f432bf..60d2019 100644
--- a/tests/test_forms.py
+++ b/tests/test_forms.py
@@ -1,25 +1,59 @@
-def test_submit_form(client):
-    pass
-    # First create a template
-    # form_payload = {
-    #     "template_id": 3,
-    #     "input_text": "Hi. The employee's name is John Doe. His job title is managing director. His department supervisor is Jane Doe. His phone number is 123456. His email is jdoe@ucsc.edu. The signature is <Mamañema>, and the date is 01/02/2005",
-    # }
-
-    # template_res = client.post("/templates/", json=template_payload)
-    # template_id = template_res.json()["id"]
-
-    # # Submit a form
-    # form_payload = {
-    #     "template_id": template_id,
-    #     "data": {"rating": 5, "comment": "Great service"},
-    # }
-
-    # response = client.post("/forms/", json=form_payload)
-
-    # assert response.status_code == 200
-
-    # data = response.json()
-    # assert data["id"] is not None
-    # assert data["template_id"] == template_id
-    # assert data["data"] == form_payload["data"]
+from src.controller import Controller
+
+
+def test_submit_form(client, monkeypatch):
+    template_payload = {
+        "name": "Template 1",
+        "pdf_path": "src/inputs/file.pdf",
+        "fields": {
+            "Employee's name": "string",
+            "Employee's job title": "string",
+            "Employee's department supervisor": "string",
+            "Employee's phone number": "string",
+            "Employee's email": "string",
+            "Signature": "string",
+            "Date": "string",
+        },
+    }
+
+    def fake_create_template(self, pdf_path):
+        assert pdf_path == template_payload["pdf_path"]
+        return "src/inputs/file_template.pdf"
+
+    monkeypatch.setattr(Controller, "create_template", fake_create_template)
+
+    template_res = client.post("/templates/create", json=template_payload)
+    assert template_res.status_code == 200
+    template_id = template_res.json()["id"]
+
+    form_payload = {
+        "template_id": template_id,
+        "input_text": "Hi. The employee's name is John Doe.",
+    }
+
+    def fake_fill_form(self, user_input, fields, pdf_form_path):
+        assert user_input == form_payload["input_text"]
+        assert fields == template_payload["fields"]
+        assert pdf_form_path == "src/inputs/file_template.pdf"
+        return "src/outputs/file_filled.pdf"
+
+    monkeypatch.setattr(Controller, "fill_form", fake_fill_form)
+
+    response = client.post("/forms/fill", json=form_payload)
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["id"] is not None
+    assert data["template_id"] == template_id
+    assert data["input_text"] == form_payload["input_text"]
+    assert data["output_pdf_path"] == "src/outputs/file_filled.pdf"
+
+
+def test_submit_form_returns_404_for_missing_template(client):
+    response = client.post(
+        "/forms/fill",
+        json={"template_id": 999999, "input_text": "Missing template test"},
+    )
+
+    assert response.status_code == 404
+    assert response.json() == {"error": "Template not found"}
diff --git a/tests/test_templates.py b/tests/test_templates.py
index bbced2b..5405da1 100644
--- a/tests/test_templates.py
+++ b/tests/test_templates.py
@@ -1,4 +1,13 @@
-def test_create_template(client):
+from src.controller import Controller
+
+
+def test_create_template(client, monkeypatch):
+    def fake_create_template(self, pdf_path):
+        assert pdf_path == "src/inputs/file.pdf"
+        return "src/inputs/file_template.pdf"
+
+    monkeypatch.setattr(Controller, "create_template", fake_create_template)
+
     payload = {
         "name": "Template 1",
         "pdf_path": "src/inputs/file.pdf",
@@ -16,3 +25,8 @@ def test_create_template(client):
     response = client.post("/templates/create", json=payload)
 
     assert response.status_code == 200
+    data = response.json()
+    assert data["id"] is not None
+    assert data["name"] == payload["name"]
+    assert data["fields"] == payload["fields"]
+    assert data["pdf_path"] == "src/inputs/file_template.pdf"