Skip to content

add membership tier to the api return #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jaden51 merged 1 commit into from
Mar 15, 2026
Merged

add membership tier to the api return #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions internal/database/gamer_activity_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,14 @@ func toGamerActivitiesFromActiveSessions(rows []sqlc.GetActiveSessionsRow) []mod
activities := make([]models.GamerActivity, len(rows))
for i, row := range rows {
activities[i] = models.GamerActivity{
ID: row.ID.String(),
StudentNumber: row.StudentNumber,
PCNumber: int(row.PcNumber.Int32),
Game: row.Game.String,
StartedAt: row.StartedAt.Time,
FirstName: &row.FirstName,
LastName: &row.LastName,
ID: row.ID.String(),
StudentNumber: row.StudentNumber,
PCNumber: int(row.PcNumber.Int32),
Game: row.Game.String,
MembershipTier: int(row.MembershipTier),
StartedAt: row.StartedAt.Time,
FirstName: &row.FirstName,
LastName: &row.LastName,
}
if row.EndedAt.Valid {
activities[i].EndedAt = &row.EndedAt.Time
Expand Down
2 changes: 1 addition & 1 deletion internal/database/queries/gamer_activity.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RETURNING id, student_number, pc_number, game, started_at, ended_at, exec_name;

-- name: GetActiveSessions :many
SELECT ga.id, ga.student_number, ga.pc_number, ga.game, ga.started_at, ga.ended_at, ga.exec_name,
gp.first_name, gp.last_name
gp.first_name, gp.last_name, gp.membership_tier
FROM gamer_activity ga
JOIN gamer_profile gp ON ga.student_number = gp.student_number
WHERE ga.ended_at IS NULL;
22 changes: 12 additions & 10 deletions internal/database/sqlc/gamer_activity.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions internal/models/gamer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ type GamerProfile struct {
}

type GamerActivity struct {
ID string `json:"id"`
StudentNumber string `json:"student_number"`
PCNumber int `json:"pc_number"`
Game string `json:"game"`
StartedAt time.Time `json:"started_at"`
EndedAt *time.Time `json:"ended_at,omitempty"`
ExecName *string `json:"exec_name,omitempty"`
FirstName *string `json:"first_name,omitempty"`
LastName *string `json:"last_name,omitempty"`
ID string `json:"id"`
StudentNumber string `json:"student_number"`
PCNumber int `json:"pc_number"`
Game string `json:"game"`
MembershipTier int `json:"membership_tier"`
StartedAt time.Time `json:"started_at"`
EndedAt *time.Time `json:"ended_at,omitempty"`
ExecName *string `json:"exec_name,omitempty"`
FirstName *string `json:"first_name,omitempty"`
LastName *string `json:"last_name,omitempty"`
}

type CreateGamerProfileRequest struct {
Expand Down
Loading