use newer event approach

internal/services/event.go

@@ -1,16 +1,16 @@
 package services
 
 import (
-	"bytes"
 	"context"
-	"encoding/gob"
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"runtime"
 	"time"
 
 	"github.com/r3labs/sse/v2"
 	"github.com/ryanfaerman/netctl/internal/dao"
+	"github.com/ryanfaerman/netctl/internal/events"
 	"github.com/ryanfaerman/netctl/internal/models"
 	"github.com/ryanfaerman/netctl/workgroup"
 )
@@ -33,33 +33,33 @@ var Event = &event{
 }
 
 func (e *event) Create(ctx context.Context, stream string, evt any) error {
-	var (
-		b bytes.Buffer
-		p any
-	)
-
-	p = &evt
-	if err := gob.NewEncoder(&b).Encode(p); err != nil {
-		return err
+	d, err := json.Marshal(evt)
+	if err != nil {
+		global.log.Error("unable to marshal event", "error", err)
 	}
 
 	id, err := global.dao.CreateEvent(ctx, dao.CreateEventParams{
 		StreamID:  stream,
 		AccountID: 1,
 		EventType: fmt.Sprintf("%T", evt),
-		EventData: b.Bytes(),
+		EventData: d,
 	})
 	if err != nil {
 		return err
 	}
 
+	j, err := events.Decode(fmt.Sprintf("%T", evt), d)
+	if err != nil {
+		return err
+	}
+
 	event := models.Event{
 		ID:        id,
 		At:        time.Now(),
 		StreamID:  stream,
 		AccountID: 1,
 		Name:      fmt.Sprintf("%T", evt),
-		Event:     evt,
+		Event:     j,
 	}
 
 	go e.Publish(context.Background(), event)

internal/services/net.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"errors"
+	"fmt"
 	"strings"
 	"time"
 
@@ -59,14 +60,6 @@ func (net) GetNetFromSession(ctx context.Context, sessionID string) (*models.Net
 	return n, n.Replay(ctx, sessionID)
 }
 
-// func (net) Create(ctx context.Context, name string) (*models.Net, error) {
-// 	id, err := global.dao.CreateNetAndReturnId(ctx, name)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	return models.FindNetById(ctx, id)
-// }
-
 func (net) Create(ctx context.Context, m *models.Net) (*models.Net, error) {
 	if err := Validation.Apply(m); err != nil {
 		return m, err
@@ -91,7 +84,7 @@ func init() {
 }
 
 func (n net) ValidateCheckinHeard(ctx context.Context, event models.Event) error {
-	if e, ok := event.Event.(events.NetCheckinHeard); ok {
+	if e, ok := event.Event.(*events.NetCheckinHeard); ok {
 		m := &models.NetCheckin{
 			ID: e.ID,
 		}
@@ -104,7 +97,7 @@ func (n net) ValidateCheckinHeard(ctx context.Context, event models.Event) error
 
 	}
 	global.log.Debug("invalid event", "event", event)
-	return errors.New("invalid event")
+	return fmt.Errorf("invalid event %T", event.Event)
 }
 
 func (n net) ValidateCheckin(ctx context.Context, stream string, checkin *models.NetCheckin) error {