System-End/hackatime
1
0
Fork 0
mirror of https://github.com/System-End/hackatime.git synced 2026-04-20 00:35:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update stats controller to handle user_id vs email

Browse source
This commit is contained in:
Max Wofford 2025-03-10 14:33:26 -04:00
parent 976741b391
commit af4f697d13
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/api/v1/stats_controller.rb
View file

@ -3,14 +3,22 @@ class Api::V1::StatsController < ApplicationController
def show
# take either user_id with a start date & end date
start_date = Date.parse(params[:start_date]) if params[:start_date].present?
start_date = Date.parse(params[:start_date]).beginning_of_day if params[:start_date].present?
start_date ||= 10.years.ago
end_date = Date.parse(params[:end_date]) if params[:end_date].present?
end_date ||= Date.today
end_date = Date.parse(params[:end_date]).end_of_day if params[:end_date].present?
end_date ||= Date.today.end_of_day
query = Heartbeat.where(time: start_date..end_date)
if params[:user_id].present? || params[:user_email].present?
user_id = params[:user_id] || find_by_email(params[:user_email])
if params[:user_id].present?
user_id = params[:user_id]
return render plain: "User not found", status: :not_found unless user_id.present?
query = query.where(user_id: user_id)
end
if params[:user_email].present?
user_id = EmailAddress.find_by(email: params[:user_email])&.user_id || find_by_email(params[:user_email])
return render plain: "User not found", status: :not_found unless user_id.present?