FJurmanovic/acc-server-manager
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix auth middleware and statistics issues

Browse Source
This commit is contained in:
Fran Jurmanović
2025-06-26 01:56:49 +02:00
parent 74df36cd0d
commit 7fdda06dba
9 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
local/repository/membership.go
View File

@@ -31,7 +31,7 @@ func (r *MembershipRepository) FindUserByUsername(ctx context.Context, username
}
// FindUserByIDWithPermissions finds a user by their ID and preloads Role and Permissions.
func (r *MembershipRepository) FindUserByIDWithPermissions(ctx context.Context, userID uuid.UUID) (*model.User, error) {
func (r *MembershipRepository) FindUserByIDWithPermissions(ctx context.Context, userID string) (*model.User, error) {
var user model.User
db := r.db.WithContext(ctx)
err := db.Preload("Role.Permissions").First(&user, "id = ?", userID).Error

10
local/repository/state_history.go
View File

@@ -92,12 +92,12 @@ func (r *StateHistoryRepository) GetPlayerCountOverTime(ctx context.Context, fil
var points []model.PlayerCountPoint
rawQuery := `
SELECT
strftime('%Y-%m-%d %H:00:00', date_created) as timestamp,
DATETIME(MIN(date_created)) as timestamp,
AVG(player_count) as count
FROM state_histories
WHERE server_id = ? AND date_created BETWEEN ? AND ?
GROUP BY 1
ORDER BY 1
GROUP BY strftime('%Y-%m-%d %H', date_created)
ORDER BY timestamp
`
err := r.db.WithContext(ctx).Raw(rawQuery, filter.ServerID, filter.StartDate, filter.EndDate).Scan(&points).Error
return points, err
@@ -125,7 +125,7 @@ func (r *StateHistoryRepository) GetDailyActivity(ctx context.Context, filter *m
var dailyActivity []model.DailyActivity
rawQuery := `
SELECT
DATE(date_created) as date,
strftime('%Y-%m-%d', date_created) as date,
COUNT(DISTINCT session_id) as sessions_count
FROM state_histories
WHERE server_id = ? AND date_created BETWEEN ? AND ?
@@ -142,7 +142,7 @@ func (r *StateHistoryRepository) GetRecentSessions(ctx context.Context, filter *
rawQuery := `
SELECT
session_id as id,
MIN(date_created) as date,
DATETIME(MIN(date_created)) as date,
session as type,
track,
MAX(player_count) as players,