handle edge cases

Author: hvn2k1

pkg/account/api/api_key.go

@@ -800,7 +800,10 @@ func (s *AccountService) UpdateAPIKeyLastUsedAt(
 		apiKey := &domain.APIKey{
 			APIKey: envAPIKey.ApiKey,
 		}
-		apiKey.UsedAt(req.LastUsedAt)
+		err = apiKey.SetUsedAt(req.LastUsedAt)
+		if err != nil {
+			return err
+		}
 		return s.accountStorage.UpdateAPIKey(contextWithTx, apiKey, envAPIKey.Environment.Id)
 	})
 	if err != nil {
@@ -840,5 +843,16 @@ func validateUpdateAPIKeyLastUsedAtRequest(
 		}
 		return dt.Err()
 	}
+
+	if req.LastUsedAt <= 0 {
+		dt, err := statusInvalidLastUsedAt.WithDetails(&errdetails.LocalizedMessage{
+			Locale:  localizer.GetLocale(),
+			Message: localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "last_used_at"),
+		})
+		if err != nil {
+			return statusInternal.Err()
+		}
+		return dt.Err()
+	}
 	return nil
 }

pkg/account/api/error.go

@@ -48,4 +48,5 @@ var (
 	statusSearchFilterIDIsEmpty                  = api.NewGRPCStatus(pkgErr.NewErrorInvalidArgEmpty(pkgErr.AccountPackageName, "search filter ID is empty", "search_filter_ID"))
 	statusSearchFilterIDNotFound                 = api.NewGRPCStatus(pkgErr.NewErrorNotFound(pkgErr.AccountPackageName, "search filter not found", "search_filter"))
 	statusInvalidListAPIKeyRequest               = api.NewGRPCStatus(pkgErr.NewErrorInvalidArgEmpty(pkgErr.AccountPackageName, "invalid list api key request", "list_api_key_request"))
+	statusInvalidLastUsedAt                      = api.NewGRPCStatus(pkgErr.NewErrorInvalidArgNotMatchFormat(pkgErr.AccountPackageName, "last used at is invalid", "last_used_at"))
 )

pkg/account/domain/api_key.go

@@ -22,11 +22,17 @@ import (
 	wrapperspb "github.com/golang/protobuf/ptypes/wrappers"
 	"github.com/jinzhu/copier"
 
+	pkgErr "github.com/bucketeer-io/bucketeer/v2/pkg/error"
 	proto "github.com/bucketeer-io/bucketeer/v2/proto/account"
 )
 
 const keyBytes = 32
 
+var (
+	ErrLastUsedAtNotUpdated = pkgErr.NewErrorFailedPrecondition(pkgErr.AccountPackageName, "last used at not updated")
+	ErrInvalidLastUsedAt    = pkgErr.NewErrorInvalidArgNotMatchFormat(pkgErr.AccountPackageName, "invalid last used at", "last_used_at")
+)
+
 type APIKey struct {
 	*proto.APIKey
 }
@@ -116,8 +122,13 @@ func (a *APIKey) Update(
 	return updated, nil
 }
 
-func (a *APIKey) UsedAt(lastUsedAt int64) {
-	if a.LastUsedAt < lastUsedAt {
-		a.LastUsedAt = lastUsedAt
+func (a *APIKey) SetUsedAt(lastUsedAt int64) error {
+	if lastUsedAt <= 0 {
+		return ErrInvalidLastUsedAt
 	}
+	if a.LastUsedAt >= lastUsedAt {
+		return ErrLastUsedAtNotUpdated
+	}
+	a.LastUsedAt = lastUsedAt
+	return nil
 }