working commit

app/operator/grant.go

@@ -9,6 +9,7 @@ import (
 	"mstore/pkg/auxuuid"
 )
 
+// CreateGrant
 type CreateGrantParams struct {
 	AccountID string `json:"accountID"`
 	Right     string `json:"operation"`
@@ -18,7 +19,7 @@ type CreateGrantResult struct {
 	GrantID string `json:"grantId"`
 }
 
-func (oper *Operator) CreateGrant(ctx context.Context, params *CreateGrantParams) (*CreateGrantResult, error) {
+func (oper *Operator) CreateGrant(ctx context.Context, operID string, params *CreateGrantParams) (*CreateGrantResult, error) {
 	var err error
 	res := &CreateGrantResult{}
 
@@ -40,9 +41,10 @@ func (oper *Operator) CreateGrant(ctx context.Context, params *CreateGrantParams
 		return res, err
 	}
 	if grantExists {
-		err := fmt.Errorf("Grant with this parapeters already exists")
+		err := fmt.Errorf("Grant with this right already exists")
 		return res, err
 	}
+	oper.logg.Debugf("Call CreateGrant")
 	now := auxtool.TimeNow()
 	grantDescr := &descr.Grant{
 		ID:        auxuuid.NewUUID(),
@@ -51,6 +53,8 @@ func (oper *Operator) CreateGrant(ctx context.Context, params *CreateGrantParams
 		Pattern:   params.Pattern,
 		CreatedAt: now,
 		UpdatedAt: now,
+		CreatedBy: operID,
+		UpdatedBy: operID,
 	}
 	err = oper.mdb.InsertGrant(ctx, grantDescr)
 	if err != nil {
@@ -60,16 +64,21 @@ func (oper *Operator) CreateGrant(ctx context.Context, params *CreateGrantParams
 	return res, err
 }
 
+// UpdateGrant
 type UpdateGrantParams struct {
 	GrantID    string
 	NewPattern string
 }
 type UpdateGrantResult struct{}
 
-func (oper *Operator) UpdateGrant(ctx context.Context, params *UpdateGrantParams) (*UpdateGrantResult, error) {
+func (oper *Operator) UpdateGrant(ctx context.Context, operID string, params *UpdateGrantParams) (*UpdateGrantResult, error) {
 	var err error
 	res := &UpdateGrantResult{}
 
+	if params.NewPattern == "" {
+		err := fmt.Errorf("Empty newPattern parameter")
+		return res, err
+	}
 	if params.GrantID == "" {
 		err := fmt.Errorf("Empty grantId parameter")
 		return res, err
@@ -88,6 +97,7 @@ func (oper *Operator) UpdateGrant(ctx context.Context, params *UpdateGrantParams
 	now := auxtool.TimeNow()
 	if params.NewPattern != "" {
 		grantDescr.UpdatedAt = now
+		grantDescr.UpdatedBy = operID
 		grantDescr.Pattern = params.NewPattern
 	}
 	err = oper.mdb.UpdateGrantByID(ctx, grantDescr.ID, grantDescr)
@@ -97,12 +107,13 @@ func (oper *Operator) UpdateGrant(ctx context.Context, params *UpdateGrantParams
 	return res, err
 }
 
+// DeleteGrant
 type DeleteGrantParams struct {
 	GrantID string `json:"grantId"`
 }
 type DeleteGrantResult struct{}
 
-func (oper *Operator) DeleteGrant(ctx context.Context, params *DeleteGrantParams) (*DeleteGrantResult, error) {
+func (oper *Operator) DeleteGrant(ctx context.Context, operID string, params *DeleteGrantParams) (*DeleteGrantResult, error) {
 	var err error
 	res := &DeleteGrantResult{}
 
@@ -129,20 +140,47 @@ func (oper *Operator) DeleteGrant(ctx context.Context, params *DeleteGrantParams
 	return res, err
 }
 
+// ListGrants
 type ListGrantsParams struct {
-	AccountID string `json:"accountId"`
+	Username  string
+	AccountID string
 }
 type ListGrantsResult struct {
 	Grants []descr.Grant `json:"grants"`
 }
 
-func (oper *Operator) ListGrants(ctx context.Context, params *ListGrantsParams) (*ListGrantsResult, error) {
+func (oper *Operator) ListGrants(ctx context.Context, operID string, params *ListGrantsParams) (*ListGrantsResult, error) {
 	var err error
 	res := &ListGrantsResult{
 		Grants: make([]descr.Grant, 0),
 	}
-
-	grantDescrs, err := oper.mdb.ListGrantsByAccountID(ctx, params.AccountID)
+	var accountDescr *descr.Account
+	var accountExists bool
+	switch {
+	case params.AccountID != "":
+		accountExists, accountDescr, err = oper.mdb.GetAccountByID(ctx, params.AccountID)
+		if err != nil {
+			return res, err
+		}
+		if !accountExists {
+			err := fmt.Errorf("Account with ID %s dont exists", params.AccountID)
+			return res, err
+		}
+	case params.Username != "":
+		accountExists, accountDescr, err = oper.mdb.GetAccountByUsername(ctx, params.Username)
+		if err != nil {
+			return res, err
+		}
+		if !accountExists {
+			err := fmt.Errorf("Account with name %s dont exists", params.Username)
+			return res, err
+		}
+	default:
+		err := fmt.Errorf("Empty username and accountId parameter")
+		return res, err
+	}
+	accountID := accountDescr.ID
+	grantDescrs, err := oper.mdb.ListGrantsByAccountID(ctx, accountID)
 	if err != nil {
 		return res, err
 	}
@@ -150,6 +188,7 @@ func (oper *Operator) ListGrants(ctx context.Context, params *ListGrantsParams)
 	return res, err
 }
 
+// Get Grants
 type GetGrantParams struct {
 	GrantID string `json:"grantId"`
 }
@@ -157,7 +196,7 @@ type GetGrantResult struct {
 	Grant *descr.Grant `json:"grant"`
 }
 
-func (oper *Operator) GetGrant(ctx context.Context, params *GetGrantParams) (*GetGrantResult, error) {
+func (oper *Operator) GetGrant(ctx context.Context, operID string, params *GetGrantParams) (*GetGrantResult, error) {
 	var err error
 	res := &GetGrantResult{}