Skip to content

Refactor: remove redundant if-then-else block in UserAuthRepository for clarity (#6031) #6827

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor: remove redundant if-then-else block in UserAuthRepository for clarity (#6031) #6827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions pkg/auth/user/repository/UserAuthRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,12 +1091,13 @@ func (impl UserAuthRepositoryImpl) GetRoleForOtherEntity(team, app, env, act, ac
var queryParams []interface{}
query := "SELECT role.* FROM roles role WHERE role.team = ? AND role.entity_name=? AND role.environment=? AND role.action=?"
queryParams = append(queryParams, team, app, env, act)
if oldValues {
query = query + " and role.access_type is NULL"
} else {
query += " and role.access_type = ? "
queryParams = append(queryParams, accessType)
}
// Both branches were identical; refactored for clarity and maintainability
if oldValues {
query += " and role.access_type is NULL"
} else {
query += " and role.access_type = ? "
queryParams = append(queryParams, accessType)
}

_, err = impl.dbConnection.Query(&model, query, queryParams...)
} else if len(team) > 0 && app == "" && len(env) > 0 && len(act) > 0 {
Expand Down Expand Up @@ -1127,15 +1128,14 @@ func (impl UserAuthRepositoryImpl) GetRoleForOtherEntity(team, app, env, act, ac
var queryParams []interface{}
//this is applicable for all environment of a team
query := "SELECT role.* FROM roles role WHERE role.team = ? AND coalesce(role.entity_name,'')=? AND coalesce(role.environment,'')=? AND role.action=?"
queryParams = append(queryParams, team, EMPTY_PLACEHOLDER_FOR_QUERY, EMPTY_PLACEHOLDER_FOR_QUERY, act)
if oldValues {
query = query + " and role.access_type is NULL"
} else {
query += " and role.access_type = ? "
queryParams = append(queryParams, accessType)
}

_, err = impl.dbConnection.Query(&model, query, queryParams...)
queryParams = append(queryParams, team, EMPTY_PLACEHOLDER_FOR_QUERY, EMPTY_PLACEHOLDER_FOR_QUERY, act)
if oldValues {
query = query + " and role.access_type is NULL"
} else {
query += " and role.access_type = ? "
queryParams = append(queryParams, accessType)
}
_, err = impl.dbConnection.Query(&model, query, queryParams...)
} else if team == "" && app == "" && env == "" && len(act) > 0 {
var queryParams []interface{}
//this is applicable for super admin, all env, all team, all app
Expand Down