ScuroNeko/YaeMikoBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

database changes

Browse Source
This commit is contained in:
ScuroNeko
2026-02-12 15:09:06 +03:00
parent c5448b14f6
commit 022cf4ba06
18 changed files with 202 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
database/psql/rp.go
View File

@@ -45,46 +45,57 @@ type RPRepository struct {
db *sqlx.DB
}
func NewRPRepository(db *laniakea.DatabaseContext) *RPRepository {
return &RPRepository{db.PostgresSQL}
func newRpRepository(db *sqlx.DB) RPRepository {
return RPRepository{db}
}
func NewRPRepository(db *laniakea.DatabaseContext) RPRepository {
return newRpRepository(db.PostgresSQL)
}
func (rep *RPRepository) GetOrCreateUser(id int64) (*RPUser, error) {
func (rep RPRepository) GetOrCreateUser(id int64) (RPUser, error) {
user, err := rep.GetUser(id)
if errors.Is(err, sql.ErrNoRows) {
return rep.CreateUser(id)
}
return user, err
}
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)
func (rep RPRepository) CreateUser(id int64) (RPUser, error) {
user := 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)
preset, err := rep.GetPreset(user.SelectedPreset)
if err != nil {
return user, err
}
aiRep := newAiRepository(rep.db)
user.Model, err = aiRep.GetModel(user.SelectedModel)
return user, err
}
func (rep *RPRepository) GetUser(id int64) (*RPUser, error) {
user := new(RPUser)
err := rep.db.Get(user, "SELECT * FROM rp_users WHERE user_id=$1", id)
model, err := aiRep.GetModel(user.SelectedModel)
if err != nil {
return user, err
}
user.Preset, err = rep.GetPreset(user.SelectedPreset)
user.Preset = &preset
user.Model = &model
return user, err
}
func (rep RPRepository) GetUser(id int64) (RPUser, error) {
user := RPUser{}
err := rep.db.Get(&user, "SELECT * FROM rp_users WHERE user_id=$1", id)
if err != nil {
return user, err
}
preset, err := rep.GetPreset(user.SelectedPreset)
if err != nil {
return user, err
}
aiRep := newAiRepository(rep.db)
user.Model, err = aiRep.GetModel(user.SelectedModel)
model, err := aiRep.GetModel(user.SelectedModel)
user.Model = &model
user.Preset = &preset
return user, err
}
func (rep *RPRepository) UpdateUser(user *RPUser) error {
func (rep RPRepository) UpdateUser(user RPUser) error {
s, args, err := sqlx.In(
"UPDATE rp_users SET selected_preset=?, used_tokens=?, user_prompt=?, selected_model=? WHERE user_id=?;",
user.SelectedPreset, user.UsedTokens, user.UserPrompt, user.SelectedModel, user.UserID,
@@ -96,7 +107,7 @@ func (rep *RPRepository) UpdateUser(user *RPUser) error {
_, err = rep.db.Exec(s, args...)
return err
}
func (rep *RPRepository) UpdateUserPreset(user *RPUser, presetId string) (*RPPreset, error) {
func (rep RPRepository) UpdateUserPreset(user RPUser, presetId string) (RPPreset, error) {
preset, err := rep.GetPreset(presetId)
if err != nil {
return preset, err
@@ -112,7 +123,7 @@ func (rep *RPRepository) UpdateUserPreset(user *RPUser, presetId string) (*RPPre
_, err = rep.db.Exec(s, args...)
return preset, err
}
func (rep *RPRepository) GetUserPreset(user *RPUser) (*RPPreset, error) {
func (rep RPRepository) GetUserPreset(user RPUser) (RPPreset, error) {
preset, err := rep.GetPreset(user.SelectedPreset)
if errors.Is(err, sql.ErrNoRows) {
return rep.UpdateUserPreset(user, "soft")
@@ -120,40 +131,40 @@ func (rep *RPRepository) GetUserPreset(user *RPUser) (*RPPreset, error) {
return preset, err
}
func (rep *RPRepository) GetAllPresets() ([]*RPPreset, error) {
presets := make([]*RPPreset, 0)
func (rep RPRepository) GetAllPresets() ([]RPPreset, error) {
presets := make([]RPPreset, 0)
err := rep.db.Select(&presets, "SELECT * FROM rp_presets ORDER BY id;")
return presets, err
}
func (rep *RPRepository) GetPreset(id string) (*RPPreset, error) {
preset := new(RPPreset)
err := rep.db.Get(preset, "SELECT * FROM rp_presets WHERE id=$1;", id)
func (rep RPRepository) GetPreset(id string) (RPPreset, error) {
preset := RPPreset{}
err := rep.db.Get(&preset, "SELECT * FROM rp_presets WHERE id=$1;", id)
return preset, err
}
func (rep *RPRepository) GetAllScenarios() ([]*RPScenario, error) {
scenarios := make([]*RPScenario, 0)
func (rep RPRepository) GetAllScenarios() ([]RPScenario, error) {
scenarios := make([]RPScenario, 0)
err := rep.db.Select(&scenarios, "SELECT * FROM rp_scenarios ORDER BY id;")
return scenarios, err
}
func (rep *RPRepository) GetScenario(id int) (*RPScenario, error) {
scenario := new(RPScenario)
err := rep.db.Get(scenario, "SELECT * FROM rp_scenarios WHERE id=$1;", id)
func (rep RPRepository) GetScenario(id int) (RPScenario, error) {
scenario := RPScenario{}
err := rep.db.Get(&scenario, "SELECT * FROM rp_scenarios WHERE id=$1;", id)
return scenario, err
}
func (rep *RPRepository) GetAllSettings() ([]*RPSetting, error) {
settings := make([]*RPSetting, 0)
func (rep RPRepository) GetAllSettings() ([]RPSetting, error) {
settings := make([]RPSetting, 0)
err := rep.db.Select(&settings, "SELECT * FROM rp_settings ORDER BY id;")
return settings, err
}
func (rep *RPRepository) GetSetting(id int) (*RPSetting, error) {
setting := new(RPSetting)
err := rep.db.Get(setting, "SELECT * FROM rp_settings WHERE id=$1;", id)
func (rep RPRepository) GetSetting(id int) (RPSetting, error) {
setting := RPSetting{}
err := rep.db.Get(&setting, "SELECT * FROM rp_settings WHERE id=$1;", id)
return setting, err
}
func (rep *RPRepository) UpdateUserCompressSettings(user *RPUser) (*RPUser, error) {
func (rep RPRepository) UpdateUserCompressSettings(user RPUser) (RPUser, error) {
query, args, err := sqlx.In(
"UPDATE rp_users SET compress_method=?, compress_limit=? WHERE user_id=?;",
user.CompressMethod, user.CompressLimit, user.UserID,