Follow wxiaoguang's suggestion

Author: lunny

models/repo/pushmirror.go

@@ -122,6 +122,17 @@ func GetPushMirrorsByRepoID(ctx context.Context, repoID int64, listOptions db.Li
 	})
 }
 
+func GetPushMirrorByIDAndRepoID(ctx context.Context, id, repoID int64) (*PushMirror, error) {
+	var pushMirror PushMirror
+	has, err := db.GetEngine(ctx).Where("id = ?", id).And("repo_id = ?", repoID).Get(&pushMirror)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrPushMirrorNotExist
+	}
+	return &pushMirror, nil
+}
+
 func GetPushMirrorByID(ctx context.Context, id int64) (*PushMirror, error) {
 	mirror, has, err := db.GetByID[PushMirror](ctx, id)
 	if err != nil {

routers/web/repo/setting/setting.go

@@ -1000,14 +1000,14 @@ func selectPushMirrorByForm(ctx *context.Context, form *forms.RepoSettingForm, r
 		return nil, err
 	}
 
-	pushMirror, err := repo_model.GetPushMirrorByID(ctx, id)
+	pushMirror, err := repo_model.GetPushMirrorByIDAndRepoID(ctx, id, repo.ID)
 	if err != nil {
+		if err == repo_model.ErrPushMirrorNotExist {
+			return nil, fmt.Errorf("PushMirror[%v] not associated to repository %v", id, repo)
+		}
 		return nil, err
 	}
 
-	if pushMirror.RepoID != repo.ID {
-		return nil, fmt.Errorf("PushMirror[%v] not associated to repository %v", id, repo)
-	}
 	pushMirror.Repo = repo
 	return pushMirror, nil
 }

tests/integration/mirror_push_test.go

@@ -141,13 +141,6 @@ func TestRepoSettingPushMirror(t *testing.T) {
 	resp := session.MakeRequest(t, req, http.StatusOK)
 	htmlDoc := NewHTMLParser(t, resp.Body)
 
-	defer func() {
-		// avoid dirty mirror data once test failure
-		repo_model.DeletePushMirrors(db.DefaultContext, repo_model.PushMirrorOptions{
-			RepoID: repo2.ID,
-		})
-	}()
-
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		t.Run("Push Mirror Add", func(t *testing.T) {
 			req = NewRequestWithValues(t, "POST", repoPrefix+"/settings", map[string]string{