nngo/classifieds
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jul 13 - Optimize code

Browse Source
This commit is contained in:
nngo
2026-07-13 16:52:00 -04:00
parent 936d860342
commit 00a9ba7770
27 changed files with 141 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/ads.py
+9 -8
View File
@@ -10,6 +10,7 @@ Category sponsor FK wired to categories.sponsor_id (set separately).
PromotedKeyword: pinned listing for a search keyword (promoted search).
"""
from datetime import datetime
from app.utils.time import utcnow
from app.extensions import db
@@ -37,9 +38,9 @@ class Ad(db.Model):
clicks = db.Column(db.Integer, nullable=False, default=0)
is_active = db.Column(db.Boolean, nullable=False, default=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=datetime.utcnow,
onupdate=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=utcnow,
onupdate=utcnow, nullable=False)
@property
def ctr(self):
@@ -49,7 +50,7 @@ class Ad(db.Model):
@property
def is_running(self):
now = datetime.utcnow()
now = utcnow()
return self.is_active and self.starts_at <= now <= self.ends_at
def __repr__(self):
@@ -75,14 +76,14 @@ class Sponsor(db.Model):
starts_at = db.Column(db.DateTime, nullable=False)
ends_at = db.Column(db.DateTime, nullable=False)
is_active = db.Column(db.Boolean, nullable=False, default=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
category = db.relationship("Category",
backref=db.backref("sponsors", lazy="selectin"))
@property
def is_running(self):
now = datetime.utcnow()
now = utcnow()
return self.is_active and self.starts_at <= now <= self.ends_at
def __repr__(self):
@@ -103,7 +104,7 @@ class PromotedKeyword(db.Model):
db.ForeignKey("listings.id"), nullable=False)
priority = db.Column(db.Integer, nullable=False, default=0)
expires_at = db.Column(db.DateTime, nullable=False, index=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
listing = db.relationship("Listing",
backref=db.backref("promoted_keywords",
@@ -111,7 +112,7 @@ class PromotedKeyword(db.Model):
@property
def is_active(self):
return self.expires_at > datetime.utcnow()
return self.expires_at > utcnow()
def __repr__(self):
return f"<PromotedKeyword '{self.keyword}' L{self.listing_id}>"
app/models/audit.py
+2 -1
View File
@@ -1,5 +1,6 @@
"""Append-only audit trail for admin write actions."""
from datetime import datetime
from app.utils.time import utcnow
from sqlalchemy import JSON
from app.extensions import db
@@ -16,7 +17,7 @@ class AuditLog(db.Model):
target_id = db.Column(db.BigInteger().with_variant(db.Integer, "sqlite"),
nullable=True, index=True)
meta = db.Column(JSON, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
actor = db.relationship("User", backref=db.backref("audit_logs", lazy="dynamic"))
app/models/category.py
+4 -3
View File
@@ -14,6 +14,7 @@ Supported types: text, number, select, bool. `hot:true` marks a field whose
value is denormalized onto an indexed Listing column for fast filtering.
"""
from datetime import datetime
from app.utils.time import utcnow
from sqlalchemy import JSON
from app.extensions import db
@@ -33,9 +34,9 @@ class Category(db.Model):
sponsor_id = db.Column(db.BigInteger, nullable=True) # FK wired in Phase 5
is_active = db.Column(db.Boolean, nullable=False, default=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=datetime.utcnow,
onupdate=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=utcnow,
onupdate=utcnow, nullable=False)
children = db.relationship("Category", backref=db.backref("parent",
remote_side=[id]), lazy="selectin")
app/models/favorite.py
+2 -1
View File
@@ -1,5 +1,6 @@
"""Favorite (saved listing). One row per user+listing pair."""
from datetime import datetime
from app.utils.time import utcnow
from app.extensions import db
@@ -15,7 +16,7 @@ class Favorite(db.Model):
db.ForeignKey("users.id"), nullable=False, index=True)
listing_id = db.Column(db.BigInteger().with_variant(db.Integer, "sqlite"),
db.ForeignKey("listings.id"), nullable=False, index=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
user = db.relationship("User",
backref=db.backref("favorites", lazy="dynamic"))
app/models/listing.py
+6 -5
View File
@@ -10,6 +10,7 @@ Portability notes (see README "MySQL upgrades"):
MySQL add a FULLTEXT(title, body) index and switch to MATCH ... AGAINST.
"""
from datetime import datetime
from app.utils.time import utcnow
from sqlalchemy import JSON, Index
from app.extensions import db
from app.models.enums import ListingStatus, Lang
@@ -55,9 +56,9 @@ class Listing(db.Model):
view_count = db.Column(db.Integer, nullable=False, default=0)
expires_at = db.Column(db.DateTime, nullable=False, index=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=datetime.utcnow,
onupdate=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=utcnow,
onupdate=utcnow, nullable=False)
user = db.relationship("User", backref=db.backref("listings", lazy="dynamic"))
category = db.relationship("Category", back_populates="listings")
@@ -73,7 +74,7 @@ class Listing(db.Model):
@property
def is_live(self):
return (self.status == ListingStatus.active
and self.expires_at > datetime.utcnow())
and self.expires_at > utcnow())
@property
def price_display(self):
@@ -101,7 +102,7 @@ class ListingImage(db.Model):
sort_order = db.Column(db.Integer, nullable=False, default=0)
width = db.Column(db.Integer, nullable=True)
height = db.Column(db.Integer, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
listing = db.relationship("Listing", back_populates="images")
app/models/messaging.py
+4 -3
View File
@@ -5,6 +5,7 @@ The seller is always listing.user; buyer is any other authenticated user.
Messages are append-only; soft-delete not needed at Phase 3.
"""
from datetime import datetime
from app.utils.time import utcnow
from app.extensions import db
@@ -23,7 +24,7 @@ class Conversation(db.Model):
seller_id = db.Column(db.BigInteger().with_variant(db.Integer, "sqlite"),
db.ForeignKey("users.id"), nullable=False, index=True)
last_message_at = db.Column(db.DateTime, nullable=True, index=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
listing = db.relationship("Listing",
backref=db.backref("conversations", lazy="dynamic"))
@@ -58,7 +59,7 @@ class Message(db.Model):
db.ForeignKey("users.id"), nullable=False)
body = db.Column(db.Text, nullable=False)
read_at = db.Column(db.DateTime, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
conversation = db.relationship("Conversation", back_populates="messages")
sender = db.relationship("User",
@@ -70,7 +71,7 @@ class Message(db.Model):
def mark_read(self):
if self.read_at is None:
self.read_at = datetime.utcnow()
self.read_at = utcnow()
def __repr__(self):
return f"<Message {self.id} C{self.conversation_id}>"
app/models/payments.py
+7 -6
View File
@@ -5,6 +5,7 @@ and are reconciled via webhooks + nightly job.
Money stored as integer cents throughout.
"""
from datetime import datetime
from app.utils.time import utcnow
from sqlalchemy import JSON
from app.extensions import db
@@ -27,9 +28,9 @@ class Subscription(db.Model):
nullable=False, default="active")
current_period_end = db.Column(db.DateTime, nullable=True)
cancel_at_period_end = db.Column(db.Boolean, nullable=False, default=False)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=datetime.utcnow,
onupdate=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=utcnow,
onupdate=utcnow, nullable=False)
user = db.relationship("User",
backref=db.backref("subscription", uselist=False))
@@ -59,7 +60,7 @@ class Transaction(db.Model):
stripe_object_id = db.Column(db.String(64), nullable=True, index=True)
status = db.Column(db.String(20), nullable=False, default="succeeded")
meta = db.Column(JSON, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
user = db.relationship("User",
backref=db.backref("transactions", lazy="dynamic"))
@@ -92,7 +93,7 @@ class Boost(db.Model):
transaction_id = db.Column(
db.BigInteger().with_variant(db.Integer, "sqlite"),
db.ForeignKey("transactions.id"), nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
listing = db.relationship("Listing",
backref=db.backref("boosts", lazy="selectin"))
@@ -102,7 +103,7 @@ class Boost(db.Model):
@property
def is_active(self):
return self.expires_at > datetime.utcnow()
return self.expires_at > utcnow()
def __repr__(self):
return f"<Boost {self.type} L{self.listing_id} exp={self.expires_at.date()}>"
app/models/plan.py
+4 -3
View File
@@ -1,5 +1,6 @@
"""Plan model. Tier limits live in `config` JSON, editable in admin without redeploy."""
from datetime import datetime
from app.utils.time import utcnow
from sqlalchemy import JSON
from app.extensions import db
@@ -16,9 +17,9 @@ class Plan(db.Model):
is_active = db.Column(db.Boolean, nullable=False, default=True)
sort_order = db.Column(db.Integer, nullable=False, default=0)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=datetime.utcnow,
onupdate=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=utcnow,
onupdate=utcnow, nullable=False)
users = db.relationship("User", back_populates="tier", lazy="dynamic")
app/models/report.py
+2 -1
View File
@@ -1,5 +1,6 @@
"""User-submitted reports against listings (spam/abuse moderation)."""
from datetime import datetime
from app.utils.time import utcnow
from app.extensions import db
from app.models.enums import ReportReason
@@ -15,7 +16,7 @@ class Report(db.Model):
db.ForeignKey("users.id"), nullable=False, index=True)
reason = db.Column(db.Enum(ReportReason), nullable=False)
note = db.Column(db.Text, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
listing = db.relationship("Listing", backref=db.backref("reports", lazy="dynamic"))
reporter = db.relationship("User", backref=db.backref("reports_filed", lazy="dynamic"))
app/models/review.py
+2 -1
View File
@@ -1,5 +1,6 @@
"""Seller reviews — left by buyers after a listing is marked sold."""
from datetime import datetime
from app.utils.time import utcnow
from app.extensions import db
@@ -16,7 +17,7 @@ class Review(db.Model):
db.ForeignKey("users.id"), nullable=False, index=True)
rating = db.Column(db.SmallInteger, nullable=False) # 1–5
body = db.Column(db.Text, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
listing = db.relationship("Listing",
backref=db.backref("reviews", lazy="dynamic"))
app/models/setting.py
+3 -2
View File
@@ -1,5 +1,6 @@
"""Admin-editable runtime settings (registration_open, flag_threshold, etc.)."""
from datetime import datetime
from app.utils.time import utcnow
from sqlalchemy import JSON
from app.extensions import db
@@ -9,8 +10,8 @@ class Setting(db.Model):
key = db.Column(db.String(80), primary_key=True)
value = db.Column(JSON, nullable=True)
updated_at = db.Column(db.DateTime, default=datetime.utcnow,
onupdate=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=utcnow,
onupdate=utcnow, nullable=False)
def __repr__(self):
return f"<Setting {self.key}>"
app/models/trust.py
+2 -1
View File
@@ -1,5 +1,6 @@
"""TrustEvent model. Append-only events that adjust a user's trust score."""
from datetime import datetime
from app.utils.time import utcnow
from app.extensions import db
from app.models.enums import TrustEventType
@@ -11,7 +12,7 @@ class TrustEvent(db.Model):
user_id = db.Column(db.BigInteger, db.ForeignKey("users.id"), nullable=False, index=True)
type = db.Column(db.Enum(TrustEventType), nullable=False)
delta = db.Column(db.Integer, nullable=False, default=0)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
user = db.relationship("User", back_populates="trust_events")
app/models/user.py
+4 -3
View File
@@ -1,5 +1,6 @@
"""User model. Argon2 password hashing, role/trust fields, Flask-Login mixin."""
from datetime import datetime
from app.utils.time import utcnow
from flask_login import UserMixin
from app.extensions import db
from app.models.enums import Role, UserStatus, TrustTier
@@ -28,9 +29,9 @@ class User(UserMixin, db.Model):
email_verified = db.Column(db.Boolean, nullable=False, default=False)
last_login_at = db.Column(db.DateTime, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=datetime.utcnow,
onupdate=datetime.utcnow, nullable=False)
created_at = db.Column(db.DateTime, default=utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=utcnow,
onupdate=utcnow, nullable=False)
trust_events = db.relationship("TrustEvent", back_populates="user",
lazy="dynamic", cascade="all, delete-orphan")