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

small fixes

Browse Source
This commit is contained in:
ScuroNeko
2026-02-13 13:15:34 +03:00
parent 022cf4ba06
commit 9ca1b05d2d
5 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
database/psql/waifus.go
View File

@@ -30,9 +30,12 @@ func NewWaifuRepository(db *laniakea.DatabaseContext) *WaifuRepository {
return &WaifuRepository{db: db.PostgresSQL}
}
func (rep *WaifuRepository) GetAll() ([]Waifu, error) {
waifus, err := sqlx.List[Waifu](rep.db, "SELECT * FROM waifus;")
//userRep := newUserRepository(rep.db)
func (rep *WaifuRepository) GetAll() ([]*Waifu, error) {
waifus := make([]*Waifu, 0)
err := rep.db.Select(&waifus, "SELECT * FROM waifus;")
if err != nil {
return nil, err
}
for _, waifu := range waifus {
if !waifu.OwnerID.Valid {
@@ -40,12 +43,15 @@ func (rep *WaifuRepository) GetAll() ([]Waifu, error) {
}
waifu.Owner = new(User)
err = rep.db.Get(waifu.Owner, "SELECT * FROM users WHERE id=$1;", waifu.OwnerID.Int64)
if err != nil {
return nil, err
}
}
return waifus, err
}
func (rep *WaifuRepository) GetByUserId(userId int) ([]Waifu, error) {
waifus, err := sqlx.List[Waifu](rep.db, "SELECT waifus.* FROM waifus WHERE owner_id=$1;", userId)
func (rep *WaifuRepository) GetByUserId(userId int) ([]*Waifu, error) {
waifus, err := sqlx.List[*Waifu](rep.db, "SELECT waifus.* FROM waifus WHERE owner_id=$1;", userId)
if err != nil {
return nil, err
}
@@ -84,9 +90,9 @@ func (rep *WaifuRepository) GetFreeByRarity(rarity int) ([]Waifu, error) {
return waifus, err
}
func (rep *WaifuRepository) GetById(id int) (Waifu, error) {
waifu := Waifu{}
err := rep.db.Get(&waifu, "SELECT * FROM waifus WHERE id=$1;", id)
func (rep *WaifuRepository) GetById(id int) (*Waifu, error) {
waifu := new(Waifu)
err := rep.db.Get(waifu, "SELECT * FROM waifus WHERE id=$1;", id)
if err != nil {
return waifu, err
}