Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix topics deleted via API not being deleted in org page #24825

Merged
merged 3 commits into from
May 21, 2023
Merged

Fix topics deleted via API not being deleted in org page #24825

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d8f53b
Fix topics deleted via API not being deleted in org page
yardenshoham May 20, 2023
405a42e
Simplify
yardenshoham May 20, 2023
75b9221
Merge branch 'main' into issues/24820
GiteaBot May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions models/repo/topic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,16 +253,7 @@ func AddTopic(repoID int64, topicName string) (*Topic, error) {
return nil, err
}

topicNames := make([]string, 0, 25)
if err := sess.Select("name").Table("topic").
Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id").
Where("repo_topic.repo_id = ?", repoID).Desc("topic.repo_count").Find(&topicNames); err != nil {
return nil, err
}

if _, err := sess.ID(repoID).Cols("topics").Update(&Repository{
Topics: topicNames,
}); err != nil {
if err = syncTopicsInRepository(sess, repoID); err != nil {
return nil, err
}

Expand All @@ -281,6 +272,11 @@ func DeleteTopic(repoID int64, topicName string) (*Topic, error) {
}

err = removeTopicFromRepo(db.DefaultContext, repoID, topic)
if err != nil {
return nil, err
}

err = syncTopicsInRepository(db.GetEngine(db.DefaultContext), repoID)

return topic, err
}
Expand Down Expand Up @@ -347,16 +343,7 @@ func SaveTopics(repoID int64, topicNames ...string) error {
}
}

topicNames = make([]string, 0, 25)
if err := sess.Table("topic").Cols("name").
Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id").
Where("repo_topic.repo_id = ?", repoID).Desc("topic.repo_count").Find(&topicNames); err != nil {
return err
}

if _, err := sess.ID(repoID).Cols("topics").Update(&Repository{
Topics: topicNames,
}); err != nil {
if err := syncTopicsInRepository(sess, repoID); err != nil {
return err
}

Expand All @@ -370,5 +357,23 @@ func GenerateTopics(ctx context.Context, templateRepo, generateRepo *Repository)
return err
}
}

return syncTopicsInRepository(db.GetEngine(ctx), generateRepo.ID)
}

// syncTopicsInRepository makes sure topics in the topics table are copied into the topics field of the repository
func syncTopicsInRepository(sess db.Engine, repoID int64) error {
yardenshoham marked this conversation as resolved.
Show resolved Hide resolved
topicNames := make([]string, 0, 25)
if err := sess.Table("topic").Cols("name").
Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id").
Where("repo_topic.repo_id = ?", repoID).Desc("topic.repo_count").Find(&topicNames); err != nil {
return err
}

if _, err := sess.ID(repoID).Cols("topics").Update(&Repository{
Topics: topicNames,
}); err != nil {
return err
}
return nil
}