admin/Authorization
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed region fetching in user_attributes

Browse Source
This commit is contained in:
F04C
2026-03-24 16:38:41 +08:00
parent 7847206283
commit f0bc603a5f
3 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/permission_repository.go
+36 -28
View File
@@ -13,13 +13,13 @@ func GetPermissionByResourceActionAndRole(resource, action string, roleID int) (
resource, action, roleID)
query := `
SELECT p.permissions_id, p.permission_name, p.description, p.resource, p.action
FROM uess_user_management.permissions p
INNER JOIN uess_user_management.role_permissions rp
ON p.permissions_id = rp.permission_id
WHERE p.resource = ? AND p.action = ? AND rp.role_id = ? AND rp.is_deleted = 0
LIMIT 1
`
SELECT p.permissions_id, p.permission_name, p.description, p.resource, p.action
FROM uess_user_management.permissions p
INNER JOIN uess_user_management.role_permissions rp
ON p.permissions_id = rp.permission_id
WHERE p.resource = ? AND p.action = ? AND rp.role_id = ? AND rp.is_deleted = 0
LIMIT 1
`
var perm models.Permission
err := db.DB.QueryRow(query, resource, action, roleID).Scan(
@@ -47,10 +47,10 @@ func GetPermissionByResourceActionAndRole(resource, action string, roleID int) (
// GetPolicyAttributesByPermission retrieves all policy attributes for a permission
func GetPolicyAttributesByPermission(permissionID int) ([]models.PolicyAttribute, error) {
query := `
SELECT id, attribute_name, attribute_type, comparison, attribute_value, permission_id
FROM uess_user_management.policy_attributes
WHERE permission_id = ?
`
SELECT id, attribute_name, attribute_type, comparison, attribute_value, permission_id
FROM uess_user_management.policy_attributes
WHERE permission_id = ?
`
rows, err := db.DB.Query(query, permissionID)
if err != nil {
@@ -83,12 +83,20 @@ func GetUserAttributes(userID string) (map[string]string, error) {
log.Printf("[Repository] GetUserAttributes - userID=%s", userID)
query := `
SELECT attribute_name, attribute_value
FROM uess_user_management.user_attributes
WHERE users_id = ?
`
SELECT attribute_name, attribute_value
FROM uess_user_management.user_attributes
WHERE users_id = ?
rows, err := db.DB.Query(query, userID)
UNION
SELECT 'region' AS attribute_name, o.reg AS attribute_value
FROM uess_reference.office o
LEFT JOIN uess_user_management.users u
ON o.id = u.office_id
WHERE u.users_id = ?
`
rows, err := db.DB.Query(query, userID, userID)
if err != nil {
log.Printf("[Repository] ✗ Database error querying user attributes: %v", err)
return nil, fmt.Errorf("error querying user attributes: %w", err)
@@ -115,10 +123,10 @@ func GetUserByID(userID string) (*models.User, error) {
log.Printf("[Repository] GetUserByID - userID=%s", userID)
query := `
SELECT users_id, email_address
FROM uess_user_management.users
WHERE users_id = ?
`
SELECT users_id, email_address
FROM uess_user_management.users
WHERE users_id = ?
`
var user models.User
err := db.DB.QueryRow(query, userID).Scan(&user.UsersID, &user.EmailAddress)
@@ -138,10 +146,10 @@ func GetUserByID(userID string) (*models.User, error) {
// GetAllPermissions retrieves all permissions (for caching)
func GetAllPermissions() ([]models.Permission, error) {
query := `
SELECT id, permission_name, description, resource, action
FROM uess_user_management.permissions
ORDER BY id
`
SELECT id, permission_name, description, resource, action
FROM uess_user_management.permissions
ORDER BY id
`
rows, err := db.DB.Query(query)
if err != nil {
@@ -171,10 +179,10 @@ func GetAllPermissions() ([]models.Permission, error) {
// GetAllPolicyAttributes retrieves all policy attributes (for caching)
func GetAllPolicyAttributes() (map[int][]models.PolicyAttribute, error) {
query := `
SELECT policy_attributes_id, attribute_name, attribute_type, comparison, attribute_value, permission_id
FROM uess_user_management.policy_attributes
ORDER BY permission_id, policy_attributes_id
`
SELECT policy_attributes_id, attribute_name, attribute_type, comparison, attribute_value, permission_id
FROM uess_user_management.policy_attributes
ORDER BY permission_id, policy_attributes_id
`
rows, err := db.DB.Query(query)
if err != nil {
repository/permission_repository_test.go
+1 -1
View File
@@ -35,7 +35,7 @@ func TestGetPolicyAttributesByPermissionSuccess(t *testing.T) {
AddRow(1, "department", "user", "=", "engineering", 1).
AddRow(2, "level", "user", ">=", "5", 1)
mock.ExpectQuery("SELECT id, attribute_name, attribute_type, comparison, attribute_value, permission_id FROM uess_user_management.policy_attributes WHERE permission_id = \\?").
mock.ExpectQuery("SELECT id, attribute_name, attribute_type, comparison, attribute_value, permission_id FROM uess_user_management.policy_attributes WHERE permission_id = ?").
WithArgs(1).
WillReturnRows(rows)