feat(ds-host): add AppUrlDataEvents

- add AppUrlDataEvents to events
- create mock AppUrlDataEvents using Generic interfaces
- appmodel sends AppUrlDataEvent when appropriate

cmd/ds-host/ds-host.go

@@ -155,6 +155,7 @@ func main() {
 	appspaceFilesEvents := &events.AppspaceFilesEvents{}
 	appspaceStatusEvents := &events.AppspaceStatusEvents{}
 	migrationJobEvents := &events.MigrationJobEvents{}
+	appUrlDataEvents := &events.AppUrlDataEvents{}
 
 	// models
 	settingsModel := &settingsmodel.SettingsModel{
@@ -186,7 +187,8 @@ func main() {
 		Config:           runtimeConfig}
 
 	appModel := &appmodel.AppModel{
-		DB: db}
+		DB:               db,
+		AppUrlDataEvents: appUrlDataEvents}
 	appModel.PrepareStatements()
 
 	appspaceFilesModel := &appspacefilesmodel.AppspaceFilesModel{

cmd/ds-host/events/events.go

@@ -210,3 +210,27 @@ func (e *AppspaceRouteHitEvents) removeSubscriber(ch chan<- *domain.AppspaceRout
 		}
 	}
 }
+
+// AppUrlDataEvents sends AppURLData
+type AppUrlDataEvents struct {
+	ownerSubs eventIDSubs[domain.UserID, domain.AppURLData]
+	appSubs   eventIDSubs[domain.AppID, domain.AppURLData]
+}
+
+func (e *AppUrlDataEvents) SubscribeOwner(ownerID domain.UserID) <-chan domain.AppURLData {
+	return e.appSubs.subscribe(domain.AppID(ownerID))
+}
+
+func (e *AppUrlDataEvents) SubscribeApp(appID domain.AppID) <-chan domain.AppURLData {
+	return e.appSubs.subscribe(appID)
+}
+
+func (e *AppUrlDataEvents) Unsubscribe(ch <-chan domain.AppURLData) {
+	e.appSubs.unsubscribe(ch)
+	e.ownerSubs.unsubscribe(ch)
+}
+
+func (e *AppUrlDataEvents) Send(ownerID domain.UserID, data domain.AppURLData) {
+	e.ownerSubs.send(ownerID, data)
+	e.appSubs.send(data.AppID, data)
+}

cmd/ds-host/events/genericevents.go

@@ -6,14 +6,14 @@ import (
 	"github.com/teleclimber/DropServer/cmd/ds-host/domain"
 )
 
-type subIDs interface {
+type SubscribeIDs interface {
 	domain.UserID | domain.AppID | domain.AppspaceID
 }
-type dataTypes interface {
+type DataTypes interface {
 	domain.AppURLData | domain.AppspaceID
 }
 
-type eventIDSubs[T subIDs, D dataTypes] struct {
+type eventIDSubs[T SubscribeIDs, D DataTypes] struct {
 	subsMux     sync.Mutex
 	subscribers map[T]*eventSubs[D]
 }
@@ -53,7 +53,7 @@ func (s *eventIDSubs[T, D]) send(subID T, data D) {
 	}
 }
 
-type eventSubs[D dataTypes] struct {
+type eventSubs[D DataTypes] struct {
 	subsMux     sync.Mutex
 	subscribers []chan D
 }

cmd/ds-host/models/appmodel/appmodel.go

@@ -22,7 +22,10 @@ type stmtPreparer interface {
 // AppModel represents the model for app
 type AppModel struct {
 	DB *domain.DB
-	// need config to select db type?
+
+	AppUrlDataEvents interface {
+		Send(ownerID domain.UserID, data domain.AppURLData)
+	}
 
 	stmt struct {
 		selectID               *sqlx.Stmt
@@ -221,6 +224,8 @@ func (m *AppModel) CreateFromURL(ownerID domain.UserID, url string, auto bool, l
 		return domain.AppID(0), err
 	}
 
+	m.sendAppURLDataEvent(appID)
+
 	return appID, nil
 }
 
@@ -361,6 +366,7 @@ func (m *AppModel) UpdateAutomatic(appID domain.AppID, auto bool) error {
 		m.getLogger("UpdateAutomatic(), Preparex()").AppID(appID).Error(err)
 		return err
 	}
+	m.sendAppURLDataEvent(appID)
 	return nil
 }
 
@@ -417,6 +423,7 @@ func (m *AppModel) SetLastFetch(appID domain.AppID, lastDt time.Time, lastResult
 		m.getLogger("SetLastFetch(), setLast()").AppID(appID).Error(err)
 		return err
 	}
+	m.sendAppURLDataEvent(appID)
 	return nil
 }
 
@@ -451,6 +458,7 @@ func (m *AppModel) SetListing(appID domain.AppID, listingFetch domain.AppListing
 	}
 
 	tx.Commit()
+	m.sendAppURLDataEvent(appID)
 	return nil
 }
 
@@ -461,6 +469,7 @@ func (m *AppModel) SetNewUrl(appID domain.AppID, url string, dt nulltypes.NullTi
 		m.getLogger("SetNewUrl(), setNewUrl()").AppID(appID).Error(err)
 		return err
 	}
+	m.sendAppURLDataEvent(appID)
 	return nil
 }
 
@@ -506,6 +515,7 @@ func (m *AppModel) UpdateURL(appID domain.AppID, url string, listingFetch domain
 	}
 
 	tx.Commit()
+	m.sendAppURLDataEvent(appID)
 	return nil
 }
 
@@ -556,6 +566,21 @@ func setListing(appID domain.AppID, l domain.AppListingFetch, sp stmtPreparer) e
 	return err
 }
 
+func (m *AppModel) sendAppURLDataEvent(appID domain.AppID) {
+	if m.AppUrlDataEvents == nil {
+		return
+	}
+	app, err := m.GetFromID(appID)
+	if err != nil {
+		return
+	}
+	urlData, err := m.GetAppUrlData(appID)
+	if err != nil {
+		return
+	}
+	m.AppUrlDataEvents.Send(app.OwnerID, urlData)
+}
+
 // GetVersion returns the version for the app
 func (m *AppModel) GetVersion(appID domain.AppID, version domain.Version) (domain.AppVersion, error) {
 	var appVersion domain.AppVersion

cmd/ds-host/testmocks/events.go

@@ -2,18 +2,30 @@ package testmocks
 
 import (
 	"github.com/teleclimber/DropServer/cmd/ds-host/domain"
+	"github.com/teleclimber/DropServer/cmd/ds-host/events"
 )
 
-//go:generate mockgen -destination=events_mocks.go -package=testmocks github.com/teleclimber/DropServer/cmd/ds-host/testmocks AppspaceFilesEvents,AppspaceStatusEvents
+//go:generate mockgen -destination=events_mocks.go -package=testmocks github.com/teleclimber/DropServer/cmd/ds-host/testmocks AppspaceFilesEvents,AppUrlDataEvents,AppspaceStatusEvents
 
 // xxx go:generate mockgen -source=$GOFILE
 // ^^ the above fails with an internal error: nil Pkg imports which I have no idea how to fix.
 
-// AppspaceFilesEvents interface for mocking
+type GenericEvents[D events.DataTypes] interface {
+	Subscribe() <-chan D
+	SubscribeOwner(domain.UserID) <-chan D
+	SubscribeApp(domain.AppID) <-chan D
+	// more subs...
+	Unsubscribe(ch <-chan D)
+}
+
 type AppspaceFilesEvents interface {
-	Send(appspaceID domain.AppspaceID)
-	Subscribe() <-chan domain.AppspaceID
-	Unsubscribe(ch <-chan domain.AppspaceID)
+	Send(domain.AppspaceID)
+	GenericEvents[domain.AppspaceID]
+}
+
+type AppUrlDataEvents interface {
+	Send(domain.UserID, domain.AppURLData)
+	GenericEvents[domain.AppURLData]
 }
 
 // AppspaceStatusEvents interface for mocking