Ignore if topic is sent twice in same request, refactoring.

Signed-off-by: David Svantesson <[email protected]>

Author: davidsvantesson

models/topic.go

@@ -60,25 +60,31 @@ func ValidateTopic(topic string) bool {
 }
 
 // SanitizeAndValidateTopics sanitizes and checks an array or topics
-func SanitizeAndValidateTopics(topics []string) (invalidTopics []string) {
+func SanitizeAndValidateTopics(topics []string) (validTopics []string, invalidTopics []string) {
+	validTopics = make([]string, 0)
 	invalidTopics = make([]string, 0)
 
-	i := 0
+	LOOP_TOPICS:
 	for _, topic := range topics {
 		topic = strings.TrimSpace(strings.ToLower(topic))
 		// ignore empty string
 		if len(topic) == 0 {
-			continue
+			continue LOOP_TOPICS
+		}
+		// ignore same topic twice
+		for _, vTopic := range validTopics {
+			if topic == vTopic {
+				continue LOOP_TOPICS
+			}
 		}
-		topics[i] = topic
-		i++
-		if !ValidateTopic(topic) {
+		if ValidateTopic(topic) {
+			validTopics = append(validTopics, topic)
+		} else {
 			invalidTopics = append(invalidTopics, topic)
 		}
 	}
-	topics = topics[:i]
 
-	return invalidTopics
+	return validTopics, invalidTopics
 }
 
 // GetTopicByName retrieves topic by name

routers/api/v1/repo/topic.go

@@ -84,11 +84,11 @@ func UpdateTopics(ctx *context.APIContext, form api.RepoTopicOptions) {
 	//     "$ref": "#/responses/empty"
 
 	topicNames := form.Topics
-	invalidTopics := models.SanitizeAndValidateTopics(topicNames)
+	validTopics, invalidTopics := models.SanitizeAndValidateTopics(topicNames)
 
-	if len(topicNames) > 25 {
+	if len(validTopics) > 25 {
 		ctx.JSON(422, map[string]interface{}{
-			"invalidTopics": topicNames[:0],
+			"invalidTopics": nil,
 			"message":       "Exceeding maximum number of topics per repo",
 		})
 		return
@@ -102,7 +102,7 @@ func UpdateTopics(ctx *context.APIContext, form api.RepoTopicOptions) {
 		return
 	}
 
-	err := models.SaveTopics(ctx.Repo.Repository.ID, topicNames...)
+	err := models.SaveTopics(ctx.Repo.Repository.ID, validTopics...)
 	if err != nil {
 		log.Error("SaveTopics failed: %v", err)
 		ctx.JSON(500, map[string]interface{}{

routers/repo/topic.go

@@ -27,11 +27,11 @@ func TopicsPost(ctx *context.Context) {
 		topics = strings.Split(topicsStr, ",")
 	}
 
-	invalidTopics := models.SanitizeAndValidateTopics(topics)
+	validTopics, invalidTopics := models.SanitizeAndValidateTopics(topics)
 
-	if len(topics) > 25 {
+	if len(validTopics) > 25 {
 		ctx.JSON(422, map[string]interface{}{
-			"invalidTopics": topics[:0],
+			"invalidTopics": nil,
 			"message":       ctx.Tr("repo.topic.count_prompt"),
 		})
 		return
@@ -45,7 +45,7 @@ func TopicsPost(ctx *context.Context) {
 		return
 	}
 
-	err := models.SaveTopics(ctx.Repo.Repository.ID, topics...)
+	err := models.SaveTopics(ctx.Repo.Repository.ID, validTopics...)
 	if err != nil {
 		log.Error("SaveTopics failed: %v", err)
 		ctx.JSON(500, map[string]interface{}{