Refactor: add memberKind ans relation constants

Signed-off-by: JeffMboya <[email protected]> Refactor: add memberKind ans relation constants Signed-off-by: JeffMboya <[email protected]> Refactor: add memberKind ans relation constants Signed-off-by: JeffMboya <[email protected]> Refactor: add memberKind ans relation constants Signed-off-by: JeffMboya <[email protected]> Refactor: add memberKind ans relation constants Signed-off-by: JeffMboya <[email protected]>
absmach · May 20, 2024 · 73f7017 · 73f7017
1 parent 3f8243e
commit 73f7017
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 34 deletions.
diff --git a/bootstrap/events/consumer/streams.go b/bootstrap/events/consumer/streams.go
@@ -20,6 +20,9 @@ const (
 	channelPrefix = "group."
 	channelUpdate = channelPrefix + "update"
 	channelRemove = channelPrefix + "remove"
+
+	memberKind = "things"
+	relation   = "group"
 )
 
 type eventHandler struct {
@@ -100,7 +103,7 @@ func decodeRemoveChannel(event map[string]interface{}) removeEvent {
 }
 
 func decodeConnectThing(event map[string]interface{}) connectionEvent {
-	if event["memberKind"] != "things" && event["relation"] != "group" {
+	if event["memberKind"] != memberKind && event["relation"] != relation {
 		return connectionEvent{}
 	}
 
@@ -111,7 +114,7 @@ func decodeConnectThing(event map[string]interface{}) connectionEvent {
 }
 
 func decodeDisconnectThing(event map[string]interface{}) connectionEvent {
-	if event["memberKind"] != "things" && event["relation"] != "group" {
+	if event["memberKind"] != memberKind && event["relation"] != relation {
 		return connectionEvent{}
 	}
 	return connectionEvent{

diff --git a/bootstrap/mocks/configs.go b/bootstrap/mocks/configs.go
diff --git a/bootstrap/mocks/service.go b/bootstrap/mocks/service.go
diff --git a/bootstrap/postgres/configs.go b/bootstrap/postgres/configs.go
@@ -64,27 +64,27 @@ func (cr configRepository) Save(ctx context.Context, cfg bootstrap.Config, chsCo
 			err = repoerr.ErrConflict
 		}
 
-		if errRollback := cr.rollback("failed to insert a Config", tx); errRollback != nil {
+		if errRollback := cr.rollback(err, tx); errRollback != nil {
 			return "", errors.Wrap(err, errRollback)
 		}
 	}
 
 	if err := insertChannels(ctx, cfg.Owner, cfg.Channels, tx); err != nil {
-		if errRollback := cr.rollback("failed to insert Channels", tx); errRollback != nil {
+		if errRollback := cr.rollback(err, tx); errRollback != nil {
 			return "", errors.Wrap(err, errRollback)
 		}
 		return "", errors.Wrap(errSaveChannels, err)
 	}
 
 	if err := insertConnections(ctx, cfg, chsConnIDs, tx); err != nil {
-		if errRollback := cr.rollback("failed to insert connections", tx); errRollback != nil {
+		if errRollback := cr.rollback(err, tx); errRollback != nil {
 			return "", errors.Wrap(err, errRollback)
 		}
 		return "", errors.Wrap(errSaveConnections, err)
 	}
 
 	if err := tx.Commit(); err != nil {
-		if errRollback := cr.rollback("failed to commit Config save", tx); errRollback != nil {
+		if errRollback := cr.rollback(err, tx); errRollback != nil {
 			return "", errors.Wrap(err, errRollback)
 		}
 		return "", err
@@ -321,7 +321,7 @@ func (cr configRepository) UpdateConnections(ctx context.Context, owner, id stri
 	}
 
 	if err := insertChannels(ctx, owner, channels, tx); err != nil {
-		if rollbackErr := cr.rollback("failed to insert Channels during the update", tx); rollbackErr != nil {
+		if rollbackErr := cr.rollback(err, tx); rollbackErr != nil {
 			return err
 		}
 		return errors.Wrap(repoerr.ErrUpdateEntity, err)
@@ -333,14 +333,14 @@ func (cr configRepository) UpdateConnections(ctx context.Context, owner, id stri
 				return repoerr.ErrNotFound
 			}
 		}
-		if errRollback := cr.rollback("failed to update connections during the update", tx); errRollback != nil {
+		if errRollback := cr.rollback(err, tx); errRollback != nil {
 			return errors.Wrap(err, errRollback)
 		}
 		return errors.Wrap(repoerr.ErrUpdateEntity, err)
 	}
 
 	if err := tx.Commit(); err != nil {
-		if errRollback := cr.rollback("failed to commit Config update", tx); errRollback != nil {
+		if errRollback := cr.rollback(err, tx); errRollback != nil {
 			return errors.Wrap(err, errRollback)
 		}
 		return errors.Wrap(repoerr.ErrUpdateEntity, err)
@@ -505,13 +505,12 @@ func (cr configRepository) retrieveAll(owner string, filter bootstrap.Filter) (s
 	return fmt.Sprintf(template, f), params
 }
 
-func (cr configRepository) rollback(content string, tx *sqlx.Tx) error {
-	errMsg := errors.New(content)
+func (cr configRepository) rollback(defErr error, tx *sqlx.Tx) error {
 	if err := tx.Rollback(); err != nil {
-		errRollback := errors.New("failed to rollback")
-		return errors.Wrap(errMsg, errors.Wrap(errRollback, err))
+		return errors.Wrap(defErr, errors.Wrap(errors.New("failed to rollback"), err))
 	}
-	return errMsg
+
+	return defErr
 }
 
 func insertChannels(_ context.Context, owner string, channels []bootstrap.Channel, tx *sqlx.Tx) error {

diff --git a/go.mod b/go.mod
@@ -97,7 +97,6 @@ require (
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -188,5 +187,4 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	mvdan.cc/gofumpt v0.6.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -826,5 +826,3 @@ gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo=
-mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA=