milestone upgrade

subtract pts, rename count to progress, send a chat message on success

tlapbot/owncast_helpers.py

@@ -187,15 +187,14 @@ def add_to_redeem_queue(db, user_id, redeem_name, note=None):
 def start_milestone(db, redeem_name):
     try:
         cursor = db.execute(
-            "SELECT count, goal FROM milestones WHERE name = ?",
+            "SELECT progress, goal FROM milestones WHERE name = ?",
             (redeem_name,)
         )
         milestone = cursor.fetchone()
         current_app.logger.error(f"Milestone: {milestone}")
         if milestone is None:
-            current_app.logger.error(f"Adding milestone to db.")
             cursor = db.execute(
-                    "INSERT INTO milestones(name, count, goal) VALUES(?, ?, ?)",
+                    "INSERT INTO milestones(name, progress, goal) VALUES(?, ?, ?)",
                     (redeem_name, 0, current_app.config['REDEEMS'][redeem_name]['goal'])
                 )
         db.commit()
@@ -203,38 +202,38 @@ def start_milestone(db, redeem_name):
         current_app.logger.error(f"Error occured adding a milestone: {e.args[0]}")
 
 
-
+def add_to_milestone(db, user_id, redeem_name, points_donated):
-def add_to_milestone(db, redeem_name, points):
     try:
-        start_milestone(db, redeem_name)
-
         cursor = db.execute(
-            "SELECT count, goal FROM milestones WHERE name = ?",
+            "SELECT progress, goal FROM milestones WHERE name = ?",
             (redeem_name,)
         )
         row = cursor.fetchone()
-        count = row[0]
+        if row is None:
+            current_app.logger.warning("Milestone not found in database.")
+            current_app.logger.warning("Maybe you forgot to run the refresh-milestones CLI command "
+                                       "after you added a new milestone to the config?")
+            return False
+        progress = row[0]
         goal = row[1]
-        result = count + points
+        if progress + points_donated > goal:
-        if result > goal:
+            points_donated = goal - progress
-            result = goal
+        if use_points(db, user_id, points_donated):
-        current_app.logger.error(f"Doing db operation to add to milestone.")
             cursor = db.execute(
-            "UPDATE milestones SET count = ? WHERE name = ?",
+                "UPDATE milestones SET progress = ? WHERE name = ?",
-            (result, redeem_name)
+                (progress + points_donated, redeem_name)
             )
             db.commit()
             return True
     except Error as e:
         current_app.logger.error(f"Error occured updating milestone: {e.args[0]}")
-    current_app.logger.error(f"Milestone add failed.")
     return False
 
 
 def all_milestones(db):
     try:
         cursor = db.execute(
-            """SELECT name, count, goal FROM milestones"""
+            """SELECT name, progress, goal FROM milestones"""
         )
         return cursor.fetchall()
     except Error as e:

tlapbot/redeems_handler.py

@@ -53,7 +53,7 @@ def handle_redeem(message, user_id):
             send_chat(f"Cannot redeem {redeem}, amount of points is not an integer.")
         elif int(note) > points:
             send_chat(f"Can't redeem {redeem}, you don't have enough points.2")
-        else:
+        elif add_to_milestone(db, user_id, redeem, int(note)):
-            add_to_milestone(db, redeem, int(note))
+            send_chat(f"Succesfully donated {int(note)} to {redeem} milestone!")
     else:
         send_chat(f"{redeem} not redeemed, type of redeem not found.")

tlapbot/schema.sql

@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS points (
 CREATE TABLE milestones (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   name TEXT NOT NULL,
-  count INTEGER NOT NULL,
+  progress INTEGER NOT NULL,
   goal INTEGER NOT NULL
 );