Rename validation functions

app.py

@@ -21,7 +21,7 @@ def dashboard():
 @ app.route("/person/<int:person_id>")
 @ validate_person
 def get_person(person_id):
-    person = db.get_person_final(person_id)
+    person = db.get_person(person_id)
     return render_template('person.html', person=person)
 
 
@@ -35,7 +35,7 @@ def create_workout(person_id):
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>")
 @ validate_workout
 def get_workout(person_id, workout_id):
-    workout = db.get_workout_final(person_id, workout_id)
+    workout = db.get_workout(person_id, workout_id)
     return render_template('workout.html', workout=workout)
 
 

db.py

@@ -49,7 +49,7 @@ class DataBase():
             'SELECT PersonId AS "PersonId", Name AS "Name" FROM Person')
         return people
 
-    def get_person(self, person_id):
+    def is_valid_person(self, person_id):
         person = self.execute(
             'SELECT PersonId AS "PersonId" FROM Person WHERE PersonId=%s LIMIT 1', [person_id], one=True)
         return person
@@ -66,12 +66,12 @@ class DataBase():
         self.execute('DELETE FROM Person WHERE PersonId=%s',
                      [person_id], commit=True)
 
-    def get_workout(self, person_id, workout_id):
+    def is_valid_workout(self, person_id, workout_id):
         workout = self.execute('SELECT W.WorkoutId AS "WorkoutId" FROM Person P, Workout W WHERE P.PersonId=W.PersonId AND P.PersonId=%s AND W.WorkoutId=%s LIMIT 1', [
                                person_id, workout_id], one=True)
         return workout
 
-    def get_topset(self, person_id, workout_id, topset_id):
+    def is_valid_topset(self, person_id, workout_id, topset_id):
         topset = self.execute("""
             SELECT T.TopSetId AS "TopSetId"
             FROM Person P, Workout W, TopSet T
@@ -128,7 +128,7 @@ class DataBase():
         self.execute('UPDATE Workout SET StartDate=%s WHERE WorkoutId=%s', [
             form.get('start-date'), workout_id], commit=True)
 
-    def get_person_final(self, person_id):
+    def get_person(self, person_id):
         topsets = self.execute("""
             SELECT 
                 P.PersonId AS "PersonId", 
@@ -154,7 +154,7 @@ class DataBase():
             'Workouts': get_workouts(topsets)
         }
 
-    def get_workout_final(self, person_id, workout_id):
+    def get_workout(self, person_id, workout_id):
         topsets = self.execute("""
             SELECT 
                 P.PersonId AS "PersonId", 

decorators.py

@@ -8,7 +8,7 @@ def validate_person(func):
     def wrapper(*args, **kwargs):
         person_id = kwargs.get('person_id')
         from app import db
-        person = db.get_person(person_id)
+        person = db.is_valid_person(person_id)
         if person is None:
             return render_template('error.html', error='404', message=f'Unable to find Person({person_id})', url='/')
         return func(*args, **kwargs)
@@ -21,7 +21,7 @@ def validate_workout(func):
         person_id = kwargs.get('person_id')
         workout_id = kwargs.get('workout_id')
         from app import db
-        workout = db.get_workout(person_id, workout_id)
+        workout = db.is_valid_workout(person_id, workout_id)
         if workout is None:
             return render_template('error.html', error='404', message=f'Unable to find Workout({workout_id}) completed by Person({person_id})', url=url_for('get_person', person_id=person_id))
         return func(*args, **kwargs)
@@ -35,7 +35,7 @@ def validate_topset(func):
         workout_id = kwargs.get('workout_id')
         topset_id = kwargs.get('topset_id')
         from app import db
-        topset = db.get_topset(person_id, workout_id, topset_id)
+        topset = db.is_valid_topset(person_id, workout_id, topset_id)
         if topset is None:
             return render_template('error.html', error='404', message=f'Unable to find TopSet({topset_id}) in Workout({workout_id}) completed by Person({person_id})', url=url_for('get_workout', person_id=person_id, workout_id=workout_id))
         return func(*args, **kwargs)

utils.py

@@ -98,7 +98,7 @@ def get_stats_from_topsets(topsets):
 
     stats = [{"Text": "Total Workouts", "Value": workout_count}]
     if people_count > 1:
-        stats.append({"Text": "Number of People", "Value": people_count})
+        stats.append({"Text": "People tracked", "Value": people_count})
     if workout_count > 0:
         first_workout_date = min(workout_start_dates)
         last_workout_date = max(workout_start_dates)