[devices] minor fixes to last seen update

Author: capcom6

internal/sms-gateway/modules/devices/repository.go

@@ -68,7 +68,7 @@ func (r *repository) Insert(device *models.Device) error {
 }
 
 func (r *repository) UpdatePushToken(id, token string) error {
-	return r.db.Model(&models.Device{}).Where("id", id).Update("push_token", token).Error
+	return r.db.Model(&models.Device{}).Where("id = ?", id).Update("push_token", token).Error
 }
 
 func (r *repository) SetLastSeen(ctx context.Context, id string, lastSeen time.Time) error {
@@ -78,7 +78,7 @@ func (r *repository) SetLastSeen(ctx context.Context, id string, lastSeen time.T
 	res := r.db.WithContext(ctx).
 		Model(&models.Device{}).
 		Where("id = ? AND last_seen < ?", id, lastSeen).
-		Update("last_seen", lastSeen)
+		UpdateColumn("last_seen", lastSeen)
 	if res.Error != nil {
 		return res.Error
 	}
@@ -99,7 +99,7 @@ func (r *repository) Remove(filter ...SelectFilter) error {
 func (r *repository) removeUnused(ctx context.Context, since time.Time) (int64, error) {
 	res := r.db.
 		WithContext(ctx).
-		Where("updated_at < ?", since).
+		Where("last_seen < ?", since).
 		Delete(&models.Device{})
 
 	return res.RowsAffected, res.Error

internal/sms-gateway/modules/devices/service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"time"
 
@@ -105,17 +106,21 @@ func (s *Service) SetLastSeen(ctx context.Context, batch map[string]time.Time) e
 		return nil
 	}
 
-	for deviceId, lastSeen := range batch {
-		if ctx.Err() != nil {
-			break
+	var multiErr error
+	for deviceID, lastSeen := range batch {
+		if err := ctx.Err(); err != nil {
+			return errors.Join(err, multiErr)
 		}
-
-		if err := s.devices.SetLastSeen(ctx, deviceId, lastSeen); err != nil {
-			s.logger.Error("can't set last seen", zap.String("device_id", deviceId), zap.Error(err))
+		if err := s.devices.SetLastSeen(ctx, deviceID, lastSeen); err != nil {
+			multiErr = errors.Join(multiErr, fmt.Errorf("device %s: %w", deviceID, err))
+			s.logger.Error("can't set last seen",
+				zap.String("device_id", deviceID),
+				zap.Time("last_seen", lastSeen),
+				zap.Error(err),
+			)
 		}
 	}
-
-	return ctx.Err()
+	return multiErr
 }
 
 // Remove removes devices for a specific user that match the provided filters.
@@ -128,8 +133,15 @@ func (s *Service) Remove(userID string, filter ...SelectFilter) error {
 		return err
 	}
 
-	if err := s.tokensCache.Delete(device.AuthToken); err != nil {
-		s.logger.Error("can't invalidate token cache", zap.Error(err))
+	hash := sha256.Sum256([]byte(device.AuthToken))
+	cacheKey := hex.EncodeToString(hash[:])
+
+	if err := s.tokensCache.Delete(cacheKey); err != nil {
+		s.logger.Error("can't invalidate token cache",
+			zap.String("device_id", device.ID),
+			zap.String("cache_key", cacheKey),
+			zap.Error(err),
+		)
 	}
 
 	return s.devices.Remove(filter...)