fix: Add subgroup notfound error (#304)

* fix: Add subgroup notfound

* fix: Validation query error

Author: tbphp

internal/services/aggregate_group_service.go

@@ -173,11 +173,14 @@ func (s *AggregateGroupService) AddSubGroups(ctx context.Context, groupID uint,
 
 	// Check if there are existing sub groups and get their validation endpoint
 	var existingEndpoint string
-	var existingSubGroup models.GroupSubGroup
-	if err := s.db.WithContext(ctx).Where("group_id = ?", groupID).First(&existingSubGroup).Error; err == nil {
-		// If we have existing sub groups, get one of their validation endpoints
+	var existingSubGroups []models.GroupSubGroup
+	if err := s.db.WithContext(ctx).Where("group_id = ?", groupID).Find(&existingSubGroups).Error; err != nil {
+		return err
+	}
+
+	if len(existingSubGroups) > 0 {
 		var existingGroup models.Group
-		if err := s.db.WithContext(ctx).First(&existingGroup, existingSubGroup.SubGroupID).Error; err == nil {
+		if err := s.db.WithContext(ctx).First(&existingGroup, existingSubGroups[0].SubGroupID).Error; err == nil {
 			existingEndpoint = utils.GetValidationEndpoint(&existingGroup)
 		}
 	}
@@ -188,12 +191,6 @@ func (s *AggregateGroupService) AddSubGroups(ctx context.Context, groupID uint,
 		return err
 	}
 
-	// Manually query existing sub groups
-	var existingSubGroups []models.GroupSubGroup
-	if err := s.db.WithContext(ctx).Where("group_id = ?", groupID).Find(&existingSubGroups).Error; err != nil {
-		return err
-	}
-
 	// Check for duplicates with existing sub groups
 	existingSubGroupIDs := make(map[uint]bool)
 	for _, sg := range existingSubGroups {
@@ -208,21 +205,27 @@ func (s *AggregateGroupService) AddSubGroups(ctx context.Context, groupID uint,
 	}
 
 	// Add new sub groups
-	return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+	err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		for _, newSg := range result.SubGroups {
 			newSg.GroupID = groupID
 			if err := tx.Create(&newSg).Error; err != nil {
 				return app_errors.ParseDBError(err)
 			}
 		}
 
-		// 触发缓存更新
-		if err := s.groupManager.Invalidate(); err != nil {
-			logrus.WithContext(ctx).WithError(err).Error("failed to invalidate group cache after adding sub groups")
-		}
-
 		return nil
 	})
+
+	if err != nil {
+		return err
+	}
+
+	// 触发缓存更新
+	if err := s.groupManager.Invalidate(); err != nil {
+		logrus.WithContext(ctx).WithError(err).Error("failed to invalidate group cache after adding sub groups")
+	}
+
+	return nil
 }
 
 // UpdateSubGroupWeight updates the weight of a specific sub group

internal/services/subgroup_manager.go

@@ -58,20 +58,21 @@ func (m *SubGroupManager) SelectSubGroup(group *models.Group) (string, error) {
 
 // RebuildSelectors rebuild all selectors based on the incoming group
 func (m *SubGroupManager) RebuildSelectors(groups map[string]*models.Group) {
-	m.mu.Lock()
-	m.selectors = make(map[uint]*selector)
-	m.mu.Unlock()
+	newSelectors := make(map[uint]*selector)
 
-	rebuildCount := 0
 	for _, group := range groups {
 		if group.GroupType == "aggregate" && len(group.SubGroups) > 0 {
-			if sel := m.getSelector(group); sel != nil {
-				rebuildCount++
+			if sel := m.createSelector(group); sel != nil {
+				newSelectors[group.ID] = sel
 			}
 		}
 	}
 
-	logrus.WithField("new_count", rebuildCount).Debug("Rebuilt selectors for aggregate groups")
+	m.mu.Lock()
+	m.selectors = newSelectors
+	m.mu.Unlock()
+
+	logrus.WithField("new_count", len(newSelectors)).Debug("Rebuilt selectors for aggregate groups")
 }
 
 // getSelector retrieves or creates a selector for the aggregate group