Merge pull request #6 from awakari/num-conds

feat: support number conditions
awakari · Aug 13, 2023 · d933374 · d933374
2 parents ac46890 + bbf275e
commit d933374
Show file tree

Hide file tree

Showing 19 changed files with 614 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -305,8 +305,8 @@ func main() {
  Description: "my subscription",
  Enabled: true,
  Condition: condition.NewBuilder().
- MatchAttrKey("tags").
- MatchText("SpaceX").
+ AttributeKey("tags").
+ AnyOfWords("SpaceX").
  BuildTextCondition(),
  }
  subId, err = client.CreateSubscription(ctx, userId, subData)

diff --git a/api/client_test.go b/api/client_test.go
@@ -405,7 +405,15 @@ func TestClient_ReadSubscription(t *testing.T) {
  Enabled: true,
  Condition: condition.
  NewBuilder().
- BuildTextCondition(),
+ Any([]condition.Condition{
+ condition.
+ NewBuilder().BuildTextCondition(),
+ condition.
+ NewBuilder().
+ LessThanOrEqual(42).
+ BuildNumberCondition(),
+ }).
+ BuildGroupCondition(),
  },
  },
  "subs API not set": {

diff --git a/api/grpc/limits/service.pb.go b/api/grpc/limits/service.pb.go
diff --git a/api/grpc/permits/service.pb.go b/api/grpc/permits/service.pb.go
diff --git a/api/grpc/reader/service.pb.go b/api/grpc/reader/service.pb.go
diff --git a/api/grpc/resolver/service.pb.go b/api/grpc/resolver/service.pb.go
diff --git a/api/grpc/subject/subject.pb.go b/api/grpc/subject/subject.pb.go
diff --git a/api/grpc/subscriptions/client_mock.go b/api/grpc/subscriptions/client_mock.go
@@ -59,11 +59,11 @@ func (cm clientMock) Read(ctx context.Context, req *ReadRequest, opts ...grpc.Ca
  },
  },
  {
- Cond: &Condition_Tc{
- Tc: &TextCondition{
- Key:  "k1",
- Term: "p1",
- Exact: true,
+ Cond: &Condition_Nc{
+ Nc: &NumberCondition{
+ Key: "k1",
+ Op: Operation_Gt,
+ Val: -42.1,
  },
  },
  },

diff --git a/api/grpc/subscriptions/service.go b/api/grpc/subscriptions/service.go
@@ -147,12 +147,39 @@ func encodeCondition(src condition.Condition) (dst *Condition) {
  Exact: c.IsExact(),
  },
  }
+ case condition.NumberCondition:
+ dstOp := encodeNumOp(c.GetOperation())
+ dst.Cond = &Condition_Nc{
+ Nc: &NumberCondition{
+ Key: c.GetKey(),
+ Op: dstOp,
+ Val: c.GetValue(),
+ },
+ }
+ }
+ return
+}
+
+func encodeNumOp(src condition.NumOp) (dst Operation) {
+ switch src {
+ case condition.NumOpGt:
+ dst = Operation_Gt
+ case condition.NumOpGte:
+ dst = Operation_Gte
+ case condition.NumOpEq:
+ dst = Operation_Eq
+ case condition.NumOpLte:
+ dst = Operation_Lte
+ case condition.NumOpLt:
+ dst = Operation_Lt
+ default:
+ dst = Operation_Undefined
  }
  return
 }
 
 func decodeCondition(src *Condition) (dst condition.Condition, err error) {
- gc, tc := src.GetGc(), src.GetTc()
+ gc, nc, tc := src.GetGc(), src.GetNc(), src.GetTc()
  switch {
  case gc != nil:
  var group []condition.Condition
@@ -171,6 +198,12 @@ func decodeCondition(src *Condition) (dst condition.Condition, err error) {
  group,
  )
  }
+ case nc != nil:
+ dstOp := decodeNumOp(nc.Op)
+ dst = condition.NewNumberCondition(
+ condition.NewKeyCondition(condition.NewCondition(src.Not), nc.GetKey()),
+ dstOp, nc.Val,
+ )
  case tc != nil:
  dst = condition.NewTextCondition(
  condition.NewKeyCondition(condition.NewCondition(src.Not), tc.GetKey()),
@@ -182,6 +215,24 @@ func decodeCondition(src *Condition) (dst condition.Condition, err error) {
  return
 }
 
+func decodeNumOp(src Operation) (dst condition.NumOp) {
+ switch src {
+ case Operation_Gt:
+ dst = condition.NumOpGt
+ case Operation_Gte:
+ dst = condition.NumOpGte
+ case Operation_Eq:
+ dst = condition.NumOpEq
+ case Operation_Lte:
+ dst = condition.NumOpLte
+ case Operation_Lt:
+ dst = condition.NumOpLt
+ default:
+ dst = condition.NumOpUndefined
+ }
+ return
+}
+
 func decodeError(src error) (dst error) {
  switch {
  case src == nil: