Merge pull request #82 from goverland-labs/feature/76-dont-use-sessio…

…n-id-in-voting

Add vote meta info for vote validation

go.mod

@@ -34,7 +34,6 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

internal/vote/dto.go

@@ -12,6 +12,12 @@ type ValidateResponse struct {
 
 	VotingPower     float64
 	ValidationError *ValidationError
+	VoteStatus      VoteStatus
+}
+
+type VoteStatus struct {
+	Voted  bool
+	Choice json.RawMessage
 }
 
 type ValidationError struct {

internal/vote/server.go

@@ -111,6 +111,12 @@ func (s *Server) Validate(ctx context.Context, req *storagepb.ValidateRequest) (
 		Ok:              validateResp.OK,
 		VotingPower:     validateResp.VotingPower,
 		ValidationError: validationError,
+		VoteStatus: &storagepb.VoteStatus{
+			Voted: validateResp.VoteStatus.Voted,
+			Choice: &protoany.Any{
+				Value: validateResp.VoteStatus.Choice,
+			},
+		},
 	}, nil
 }
 

internal/vote/service.go

@@ -126,10 +126,27 @@ func (s *Service) Validate(ctx context.Context, req ValidateRequest) (ValidateRe
 		}
 	}
 
+	voted, err := s.repo.GetByFilters([]Filter{
+		VoterFilter{Voter: req.Voter},
+		ProposalIDsFilter{ProposalIDs: []string{req.Proposal}},
+	}, 1, 0, "")
+	if err != nil {
+		return ValidateResponse{}, fmt.Errorf("get by filters: %w", err)
+	}
+
+	var votedStatus VoteStatus
+	if len(voted.Votes) > 0 {
+		votedStatus = VoteStatus{
+			Voted:  true,
+			Choice: voted.Votes[0].Choice,
+		}
+	}
+
 	return ValidateResponse{
 		OK:              resp.GetOk(),
 		VotingPower:     resp.GetVotingPower(),
 		ValidationError: validationError,
+		VoteStatus:      votedStatus,
 	}, nil
 }