add dbm new model and fixed json_data

dbm/dbmHandler.go

@@ -12,23 +12,23 @@ import (
 	"github.com/tecamino/tecamino-dbm/args"
 	"github.com/tecamino/tecamino-dbm/models"
 	serverModels "github.com/tecamino/tecamino-dbm/server/models"
-	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 	"github.com/tecamino/tecamino-logger/logging"
 )
 
 type DBMHandler struct {
-	filePath string
-	DB       models.Datapoint
-	Conns    *serverModels.Connections
+	DBM   *models.DBM
+	Conns *serverModels.Connections
 	sync.RWMutex
-	Log *logging.Logger
-	arg *args.Args
+	Log      *logging.Logger
+	arg      *args.Args
+	filePath string
 }
 
 // initialze new Database Manager
 // it will call cli arguments
 func NewDbmHandler(a *args.Args) (*DBMHandler, error) {
 
+	//initialize new logger
 	logger, err := logging.NewLogger("dbmServer.log", &logging.Config{
 		MaxSize:     1,
 		MaxBackup:   3,
@@ -42,12 +42,16 @@ func NewDbmHandler(a *args.Args) (*DBMHandler, error) {
 	}
 	logger.Info("main", "start dma handler")
 
+	//initialize connection map
+	conns := serverModels.NewConnections()
+
 	// Initialize dtabase manager handler
 	dmaHandler := DBMHandler{
 		arg:      a,
 		filePath: fmt.Sprintf("%s/%s.dbm", a.RootDir, a.DBMFile),
+		DBM:      models.NewDBM(conns, logger),
 		Log:      logger,
-		Conns:    serverModels.NewConnections(),
+		Conns:    conns,
 	}
 
 	// initialize system datapoint and periodically update it
@@ -67,16 +71,20 @@ func NewDbmHandler(a *args.Args) (*DBMHandler, error) {
 
 		// read in dtaabase file content
 		scanner := bufio.NewScanner(f)
-
+		var line int
 		for scanner.Scan() {
+			line++
 			dp := models.Datapoint{}
 			if err = json.Unmarshal(scanner.Bytes(), &dp); err != nil {
+				dmaHandler.Log.Error("dmbHandler.NewDmbHandler", "error in line "+fmt.Sprint(line)+" "+scanner.Text())
+				dmaHandler.Log.Error("dmbHandler.NewDmbHandler", err.Error())
+
 				return nil, err
 			}
-			dmaHandler.ImportDatapoints(dp)
+			dmaHandler.DBM.ImportDatapoints(dp)
 		}
 	}
-	dmaHandler.Log.Info("dmbHandler.NewDmbHandler", fmt.Sprintf("%d datapoint imported in %v", dmaHandler.GetNumbersOfDatapoints(), time.Since(s)))
+	dmaHandler.Log.Info("dmbHandler.NewDmbHandler", fmt.Sprintf("%d datapoint imported in %v", dmaHandler.DBM.GetNumbersOfDatapoints(), time.Since(s)))
 	return &dmaHandler, nil
 }
 
@@ -87,7 +95,7 @@ func (d *DBMHandler) SaveDb() (err error) {
 	}
 	defer f.Close()
 
-	for _, dp := range d.DB.GetAllDatapoints(0) {
+	for _, dp := range d.DBM.GetAllDatapoints(0) {
 		//exclude System datapoints from saving
 		//System datapoints are used for internal purposes and should not be saved in the database
 		if strings.Contains(dp.Path, "System:") {
@@ -110,59 +118,3 @@ func (d *DBMHandler) SaveDb() (err error) {
 	}
 	return
 }
-
-func (d *DBMHandler) CreateDatapoints(sets ...json_dataModels.Set) ([]json_dataModels.Set, error) {
-	if len(sets) == 0 {
-		return nil, nil
-	}
-
-	dps, err := d.DB.CreateDatapoints(d.Conns, sets...)
-	if err != nil {
-		return nil, err
-	}
-
-	var ndp uint64
-	for _, dp := range dps {
-		if !dp.Updated {
-			ndp++
-		}
-	}
-	dp := d.QueryDatapoints(1, "System:Datapoints")
-	d.UpdateDatapointValue("System:Datapoints", dp[0].GetValueUint64()+ndp)
-	return dps, nil
-}
-
-func (d *DBMHandler) ImportDatapoints(dps ...models.Datapoint) error {
-	for _, dp := range dps {
-		err := d.DB.ImportDatapoint(d.Conns, dp, dp.Path)
-		if err != nil {
-			return err
-		}
-		dps := d.QueryDatapoints(1, "System:Datapoints")
-		d.UpdateDatapointValue("System:Datapoints", dps[0].GetValueUint64()+1)
-	}
-	return nil
-}
-
-func (d *DBMHandler) UpdateDatapointValue(path string, value any) error {
-	return d.DB.UpdateDatapointValue(d.Conns, value, path)
-}
-
-func (d *DBMHandler) RemoveDatapoint(sets ...json_dataModels.Set) ([]json_dataModels.Set, error) {
-	var lsRemoved []json_dataModels.Set
-	for _, set := range sets {
-		removed, err := d.DB.RemoveDatapoint(d.Conns, set)
-		if err != nil {
-			return lsRemoved, err
-		}
-		lsRemoved = append(lsRemoved, removed)
-		dp := d.QueryDatapoints(1, "System:Datapoints")
-		d.UpdateDatapointValue("System:Datapoints", dp[0].GetValueUint64()-1)
-	}
-
-	return lsRemoved, nil
-}
-
-func (d *DBMHandler) QueryDatapoints(depth uint, key string) []*models.Datapoint {
-	return d.DB.QueryDatapoints(depth, key)
-}