Use CSV-backed schema and DB helper

Replace direct psycopg2/dotenv usage with the shared get_db_connection helper; product listing now SELECTs * and builds dicts from cursor.description to return the full CSV-derived schema. The reset endpoint now recreates a product table matching the CSV columns and seeds rows from tests/csv/small.csv using csv.DictReader with parameterized INSERTs. Updated docstrings and response messages accordingly and removed the previous hardcoded sample seed data.

Author: goldlabelapps

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

@@ -1,60 +1,68 @@
 import os
-import psycopg2
-from dotenv import load_dotenv
+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(os.path.dirname(os.path.dirname(__file__))), 'tests', 'csv', 'small.csv')
+
 @router.post("/products/reset", status_code=status.HTTP_200_OK)
 def reset_products() -> dict:
-    """Delete and recreate the product table, then seed with initial 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')
-    )
+    """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
+    # Drop and recreate table with all CSV columns
     cur.execute('''
         DROP TABLE IF EXISTS product;
         CREATE TABLE product (
             id SERIAL PRIMARY KEY,
-            name VARCHAR(255) NOT NULL,
-            description TEXT,
-            price NUMERIC(10,2) NOT NULL,
-            in_stock BOOLEAN DEFAULT TRUE,
-            created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+            Params TEXT,
+            item INTEGER,
+            desc 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
         );
     ''')
-    # Seed data
-    seed_products = [
-        ("Apple", "Fresh red apple", 0.99, True),
-        ("Banana", "Organic banana", 0.59, True),
-        ("Orange", "Juicy orange", 1.29, True),
-    ]
-    cur.executemany(
-        "INSERT INTO product (name, description, price, in_stock) VALUES (%s, %s, %s, %s);",
-        seed_products
-    )
+    # 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:
+            cur.execute(
+                """
+                INSERT INTO product (
+                    Params, item, desc, UOS, Pack_Description, Hierarchy1, Hierarchy2, Hierarchy3, UOP,
+                    sSell1, sSell2, sSell3, sSell4, sSell5, pack1, pack2, pack3, pack4, pack5, EAN
+                ) VALUES (
+                    %(Params)s, %(item)s, %(desc)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 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;')
+    products = [dict(zip([desc[0] for desc in cur.description], row)) for row in cur.fetchall()]
     cur.close()
     conn.close()
-    return {"message": "Product table reset and seeded.", "data": products}
+    return {"message": "Product table reset and seeded from CSV.", "data": products}
 import os, time
 import psycopg2
 from dotenv import load_dotenv