Skip to content

[devices] store empty token as null #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
capcom6 merged 1 commit into from
Apr 10, 2026
Merged

[devices] store empty token as null #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions internal/sms-gateway/models/migrations/mysql/20260402000000_normalize_push_token.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-- +goose Up
-- +goose StatementBegin
UPDATE `devices`
SET `push_token` = NULL
WHERE `push_token` = '';
-- +goose StatementEnd
---
-- +goose Down
-- +goose StatementBegin
SELECT 'down SQL query';
-- +goose StatementEnd
2 changes: 1 addition & 1 deletion internal/sms-gateway/modules/devices/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (r *Repository) Insert(device *models.Device) error {
return r.db.Create(device).Error
}

func (r *Repository) UpdatePushToken(id, token string) error {
func (r *Repository) UpdatePushToken(id string, token *string) error {
res := r.db.Model((*models.Device)(nil)).Where("id = ?", id).Update("push_token", token)
if res.Error != nil {
return fmt.Errorf("failed to update device: %w", res.Error)
Expand Down
3 changes: 2 additions & 1 deletion internal/sms-gateway/modules/devices/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/db"
"github.com/samber/lo"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -134,7 +135,7 @@ func (s *Service) UpdatePushToken(id string, token string) error {
)
}

if err := s.devices.UpdatePushToken(id, token); err != nil {
if err := s.devices.UpdatePushToken(id, lo.EmptyableToPtr(token)); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion internal/sms-gateway/modules/events/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (s *Service) processEvent(wrapper *eventWrapper) {

// Process each device
for _, device := range devices {
if device.PushToken != nil && *device.PushToken != "" {
if device.PushToken != nil {
// Device has push token, use push service
if enqErr := s.pushSvc.Enqueue(*device.PushToken, push.Event{
Type: wrapper.Event.EventType,
Expand Down
Loading