feat: add connection type to goal, query connections when getting goal

api-description/web-api.swagger.yaml

@@ -4356,24 +4356,6 @@ definitions:
       - WriteType_OVERRIDE
       - WriteType_PATCH
     default: WriteType_UNSPECIFIED
-  ClauseOperator:
-    type: string
-    enum:
-      - EQUALS
-      - IN
-      - ENDS_WITH
-      - STARTS_WITH
-      - SEGMENT
-      - GREATER
-      - GREATER_OR_EQUAL
-      - LESS
-      - LESS_OR_EQUAL
-      - BEFORE
-      - AFTER
-      - FEATURE_FLAG
-      - PARTIALLY_MATCH
-    default: EQUALS
-    description: ' - FEATURE_FLAG: Attribute is feature ID, and value is variation ID.'
   FeatureVariationType:
     type: string
     enum:
@@ -4389,6 +4371,13 @@ definitions:
       - Action_ON
       - Action_OFF
     default: Action_UNKNOWN
+  GoalConnectionType:
+    type: string
+    enum:
+      - UNKNOWN
+      - EXPERIMENT
+      - OPERATION
+    default: UNKNOWN
   ListFlagTriggersResponseFlagTriggerWithUrl:
     type: object
     properties:
@@ -5184,6 +5173,61 @@ definitions:
       expiry:
         type: string
         format: int64
+  autoopsActionType:
+    type: string
+    enum:
+      - UNKNOWN
+      - ENABLE
+      - DISABLE
+    default: UNKNOWN
+  autoopsAutoOpsRule:
+    type: object
+    properties:
+      id:
+        type: string
+      featureId:
+        type: string
+      opsType:
+        $ref: '#/definitions/autoopsOpsType'
+      clauses:
+        type: array
+        items:
+          type: object
+          $ref: '#/definitions/bucketeerautoopsClause'
+      createdAt:
+        type: string
+        format: int64
+      updatedAt:
+        type: string
+        format: int64
+      deleted:
+        type: boolean
+      autoOpsStatus:
+        $ref: '#/definitions/autoopsAutoOpsStatus'
+  autoopsAutoOpsStatus:
+    type: string
+    enum:
+      - WAITING
+      - RUNNING
+      - FINISHED
+      - STOPPED
+    default: WAITING
+  autoopsOpsType:
+    type: string
+    enum:
+      - TYPE_UNKNOWN
+      - SCHEDULE
+      - EVENT_RATE
+    default: TYPE_UNKNOWN
+  bucketeerautoopsClause:
+    type: object
+    properties:
+      id:
+        type: string
+      clause:
+        $ref: '#/definitions/protobufAny'
+      actionType:
+        $ref: '#/definitions/autoopsActionType'
   bucketeerenvironmentOrganization:
     type: object
     properties:
@@ -5221,6 +5265,19 @@ definitions:
         format: int32
       ownerEmail:
         type: string
+  bucketeerfeatureClause:
+    type: object
+    properties:
+      id:
+        type: string
+      attribute:
+        type: string
+      operator:
+        $ref: '#/definitions/featureClauseOperator'
+      values:
+        type: array
+        items:
+          type: string
   bucketeerfeatureListTagsRequestOrderBy:
     type: string
     enum:
@@ -5897,6 +5954,8 @@ definitions:
         type: string
       description:
         type: string
+      connectionType:
+        $ref: '#/definitions/GoalConnectionType'
     required:
       - environmentId
       - id
@@ -6010,6 +6069,18 @@ definitions:
         description: This field is set only when APIs return.
       archived:
         type: boolean
+      connectionType:
+        $ref: '#/definitions/GoalConnectionType'
+      experiments:
+        type: array
+        items:
+          type: object
+          $ref: '#/definitions/experimentExperiment'
+      autoOpsRules:
+        type: array
+        items:
+          type: object
+          $ref: '#/definitions/autoopsAutoOpsRule'
   experimentListExperimentsRequestOrderBy:
     type: string
     enum:
@@ -6145,19 +6216,24 @@ definitions:
     properties:
       description:
         type: string
-  featureClause:
-    type: object
-    properties:
-      id:
-        type: string
-      attribute:
-        type: string
-      operator:
-        $ref: '#/definitions/ClauseOperator'
-      values:
-        type: array
-        items:
-          type: string
+  featureClauseOperator:
+    type: string
+    enum:
+      - EQUALS
+      - IN
+      - ENDS_WITH
+      - STARTS_WITH
+      - SEGMENT
+      - GREATER
+      - GREATER_OR_EQUAL
+      - LESS
+      - LESS_OR_EQUAL
+      - BEFORE
+      - AFTER
+      - FEATURE_FLAG
+      - PARTIALLY_MATCH
+    default: EQUALS
+    description: ' - FEATURE_FLAG: Attribute is feature ID, and value is variation ID.'
   featureCloneFeatureCommand:
     type: object
     properties:
@@ -6644,7 +6720,7 @@ definitions:
         type: array
         items:
           type: object
-          $ref: '#/definitions/featureClause'
+          $ref: '#/definitions/bucketeerfeatureClause'
   featureSegment:
     type: object
     properties:

migration/mysql/20250116060049_update_goal_table.sql

@@ -0,0 +1 @@
+ALTER TABLE `goal` ADD COLUMN `connection_type` INT NOT NULL DEFAULT 0 AFTER `description`;

migration/mysql/atlas.sum

@@ -1,4 +1,4 @@
-h1:ByERmIG4qrnBTy9Iu6SJWvS0WrGAx+McScOzEnkb+GU=
+h1:1gFvYJwtEn7dAVsV68Nzh0bXhPLPHh6OHmeV2U7vjQU=
 20240626022133_initialization.sql h1:u9qmPkwWX7PN92qEcDDfR92lrMpwadQSMxUJgv6LjQ0=
 20240708065726_update_audit_log_table.sql h1:k7gK8Njv1yHMsYXAQtSgMaSbXy4lxyZ9MPzbJyMyyoM=
 20240815043128_update_auto_ops_rule_table.sql h1:6ib+XfS1uu9AUO3qESvkpUfOu3qUsLwHm9KHcrGEz0E=
@@ -22,3 +22,4 @@ h1:ByERmIG4qrnBTy9Iu6SJWvS0WrGAx+McScOzEnkb+GU=
 20250109061411_update_tag_table.sql h1:3QsxRDVjdv45SkOKTUFswaSFaXV2ViHoqjlr6XR5fmY=
 20250115040347_update_account_v2_table.sql h1:nEzBj41mgpXbQGgbNaIZ9thMqvtfamLO9NHISpEwMm8=
 20250116054703_remove_environment_namespace_column.sql h1:UNiN/syYAs8nUQOkMw3RRvDQBQU/kKYv7B3XBhL6qPM=
+20250116060049_update_goal_table.sql h1:zEhXMf2hntdk2Im9klR76vx6PEAh+cJwk3fKgm2gGPs=

pkg/experiment/api/api.go

@@ -24,6 +24,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	accountclient "github.com/bucketeer-io/bucketeer/pkg/account/client"
+	autoopsclient "github.com/bucketeer-io/bucketeer/pkg/autoops/client"
 	featureclient "github.com/bucketeer-io/bucketeer/pkg/feature/client"
 	"github.com/bucketeer-io/bucketeer/pkg/locale"
 	"github.com/bucketeer-io/bucketeer/pkg/log"
@@ -51,6 +52,7 @@ func WithLogger(l *zap.Logger) Option {
 type experimentService struct {
 	featureClient featureclient.Client
 	accountClient accountclient.Client
+	autoOpsClient autoopsclient.Client
 	mysqlClient   mysql.Client
 	publisher     publisher.Publisher
 	opts          *options
@@ -60,6 +62,7 @@ type experimentService struct {
 func NewExperimentService(
 	featureClient featureclient.Client,
 	accountClient accountclient.Client,
+	autoOpsClient autoopsclient.Client,
 	mysqlClient mysql.Client,
 	publisher publisher.Publisher,
 	opts ...Option,
@@ -73,6 +76,7 @@ func NewExperimentService(
 	return &experimentService{
 		featureClient: featureClient,
 		accountClient: accountClient,
+		autoOpsClient: autoOpsClient,
 		mysqlClient:   mysqlClient,
 		publisher:     publisher,
 		opts:          dopts,

pkg/experiment/api/api_test.go

@@ -25,6 +25,7 @@ import (
 	md "google.golang.org/grpc/metadata"
 
 	accountclientmock "github.com/bucketeer-io/bucketeer/pkg/account/client/mock"
+	autoopsclientmock "github.com/bucketeer-io/bucketeer/pkg/autoops/client/mock"
 	featureclientmock "github.com/bucketeer-io/bucketeer/pkg/feature/client/mock"
 	publishermock "github.com/bucketeer-io/bucketeer/pkg/pubsub/publisher/mock"
 	"github.com/bucketeer-io/bucketeer/pkg/rpc"
@@ -40,12 +41,14 @@ func TestNewExperimentService(t *testing.T) {
 	defer mockController.Finish()
 	featureClientMock := featureclientmock.NewMockClient(mockController)
 	accountClientMock := accountclientmock.NewMockClient(mockController)
+	autoOpsClientMock := autoopsclientmock.NewMockClient(mockController)
 	mysqlClient := mysqlmock.NewMockClient(mockController)
 	p := publishermock.NewMockPublisher(mockController)
 	logger := zap.NewNop()
 	s := NewExperimentService(
 		featureClientMock,
 		accountClientMock,
+		autoOpsClientMock,
 		mysqlClient,
 		p,
 		WithLogger(logger),
@@ -104,10 +107,11 @@ func createExperimentService(c *gomock.Controller, specifiedEnvironmentId *strin
 		},
 	}
 	accountClientMock.EXPECT().GetAccountV2ByEnvironmentID(gomock.Any(), gomock.Any()).Return(ar, nil).AnyTimes()
+	autoOpsClientMock := autoopsclientmock.NewMockClient(c)
 	mysqlClient := mysqlmock.NewMockClient(c)
 	p := publishermock.NewMockPublisher(c)
 	p.EXPECT().Publish(gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	es := NewExperimentService(featureClientMock, accountClientMock, mysqlClient, p)
+	es := NewExperimentService(featureClientMock, accountClientMock, autoOpsClientMock, mysqlClient, p)
 	return es.(*experimentService)
 }
 

pkg/experiment/api/goal.go

@@ -31,6 +31,7 @@ import (
 	"github.com/bucketeer-io/bucketeer/pkg/log"
 	"github.com/bucketeer-io/bucketeer/pkg/storage/v2/mysql"
 	accountproto "github.com/bucketeer-io/bucketeer/proto/account"
+	autoopsproto "github.com/bucketeer-io/bucketeer/proto/autoops"
 	eventproto "github.com/bucketeer-io/bucketeer/proto/event/domain"
 	proto "github.com/bucketeer-io/bucketeer/proto/experiment"
 )
@@ -76,6 +77,18 @@ func (s *experimentService) GetGoal(ctx context.Context, req *proto.GetGoalReque
 		}
 		return nil, dt.Err()
 	}
+	err = s.mapConnectedOperations(ctx, []*proto.Goal{goal.Goal}, req.EnvironmentId)
+	if err != nil {
+		s.logger.Error("Failed to map connected operations", zap.Error(err))
+		dt, err := statusInternal.WithDetails(&errdetails.LocalizedMessage{
+			Locale:  localizer.GetLocale(),
+			Message: localizer.MustLocalize(locale.InternalServerError),
+		})
+		if err != nil {
+			return nil, statusInternal.Err()
+		}
+		return nil, dt.Err()
+	}
 	return &proto.GetGoalResponse{Goal: goal.Goal}, nil
 }
 
@@ -174,6 +187,19 @@ func (s *experimentService) ListGoals(
 		}
 		return nil, dt.Err()
 	}
+	err = s.mapConnectedOperations(ctx, goals, req.EnvironmentId)
+	if err != nil {
+		s.logger.Error("Failed to map connected operations", zap.Error(err))
+		dt, err := statusInternal.WithDetails(&errdetails.LocalizedMessage{
+			Locale:  localizer.GetLocale(),
+			Message: localizer.MustLocalize(locale.InternalServerError),
+		})
+		if err != nil {
+			return nil, statusInternal.Err()
+		}
+		return nil, dt.Err()
+	}
+
 	return &proto.ListGoalsResponse{
 		Goals:      goals,
 		Cursor:     strconv.Itoa(nextCursor),
@@ -212,6 +238,41 @@ func (s *experimentService) newGoalListOrders(
 	return []*mysql.Order{mysql.NewOrder(column, direction)}, nil
 }
 
+func (s *experimentService) mapConnectedOperations(
+	ctx context.Context,
+	goals []*proto.Goal,
+	environmentID string,
+) error {
+	listAutoOpRulesResp, err := s.autoOpsClient.ListAutoOpsRules(ctx, &autoopsproto.ListAutoOpsRulesRequest{
+		EnvironmentId: environmentID,
+	})
+	if err != nil {
+		return err
+	}
+	autoOpsRules := listAutoOpRulesResp.AutoOpsRules
+	goalOpsMap := make(map[string][]*autoopsproto.AutoOpsRule)
+	for _, rule := range autoOpsRules {
+		for _, clause := range rule.Clauses {
+			if clause.Clause.MessageIs(&autoopsproto.OpsEventRateClause{}) {
+				c := &autoopsproto.OpsEventRateClause{}
+				if err := clause.Clause.UnmarshalTo(c); err != nil {
+					return err
+				}
+				if c.GoalId == "" {
+					continue
+				}
+				goalOpsMap[c.GoalId] = append(goalOpsMap[c.GoalId], rule)
+			}
+		}
+	}
+	for _, goal := range goals {
+		if ops, ok := goalOpsMap[goal.Id]; ok {
+			goal.AutoOpsRules = ops
+		}
+	}
+	return nil
+}
+
 func (s *experimentService) CreateGoal(
 	ctx context.Context,
 	req *proto.CreateGoalRequest,
@@ -229,7 +290,7 @@ func (s *experimentService) CreateGoal(
 	if err := validateCreateGoalRequest(req, localizer); err != nil {
 		return nil, err
 	}
-	goal, err := domain.NewGoal(req.Command.Id, req.Command.Name, req.Command.Description)
+	goal, err := domain.NewGoal(req.Command.Id, req.Command.Name, req.Command.Description, proto.Goal_UNKNOWN)
 	if err != nil {
 		s.logger.Error(
 			"Failed to create a new goal",
@@ -316,7 +377,7 @@ func (s *experimentService) createGoalNoCommand(
 	if err := validateCreateGoalNoCommandRequest(req, localizer); err != nil {
 		return nil, err
 	}
-	goal, err := domain.NewGoal(req.Id, req.Name, req.Description)
+	goal, err := domain.NewGoal(req.Id, req.Name, req.Description, req.ConnectionType)
 	if err != nil {
 		s.logger.Error(
 			"Failed to create a new goal",