Update team model and creation logic to support role management

- Added role_id field to the team model for specifying team owner roles.
- Enhanced team creation logic to set default role_id based on team configuration if not provided.
- Updated tests to reflect changes in team type and role handling, ensuring accurate assertions.
- Improved documentation for team configuration to clarify default role settings for team creators.

openapi/oauth/providers/user/team_test.go

@@ -86,7 +86,7 @@ func TestTeamBasicOperations(t *testing.T) {
 		OwnerID:     ownerUserID,
 		Status:      "active",
 		Type:        "corporation",
-		TypeID:      "business",
+		TypeID:      "free",
 		Metadata:    map[string]interface{}{"test": true, "uuid": testUUID},
 	}
 
@@ -126,6 +126,7 @@ func TestTeamBasicOperations(t *testing.T) {
 		assert.Equal(t, testTeam.Name, team["name"])
 		assert.Equal(t, testTeam.DisplayName, team["display_name"])
 		assert.Equal(t, testTeam.OwnerID, team["owner_id"])
+		assert.Equal(t, testTeam.TypeID, team["type_id"])
 	})
 
 	// Test GetTeamDetail

openapi/user/team.go

@@ -692,34 +692,42 @@ func teamCreate(ctx context.Context, userID string, teamData maps.MapStrAny) (st
 	teamData["created_at"] = time.Now()
 	teamData["updated_at"] = time.Now()
 
-	// Set default type_id from team config if not provided
+	// Get team config for setting defaults
-	if _, hasType := teamData["type_id"]; !hasType {
+	locale := ""
-		// Try to get locale from team data
+	if localeVal, ok := teamData["locale"].(string); ok && localeVal != "" {
-		locale := ""
+		locale = strings.TrimSpace(strings.ToLower(localeVal))
-		if localeVal, ok := teamData["locale"].(string); ok && localeVal != "" {
+	}
-			locale = strings.TrimSpace(strings.ToLower(localeVal))
-		}
 
-		// Fallback: try common locale variations or use "en" as final fallback
+	// Fallback: try common locale variations or use "en" as final fallback
-		// This ensures we always get a valid config even if locale is invalid
+	// This ensures we always get a valid config even if locale is invalid
-		teamConfig := GetTeamConfig(locale)
+	teamConfig := GetTeamConfig(locale)
-		if teamConfig == nil {
+	if teamConfig == nil {
-			// Try fallback locales in order
+		// Try fallback locales in order
-			fallbackLocales := []string{"en", "zh-cn"}
+		fallbackLocales := []string{"en", "zh-cn"}
-			for _, fallback := range fallbackLocales {
+		for _, fallback := range fallbackLocales {
-				teamConfig = GetTeamConfig(fallback)
+			teamConfig = GetTeamConfig(fallback)
-				if teamConfig != nil {
+			if teamConfig != nil {
-					break
+				break
-				}
 			}
 		}
+	}
 
+	// Set default type_id from team config if not provided
+	if _, hasType := teamData["type_id"]; !hasType {
 		// Apply default type from config if available
 		if teamConfig != nil && teamConfig.Type != "" {
 			teamData["type_id"] = teamConfig.Type
 		}
 	}
 
+	// Set default role_id from team config if not provided
+	if _, hasRole := teamData["role_id"]; !hasRole {
+		// Apply default role from config if available
+		if teamConfig != nil && teamConfig.Role != "" {
+			teamData["role_id"] = teamConfig.Role
+		}
+	}
+
 	// Clean up: remove locale from team data as it's not stored in database
 	delete(teamData, "locale")
 
@@ -729,12 +737,18 @@ func teamCreate(ctx context.Context, userID string, teamData maps.MapStrAny) (st
 		return "", fmt.Errorf("failed to create team: %w", err)
 	}
 
+	// Determine owner member role_id from team config
+	ownerRoleID := "owner" // fallback default
+	if teamConfig != nil && teamConfig.Role != "" {
+		ownerRoleID = teamConfig.Role
+	}
+
 	// Add the creator as an owner member of the team
 	ownerMemberData := maps.MapStrAny{
 		"team_id":     teamID,
 		"user_id":     userID,
 		"member_type": "user",
-		"role_id":     "owner",
+		"role_id":     ownerRoleID,
 		"status":      "active",
 		"joined_at":   time.Now(),
 		"created_at":  time.Now(),

openapi/user/types.go

@@ -503,7 +503,8 @@ type CreateInvitationRequest struct {
 type TeamConfig struct {
 	Roles  []*TeamRole   `json:"roles,omitempty"`
 	Invite *InviteConfig `json:"invite,omitempty"`
-	Type   string        `json:"type,omitempty"` // Default type for new teams
+	Type   string        `json:"type,omitempty"` // Default subscription type for new teams
+	Role   string        `json:"role,omitempty"` // Default user role for team creator
 }
 
 // TeamRole represents a team role configuration
@@ -511,8 +512,9 @@ type TeamRole struct {
 	RoleID      string `json:"role_id"`
 	Label       string `json:"label"`
 	Description string `json:"description"`
-	Default     bool   `json:"default"` // Whether this role is the default role
+	Default     bool   `json:"default"`  // Whether this role is the default role
-	Hidden      bool   `json:"hidden"`  // Whether this role is hidden from UI
+	Hidden      bool   `json:"hidden"`   // Whether this role is hidden from UI
+	IsOwner     bool   `json:"is_owner"` // Whether this role represents team owner (deprecated, use config.Role instead)
 }
 
 // InviteConfig represents the invitation configuration

yao/models/team.mod.yao

@@ -270,6 +270,15 @@
       "index": true,
       "nullable": false
     },
+    {
+      "name": "role_id",
+      "type": "string",
+      "label": "Role ID",
+      "comment": "Team owner role identifier (references role.role_id)",
+      "length": 50,
+      "nullable": true,
+      "index": true
+    },
     {
       "name": "type_id",
       "type": "string",
@@ -439,6 +448,12 @@
       "columns": ["type_id", "status"],
       "type": "index",
       "comment": "Index on team type and status for limits and permissions"
+    },
+    {
+      "name": "idx_team_role_type",
+      "columns": ["role_id", "type_id"],
+      "type": "index",
+      "comment": "Index on team owner role and type for permission queries"
     }
   ],
   "relations": {
@@ -448,6 +463,12 @@
       "key": "owner_id",
       "foreign": "user_id"
     },
+    "role": {
+      "type": "hasOne",
+      "model": "__yao.role",
+      "key": "role_id",
+      "foreign": "role_id"
+    },
     "user_type": {
       "type": "hasOne",
       "model": "__yao.user.type",