Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/activity.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def create_activity():
begin_time=datetime.fromisoformat(data['begin_time']),
end_time=datetime.fromisoformat(data['end_time']),
activity_type=data['activity_type'],
coach=data.get('coach'),
average_speed=data['average_speed'],
max_speed=data['max_speed'],
average_heart_rate=data['average_heart_rate'],
Expand Down
25 changes: 25 additions & 0 deletions api/sessions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
from flask import Blueprint, jsonify
from models.activity import Activity
from models import db
from datetime import datetime

sessions_bp = Blueprint('sessions_api', __name__)

@sessions_bp.route('', methods=['GET'])
def get_sessions():
# replace with authenticated user ID from session/token
user_id = 1

activities = Activity.query.filter_by(user_id=user_id).order_by(Activity.begin_time.desc()).all()

sessions = []
for a in activities:
sessions.append({
'session_id': a.id,
'coach': a.coach if a.coach else 'N/A',
'duration': a.duration,
'date': a.begin_time.strftime("%Y/%m/%d"),
'training': a.activity_type
})

return jsonify(sessions), 200
3 changes: 2 additions & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from api.dashboard import dashboard_bp
from api.body_insight import body_insight_bp
from api.activity import activity_bp
from api.sessions import sessions_bp
from models import db
from dotenv import load_dotenv
from api.sync import sync_bp
Expand Down Expand Up @@ -79,7 +80,7 @@
app.register_blueprint(sync_bp, url_prefix='/api/synced')
app.register_blueprint(body_insight_bp, url_prefix='/api/body_insight')
app.register_blueprint(activity_bp, url_prefix='/api/activity')

app.register_blueprint(sessions_bp, url_prefix='/api/sessions')
# Main index route (login + welcome)
@app.route('/', methods=['GET', 'POST'])
def index():
Expand Down
4 changes: 4 additions & 0 deletions models/activity.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class Activity(db.Model):
begin_time = db.Column(db.DateTime, nullable=False)
end_time = db.Column(db.DateTime, nullable=False)
activity_type = db.Column(db.String(50), nullable=False)
coach = db.Column(db.String(100), nullable=True)
average_speed = db.Column(db.Float, nullable=False)
max_speed = db.Column(db.Float, nullable=False)
average_heart_rate = db.Column(db.Integer, nullable=False)
Expand All @@ -24,6 +25,8 @@ class Activity(db.Model):
elevation_loss = db.Column(db.Float, nullable=False)
max_elevation = db.Column(db.Float, nullable=False)
min_elevation = db.Column(db.Float, nullable=False)



time_series = db.relationship('ActivityTimeSeries', backref='activity', cascade="all, delete-orphan")

Expand All @@ -34,6 +37,7 @@ def as_dict(self):
"begin_time": self.begin_time.isoformat(),
"end_time": self.end_time.isoformat(),
"activity_type": self.activity_type,
"coach": self.coach,
"average_speed": self.average_speed,
"max_speed": self.max_speed,
"average_heart_rate": self.average_heart_rate,
Expand Down