lots of changes

plugins/submission/models.py

@@ -1,39 +1,35 @@
 from datetime import datetime
 from app import db
 from plugins.plant.models import Plant
-
+from plugins.auth.models import User
 
 class Submission(db.Model):
-    __tablename__ = 'submissions'
-    __table_args__ = {'extend_existing': True}
+    __tablename__ = "submissions"
+    __table_args__ = {"extend_existing": True}
 
     id = db.Column(db.Integer, primary_key=True)
-    user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
-    plant_id = db.Column(db.Integer, db.ForeignKey('plant.id'), nullable=True)
+    user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
+    submitted_at = db.Column(db.DateTime, default=datetime.utcnow)
+    plant_name = db.Column(db.String(100), nullable=False)
+    scientific_name = db.Column(db.String(120), nullable=True)
+    notes = db.Column(db.Text, nullable=True)
+    approved = db.Column(db.Boolean, default=None)
+    approved_at = db.Column(db.DateTime, nullable=True)
+    reviewed_by = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=True)
 
-    common_name = db.Column(db.String(120), nullable=False)
-    scientific_name = db.Column(db.String(120))
-    price = db.Column(db.Float, nullable=False)
-    source = db.Column(db.String(120))
-    timestamp = db.Column(db.DateTime, default=datetime.utcnow)
+    # Explicit bidirectional relationships
+    submitter = db.relationship("User", foreign_keys=[user_id], back_populates="submitted_submissions")
+    reviewer = db.relationship("User", foreign_keys=[reviewed_by], back_populates="reviewed_submissions")
 
-    height = db.Column(db.Float)
-    width = db.Column(db.Float)
-    leaf_count = db.Column(db.Integer)
-    potting_mix = db.Column(db.String(255))
-    container_size = db.Column(db.String(120))
-    health_status = db.Column(db.String(50))
-    notes = db.Column(db.Text)
+    images = db.relationship("SubmissionImage", backref="submission", lazy=True)
 
-    # Image references via SubmissionImage table
-    images = db.relationship('SubmissionImage', backref='submission', lazy=True)
 
 
 class SubmissionImage(db.Model):
-    __tablename__ = 'submission_images'
-    __table_args__ = {'extend_existing': True}
+    __tablename__ = "submission_images"
+    __table_args__ = {"extend_existing": True}
 
     id = db.Column(db.Integer, primary_key=True)
-    submission_id = db.Column(db.Integer, db.ForeignKey('submissions.id'), nullable=False)
-    file_path = db.Column(db.String(255), nullable=False)
-    is_visible = db.Column(db.Boolean, default=True)
+    submission_id = db.Column(db.Integer, db.ForeignKey("submissions.id"), nullable=False)
+    file_url = db.Column(db.String(256), nullable=False)
+    uploaded_at = db.Column(db.DateTime, default=datetime.utcnow)