From 27f9f6f75c04180dd766b0265c7575a708cbf0b0 Mon Sep 17 00:00:00 2001 From: wanghaosq Date: Wed, 17 Nov 2021 14:18:44 +0800 Subject: [PATCH] resolve delete log information in db: fail to remove privileges: 404 NOT FOUND --- pkg/cibot/ownerhandler.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkg/cibot/ownerhandler.go b/pkg/cibot/ownerhandler.go index 8602f54..4d57d6b 100644 --- a/pkg/cibot/ownerhandler.go +++ b/pkg/cibot/ownerhandler.go @@ -193,14 +193,21 @@ func (handler *OwnerHandler) removeOwners(repo database.Repositories, expectedMe glog.Infof("list of remove privileges: %v", listOfRemove) memberbody := &gitee.DeleteV5ReposOwnerRepoCollaboratorsUsernameOpts{} memberbody.AccessToken = optional.NewString(handler.Config.GiteeToken) + checkBody := &gitee.GetV5ReposOwnerRepoCollaboratorsUsernameOpts{} + checkBody.AccessToken = optional.NewString(handler.Config.GiteeToken) glog.Infof("begin to remove privileges for %s/%s", repo.Owner, repo.Repo) for _, v := range listOfRemove { - _, err := handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername( - handler.Context, repo.Owner, repo.Repo, v, memberbody) + _,err := handler.GiteeClient.RepositoriesApi.GetV5ReposOwnerRepoCollaboratorsUsername(handler.Context, repo.Owner, repo.Repo, v, checkBody) if err != nil { - glog.Errorf("fail to remove privileges: %v", err) - continue + glog.Infof("%s is not in %s/%s", v, repo.Owner, repo.Repo) + }else{ + _, err = handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername( + handler.Context, repo.Owner, repo.Repo, v, memberbody) + if err != nil { + glog.Errorf("fail to remove privileges: %v", err) + continue + } } // remove from DB -- Gitee