some fixes and improvements
This commit is contained in:
@@ -55,6 +55,14 @@ func (rep *RPRepository) GetOrCreateUser(id int64) (*RPUser, error) {
|
||||
func (rep *RPRepository) CreateUser(id int64) (*RPUser, error) {
|
||||
user := new(RPUser)
|
||||
err := rep.db.Get(user, "INSERT INTO rp_users(user_id) VALUES ($1) RETURNING *;", id)
|
||||
if err != nil {
|
||||
return user, err
|
||||
}
|
||||
user.Preset, err = rep.GetPreset(user.SelectedPreset)
|
||||
if err != nil {
|
||||
return user, err
|
||||
}
|
||||
user.Model, err = rep.GetModel(user.SelectedModel)
|
||||
return user, err
|
||||
}
|
||||
func (rep *RPRepository) GetUser(id int64) (*RPUser, error) {
|
||||
@@ -95,7 +103,7 @@ func (rep *RPRepository) GetUserPreset(user *RPUser) (*RPGeneralPreset, error) {
|
||||
|
||||
func (rep *RPRepository) GetAllPresets() ([]*RPGeneralPreset, error) {
|
||||
presets := make([]*RPGeneralPreset, 0)
|
||||
err := rep.db.Select(&presets, "SELECT * FROM rp_general_presets ORDER BY id DESC;")
|
||||
err := rep.db.Select(&presets, "SELECT * FROM rp_general_presets ORDER BY id;")
|
||||
return presets, err
|
||||
}
|
||||
func (rep *RPRepository) GetPreset(id string) (*RPGeneralPreset, error) {
|
||||
@@ -106,7 +114,7 @@ func (rep *RPRepository) GetPreset(id string) (*RPGeneralPreset, error) {
|
||||
|
||||
func (rep *RPRepository) GetAllScenarios() ([]*RPScenarios, error) {
|
||||
scenarios := make([]*RPScenarios, 0)
|
||||
err := rep.db.Select(&scenarios, "SELECT * FROM rp_scenarios ORDER BY id DESC;")
|
||||
err := rep.db.Select(&scenarios, "SELECT * FROM rp_scenarios ORDER BY id;")
|
||||
return scenarios, err
|
||||
}
|
||||
func (rep *RPRepository) GetScenario(id int) (*RPScenarios, error) {
|
||||
@@ -122,6 +130,6 @@ func (rep *RPRepository) GetModel(id string) (*RPModel, error) {
|
||||
}
|
||||
func (rep *RPRepository) GetAllModels() ([]*RPModel, error) {
|
||||
models := make([]*RPModel, 0)
|
||||
err := rep.db.Select(&models, "SELECT * FROM rp_models ORDER BY id DESC;")
|
||||
err := rep.db.Select(&models, "SELECT * FROM rp_models ORDER BY id;")
|
||||
return models, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user