fix ci-lint

Author: zhufuyi

pkg/ggorm/query/query_condition.go

@@ -191,54 +191,6 @@ func (p *Params) ConvertToGormConditions() (string, []interface{}, error) {
 	return str, args, nil
 }
 
-func getExpsAndLogics(keyLen int, paramSrc string) ([]string, []string) { //nolint
-	exps, logics := []string{}, []string{}
-	param := strings.Replace(paramSrc, " ", "", -1)
-	sps := strings.SplitN(param, "?", 2)
-	if len(sps) == 2 {
-		param = sps[1]
-	}
-
-	num := keyLen
-	if num == 0 {
-		return exps, logics
-	}
-
-	fields := []string{}
-	kvs := strings.Split(param, "&")
-	for _, kv := range kvs {
-		if strings.Contains(kv, "page=") || strings.Contains(kv, "size=") || strings.Contains(kv, "sort=") {
-			continue
-		}
-		fields = append(fields, kv)
-	}
-
-	// divide into num groups based on non-repeating keys, and determine in each group whether exp and logic exist
-	group := map[string]string{}
-	for _, field := range fields {
-		split := strings.SplitN(field, "=", 2)
-		if len(split) != 2 {
-			continue
-		}
-
-		if _, ok := group[split[0]]; ok {
-			// if exp does not exist, the default value of null is filled, and if logic does not exist, the default value of null is filled.
-			exps = append(exps, group["exp"])
-			logics = append(logics, group["logic"])
-
-			group = map[string]string{}
-			continue
-		}
-		group[split[0]] = split[1]
-	}
-
-	// handling the last group
-	exps = append(exps, group["exp"])
-	logics = append(logics, group["logic"])
-
-	return exps, logics
-}
-
 // Conditions query conditions
 type Conditions struct {
 	Columns []Column `json:"columns" form:"columns" binding:"min=1"` // columns info

pkg/ggorm/query/query_condition_test.go

@@ -4,8 +4,6 @@ import (
 	"reflect"
 	"strings"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestPage(t *testing.T) {
@@ -438,10 +436,10 @@ func TestParams_ConvertToGormConditions(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		params := &Params{
-			Columns: tt.args.columns,
-		}
 		t.Run(tt.name, func(t *testing.T) {
+			params := &Params{
+				Columns: tt.args.columns,
+			}
 			got, got1, err := params.ConvertToGormConditions()
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ConvertToGormConditions() error = %v, wantErr %v", err, tt.wantErr)
@@ -459,181 +457,3 @@ func TestParams_ConvertToGormConditions(t *testing.T) {
 		})
 	}
 }
-
-func Test_getExpsAndLogics(t *testing.T) {
-	type args struct {
-		keyLen   int
-		paramSrc string
-	}
-	tests := []struct {
-		name  string
-		args  args
-		want  []string
-		want1 []string
-	}{
-		{
-			name: "0 columns",
-			args: args{
-				keyLen:   0,
-				paramSrc: "page=0&size=10",
-			},
-			want:  []string{},
-			want1: []string{},
-		},
-		{
-			name: "1 columns",
-			args: args{
-				keyLen:   1,
-				paramSrc: "k=name&v=LiSi&page=0&size=10",
-			},
-			want:  []string{""},
-			want1: []string{""},
-		},
-		{
-			name: "1 columns gt",
-			args: args{
-				keyLen:   1,
-				paramSrc: "k=age&exp=gt&v=20&page=0&size=10",
-			},
-			want:  []string{"gt"},
-			want1: []string{""},
-		},
-		{
-			name: "1 columns gt and",
-			args: args{
-				keyLen:   1,
-				paramSrc: "k=age&exp=gt&v=20&logic=or&page=0&size=10",
-			},
-			want:  []string{"gt"},
-			want1: []string{"or"},
-		},
-		{
-			name: "2 columns",
-			args: args{
-				keyLen:   2,
-				paramSrc: "k=name&v=LiSi&k=gender&v=male&page=0&size=10",
-			},
-			want:  []string{"", ""},
-			want1: []string{"", ""},
-		},
-		{
-			name: "2 columns gt",
-			args: args{
-				keyLen:   2,
-				paramSrc: "k=name&v=LiSi&k=age&v=20&exp=gt&page=0&size=10",
-			},
-			want:  []string{"", "gt"},
-			want1: []string{"", ""},
-		},
-		{
-			name: "3 columns gt  or",
-			args: args{
-				keyLen:   3,
-				paramSrc: "k=name&v=LiSi&exp=neq&k=age&v=20&exp=gt&k=gender&v=male&logic=or&page=0&size=10",
-			},
-			want:  []string{"neq", "gt", ""},
-			want1: []string{"", "", "or"},
-		},
-		{
-			name: "error",
-			args: args{
-				keyLen:   1,
-				paramSrc: "k=name&exp=gt&v=LiSi&page=0&size=10",
-			},
-			want:  []string{"gt"},
-			want1: []string{""},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, got1 := getExpsAndLogics(tt.args.keyLen, tt.args.paramSrc)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("getExpsAndLogics() got = %v, want %v", got, tt.want)
-			}
-			if !reflect.DeepEqual(got1, tt.want1) {
-				t.Errorf("getExpsAndLogics() got1 = %v, want %v", got1, tt.want1)
-			}
-			t.Logf("%+v  %+v", got, got1)
-		})
-	}
-}
-
-func TestConditions_ConvertToGorm(t *testing.T) {
-	c := Conditions{
-		Columns: []Column{
-			{
-				Name:  "name",
-				Value: "ZhangSan",
-			},
-			{
-				Name:  "gender",
-				Value: "male",
-			},
-		}}
-	str, values, err := c.ConvertToGorm()
-	if err != nil {
-		t.Error(err)
-	}
-	assert.Equal(t, "name = ? AND gender = ?", str)
-	assert.Equal(t, len(values), 2)
-}
-
-func TestConditions_checkValid(t *testing.T) {
-	// empty error
-	c := Conditions{}
-	err := c.CheckValid()
-	assert.Error(t, err)
-
-	// value is empty error
-	c = Conditions{
-		Columns: []Column{
-			{
-				Name:  "foo",
-				Value: nil,
-			},
-		},
-	}
-	err = c.CheckValid()
-	assert.Error(t, err)
-
-	// exp error
-	c = Conditions{
-		Columns: []Column{
-			{
-				Name:  "foo",
-				Value: "bar",
-				Exp:   "unknown-exp",
-			},
-		},
-	}
-	err = c.CheckValid()
-	assert.Error(t, err)
-
-	// logic error
-	c = Conditions{
-		Columns: []Column{
-			{
-				Name:  "foo",
-				Value: "bar",
-				Logic: "unknown-logic",
-			},
-		},
-	}
-	err = c.CheckValid()
-	assert.Error(t, err)
-
-	// success
-	c = Conditions{
-		Columns: []Column{
-			{
-				Name:  "name",
-				Value: "ZhangSan",
-			},
-			{
-				Name:  "gender",
-				Value: "male",
-			},
-		}}
-	err = c.CheckValid()
-	assert.NoError(t, err)
-}

pkg/ggorm/test_sqlite.db

@@ -1,3 +1,4 @@
+// Package gocron is scheduled task library.
 package gocron
 
 import (
@@ -113,22 +114,22 @@ func Stop() {
 	}
 }
 
-// EverySecond executed every size second (1~59)
+// EverySecond every second size (1~59)
 func EverySecond(size int) string {
 	return fmt.Sprintf("@every %ds", size)
 }
 
-// EveryMinute every size minute (1~59)
+// EveryMinute every minute size (1~59)
 func EveryMinute(size int) string {
 	return fmt.Sprintf("@every %dm", size)
 }
 
-// EveryHour every size hour (1~23)
+// EveryHour every hour size (1~23)
 func EveryHour(size int) string {
 	return fmt.Sprintf("@every %dh", size)
 }
 
-// EveryDay every size day (1~31)
-func EveryDay(size int) string {
-	return fmt.Sprintf("@every %dd", size)
+// Everyday size (1~31)
+func Everyday(size int) string {
+	return fmt.Sprintf("@every %dh", size*24)
 }

pkg/gocron/cron.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"testing"
 	"time"
+
+	"go.uber.org/zap"
 )
 
 func TestInitAndRun(t *testing.T) {
@@ -68,7 +70,7 @@ func TestRunOnce(t *testing.T) {
 		},
 	}
 
-	err := Init()
+	err := Init(WithLog(zap.NewNop()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -92,6 +94,9 @@ func TestEvery(t *testing.T) {
 	task_3 := func() {
 		fmt.Println("this is task_3")
 	}
+	task_4 := func() {
+		fmt.Println("this is task_4")
+	}
 
 	tasks := []*Task{
 		{
@@ -109,6 +114,11 @@ func TestEvery(t *testing.T) {
 			Name:     "task_3",
 			Fn:       task_3,
 		},
+		{
+			TimeSpec: Everyday(1),
+			Name:     "task_4",
+			Fn:       task_4,
+		},
 	}
 
 	err := Init()

pkg/gocron/cron_test.go

@@ -8,31 +8,31 @@ import (
 	"encoding/hex"
 	"errors"
 
-	"testCode/pkg/gocrypto/wcipher"
+	"github.com/zhufuyi/sponge/pkg/gocrypto/wcipher"
 )
 
 // AesEncrypt aes encryption, returns ciphertext is not transcoded
 func AesEncrypt(rawData []byte, opts ...AesOption) ([]byte, error) {
 	o := defaultAesOptions()
 	o.apply(opts...)
 
-	return aesEncrypt(o.mode, rawData, o.aesKey)
+	return aesEncryptByMode(o.mode, rawData, o.aesKey)
 }
 
 // AesDecrypt aes decryption, parameter input un-transcode cipher text
 func AesDecrypt(cipherData []byte, opts ...AesOption) ([]byte, error) {
 	o := defaultAesOptions()
 	o.apply(opts...)
 
-	return aesDecrypt(o.mode, cipherData, o.aesKey)
+	return aesDecryptByMode(o.mode, cipherData, o.aesKey)
 }
 
 // AesEncryptHex aes encryption, the returned ciphertext is transcoded
 func AesEncryptHex(rawData string, opts ...AesOption) (string, error) {
 	o := defaultAesOptions()
 	o.apply(opts...)
 
-	cipherData, err := aesEncrypt(o.mode, []byte(rawData), o.aesKey)
+	cipherData, err := aesEncryptByMode(o.mode, []byte(rawData), o.aesKey)
 	if err != nil {
 		return "", err
 	}
@@ -50,7 +50,7 @@ func AesDecryptHex(cipherStr string, opts ...AesOption) (string, error) {
 		return "", err
 	}
 
-	rawData, err := aesDecrypt(o.mode, cipherData, o.aesKey)
+	rawData, err := aesDecryptByMode(o.mode, cipherData, o.aesKey)
 	if err != nil {
 		return "", err
 	}
@@ -76,7 +76,7 @@ func getCipherMode(mode string) (wcipher.CipherMode, error) {
 	return cipherMode, nil
 }
 
-func aesEncrypt(mode string, rawData []byte, key []byte) ([]byte, error) {
+func aesEncryptByMode(mode string, rawData []byte, key []byte) ([]byte, error) {
 	cipherMode, err := getCipherMode(mode)
 	if err != nil {
 		return nil, err
@@ -90,7 +90,7 @@ func aesEncrypt(mode string, rawData []byte, key []byte) ([]byte, error) {
 	return cip.Encrypt(rawData), nil
 }
 
-func aesDecrypt(mode string, cipherData []byte, key []byte) ([]byte, error) {
+func aesDecryptByMode(mode string, cipherData []byte, key []byte) ([]byte, error) {
 	cipherMode, err := getCipherMode(mode)
 	if err != nil {
 		return nil, err