merch-tracker-v2/api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sql fix

Browse source
This commit is contained in:
nquidox 2025-09-24 21:35:59 +03:00
parent 9dd51419bd
commit cbc7352a36
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/api/merch/repository.go
View file

@ -171,7 +171,10 @@ func (r *Repo) deleteMerch(userUuid, merchUuid string) error {
} }
func (r *Repo) getAllUserMerch(userUuid string) (merchList []Merch, err error) { func (r *Repo) getAllUserMerch(userUuid string) (merchList []Merch, err error) {
err = r.db.Model(&Merch{}).Where("user_uuid = ?", userUuid).Find(&merchList).Error err = r.db.Model(&Merch{}).
Where("user_uuid = ?", userUuid).
Where("deleted_at IS NULL").
Find(&merchList).Error
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -183,10 +186,11 @@ func (r *Repo) getPricesWithDays(userUuid string, period time.Time) (prices []Pr
SELECT p.created_at, p.merch_uuid, p.price, p.origin SELECT p.created_at, p.merch_uuid, p.price, p.origin
FROM prices AS p FROM prices AS p
JOIN merch AS m ON m.merch_uuid = p.merch_uuid JOIN merch AS m ON m.merch_uuid = p.merch_uuid
where m.user_uuid = ? WHERE m.user_uuid = ?
and p.created_at > ? AND p.created_at > ?
and p.deleted_at IS NULL AND p.deleted_at IS NULL
order by p.created_at desc AND m.deleted_at IS NULL
ORDER BY p.created_at DESC
`, userUuid, period).Scan(&prices).Error `, userUuid, period).Scan(&prices).Error
if err != nil { if err != nil {