Merge pull request #61 from goverland-labs/feature/vote_improvement

Extend vote response with proposal identifier

CHANGELOG.md

@@ -7,6 +7,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+- Extend vote response with proposal identifier
+
 ## [0.1.19] - 2024-06-27
 
 ### Changed

internal/vote/server.go

@@ -3,6 +3,7 @@ package vote
 import (
 	"context"
 	"errors"
+
 	"gorm.io/gorm"
 
 	protoany "github.com/golang/protobuf/ptypes/any"
@@ -135,11 +136,16 @@ func (s *Server) Vote(ctx context.Context, req *storagepb.VoteRequest) (*storage
 		return nil, status.Error(codes.Internal, "failed to vote")
 	}
 
-	s.sp.FetchAndStoreVote(ctx, voteResp.ID)
+	vote := s.sp.FetchAndStoreVote(ctx, voteResp.ID)
+	var proposalID string
+	if vote != nil {
+		proposalID = vote.ProposalID
+	}
 
 	return &storagepb.VoteResponse{
-		Id:   voteResp.ID,
-		Ipfs: voteResp.IPFS,
+		Id:         voteResp.ID,
+		Ipfs:       voteResp.IPFS,
+		ProposalId: proposalID,
 		Relayer: &storagepb.Relayer{
 			Address: voteResp.Relayer.Address,
 			Receipt: voteResp.Relayer.Receipt,

internal/vote/service.go

@@ -171,20 +171,22 @@ func (s *Service) Vote(ctx context.Context, req VoteRequest) (VoteResponse, erro
 	}, nil
 }
 
-func (s *Service) FetchAndStoreVote(ctx context.Context, id string) {
+func (s *Service) FetchAndStoreVote(ctx context.Context, id string) *Vote {
 	vote, err := s.dsClient.GetVote(ctx, &votingpb.GetVoteRequest{
 		Id: id,
 	})
 	if err != nil {
 		log.Error().Err(err).Msgf("fetch vote: %s", id)
-		return
+		return nil
 	}
 
-	err = s.HandleVotes(ctx, []Vote{convertFromProtoToInternal(vote)})
+	internal := convertFromProtoToInternal(vote)
+	err = s.HandleVotes(ctx, []Vote{internal})
 	if err != nil {
 		log.Error().Err(err).Msgf("store vote: %s", id)
-		return
 	}
+
+	return &internal
 }
 
 func (s *Service) HandleResolvedAddresses(list []ResolvedAddress) error {