From b2e1c216a0331fd4d7703da159eff0d42cd261e7 Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 24 Dec 2025 10:48:25 -0500 Subject: [PATCH] refactor(scheduler): replace uuid with id.NewRandom for schedule ID generation Signed-off-by: Deluan --- plugins/host_scheduler.go | 6 +++--- plugins/host_scheduler_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/host_scheduler.go b/plugins/host_scheduler.go index 40b5cd255..1fbe23c23 100644 --- a/plugins/host_scheduler.go +++ b/plugins/host_scheduler.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/google/uuid" "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model/id" "github.com/navidrome/navidrome/plugins/host" "github.com/navidrome/navidrome/scheduler" ) @@ -49,7 +49,7 @@ func newSchedulerService(pluginName string, manager *Manager, sched scheduler.Sc func (s *schedulerServiceImpl) ScheduleOneTime(ctx context.Context, delaySeconds int32, payload string, scheduleID string) (string, error) { if scheduleID == "" { - scheduleID = uuid.New().String() + scheduleID = id.NewRandom() } s.mu.Lock() @@ -81,7 +81,7 @@ func (s *schedulerServiceImpl) ScheduleOneTime(ctx context.Context, delaySeconds func (s *schedulerServiceImpl) ScheduleRecurring(ctx context.Context, cronExpression string, payload string, scheduleID string) (string, error) { if scheduleID == "" { - scheduleID = uuid.New().String() + scheduleID = id.NewRandom() } capturedID := scheduleID diff --git a/plugins/host_scheduler_test.go b/plugins/host_scheduler_test.go index e152f7bec..188167a9d 100644 --- a/plugins/host_scheduler_test.go +++ b/plugins/host_scheduler_test.go @@ -128,7 +128,7 @@ var _ = Describe("SchedulerService", Ordered, func() { It("should auto-generate schedule ID when empty", func() { scheduleID, err := testService.ScheduleOneTime(GinkgoT().Context(), 1, "data", "") Expect(err).ToNot(HaveOccurred()) - Expect(scheduleID).To(HaveLen(36)) // UUID format + Expect(scheduleID).ToNot(BeEmpty()) }) })