fix: team_user delete problem

ElaBosak233 · Apr 1, 2024 · b9bd6a9 · b9bd6a9
1 parent 1ebc7eb
commit b9bd6a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/casbin/policy.go b/internal/casbin/policy.go
@@ -17,9 +17,10 @@ func initDefaultPolicy() {
 		{"user", "/api/teams/", "POST"},
 		{"user", "/api/teams/{id}", "PUT"},
 		{"user", "/api/teams/{id}", "GET"},
+		{"user", "/api/teams/{id}", "DELETE"},
 		{"user", "/api/teams/{id}/invite", "PUT"},
 		{"user", "/api/teams/{id}/invite", "GET"},
-		{"user", "/api/teams/{id}/users", "DELETE"},
+		{"user", "/api/teams/{id}/users/{user_id}", "DELETE"},
 		{"user", "/api/teams/{id}/join", "POST"},
 		{"user", "/api/teams/{id}/leave", "DELETE"},
 		{"user", "/api/challenges/", "GET"},

diff --git a/internal/repository/user_team.go b/internal/repository/user_team.go
@@ -29,7 +29,10 @@ func (t *UserTeamRepository) Insert(userTeam model.UserTeam) error {
 }
 
 func (t *UserTeamRepository) Delete(userTeam model.UserTeam) error {
-	result := t.db.Table("user_teams").Delete(&userTeam)
+	result := t.db.Table("user_teams").
+		Where("user_id = ?", userTeam.UserID).
+		Where("team_id = ?", userTeam.TeamID).
+		Delete(&userTeam)
 	return result.Error
 }