simplify table

events/__init__.py

@@ -9,7 +9,6 @@ from sqlalchemy import inspect
 from files.helpers.const import AWARDS2, AWARDS_DISABLED
 
 from .table import Event
-from .columns import *
 
 from events.classes import *
 from events.helpers import *

events/columns.py

@@ -1,18 +0,0 @@
-from sqlalchemy import Column, Integer, Boolean
-from .table import Event
-
-Event.hw_zombie = Column(Integer, default=0, nullable=False)
-Event.jumpscare = Column(Integer, default=0)
-Event.hwmusic = Column(Boolean, default=False)
-
-COLUMN_DEFAULTS = {
-	"hw_zombie": {
-		"default": 0
-	},
-	"jumpscare": {
-		"default": 0
-	},
-	"hwmusic": {
-		"default": False
-	},
-}

events/routes/awards.py

@@ -3,22 +3,21 @@ from files.classes.award import AwardRelationship
 from files.helpers.alerts import send_repeatable_notification
 from files.helpers.useractions import badge_grant
 
-from events import Event, COLUMN_DEFAULTS
+from events import Event
 
 def award_thing_event(v, kind, author):
+	event_author = g.db.get(Event, author.id)
+	event_v = g.db.get(Event, v.id)
 
-	def event_user(user):
-		event_user = g.db.get(Event, user.id)
-		if not event_user:
-			event_user = Event(id=user.id)
-			for column in COLUMN_DEFAULTS:
-				event_user.column = COLUMN_DEFAULTS[column]["default"]
-			g.db.add(event_user)
-			g.db.commit()
-		return event_user
+	if not event_author:
+		event_author = Event(id=author.id)
+		g.db.add(event_author)
 
-	event_author = event_user(author)
-	event_v = event_user(v)
+	if not event_v:
+		event_v = Event(id=v.id)
+		g.db.add(event_v)
+
+	g.db.flush()
 
 	if kind == "hw-bite":
 		if event_author.hw_zombie < 0:

events/table.py

@@ -8,6 +8,11 @@ class Event(Base):
 	__tablename__ = "event"
 	id = Column(Integer, ForeignKey("users.id"), primary_key=True)
 
+	#event specific columns
+	hw_zombie = Column(Integer, default=0, nullable=False)
+	jumpscare = Column(Integer, default=0)
+	hwmusic = Column(Boolean, default=False)
+
 	def __init__(self, *args, **kwargs):
 		super().__init__(*args, **kwargs)