Merge branch 'callServiceReturnAbWithBranch-error-return-prajwalp' into 'devbranch'

#14 Return the error from CallServiceReturnABWithBranch method

See merge request !281

routebuildermdl/serviceCachemdl.go

@@ -253,6 +253,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 
 	serviceCache := tmpSvcCache
 	res, ab, err := serviceCache.Service(rs, p)
+	loggermdl.LogError("error while calling activity:", err.Error())
 	if errormdl.CheckErr1(err) != nil {
 		// Rollback
 		if ab.TransactionEnable {
@@ -260,7 +261,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 			case dalmdl.MYSQL:
 				if ab.TXN != nil {
 					loggermdl.LogError("MYSQL Transaction Rollbacked")
-					err = ab.TXN.Rollback()
+					err := ab.TXN.Rollback()
 					if err != nil {
 						loggermdl.LogError("Error while rollback")
 						return res, ab, errormdl.Wrap("Error while rollback")
@@ -270,7 +271,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 			case dalmdl.SQLSERVER:
 				if ab.SQLServerTXN != nil {
 					loggermdl.LogError("SQLSERVER Transaction Rollbacked")
-					err = ab.SQLServerTXN.Rollback()
+					err := ab.SQLServerTXN.Rollback()
 					if err != nil {
 						loggermdl.LogError("Error while rollback")
 						return res, ab, errormdl.Wrap("Error while rollback")
@@ -280,7 +281,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 			case dalmdl.GraphDB:
 				if ab.GraphDbTXN != nil {
 					loggermdl.LogError("GRAPHDB Transaction Rollbacked")
-					err = ab.GraphDbTXN.Discard(context.TODO())
+					err := ab.GraphDbTXN.Discard(context.TODO())
 					if err != nil {
 						loggermdl.LogError("Error while rollback")
 						return res, ab, errormdl.Wrap("Error while rollback")
@@ -291,6 +292,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 				loggermdl.LogError("Invalid database type while rollback transaction")
 			}
 		}
+		return res, ab, err //returning error
 	} else {
 		if ab.TransactionEnable {
 			// Commit
@@ -298,7 +300,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 			case dalmdl.MYSQL:
 				if ab.TXN != nil {
 					loggermdl.LogError("MYSQL Transaction Commited")
-					err = ab.TXN.Commit()
+					err := ab.TXN.Commit()
 					if err != nil {
 						loggermdl.LogError("Error while commit")
 						return res, ab, errormdl.Wrap("Error while commit")
@@ -308,7 +310,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 			case dalmdl.SQLSERVER:
 				if ab.SQLServerTXN != nil {
 					loggermdl.LogError("SQLSERVER Transaction Commited")
-					err = ab.SQLServerTXN.Commit()
+					err := ab.SQLServerTXN.Commit()
 					if err != nil {
 						loggermdl.LogError("Error while commit")
 						return res, ab, errormdl.Wrap("Error while commit")
@@ -318,7 +320,7 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 			case dalmdl.GraphDB:
 				if ab.GraphDbTXN != nil {
 					loggermdl.LogError("GRAPHDB Transaction Commited")
-					err = ab.GraphDbTXN.Commit(context.TODO())
+					err := ab.GraphDbTXN.Commit(context.TODO())
 					if err != nil {
 						loggermdl.LogError("Error while commit")
 						return res, ab, errormdl.Wrap("Error while commit")
@@ -331,5 +333,6 @@ func CallServiceReturnABWithBranch(name, branch string, rs *gjson.Result, isRest
 			}
 		}
 	}
+
 	return res, ab, nil
 }