feat: update subscription's condition

awakari · Nov 3, 2023 · 7deb1fb · 7deb1fb
1 parent bdcb179
commit 7deb1fb
Show file tree

Hide file tree

Showing 11 changed files with 162 additions and 84 deletions.
diff --git a/README.md b/README.md
@@ -312,10 +312,12 @@ func main() {
    }
    subId, err = client.CreateSubscription(ctx, userId, subData)
 
-   // Update the subscription mutable fields
+   // Update the subscription
    upd := subscription.Data{
       Description: "my disabled subscription",
       Enabled:     false,
+      subData.Expires, // don't change
+      subData.Condition, // don't change
    }
    err = client.UpdateSubscription(ctx, userId, subId, upd)
 

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/service.go b/api/grpc/subscriptions/service.go
@@ -21,7 +21,7 @@ type Service interface {
 	// Read returns the subscription specified by the id. Returns ErrNotFound if subscription is missing.
 	Read(ctx context.Context, userId, subId string) (subData subscription.Data, err error)
 
-	// Update the mutable part of the subscription.Data
+	// Update the subscription.Data
 	Update(ctx context.Context, userId, subId string, subData subscription.Data) (err error)
 
 	// Delete the specified subscription all associated conditions those not in use by any other subscription.
@@ -92,14 +92,20 @@ func (svc service) Read(ctx context.Context, userId, subId string) (subData subs
 
 func (svc service) Update(ctx context.Context, userId, subId string, data subscription.Data) (err error) {
 	ctx = auth.SetOutgoingAuthInfo(ctx, userId)
-	req := UpdateRequest{
-		Id:          subId,
-		Description: data.Description,
-		Enabled:     data.Enabled,
-		Expires:     timestamppb.New(data.Expires.UTC()),
+	if data.Condition == nil {
+		err = fmt.Errorf("%w: missing condition", ErrInvalid)
+	}
+	if err == nil {
+		req := UpdateRequest{
+			Id:          subId,
+			Description: data.Description,
+			Enabled:     data.Enabled,
+			Expires:     timestamppb.New(data.Expires.UTC()),
+			Cond:        encodeCondition(data.Condition),
+		}
+		_, err = svc.client.Update(ctx, &req)
+		err = decodeError(err)
 	}
-	_, err = svc.client.Update(ctx, &req)
-	err = decodeError(err)
 	return
 }
 

diff --git a/api/grpc/subscriptions/service.pb.go b/api/grpc/subscriptions/service.pb.go
diff --git a/api/grpc/subscriptions/service.proto b/api/grpc/subscriptions/service.proto
@@ -91,6 +91,7 @@ message UpdateRequest {
   string description = 2;
   bool enabled = 3;
   google.protobuf.Timestamp expires = 4;
+  Condition cond = 5;
 }
 
 message UpdateResponse {