simplify

charger/ocpp.go

@@ -15,6 +15,7 @@ import (
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/smartcharging"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/types"
+	"github.com/samber/lo"
 )
 
 // OCPP charger implementation
@@ -157,12 +158,8 @@ func NewOCPP(id string, connector int, idtag string,
 		return nil, fmt.Errorf("invalid connector: %d", connector)
 	}
 
-	if remoteStart && idtag == "" {
-		idtag = cp.IdTag
-
-		if idtag == "" {
-			idtag = defaultIdTag
-		}
+	if remoteStart {
+		idtag = lo.CoalesceOrEmpty(idtag, cp.IdTag, defaultIdTag)
 	}
 
 	conn, err := ocpp.NewConnector(log, connector, cp, idtag, timeout)

charger/ocpp/connector.go

@@ -77,15 +77,15 @@ func (conn *Connector) TriggerMessageRequest(feature remotetrigger.MessageTrigge
 	})
 }
 
-func (conn *Connector) remoteStartTransactionRequest(idtag string) {
+func (conn *Connector) remoteStartTransactionRequest() {
 	rc := make(chan error, 1)
 	err := Instance().RemoteStartTransaction(conn.cp.ID(), func(resp *core.RemoteStartTransactionConfirmation, err error) {
 		if err == nil && resp != nil && resp.Status != types.RemoteStartStopStatusAccepted {
 			err = errors.New(string(resp.Status))
 		}
 
 		rc <- err
-	}, idtag, func(request *core.RemoteStartTransactionRequest) {
+	}, conn.remoteIdTag, func(request *core.RemoteStartTransactionRequest) {
 		connector := conn.id
 		request.ConnectorId = &connector
 	})

charger/ocpp/connector_core.go

@@ -39,7 +39,7 @@ func (conn *Connector) StatusNotification(request *core.StatusNotificationReques
 
 	if conn.isWaitingForAuth() {
 		if conn.remoteIdTag != "" {
-			defer conn.remoteStartTransactionRequest(conn.remoteIdTag)
+			defer conn.remoteStartTransactionRequest()
 		} else {
 			conn.log.DEBUG.Printf("waiting for local authentication")
 		}