.DS_Store gelöscht

go.mod

@@ -1,4 +1,4 @@
-module github.com/tecamino/tecamino-json_data
+module gitea.tecamino.com/paadi/tecamino-json_data
 
 go 1.21.0
 

models/bus.go

@@ -4,7 +4,7 @@ import "slices"
 
 // bus model
 type Bus struct {
-	Name    string `json:"name,omitempty"`
+	Name    string `json:"name"`
 	Address []uint `json:"address,omitempty"` // address of bus
 	Topic   *Topic `json:"topic,omitempty"`   // address of bus
 }
@@ -16,9 +16,7 @@ func (b *Bus) AddAddress(address ...uint) {
 		}
 		b.Address = append(b.Address, a)
 		slices.Sort(b.Address)
-
 	}
-
 }
 
 func (b *Bus) AddSubscription(sub ...string) {
@@ -34,3 +32,25 @@ func (b *Bus) AddPublish(pub ...string) {
 	}
 	b.Topic.AddPublish(pub...)
 }
+
+func (b *Bus) RemoveAddress(address ...uint) {
+	if len(b.Address) == 1 {
+		b.Address = []uint{}
+		return
+	}
+	for _, toDelete := range address {
+		for i, a := range b.Address {
+			if a == toDelete {
+				b.Address = slices.Delete(b.Address, i, i+1)
+			}
+		}
+	}
+}
+
+func (b *Bus) RemoveSubscription(sub ...string) {
+	b.Topic.RemoveSubscription(sub...)
+}
+
+func (b *Bus) RemovePublish(pub ...string) {
+	b.Topic.RemovePublish(pub...)
+}

models/driver.go

@@ -2,42 +2,70 @@ package models
 
 // driver model
 type Driver struct {
-	Type  string          `json:"type"`  // driver type name of driver in collection
-	Buses map[string]*Bus `json:"buses"` // name of driver bus
+	Type  string `json:"type"`            // driver type name of driver in collection
+	Buses []*Bus `json:"buses,omitempty"` // name of driver bus
 }
 
 func (d *Driver) AddNewBus(name string) *Bus {
-	if d.Buses == nil {
-		d.Buses = make(map[string]*Bus)
+	for _, b := range d.Buses {
+		if b.Name == name {
+			return b
+		}
 	}
-	if b, ok := d.Buses[name]; ok {
-		return b
-	}
-	d.Buses[name] = &Bus{Name: name}
-	return d.Buses[name]
+	b := &Bus{Name: name}
+	d.Buses = append(d.Buses, b)
+	return b
 }
 
-func (d *Driver) AddBuses(buses map[string]*Bus) {
-	if d.Buses == nil {
-		d.Buses = make(map[string]*Bus)
-	}
-	for key, newBus := range buses {
-		if currentBus, ok := d.Buses[key]; ok {
+func (d *Driver) AddBuses(buses []*Bus) {
+next:
+	for _, newBus := range buses {
+		for _, currentBus := range d.Buses {
+			if currentBus.Name != newBus.Name {
+				continue
+			}
 			currentBus.AddAddress(newBus.Address...)
 			if newBus.Topic == nil {
-				continue
+				continue next
 			}
 			currentBus.AddSubscription(newBus.Topic.Subscribe...)
 			currentBus.AddPublish(newBus.Topic.Publish...)
-			continue
+			continue next
+		}
+		d.Buses = append(d.Buses, newBus)
+	}
+}
+
+func (d *Driver) RemoveBuses(buses []*Bus) {
+	for _, bus := range buses {
+		for i := 0; i < len(d.Buses); i++ {
+			currentBus := d.Buses[i]
+			if currentBus.Name != bus.Name {
+				continue
+			}
+
+			currentBus.RemoveAddress(bus.Address...)
+
+			shouldRemove := true
+			if bus.Topic != nil {
+				currentBus.RemoveSubscription(bus.Topic.Subscribe...)
+				currentBus.RemovePublish(bus.Topic.Publish...)
+				shouldRemove = len(currentBus.Topic.Subscribe) == 0 && len(currentBus.Topic.Publish) == 0
+			}
+			if len(currentBus.Address) == 0 && shouldRemove {
+				d.Buses = append(d.Buses[:i], d.Buses[i+1:]...)
+				i-- // adjust index after removal
+			}
+			break
 		}
-		d.Buses[key] = newBus
 	}
 }
 
 func (d *Driver) GetBus(name string) *Bus {
-	if b, ok := d.Buses[name]; ok {
-		return b
+	for _, b := range d.Buses {
+		if b.Name == name {
+			return b
+		}
 	}
 	return nil
 }

models/drivers.go

@@ -7,14 +7,30 @@ func (d *Drivers) AddNewDriver(typ string) *Driver {
 	if drv, ok := (*d)[typ]; ok {
 		return drv
 	}
-	(*d)[typ] = &Driver{Type: typ}
-	return (*d)[typ]
+	drv := &Driver{Type: typ}
+	(*d)[typ] = drv
+	return drv
 }
 
-func (d *Drivers) AddDriver(drv Driver) {
+func (d *Drivers) AddDriver(drv *Driver) {
 	if driver, ok := (*d)[drv.Type]; ok {
 		driver.AddBuses(drv.Buses)
-		(*d)[drv.Type] = driver
+		return
+	}
+	(*d)[drv.Type] = drv
+}
+
+func (d *Drivers) RemoveDriver(drv *Driver) {
+	if driver, ok := (*d)[drv.Type]; ok {
+		driver.RemoveBuses(drv.Buses)
+	}
+	d.CleanEmptyDrivers()
+}
+
+func (d *Drivers) CleanEmptyDrivers() {
+	for key, drv := range *d {
+		if len(drv.Buses) == 0 {
+			delete(*d, key)
+		}
 	}
-	(*d)[drv.Type] = &drv
 }

models/publish.go

@@ -3,17 +3,18 @@ package models
 import (
 	"fmt"
 
+	"gitea.tecamino.com/paadi/tecamino-json_data/utils"
 	"github.com/google/uuid"
-	"github.com/tecamino/tecamino-json_data/utils"
 )
 
 // publish model
 type Publish struct {
-	Event string    `json:"event,omitempty"` // publish event onCreate|onChange|onDelete
-	Uuid  uuid.UUID `json:"uuid,omitempty"`  //  universally unique identifier
-	Path  string    `json:"path,omitempty"`  // dbm path
-	Type  Type      `json:"type,omitempty"`  // dbm datatype
-	Value any       `json:"value,omitempty"` // dbm value
+	Event   string    `json:"event,omitempty"`   // publish event onCreate|onChange|onDelete
+	Uuid    uuid.UUID `json:"uuid,omitempty"`    //  universally unique identifier
+	Drivers *Drivers  `json:"drivers,omitempty"` // assigned drivers
+	Path    string    `json:"path,omitempty"`    // dbm path
+	Type    Type      `json:"type,omitempty"`    // dbm datatype
+	Value   any       `json:"value,omitempty"`   // dbm value
 }
 
 // returns input parameter as assigned dbm datatype

models/topic.go

@@ -1,10 +1,12 @@
 package models
 
-import "slices"
+import (
+	"slices"
+)
 
 // topic model
 type Topic struct {
-	Publish   []string `json:"Publish,omitempty"`
+	Publish   []string `json:"publish,omitempty"`
 	Subscribe []string `json:"subscribe,omitempty"`
 }
 
@@ -27,3 +29,32 @@ func (t *Topic) AddPublish(pubs ...string) {
 		slices.Sort(t.Publish)
 	}
 }
+
+func (t *Topic) RemoveSubscription(subs ...string) {
+	if len(t.Subscribe) == 1 {
+		t.Subscribe = []string{}
+		return
+	}
+
+	for _, toDelete := range subs {
+		for i, a := range t.Subscribe {
+			if a == toDelete {
+				t.Subscribe = slices.Delete(t.Subscribe, i, i+1)
+			}
+		}
+	}
+}
+
+func (t *Topic) RemovePublish(pubs ...string) {
+	if len(t.Publish) == 1 {
+		t.Publish = []string{}
+		return
+	}
+	for _, toDelete := range pubs {
+		for i, a := range t.Publish {
+			if a == toDelete {
+				t.Publish = slices.Delete(t.Publish, i, i+1)
+			}
+		}
+	}
+}

models/type.go

@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 
-	"github.com/tecamino/tecamino-json_data/utils"
+	"gitea.tecamino.com/paadi/tecamino-json_data/utils"
 )
 
 // all avaiable datatypes of dbm

request.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/tecamino/tecamino-json_data/models"
+	"gitea.tecamino.com/paadi/tecamino-json_data/models"
 )
 
 // Returns a new json_data Request model

response.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/tecamino/tecamino-json_data/models"
+	"gitea.tecamino.com/paadi/tecamino-json_data/models"
 )
 
 // Returns a new json_data Response model