Merge branch 'develop' into feature/statistics-api
# Conflicts: # internal/backend/music.go # internal/backend/sync.go # internal/server/server.go # internal/server/syncHandler.go # internal/server/sync_handler_test.go # internal/server/test_helpers.go # internal/server/zz_music_handler_test.go
This commit is contained in:
@@ -27,6 +27,15 @@ type Session struct {
|
||||
CreatedAt pgtype.Timestamptz `json:"created_at"`
|
||||
}
|
||||
|
||||
type Session struct {
|
||||
Token string `json:"token"`
|
||||
IpAddress string `json:"ip_address"`
|
||||
UserAgent string `json:"user_agent"`
|
||||
ClientType *string `json:"client_type"`
|
||||
ExpiresAt pgtype.Timestamptz `json:"expires_at"`
|
||||
CreatedAt pgtype.Timestamptz `json:"created_at"`
|
||||
}
|
||||
|
||||
type Song struct {
|
||||
SoundtrackID int32 `json:"soundtrack_id"`
|
||||
SongName string `json:"song_name"`
|
||||
|
||||
Reference in New Issue
Block a user