update

Author: chenjie199234

redis/verifycode.go

@@ -3,6 +3,7 @@ package redis
 import (
 	"context"
 	"errors"
+	"strconv"
 
 	"github.com/chenjie199234/Corelib/util/common"
 
@@ -104,20 +105,25 @@ func (c *Client) CheckVerifyCode(ctx context.Context, target, action, code, must
 }
 
 // return nil means has check times
-// return ErrVerifyCodeCheckTimesUsedup means no check times any more
 // return ErrVerifyCodeMissing means verify code doesn't exist
-func (c *Client) HasCheckTimes(ctx context.Context, target, action string) error {
+// return ErrVerifyCodeCheckTimesUsedup means no check times any more
+// return ErrVerifyCodeReceiverMissing means the must receiver doesn't exist
+func (c *Client) HasCheckTimes(ctx context.Context, target, action, mustreceiver string) error {
 	key := "verify_code_{" + target + "}_" + action
-	r, e := c.HGet(ctx, key, "_check").Int()
+	rs, e := c.HMGet(ctx, key, "_check", mustreceiver).Result()
 	if e != nil {
-		if e == gredis.Nil {
-			e = ErrVerifyCodeMissing
-		}
 		return e
 	}
-	if r >= 5 {
+	if rs[0] == nil {
+		return ErrVerifyCodeMissing
+	} else if r, e := strconv.Atoi(rs[0].(string)); e != nil {
+		return e
+	} else if r >= 5 {
 		return ErrVerifyCodeCheckTimesUsedup
 	}
+	if mustreceiver != "" && rs[1] == nil {
+		return ErrVerifyCodeReceiverMissing
+	}
 	return nil
 }
 

redis/verifycode_test.go

@@ -26,6 +26,12 @@ func Test_VerifyCode(t *testing.T) {
 		t.Fatal(e)
 		return
 	}
+
+	//0 empty
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", ""); e != ErrVerifyCodeMissing {
+		t.Fatal("should be verify code missing")
+		return
+	}
 	//1
 	code, dup, e := client.MakeVerifyCode(context.Background(), "testuserid", "testaction", "", 300)
 	if e != nil {
@@ -36,6 +42,10 @@ func Test_VerifyCode(t *testing.T) {
 		t.Fatal("should not be dup")
 		return
 	}
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", "[email protected]"); e != ErrVerifyCodeReceiverMissing {
+		t.Fatal("should be receiver missing")
+		return
+	}
 	//1 dup check
 	newcode, dup, e := client.MakeVerifyCode(context.Background(), "testuserid", "testaction", "[email protected]", 300)
 	if e != nil {
@@ -50,6 +60,10 @@ func Test_VerifyCode(t *testing.T) {
 		t.Fatal("should get same code")
 		return
 	}
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", "[email protected]"); e != nil {
+		t.Fatal(e)
+		return
+	}
 	newcode, dup, e = client.MakeVerifyCode(context.Background(), "testuserid", "testaction", "[email protected]", 300)
 	if e != nil {
 		t.Fatal(e)
@@ -76,6 +90,10 @@ func Test_VerifyCode(t *testing.T) {
 		t.Fatal("should get same code")
 		return
 	}
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", "123123123"); e != nil {
+		t.Fatal(e)
+		return
+	}
 
 	//1 wrong receiver check
 	if e := client.CheckVerifyCode(context.Background(), "testuserid", "testaction", code, "abc"); e != ErrVerifyCodeReceiverMissing {
@@ -86,7 +104,7 @@ func Test_VerifyCode(t *testing.T) {
 		}
 		return
 	}
-	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction"); e != nil {
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", ""); e != nil {
 		t.Fatal(e)
 		return
 	}
@@ -96,7 +114,7 @@ func Test_VerifyCode(t *testing.T) {
 		t.Fatal(e)
 		return
 	}
-	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction"); e != ErrVerifyCodeMissing {
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", ""); e != ErrVerifyCodeMissing {
 		t.Fatal("should be verify code missing")
 		return
 	}
@@ -117,7 +135,7 @@ func Test_VerifyCode(t *testing.T) {
 		t.Fatal(e)
 		return
 	}
-	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction"); e != ErrVerifyCodeMissing {
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", ""); e != ErrVerifyCodeMissing {
 		t.Fatal("should be verify code missing")
 		return
 	}
@@ -150,7 +168,23 @@ func Test_VerifyCode(t *testing.T) {
 		}
 		return
 	}
-	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction"); e != nil {
+	if e := client.CheckVerifyCode(context.Background(), "testuserid", "testaction", "123", ""); e != ErrVerifyCodeWrong {
+		if e == nil {
+			t.Fatal("should not pass")
+		} else {
+			t.Fatal(e)
+		}
+		return
+	}
+	if e := client.CheckVerifyCode(context.Background(), "testuserid", "testaction", "123", ""); e != ErrVerifyCodeWrong {
+		if e == nil {
+			t.Fatal("should not pass")
+		} else {
+			t.Fatal(e)
+		}
+		return
+	}
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", ""); e != nil {
 		t.Fatal(e)
 		return
 	}
@@ -162,7 +196,7 @@ func Test_VerifyCode(t *testing.T) {
 		}
 		return
 	}
-	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction"); e != ErrVerifyCodeCheckTimesUsedup {
+	if e := client.HasCheckTimes(context.Background(), "testuserid", "testaction", ""); e != ErrVerifyCodeCheckTimesUsedup {
 		t.Fatal("should be check times used up")
 		return
 	}