From cbc7352a360bbe78ad71bc064f5ccf8e322778f0 Mon Sep 17 00:00:00 2001
From: nquidox <nquidox@gmail.com>
Date: Wed, 24 Sep 2025 21:35:59 +0300
Subject: [PATCH] sql fix

---
 internal/api/merch/repository.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/internal/api/merch/repository.go b/internal/api/merch/repository.go
index 2592e42..e1aebef 100644
--- a/internal/api/merch/repository.go
+++ b/internal/api/merch/repository.go
@@ -171,7 +171,10 @@ func (r *Repo) deleteMerch(userUuid, merchUuid string) 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 {
 		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
 		FROM prices AS p
 		JOIN merch AS m ON m.merch_uuid = p.merch_uuid
-		where m.user_uuid = ?
-		and p.created_at > ?
-		and p.deleted_at IS NULL
-		order by p.created_at desc
+		WHERE m.user_uuid = ?
+		AND p.created_at > ?
+		AND p.deleted_at IS NULL
+		AND m.deleted_at IS NULL
+		ORDER BY p.created_at DESC
 	`, userUuid, period).Scan(&prices).Error
 
 	if err != nil {