Merge pull request #21 from goldlabelapps/staging

This pull request refactors the product seeding and retrieval logic in the API to support a more flexible, CSV-driven schema for the `product` table.

Author: goldlabelapps

app/api/products/__init__.py

@@ -1,2 +1,2 @@
-from .products import router
-from .reset import router as reset_router
+from .products import router as products_router
+from .seed import router as seed_router

app/api/products/products.py

@@ -1,43 +1,27 @@
+
 from app import __version__
 from fastapi import APIRouter
-from fastapi import status
 import os, time
-import psycopg2
-from dotenv import load_dotenv
-from app import __version__
+from app.api.db import get_db_connection
 
 router = APIRouter()
 
 @router.get("/products")
 def root() -> dict:
-    """Return a structured welcome message for the API root, including product data."""
-    load_dotenv()
-    conn = psycopg2.connect(
-        host=os.getenv('DB_HOST'),
-        port=os.getenv('DB_PORT', '5432'),
-        dbname=os.getenv('DB_NAME'),
-        user=os.getenv('DB_USER'),
-        password=os.getenv('DB_PASSWORD')
-    )
+    """Return all products with full CSV-based schema."""
+    conn_gen = get_db_connection()
+    conn = next(conn_gen)
     cur = conn.cursor()
-    cur.execute('SELECT id, name, description, price, in_stock, created_at FROM product;')
-    products = [
-        {
-            "id": row[0],
-            "name": row[1],
-            "description": row[2],
-            "price": float(row[3]),
-            "in_stock": row[4],
-            "created_at": row[5].isoformat() if row[5] else None
-        }
-        for row in cur.fetchall()
-    ]
+    cur.execute('SELECT * FROM product;')
+    if cur.description is None:
+        products = []
+    else:
+        columns = [desc[0] for desc in cur.description]
+        products = [dict(zip(columns, row)) for row in cur.fetchall()]
     cur.close()
     conn.close()
 
-    load_dotenv()
     base_url = os.getenv("BASE_URL", "http://localhost:8000")
-
     epoch = int(time.time() * 1000)
     meta = {
         "severity": "success",

app/api/products/reset.py

@@ -0,0 +1,83 @@
+from app import __version__
+import os, time
+import csv
+from fastapi import APIRouter, status
+from app.api.db import get_db_connection
+
+router = APIRouter()
+
+CSV_PATH = os.path.join(os.path.dirname(__file__), 'start_data.csv')
+CSV_PATH = os.path.abspath(CSV_PATH)
+
+@router.get("/products/seed", status_code=status.HTTP_200_OK)
+def seed_products() -> dict:
+    """Delete and recreate the product table, then seed with CSV data."""
+    conn_gen = get_db_connection()
+    conn = next(conn_gen)
+    cur = conn.cursor()
+    # Drop and recreate table with all CSV columns
+    cur.execute('''
+        DROP TABLE IF EXISTS product;
+        CREATE TABLE product (
+            id SERIAL PRIMARY KEY,
+            Params TEXT,
+            item INTEGER,
+            title TEXT,
+            UOS TEXT,
+            Pack_Description TEXT,
+            Hierarchy1 TEXT,
+            Hierarchy2 TEXT,
+            Hierarchy3 TEXT,
+            UOP TEXT,
+            sSell1 NUMERIC(10,2),
+            sSell2 NUMERIC(10,2),
+            sSell3 NUMERIC(10,2),
+            sSell4 NUMERIC(10,2),
+            sSell5 NUMERIC(10,2),
+            pack1 INTEGER,
+            pack2 INTEGER,
+            pack3 INTEGER,
+            pack4 INTEGER,
+            pack5 INTEGER,
+            EAN TEXT
+        );
+    ''')
+    # Read and insert CSV data
+    with open(CSV_PATH, newline='') as csvfile:
+        reader = csv.DictReader(csvfile)
+        rows = [row for row in reader]
+        for row in rows:
+            # Map 'desc' from CSV to 'title' for DB
+            row['title'] = row.pop('desc')
+            cur.execute(
+                """
+                INSERT INTO product (
+                    Params, item, title, UOS, Pack_Description, Hierarchy1, Hierarchy2, Hierarchy3, UOP,
+                    sSell1, sSell2, sSell3, sSell4, sSell5, pack1, pack2, pack3, pack4, pack5, EAN
+                ) VALUES (
+                    %(Params)s, %(item)s, %(title)s, %(UOS)s, %(Pack_Description)s, %(Hierarchy1)s, %(Hierarchy2)s, %(Hierarchy3)s, %(UOP)s,
+                    %(sSell1)s, %(sSell2)s, %(sSell3)s, %(sSell4)s, %(sSell5)s, %(pack1)s, %(pack2)s, %(pack3)s, %(pack4)s, %(pack5)s, %(EAN)s
+                )
+                """,
+                row
+            )
+    conn.commit()
+    cur.execute('SELECT * FROM product;')
+    if cur.description is None:
+        products = []
+    else:
+        columns = [desc[0] for desc in cur.description]
+        products = [dict(zip(columns, row)) for row in cur.fetchall()]
+    cur.close()
+    conn.close()
+
+    base_url = os.getenv("BASE_URL", "http://localhost:8000")
+    epoch = int(time.time() * 1000)
+    meta = {
+        "severity": "success",
+        "title": "Product table seeded",
+        "version": __version__,
+        "base_url": base_url,
+        "time": epoch,
+    }
+    return {"meta": meta, "data": products}

app/api/products/seed.py

@@ -13,9 +13,9 @@
 from app.api.root import router as root_router
 from app.api.health import router as health_router
 from app.api.products.products import router as products_router
-from app.api.products.reset import router as reset_router
+from app.api.products.seed import router as seed_router
 
 router.include_router(root_router)
 router.include_router(health_router)
 router.include_router(products_router)
-router.include_router(reset_router)
+router.include_router(seed_router)

tests/csv/small.csv app/api/products/start_data.csvtests/csv/small.csv renamed to app/api/products/start_data.csv

@@ -25,22 +25,3 @@ def test_health_returns_ok() -> None:
     assert response.status_code == 200
     assert response.json() == {"status": "ok"}
 
-
-def test_echo_returns_message() -> None:
-    """POST /echo should return the provided message."""
-    response = client.post("/echo", json={"message": "hello"})
-    assert response.status_code == 200
-    assert response.json() == {"echo": "hello"}
-
-
-def test_echo_empty_string() -> None:
-    """POST /echo with an empty string should echo back an empty string."""
-    response = client.post("/echo", json={"message": ""})
-    assert response.status_code == 200
-    assert response.json() == {"echo": ""}
-
-
-def test_echo_missing_body_returns_422() -> None:
-    """POST /echo without a body should return 422 Unprocessable Entity."""
-    response = client.post("/echo", json={})
-    assert response.status_code == 422