feat: integrate indexer-service types for NATS messaging

- Use indexerTypes.IndexerMessageEnvelope from indexer-service instead of local types
- Add IndexingConfig() methods to ProjectBase and ProjectSettings domain models
  - ProjectBase uses "viewer" for access check, "writer" for history
  - ProjectSettings uses "auditor" for access check with project UID
- Remove duplicate IndexerMessage and SettingsIndexerMessage local types
- Update SendIndexerMessage to accept IndexerMessageEnvelope with IndexingConfig
- Refactor message building to eliminate duplicate IndexingConfig initialization
- Update all tests to use indexer-service types
- Update root-project-setup script to use new message format

This change establishes the framework for passing indexing configuration
to the indexer service via NATS messages for proper access control and
search functionality.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Andres Tobon <andrest2455@gmail.com>

Author: andrest50

cmd/project-api/service_endpoint_project_test.go

@@ -153,9 +153,8 @@ func TestCreateProject(t *testing.T) {
 				// Mock successful project creation
 				mockRepo.On("CreateProject", mock.Anything, mock.AnythingOfType("*models.ProjectBase"), mock.AnythingOfType("*models.ProjectSettings")).Return(nil)
 				// Mock message sending
-				mockMsg.On("SendIndexerMessage", mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("models.ProjectIndexerMessage"), mock.AnythingOfType("bool")).Return(nil)
+				mockMsg.On("SendIndexerMessage", mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("types.IndexerMessageEnvelope"), mock.AnythingOfType("bool")).Return(nil).Times(2)
 				mockMsg.On("SendAccessMessage", mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("models.ProjectAccessMessage"), mock.AnythingOfType("bool")).Return(nil)
-				mockMsg.On("SendIndexerMessage", mock.Anything, mock.AnythingOfType("string"), mock.AnythingOfType("models.ProjectSettingsIndexerMessage"), mock.AnythingOfType("bool")).Return(nil)
 			},
 			expectedError: false,
 		},

go.mod

@@ -5,6 +5,7 @@ module github.com/linuxfoundation/lfx-v2-project-service
 go 1.24.0
 
 require (
+	github.com/linuxfoundation/lfx-v2-indexer-service v0.4.13
 	github.com/auth0/go-jwt-middleware/v2 v2.3.0
 	github.com/aws/aws-sdk-go-v2/config v1.32.0
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.10
@@ -42,6 +43,7 @@ require (
 	github.com/gohugoio/hashstructure v0.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/klauspost/compress v1.18.1 // indirect
+	github.com/linuxfoundation/lfx-v2-indexer-service v0.4.13 // indirect
 	github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d // indirect
 	github.com/nats-io/nkeys v0.4.11 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect

go.sum

@@ -62,6 +62,8 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
 github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
+github.com/linuxfoundation/lfx-v2-indexer-service v0.4.13 h1:SANx5u+qJ+1DkMadpSDhPYJgPgnHDBPxw9Am6LC5pjk=
+github.com/linuxfoundation/lfx-v2-indexer-service v0.4.13/go.mod h1:j013GdKST/hMWFhciRuzJd0sy764sNtlmO3gqmsnaCA=
 github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d h1:Zj+PHjnhRYWBK6RqCDBcAhLXoi3TzC27Zad/Vn+gnVQ=
 github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d/go.mod h1:WZy8Q5coAB1zhY9AOBJP0O6J4BuDfbupUDavKY+I3+s=
 github.com/manveru/gobdd v0.0.0-20131210092515-f1a17fdd710b h1:3E44bLeN8uKYdfQqVQycPnaVviZdBLbizFhU49mtbe4=

internal/domain/models/message.go

@@ -3,41 +3,6 @@
 
 package models
 
-// MessageAction is a type for the action of a project message.
-type MessageAction string
-
-// MessageAction constants for the action of a project message.
-const (
-	// ActionCreated is the action for a resource creation message.
-	ActionCreated MessageAction = "created"
-	// ActionUpdated is the action for a resource update message.
-	ActionUpdated MessageAction = "updated"
-	// ActionDeleted is the action for a resource deletion message.
-	ActionDeleted MessageAction = "deleted"
-)
-
-// ProjectIndexerMessage is a type-safe NATS message for project indexing operations.
-type ProjectIndexerMessage struct {
-	Action MessageAction `json:"action"`
-	Data   ProjectBase   `json:"data"`
-	Tags   []string      `json:"tags"`
-}
-
-// ProjectSettingsIndexerMessage is a type-safe NATS message for project settings indexing operations.
-type ProjectSettingsIndexerMessage struct {
-	Action MessageAction   `json:"action"`
-	Data   ProjectSettings `json:"data"`
-	Tags   []string        `json:"tags"`
-}
-
-// IndexerMessageEnvelope is the actual message format sent to NATS for indexing operations.
-type IndexerMessageEnvelope struct {
-	Action  MessageAction     `json:"action"`
-	Headers map[string]string `json:"headers"`
-	Data    any               `json:"data"`
-	Tags    []string          `json:"tags"`
-}
-
 // ProjectAccessData is the schema for the data in the message sent to the fga-sync service.
 // These are the fields that the fga-sync service needs in order to update the OpenFGA permissions.
 type ProjectAccessData struct {

internal/domain/models/message_test.go

@@ -9,116 +9,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestMessageActionConstants(t *testing.T) {
-	tests := []struct {
-		name     string
-		action   MessageAction
-		expected string
-	}{
-		{
-			name:     "action created",
-			action:   ActionCreated,
-			expected: "created",
-		},
-		{
-			name:     "action updated",
-			action:   ActionUpdated,
-			expected: "updated",
-		},
-		{
-			name:     "action deleted",
-			action:   ActionDeleted,
-			expected: "deleted",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			assert.Equal(t, tt.expected, string(tt.action))
-		})
-	}
-}
-
-func TestProjectIndexerMessage(t *testing.T) {
-	tests := []struct {
-		name    string
-		message ProjectIndexerMessage
-		verify  func(t *testing.T, msg ProjectIndexerMessage)
-	}{
-		{
-			name: "project indexer message with all fields",
-			message: ProjectIndexerMessage{
-				Action: ActionCreated,
-				Data: ProjectBase{
-					UID:  "project-123",
-					Slug: "test-project",
-					Name: "Test Project",
-				},
-				Tags: []string{"project-123", "test-project", "Test Project"},
-			},
-			verify: func(t *testing.T, msg ProjectIndexerMessage) {
-				assert.Equal(t, ActionCreated, msg.Action)
-				assert.Equal(t, "project-123", msg.Data.UID)
-				assert.Equal(t, "test-project", msg.Data.Slug)
-				assert.Equal(t, "Test Project", msg.Data.Name)
-				assert.Len(t, msg.Tags, 3)
-			},
-		},
-		{
-			name: "project indexer message with minimal fields",
-			message: ProjectIndexerMessage{
-				Action: ActionDeleted,
-				Data: ProjectBase{
-					UID: "project-456",
-				},
-			},
-			verify: func(t *testing.T, msg ProjectIndexerMessage) {
-				assert.Equal(t, ActionDeleted, msg.Action)
-				assert.Equal(t, "project-456", msg.Data.UID)
-				assert.Empty(t, msg.Tags)
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.verify(t, tt.message)
-		})
-	}
-}
-
-func TestProjectSettingsIndexerMessage(t *testing.T) {
-	tests := []struct {
-		name    string
-		message ProjectSettingsIndexerMessage
-		verify  func(t *testing.T, msg ProjectSettingsIndexerMessage)
-	}{
-		{
-			name: "project settings indexer message with all fields",
-			message: ProjectSettingsIndexerMessage{
-				Action: ActionUpdated,
-				Data: ProjectSettings{
-					UID:              "settings-123",
-					MissionStatement: "Our mission",
-				},
-				Tags: []string{"settings-123", "Our mission"},
-			},
-			verify: func(t *testing.T, msg ProjectSettingsIndexerMessage) {
-				assert.Equal(t, ActionUpdated, msg.Action)
-				assert.Equal(t, "settings-123", msg.Data.UID)
-				assert.Equal(t, "Our mission", msg.Data.MissionStatement)
-				assert.Len(t, msg.Tags, 2)
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.verify(t, tt.message)
-		})
-	}
-}
-
 func TestProjectAccessMessage(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -154,48 +44,3 @@ func TestProjectAccessMessage(t *testing.T) {
 		})
 	}
 }
-
-func TestIndexerMessageEnvelope(t *testing.T) {
-	tests := []struct {
-		name    string
-		message IndexerMessageEnvelope
-		verify  func(t *testing.T, msg IndexerMessageEnvelope)
-	}{
-		{
-			name: "indexer message envelope with all fields",
-			message: IndexerMessageEnvelope{
-				Action: ActionCreated,
-				Headers: map[string]string{
-					"request-id": "test-request-123",
-					"user-id":    "user-456",
-				},
-				Data: map[string]interface{}{
-					"uid":  "project-123",
-					"slug": "test-project",
-					"name": "Test Project",
-				},
-				Tags: []string{"project-123", "test-project"},
-			},
-			verify: func(t *testing.T, msg IndexerMessageEnvelope) {
-				assert.Equal(t, ActionCreated, msg.Action)
-				assert.Equal(t, "test-request-123", msg.Headers["request-id"])
-				assert.Equal(t, "user-456", msg.Headers["user-id"])
-				assert.NotNil(t, msg.Data)
-				assert.Len(t, msg.Tags, 2)
-
-				// Verify data can be type asserted
-				data, ok := msg.Data.(map[string]interface{})
-				assert.True(t, ok)
-				assert.Equal(t, "project-123", data["uid"])
-				assert.Equal(t, "test-project", data["slug"])
-				assert.Equal(t, "Test Project", data["name"])
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.verify(t, tt.message)
-		})
-	}
-}

internal/domain/models/project.go

@@ -5,7 +5,10 @@ package models
 
 import (
 	"fmt"
+	"strings"
 	"time"
+
+	indexerTypes "github.com/linuxfoundation/lfx-v2-indexer-service/pkg/types"
 )
 
 // UserInfo represents user information including profile details.
@@ -101,6 +104,27 @@ func (p *ProjectBase) Tags() []string {
 	return tags
 }
 
+// IndexingConfig generates an IndexingConfig for indexing this project.
+func (p *ProjectBase) IndexingConfig() *indexerTypes.IndexingConfig {
+	if p == nil {
+		return nil
+	}
+
+	return &indexerTypes.IndexingConfig{
+		ObjectID:             p.UID,
+		Public:               &p.Public,
+		AccessCheckObject:    fmt.Sprintf("project:%s", p.UID),
+		AccessCheckRelation:  "viewer",
+		HistoryCheckObject:   fmt.Sprintf("project:%s", p.UID),
+		HistoryCheckRelation: "writer",
+		SortName:             p.Name,
+		NameAndAliases:       []string{p.Name, p.Slug},
+		ParentRefs:           []string{fmt.Sprintf("project:%s", p.ParentUID)},
+		Fulltext:             strings.Join([]string{p.Name, p.Slug, p.Description}, " "),
+		Tags:                 p.Tags(),
+	}
+}
+
 // Tags generates a consistent set of tags for the project settings.
 // IMPORTANT: If you modify this method, please update the Project Tags documentation in the README.md
 // to ensure consumers understand how to use these tags for searching.
@@ -127,3 +151,20 @@ func (p *ProjectSettings) Tags() []string {
 
 	return tags
 }
+
+// IndexingConfig generates an IndexingConfig for indexing this project settings.
+// Note: Project settings use the project UID for access checks, not the settings UID.
+func (p *ProjectSettings) IndexingConfig(projectUID string) *indexerTypes.IndexingConfig {
+	if p == nil {
+		return nil
+	}
+
+	return &indexerTypes.IndexingConfig{
+		ObjectID:             p.UID,
+		AccessCheckObject:    fmt.Sprintf("project:%s", projectUID),
+		AccessCheckRelation:  "auditor",
+		HistoryCheckObject:   fmt.Sprintf("project:%s", projectUID),
+		HistoryCheckRelation: "writer",
+		Tags:                 p.Tags(),
+	}
+}

internal/infrastructure/nats/message.go

@@ -11,6 +11,8 @@ import (
 	"time"
 
 	"github.com/go-viper/mapstructure/v2"
+	indexerConstants "github.com/linuxfoundation/lfx-v2-indexer-service/pkg/constants"
+	indexerTypes "github.com/linuxfoundation/lfx-v2-indexer-service/pkg/types"
 	"github.com/linuxfoundation/lfx-v2-project-service/internal/domain/models"
 	"github.com/linuxfoundation/lfx-v2-project-service/pkg/constants"
 	"github.com/nats-io/nats.go"
@@ -59,9 +61,10 @@ func (m *MessageBuilder) requestMessage(subject string, data []byte, timeout tim
 func (m *MessageBuilder) sendIndexerMessage(
 	ctx context.Context,
 	subject string,
-	action models.MessageAction,
+	action indexerConstants.MessageAction,
 	data []byte,
 	tags []string,
+	indexingConfig *indexerTypes.IndexingConfig,
 	sync bool,
 ) error {
 	headers := make(map[string]string)
@@ -74,7 +77,7 @@ func (m *MessageBuilder) sendIndexerMessage(
 
 	var payload any
 	switch action {
-	case models.ActionCreated, models.ActionUpdated:
+	case indexerConstants.ActionCreated, indexerConstants.ActionUpdated:
 		// The data should be a JSON object.
 		var jsonData any
 		if err := json.Unmarshal(data, &jsonData); err != nil {
@@ -97,18 +100,17 @@ func (m *MessageBuilder) sendIndexerMessage(
 			slog.ErrorContext(ctx, "error decoding data", constants.ErrKey, err, "subject", subject)
 			return err
 		}
-	case models.ActionDeleted:
+	case indexerConstants.ActionDeleted:
 		// The data should just be a string of the UID being deleted.
 		payload = data
 	}
 
-	// TODO: use the model from the indexer service to keep the message body consistent.
-	// Ticket https://linuxfoundation.atlassian.net/browse/LFXV2-147
-	message := models.IndexerMessageEnvelope{
-		Action:  action,
-		Headers: headers,
-		Data:    payload,
-		Tags:    tags,
+	message := indexerTypes.IndexerMessageEnvelope{
+		Action:         action,
+		Headers:        headers,
+		Data:           payload,
+		Tags:           tags,
+		IndexingConfig: indexingConfig,
 	}
 
 	messageBytes, err := json.Marshal(message)
@@ -125,25 +127,17 @@ func (m *MessageBuilder) sendIndexerMessage(
 // SendIndexerMessage sends indexer messages to NATS for search indexing.
 func (m *MessageBuilder) SendIndexerMessage(ctx context.Context, subject string, message interface{}, sync bool) error {
 	switch msg := message.(type) {
-	case models.ProjectIndexerMessage:
+	case indexerTypes.IndexerMessageEnvelope:
 		dataBytes, err := json.Marshal(msg.Data)
 		if err != nil {
-			slog.ErrorContext(ctx, "error marshalling project data into JSON", constants.ErrKey, err)
+			slog.ErrorContext(ctx, "error marshalling message data into JSON", constants.ErrKey, err)
 			return err
 		}
-		return m.sendIndexerMessage(ctx, subject, msg.Action, dataBytes, msg.Tags, sync)
-
-	case models.ProjectSettingsIndexerMessage:
-		dataBytes, err := json.Marshal(msg.Data)
-		if err != nil {
-			slog.ErrorContext(ctx, "error marshalling project settings data into JSON", constants.ErrKey, err)
-			return err
-		}
-		return m.sendIndexerMessage(ctx, subject, msg.Action, dataBytes, msg.Tags, sync)
+		return m.sendIndexerMessage(ctx, subject, msg.Action, dataBytes, msg.Tags, msg.IndexingConfig, sync)
 
 	case string:
 		// For delete operations, the message is just the UID string
-		return m.sendIndexerMessage(ctx, subject, models.ActionDeleted, []byte(msg), nil, sync)
+		return m.sendIndexerMessage(ctx, subject, indexerConstants.ActionDeleted, []byte(msg), nil, nil, sync)
 
 	default:
 		slog.ErrorContext(ctx, "unsupported indexer message type", "type", fmt.Sprintf("%T", message))