From 04e5710b00ef8a2b5ece6682c8555210266edc54 Mon Sep 17 00:00:00 2001 From: Vojtech Mares Date: Sat, 4 May 2024 17:20:29 +0200 Subject: [PATCH] refactor(training): make TrainingID a type alias of uuid.UUID, not new type --- pkg/training/model.go | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/pkg/training/model.go b/pkg/training/model.go index 5870b2f..2e0ed1a 100644 --- a/pkg/training/model.go +++ b/pkg/training/model.go @@ -1,32 +1,13 @@ package training import ( - "encoding/json" - "github.com/google/uuid" ) -type TrainingID uuid.UUID +type TrainingID = uuid.UUID func NewTrainingID() TrainingID { - return TrainingID(uuid.Must(uuid.NewV7())) -} - -func (id TrainingID) String() string { - return uuid.UUID(id).String() -} - -func (id TrainingID) MarshalJSON() ([]byte, error) { - return json.Marshal(uuid.UUID(id)) -} - -func (id *TrainingID) UnmarshalJSON(data []byte) error { - var u uuid.UUID - if err := json.Unmarshal(data, &u); err != nil { - return err - } - *id = TrainingID(u) - return nil + return uuid.Must(uuid.NewV7()) } type Training struct {