Merge branch 'main' into tbramwell/LFXV2-1735-otel-sdk-bootstrap

Author: bramwelt

cmd/voting-api/eventing/vote_response_event_handler.go

@@ -152,6 +152,7 @@ func convertMapToVoteResponseData(
 		PollID:                  voteDB.PollID,
 		ProjectID:               voteDB.ProjectID,
 		VoteCreationTime:        voteDB.VoteCreationTime,
+		LastModifiedTime:        voteDB.LastModifiedTime,
 		UserID:                  voteDB.UserID,
 		UserEmail:               voteDB.UserEmail,
 		UserRole:                voteDB.UserRole,

cmd/voting-api/eventing/vote_response_event_handler_test.go

@@ -24,6 +24,7 @@ func TestConvertMapToVoteResponseData(t *testing.T) {
 			"poll_id":            "poll-456",
 			"project_id":         "project-sfid",
 			"vote_creation_time": "2024-01-01T00:00:00Z",
+			"last_modified_time": "2024-06-01T12:00:00Z",
 			"user_id":            "user-123",
 			"user_email":         "test@example.com",
 			"user_role":          "voter",
@@ -59,6 +60,7 @@ func TestConvertMapToVoteResponseData(t *testing.T) {
 		assert.Equal(t, "testuser", result.Username)
 		assert.Equal(t, "submitted", result.VoteStatus)
 		assert.False(t, result.Abstained)
+		assert.Equal(t, "2024-06-01T12:00:00Z", result.LastModifiedTime)
 	})
 
 	t.Run("converts ranked choice answers from string to int", func(t *testing.T) {

internal/domain/event_models.go

@@ -157,6 +157,7 @@ type VoteDBRaw struct {
 	PollID                  string          `json:"poll_id"`
 	ProjectID               string          `json:"project_id"`
 	VoteCreationTime        string          `json:"vote_creation_time"`
+	LastModifiedTime        string          `json:"last_modified_time"`
 	UserID                  string          `json:"user_id"`
 	UserEmail               string          `json:"user_email"`
 	UserRole                string          `json:"user_role"`
@@ -282,6 +283,7 @@ type VoteResponseData struct {
 	ProjectID               string           `json:"project_id"`  // v1 project ID (SFID)
 	ProjectUID              string           `json:"project_uid"` // v2 project UID
 	VoteCreationTime        string           `json:"vote_creation_time"`
+	LastModifiedTime        string           `json:"last_modified_time"`
 	UserID                  string           `json:"user_id"`
 	UserEmail               string           `json:"user_email"`
 	UserRole                string           `json:"user_role"`