Add user id to products model and apis

api/evidence.py

@@ -682,7 +682,7 @@ def finish_attestation():
             from web.products import update_product_data
             product_key = attestation.product_key
             product_version = attestation.product_version
-            update_product_data(product_key, product_version)
+            update_product_data(product_key, product_version, user_id=attestation.user_id)
 
             # Return response matching swagger spec
             return jsonify({

models.py

@@ -386,6 +386,7 @@ class Product(db.Model):
     id = db.Column(Integer, primary_key=True)
     product_key = db.Column(String(255), nullable=False)
     product_version = db.Column(String(255), nullable=False)
+    user_id = db.Column(Integer, ForeignKey('users.id'), nullable=False)
     name = db.Column(String(255), nullable=True)
     description = db.Column(Text, nullable=True)
     product_metadata = db.Column(MutableDict.as_mutable(JSON), nullable=True)
@@ -394,6 +395,8 @@ class Product(db.Model):
     updated_at = db.Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
     deleted = db.Column(Boolean, default=False)
 
+    user = relationship("User", backref="products")
+
     __table_args__ = (
         db.UniqueConstraint('product_key', 'product_version', name='uq_product_key_version'),
     )
@@ -403,6 +406,7 @@ class Product(db.Model):
             'id': self.id,
             'product_key': self.product_key,
             'product_version': self.product_version,
+            'user_id': self.user_id,
             'name': self.name,
             'description': self.description,
             'product_metadata': self.product_metadata,

templates/products.html

@@ -22,6 +22,14 @@
                 <div class="col-md-4">
                     <input type="text" class="form-control" name="filter" placeholder="Products substring" value="{{ filter_query }}">
                 </div>
+                {% if is_admin %}
+                <div class="col-md-3 form-check align-items-center d-flex">
+                    <input class="form-check-input me-2" type="checkbox" id="showAllCheckbox" name="show_all" value="1" {% if show_all %}checked{% endif %} onchange="this.form.submit()">
+                    <label class="form-check-label" for="showAllCheckbox">
+                        Show all users' products
+                    </label>
+                </div>
+                {% endif %}
                 <div class="col-md-2">
                     <button type="submit" class="btn btn-primary w-100">
                         <i data-feather="filter" class="me-1"></i> Filter

web/products.py

@@ -1,10 +1,12 @@
-from flask import Blueprint, render_template, request, redirect, url_for
+from flask import Blueprint, render_template, request, redirect, url_for, session
 from models import db, Attestation, PolicyResult, Product
 from sqlalchemy import func, text
 
-def get_products_with_stats(filter_query=None):
+def get_products_with_stats(filter_query=None, user_id=None, show_all=False):
     # Only consume data from products table
     query = Product.query.filter(Product.deleted == False)
+    if not show_all and user_id is not None:
+        query = query.filter(Product.user_id == user_id)
     if filter_query:
         like_pattern = f'%{filter_query}%'
         query = query.filter(
@@ -42,16 +44,22 @@ def get_products_with_stats(filter_query=None):
             'attestation_count': attestation_count,
             'policy_result_count': policy_result_count,
             'badges': badges,
-            'product_metadata': product.product_metadata
+            'product_metadata': product.product_metadata,
+            'user_id': product.user_id
         })
     return products, pagination
     return products
 
 # Function to update product data
-def update_product_data(product_key, product_version, name=None, description=None, metadata=None, badges=None):
-    product = Product.query.filter_by(product_key=product_key, product_version=product_version, deleted=False).first()
+def update_product_data(product_key, product_version, name=None, description=None, metadata=None, badges=None, user_id=None):
+    # Allow user_id to be passed explicitly (for background/API use), else fallback to session
+    if user_id is None:
+        user_id = session.get('user_id')
+    if user_id is None:
+        raise ValueError("user_id must be provided to update_product_data")
+    product = Product.query.filter_by(product_key=product_key, product_version=product_version, deleted=False, user_id=user_id).first()
     if not product:
-        product = Product(product_key=product_key, product_version=product_version)
+        product = Product(product_key=product_key, product_version=product_version, user_id=user_id)
         db.session.add(product)
     if name is not None:
         product.name = name

web/routes.py

@@ -225,8 +225,16 @@ def products_page():
     filter_query = request.args.get('filter', '')
     page = request.args.get('page', 1, type=int)
     per_page = request.args.get('per_page', 20, type=int)
-    products, pagination = get_products_with_stats(filter_query)
-    return render_template('products.html', products=products, pagination=pagination, filter_query=filter_query)
+    user_id = session.get('user_id')
+    show_all = False
+    is_admin = False
+    if user_id:
+        from .routes import is_admin_user_web as _is_admin_user_web
+        is_admin = _is_admin_user_web(user_id)
+        if is_admin:
+            show_all = request.args.get('show_all', '0') == '1'
+    products, pagination = get_products_with_stats(filter_query, user_id=user_id, show_all=show_all)
+    return render_template('products.html', products=products, pagination=pagination, filter_query=filter_query, show_all=show_all, is_admin=is_admin)
 
 # --- Products CSV Download ---
 @web_bp.route('/products/download-csv')