diff --git a/models/rbac.go b/models/rbac.go index 505dfd7..b833083 100644 --- a/models/rbac.go +++ b/models/rbac.go @@ -38,24 +38,21 @@ type UserAttribute struct { // User represents a system user type User struct { - UserID string `json:"user_id" db:"user_id"` - FirstName string `json:"first_name" db:"first_name"` - MiddleInitial string `json:"middle_initial" db:"middle_initial"` - LastName string `json:"last_name" db:"last_name"` - Suffix string `json:"suffix" db:"suffix"` - EmailAddress string `json:"email_address" db:"email_address"` + UserID string `json:"user_id" db:"user_id"` + FirstName string `json:"first_name" db:"first_name"` + MiddleInitial string `json:"middle_initial" db:"middle_initial"` + LastName string `json:"last_name" db:"last_name"` + Suffix string `json:"suffix" db:"suffix"` + EmailAddress string `json:"email_address" db:"email_address"` + HomeAddress string `json:"home_address" db:"home_address"` + ContactNumber string `json:"contact_number" db:"contact_number"` + RoleID int `json:"role_id" db:"role_id"` + IsDeleted string `json:"is_deleted" db:"is_deleted"` - HomeAddress string `json:"home_address" db:"home_address"` - ContactNumber string `json:"contact_number" db:"contact_number"` - - RoleID int `json:"role_id" db:"role_id"` - IsDeleted string `json:"is_deleted" db:"is_deleted"` - - - CreatedAt time.Time `json:"created_at" db:"created_at"` - UpdatedAt time.Time `json:"updated_at" db:"updated_at"` + CreatedAt time.Time `json:"created_at" db:"created_at"` + UpdatedAt time.Time `json:"updated_at" db:"updated_at"` } // AuthorizationContext holds all context needed for authorization decisions diff --git a/repository/permission_repository.go b/repository/permission_repository.go index a602ce0..32ff68d 100644 --- a/repository/permission_repository.go +++ b/repository/permission_repository.go @@ -116,15 +116,12 @@ func GetUserByID(userID string) (*models.User, error) { &user.Suffix, &user.EmailAddress, - - &user.HomeAddress, &user.ContactNumber, &user.RoleID, &user.IsDeleted, - &user.CreatedAt, &user.UpdatedAt, )