Merge pull request #14375 from moznion/fix_quota_updating

Fix quota updating

pkg/services/sqlstore/quota.go

@@ -101,12 +101,12 @@ func UpdateOrgQuota(cmd *m.UpdateOrgQuotaCmd) error {
 		quota := m.Quota{
 		quota := m.Quota{
 			Target: cmd.Target,
 			Target: cmd.Target,
 			OrgId:  cmd.OrgId,
 			OrgId:  cmd.OrgId,
-			Updated: time.Now(),
 		}
 		}
 		has, err := sess.Get(&quota)
 		has, err := sess.Get(&quota)
 		if err != nil {
 		if err != nil {
 			return err
 			return err
 		}
 		}
+		quota.Updated = time.Now()
 		quota.Limit = cmd.Limit
 		quota.Limit = cmd.Limit
 		if !has {
 		if !has {
 			quota.Created = time.Now()
 			quota.Created = time.Now()
@@ -203,12 +203,12 @@ func UpdateUserQuota(cmd *m.UpdateUserQuotaCmd) error {
 		quota := m.Quota{
 		quota := m.Quota{
 			Target: cmd.Target,
 			Target: cmd.Target,
 			UserId: cmd.UserId,
 			UserId: cmd.UserId,
-			Updated: time.Now(),
 		}
 		}
 		has, err := sess.Get(&quota)
 		has, err := sess.Get(&quota)
 		if err != nil {
 		if err != nil {
 			return err
 			return err
 		}
 		}
+		quota.Updated = time.Now()
 		quota.Limit = cmd.Limit
 		quota.Limit = cmd.Limit
 		if !has {
 		if !has {
 			quota.Created = time.Now()
 			quota.Created = time.Now()

pkg/services/sqlstore/quota_test.go

@@ -2,6 +2,7 @@ package sqlstore
 
 
 import (
 import (
 	"testing"
 	"testing"
+	"time"
 
 
 	m "github.com/grafana/grafana/pkg/models"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/setting"
@@ -168,5 +169,69 @@ func TestQuotaCommandsAndQueries(t *testing.T) {
 			So(query.Result.Limit, ShouldEqual, 5)
 			So(query.Result.Limit, ShouldEqual, 5)
 			So(query.Result.Used, ShouldEqual, 1)
 			So(query.Result.Used, ShouldEqual, 1)
 		})
 		})
+
+		// related: https://github.com/grafana/grafana/issues/14342
+		Convey("Should org quota updating is successful even if it called multiple time", func() {
+			orgCmd := m.UpdateOrgQuotaCmd{
+				OrgId:  orgId,
+				Target: "org_user",
+				Limit:  5,
+			}
+			err := UpdateOrgQuota(&orgCmd)
+			So(err, ShouldBeNil)
+
+			query := m.GetOrgQuotaByTargetQuery{OrgId: orgId, Target: "org_user", Default: 1}
+			err = GetOrgQuotaByTarget(&query)
+			So(err, ShouldBeNil)
+			So(query.Result.Limit, ShouldEqual, 5)
+
+			// XXX: resolution of `Updated` column is 1sec, so this makes delay
+			time.Sleep(1 * time.Second)
+
+			orgCmd = m.UpdateOrgQuotaCmd{
+				OrgId:  orgId,
+				Target: "org_user",
+				Limit:  10,
+			}
+			err = UpdateOrgQuota(&orgCmd)
+			So(err, ShouldBeNil)
+
+			query = m.GetOrgQuotaByTargetQuery{OrgId: orgId, Target: "org_user", Default: 1}
+			err = GetOrgQuotaByTarget(&query)
+			So(err, ShouldBeNil)
+			So(query.Result.Limit, ShouldEqual, 10)
+		})
+
+		// related: https://github.com/grafana/grafana/issues/14342
+		Convey("Should user quota updating is successful even if it called multiple time", func() {
+			userQuotaCmd := m.UpdateUserQuotaCmd{
+				UserId: userId,
+				Target: "org_user",
+				Limit:  5,
+			}
+			err := UpdateUserQuota(&userQuotaCmd)
+			So(err, ShouldBeNil)
+
+			query := m.GetUserQuotaByTargetQuery{UserId: userId, Target: "org_user", Default: 1}
+			err = GetUserQuotaByTarget(&query)
+			So(err, ShouldBeNil)
+			So(query.Result.Limit, ShouldEqual, 5)
+
+			// XXX: resolution of `Updated` column is 1sec, so this makes delay
+			time.Sleep(1 * time.Second)
+
+			userQuotaCmd = m.UpdateUserQuotaCmd{
+				UserId: userId,
+				Target: "org_user",
+				Limit:  10,
+			}
+			err = UpdateUserQuota(&userQuotaCmd)
+			So(err, ShouldBeNil)
+
+			query = m.GetUserQuotaByTargetQuery{UserId: userId, Target: "org_user", Default: 1}
+			err = GetUserQuotaByTarget(&query)
+			So(err, ShouldBeNil)
+			So(query.Result.Limit, ShouldEqual, 10)
+		})
 	})
 	})
 }
 }