[MM-16751] golint model (#17896)
Этот коммит содержится в:
коммит произвёл
Claudio Costa
родитель
953eebdef4
Коммит
97ccf0bdf6
@@ -98,7 +98,7 @@ func (awsm *AwsMeter) GetUserCategoryUsage(dimensions []string, startTime time.T
|
||||
var err error
|
||||
|
||||
switch dimension {
|
||||
case model.AWS_METERING_DIMENSION_USAGE_HRS:
|
||||
case model.AwsMeteringDimensionUsageHrs:
|
||||
userCount, err = awsm.store.User().AnalyticsActiveCountForPeriod(model.GetMillisForTime(startTime), model.GetMillisForTime(endTime), model.UserCountOptions{})
|
||||
if err != nil {
|
||||
mlog.Warn("Failed to obtain usage data", mlog.String("dimension", dimension), mlog.String("start", startTime.String()), mlog.Int64("count", userCount), mlog.Err(err))
|
||||
|
||||
@@ -42,7 +42,7 @@ func String(i string) *string {
|
||||
func TestAwsMeterUsage(t *testing.T) {
|
||||
startTime := time.Now()
|
||||
endTime := time.Now()
|
||||
dimensions := []string{model.AWS_METERING_DIMENSION_USAGE_HRS}
|
||||
dimensions := []string{model.AwsMeteringDimensionUsageHrs}
|
||||
|
||||
userStoreMock := mocks.UserStore{}
|
||||
userStoreMock.On("AnalyticsActiveCountForPeriod", model.GetMillisForTime(startTime), model.GetMillisForTime(endTime), mock.AnythingOfType("model.UserCountOptions")).Return(int64(2), nil)
|
||||
@@ -52,7 +52,7 @@ func TestAwsMeterUsage(t *testing.T) {
|
||||
|
||||
reports := make([]*AWSMeterReport, 1)
|
||||
reports[0] = &AWSMeterReport{
|
||||
Dimension: model.AWS_METERING_DIMENSION_USAGE_HRS,
|
||||
Dimension: model.AwsMeteringDimensionUsageHrs,
|
||||
Value: 2,
|
||||
Timestamp: startTime,
|
||||
}
|
||||
@@ -108,7 +108,7 @@ func TestAwsMeterUsage(t *testing.T) {
|
||||
func TestAwsMeterUsageWithDBError(t *testing.T) {
|
||||
startTime := time.Now()
|
||||
endTime := time.Now()
|
||||
dimensions := []string{model.AWS_METERING_DIMENSION_USAGE_HRS}
|
||||
dimensions := []string{model.AwsMeteringDimensionUsageHrs}
|
||||
|
||||
userStoreMock := mocks.UserStore{}
|
||||
userStoreMock.On("AnalyticsActiveCountForPeriod", model.GetMillisForTime(startTime), model.GetMillisForTime(endTime), mock.AnythingOfType("model.UserCountOptions")).Return(int64(0), errors.New("error"))
|
||||
@@ -118,7 +118,7 @@ func TestAwsMeterUsageWithDBError(t *testing.T) {
|
||||
|
||||
reports := make([]*AWSMeterReport, 1)
|
||||
reports[0] = &AWSMeterReport{
|
||||
Dimension: model.AWS_METERING_DIMENSION_USAGE_HRS,
|
||||
Dimension: model.AwsMeteringDimensionUsageHrs,
|
||||
Value: 2,
|
||||
Timestamp: startTime,
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user