1 files changed, 39 insertions, 2 deletions

diff --git a/models/repo_collaboration.go b/models/repo_collaboration.go
index 85bc99f320..4bb95cd05c 100644
--- a/models/repo_collaboration.go
+++ b/models/repo_collaboration.go
@@ -7,6 +7,8 @@ package models
 
 import (
 	"fmt"
+
+	"xorm.io/builder"
 )
 
 // Collaboration represent the relation between an individual and a repository.
@@ -189,14 +191,49 @@ func (repo *Repository) DeleteCollaboration(uid int64) (err error) {
 		return err
 	}
 
-	// Remove all IssueWatches a user has subscribed to in the repository
-	if err := removeIssueWatchersByRepoID(sess, uid, repo.ID); err != nil {
+	if err = repo.reconsiderWatches(sess, uid); err != nil {
+		return err
+	}
+
+	// Unassign a user from any issue (s)he has been assigned to in the repository
+	if err := repo.reconsiderIssueAssignees(sess, uid); err != nil {
 		return err
 	}
 
 	return sess.Commit()
 }
 
+func (repo *Repository) reconsiderIssueAssignees(e Engine, uid int64) error {
+	user, err := getUserByID(e, uid)
+	if err != nil {
+		return err
+	}
+
+	if canAssigned, err := canBeAssigned(e, user, repo, true); err != nil || canAssigned {
+		return err
+	}
+
+	if _, err := e.Where(builder.Eq{"assignee_id": uid}).
+		In("issue_id", builder.Select("id").From("issue").Where(builder.Eq{"repo_id": repo.ID})).
+		Delete(&IssueAssignees{}); err != nil {
+		return fmt.Errorf("Could not delete assignee[%d] %v", uid, err)
+	}
+	return nil
+}
+
+func (repo *Repository) reconsiderWatches(e Engine, uid int64) error {
+	if has, err := hasAccess(e, uid, repo); err != nil || has {
+		return err
+	}
+
+	if err := watchRepo(e, uid, repo.ID, false); err != nil {
+		return err
+	}
+
+	// Remove all IssueWatches a user has subscribed to in the repository
+	return removeIssueWatchersByRepoID(e, uid, repo.ID)
+}
+
 func (repo *Repository) getRepoTeams(e Engine) (teams []*Team, err error) {
 	return teams, e.
 		Join("INNER", "team_repo", "team_repo.team_id = team.id").