feat(receiver): make type immutable (#152)

* feat(receiver): make type immutable * chore: update proto
raystack · Nov 21, 2022 · 193787a · 193787a
1 parent a4fdf9f
commit 193787a
Show file tree

Hide file tree

Showing 9 changed files with 613 additions and 584 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ NAME="github.com/odpf/siren"
 LAST_COMMIT := $(shell git rev-parse --short HEAD)
 LAST_TAG := "$(shell git rev-list --tags --max-count=1)"
 APP_VERSION := "$(shell git describe --tags ${LAST_TAG})-next"
-PROTON_COMMIT := "45cc543ff18d6efd6d8a39947018c828599b476b"
+PROTON_COMMIT := "f21015688d165bec2d859c6fca284754dd81755f"
 
 .PHONY: all build test clean dist vet proto install
 

diff --git a/core/receiver/service.go b/core/receiver/service.go
@@ -102,6 +102,14 @@ func (s *Service) Get(ctx context.Context, id uint64) (*Receiver, error) {
 }
 
 func (s *Service) Update(ctx context.Context, rcv *Receiver) error {
+	rcv, err := s.repository.Get(ctx, rcv.ID)
+	if err != nil {
+		if errors.As(err, new(NotFoundError)) {
+			return errors.ErrNotFound.WithMsgf(err.Error())
+		}
+		return err
+	}
+
 	receiverPlugin, err := s.getReceiverPlugin(rcv.Type)
 	if err != nil {
 		return err

diff --git a/core/receiver/service_test.go b/core/receiver/service_test.go
@@ -396,17 +396,38 @@ func TestService_UpdateReceiver(t *testing.T) {
 	var (
 		ctx       = context.TODO()
 		testCases = []testCase{
+			{
+				Description: "should return error if get receiver return error",
+				Setup: func(rr *mocks.ReceiverRepository, ss *mocks.ConfigResolver) {
+					rr.EXPECT().Get(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64")).Return(nil, errors.New("some error"))
+				},
+				Rcv: &receiver.Receiver{
+					ID: 123,
+				},
+				Err: errors.New("some error"),
+			},
 			{
 				Description: "should return error if type unknown",
-				Setup:       func(rr *mocks.ReceiverRepository, ss *mocks.ConfigResolver) {},
+				Setup: func(rr *mocks.ReceiverRepository, ss *mocks.ConfigResolver) {
+					rr.EXPECT().Get(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64")).Return(&receiver.Receiver{
+						Type: "random",
+					}, nil)
+				},
 				Rcv: &receiver.Receiver{
-					Type: "random",
+					ID: 123,
 				},
 				Err: errors.New("unsupported receiver type: \"random\""),
 			},
 			{
 				Description: "should return error if PreHookDBTransformConfigs return error",
 				Setup: func(rr *mocks.ReceiverRepository, ss *mocks.ConfigResolver) {
+					rr.EXPECT().Get(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64")).Return(&receiver.Receiver{
+						ID:   123,
+						Type: receiver.TypeSlack,
+						Configurations: map[string]interface{}{
+							"token": "key",
+						},
+					}, nil)
 					ss.EXPECT().PreHookDBTransformConfigs(mock.AnythingOfType("*context.emptyCtx"), map[string]interface{}{"token": "key"}).Return(nil, errors.New("some error"))
 				},
 				Rcv: &receiver.Receiver{
@@ -421,6 +442,13 @@ func TestService_UpdateReceiver(t *testing.T) {
 			{
 				Description: "should return error if Update repository return error",
 				Setup: func(rr *mocks.ReceiverRepository, ss *mocks.ConfigResolver) {
+					rr.EXPECT().Get(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64")).Return(&receiver.Receiver{
+						ID:   123,
+						Type: receiver.TypeSlack,
+						Configurations: map[string]interface{}{
+							"token": "key",
+						},
+					}, nil)
 					ss.EXPECT().PreHookDBTransformConfigs(mock.AnythingOfType("*context.emptyCtx"), map[string]interface{}{"token": "key"}).Return(map[string]interface{}{
 						"token": "encrypted_key",
 					}, nil)
@@ -444,6 +472,13 @@ func TestService_UpdateReceiver(t *testing.T) {
 			{
 				Description: "should return nil error if no error returned",
 				Setup: func(rr *mocks.ReceiverRepository, ss *mocks.ConfigResolver) {
+					rr.EXPECT().Get(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64")).Return(&receiver.Receiver{
+						ID:   123,
+						Type: receiver.TypeSlack,
+						Configurations: map[string]interface{}{
+							"token": "key",
+						},
+					}, nil)
 					ss.EXPECT().PreHookDBTransformConfigs(mock.AnythingOfType("*context.emptyCtx"), map[string]interface{}{"token": "key"}).Return(map[string]interface{}{
 						"token": "encrypted_key",
 					}, nil)
@@ -466,6 +501,13 @@ func TestService_UpdateReceiver(t *testing.T) {
 			}, {
 				Description: "should return error not found if repository return not found error",
 				Setup: func(rr *mocks.ReceiverRepository, ss *mocks.ConfigResolver) {
+					rr.EXPECT().Get(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64")).Return(&receiver.Receiver{
+						ID:   123,
+						Type: receiver.TypeSlack,
+						Configurations: map[string]interface{}{
+							"token": "key",
+						},
+					}, nil)
 					ss.EXPECT().PreHookDBTransformConfigs(mock.AnythingOfType("*context.emptyCtx"), map[string]interface{}{"token": "key"}).Return(map[string]interface{}{
 						"token": "encrypted_key",
 					}, nil)

diff --git a/internal/api/v1beta1/receiver.go b/internal/api/v1beta1/receiver.go
@@ -97,14 +97,9 @@ func (s *GRPCServer) GetReceiver(ctx context.Context, req *sirenv1beta1.GetRecei
 }
 
 func (s *GRPCServer) UpdateReceiver(ctx context.Context, req *sirenv1beta1.UpdateReceiverRequest) (*sirenv1beta1.UpdateReceiverResponse, error) {
-	if !receiver.IsTypeSupported(req.GetType()) {
-		return nil, s.generateRPCErr(errors.ErrInvalid.WithMsgf("unsupported type %s", req.GetType()))
-	}
-
 	rcv := &receiver.Receiver{
 		ID:             req.GetId(),
 		Name:           req.GetName(),
-		Type:           req.GetType(),
 		Labels:         req.GetLabels(),
 		Configurations: req.GetConfigurations().AsMap(),
 	}

diff --git a/internal/api/v1beta1/receiver_test.go b/internal/api/v1beta1/receiver_test.go
@@ -251,14 +251,12 @@ func TestGRPCServer_UpdateReceiver(t *testing.T) {
 	dummyReq := &sirenv1beta1.UpdateReceiverRequest{
 		Id:             uint64(22),
 		Name:           "foo",
-		Type:           "slack",
 		Labels:         labels,
 		Configurations: configurationsData,
 	}
 	payload := &receiver.Receiver{
 		ID:             uint64(22),
 		Name:           "foo",
-		Type:           "slack",
 		Labels:         labels,
 		Configurations: configurations,
 	}

diff --git a/internal/store/postgres/receiver.go b/internal/store/postgres/receiver.go
@@ -18,7 +18,7 @@ RETURNING *
 `
 
 const receiverUpdateQuery = `
-UPDATE receivers SET name=$2, type=$3, labels=$4, configurations=$5, updated_at=now()
+UPDATE receivers SET name=$2, labels=$3, configurations=$4, updated_at=now()
 WHERE id = $1
 RETURNING *
 `
@@ -132,7 +132,6 @@ func (r ReceiverRepository) Update(ctx context.Context, rcv *receiver.Receiver)
 	if err := r.client.db.QueryRowxContext(ctx, receiverUpdateQuery,
 		receiverModel.ID,
 		receiverModel.Name,
-		receiverModel.Type,
 		receiverModel.Labels,
 		receiverModel.Configurations,
 	).StructScan(&updatedReceiver); err != nil {