better message formatting

api/pkg/db/internal/mongo/organizationdb/create.go

@@ -10,7 +10,7 @@ import (
 
 func (db *OrganizationDB) Create(ctx context.Context, _, _ primitive.ObjectID, org *model.Organization) error {
 	if org == nil {
-		return merrors.InvalidArgument("Organization object is nil")
+		return merrors.InvalidArgument("Organization object is nil", "organization")
 	}
 	org.SetID(primitive.NewObjectID())
 	// Organizaiton reference must be set to the same value as own organization reference

api/pkg/db/internal/mongo/refreshtokensdb/crud.go

@@ -18,7 +18,7 @@ func (db *RefreshTokenDB) Create(ctx context.Context, rt *model.RefreshToken) er
 	// First, try to find an existing token for this account/client/device combination
 	var existing model.RefreshToken
 	if rt.AccountRef == nil {
-		return merrors.InvalidArgument("Account reference must have a vaild value")
+		return merrors.InvalidArgument("Account reference must have a vaild value", "refreshToken.accountRef")
 	}
 	if err := db.FindOne(ctx, filterByAccount(*rt.AccountRef, &rt.SessionIdentifier), &existing); err != nil {
 		if errors.Is(err, merrors.ErrNoData) {

api/pkg/db/internal/mongo/repositoryimp/index.go

@@ -15,7 +15,7 @@ func (r *MongoRepository) CreateIndex(def *ri.Definition) error {
 		return merrors.NoData("data collection is not set")
 	}
 	if len(def.Keys) == 0 {
-		return merrors.InvalidArgument("Index definition has no keys")
+		return merrors.InvalidArgument("Index definition has no keys", "index.keys")
 	}
 
 	// ----- build BSON keys --------------------------------------------------

api/pkg/db/internal/mongo/repositoryimp/repository.go

@@ -83,7 +83,7 @@ func (r *MongoRepository) findOneByFilterImp(ctx context.Context, filter bson.D,
 
 func (r *MongoRepository) Get(ctx context.Context, id primitive.ObjectID, result storable.Storable) error {
 	if id.IsZero() {
-		return merrors.InvalidArgument("zero id provided while fetching " + result.Collection())
+		return merrors.InvalidArgument("zero id provided while fetching "+result.Collection(), "id")
 	}
 	return r.findOneByFilterImp(ctx, idFilter(id), fmt.Sprintf("%s with ID = %s not found", result.Collection(), id.Hex()), result)
 }
@@ -134,7 +134,7 @@ func (r *MongoRepository) Update(ctx context.Context, obj storable.Storable) err
 
 func (r *MongoRepository) Patch(ctx context.Context, id primitive.ObjectID, patch builder.Patch) error {
 	if id.IsZero() {
-		return merrors.InvalidArgument("zero id provided while patching")
+		return merrors.InvalidArgument("zero id provided while patching", "id")
 	}
 	_, err := r.collection.UpdateByID(ctx, id, patch.Build())
 	return err

api/pkg/db/internal/mongo/tseriesimp/tseries.go

@@ -22,7 +22,7 @@ type TimeSeries struct {
 
 func NewMongoTimeSeriesCollection(ctx context.Context, db *mongo.Database, tsOpts *tsoptions.Options) (*TimeSeries, error) {
 	if tsOpts == nil {
-		return nil, merrors.InvalidArgument("nil time-series options provided")
+		return nil, merrors.InvalidArgument("nil time-series options provided", "options")
 	}
 	// Configure time-series options
 	granularity := tsOpts.Granularity.String()