record not found ignore

internal/api/merch/repository.go

@@ -2,6 +2,7 @@ package merch
 
 import (
 	"database/sql"
+	"errors"
 	"gorm.io/gorm"
 	"time"
 )
@@ -44,7 +45,7 @@ func (r *Repo) addMerch(bundle merchBundle) error {
 }
 
 func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
-	var merch *Merch
+	var merch Merch
 	if err := r.db.
 		Where("user_uuid = ?", userUuid).
 		Where("merch_uuid = ?", merchUuid).
@@ -53,24 +54,28 @@ func (r *Repo) getSingleMerch(userUuid, merchUuid string) (merchBundle, error) {
 		return merchBundle{}, err
 	}
 
-	var surugaya *Surugaya
+	var surugaya Surugaya
 	if err := r.db.
 		Where("merch_uuid = ?", merchUuid).
 		First(&surugaya).Error; err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return merchBundle{}, err
 		}
+	}
 
-	var mandarake *Mandarake
+	var mandarake Mandarake
 	if err := r.db.
 		Where("merch_uuid = ?", merchUuid).
 		First(&mandarake).Error; err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return merchBundle{}, err
 		}
+	}
 
 	return merchBundle{
-		Merch:     merch,
-		Surugaya:  surugaya,
-		Mandarake: mandarake,
+		Merch:     &merch,
+		Surugaya:  &surugaya,
+		Mandarake: &mandarake,
 	}, nil
 }
 
@@ -107,10 +112,6 @@ func (r *Repo) updateMerch(payload MerchDTO, userUuid string) error {
 		fields["link"] = payload.OriginSurugaya.Link
 	}
 
-	if payload.OriginSurugaya.CookieValues != "" {
-		fields["cookie_values"] = payload.OriginSurugaya.CookieValues
-	}
-
 	if len(fields) > 0 {
 		if err := r.db.
 			Model(&Surugaya{}).