diff --git a/models/rbac.go b/models/rbac.go index 3540d72..505dfd7 100644 --- a/models/rbac.go +++ b/models/rbac.go @@ -44,16 +44,16 @@ type User struct { LastName string `json:"last_name" db:"last_name"` Suffix string `json:"suffix" db:"suffix"` EmailAddress string `json:"email_address" db:"email_address"` - EmpID string `json:"emp_id" db:"emp_id"` - IsLoggedIn string `json:"is_logged_in" db:"is_logged_in"` - FirstLoggedIn string `json:"first_logged_in" db:"first_logged_in"` + + + HomeAddress string `json:"home_address" db:"home_address"` ContactNumber string `json:"contact_number" db:"contact_number"` - DeviceID string `json:"device_id" db:"device_id"` + RoleID int `json:"role_id" db:"role_id"` IsDeleted string `json:"is_deleted" db:"is_deleted"` - SecretKey string `json:"secret_key" db:"secret_key"` - IsActivated string `json:"is_activated" db:"is_activated"` + + CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` } diff --git a/repository/permission_repository.go b/repository/permission_repository.go index 8ca4eb9..a602ce0 100644 --- a/repository/permission_repository.go +++ b/repository/permission_repository.go @@ -100,8 +100,8 @@ func GetUserAttributes(userID string) (map[string]string, error) { func GetUserByID(userID string) (*models.User, error) { query := ` SELECT user_id, first_name, middle_initial, last_name, suffix, email_address, - emp_id, is_logged_in, first_logged_in, home_address, contact_number, device_id, - role_id, is_deleted, secret_key, is_activated, created_at, updated_at + home_address, contact_number, + role_id, is_deleted, created_at, updated_at FROM uess_user_management.users WHERE user_id = ? AND is_deleted = 'N' LIMIT 1 @@ -115,16 +115,16 @@ func GetUserByID(userID string) (*models.User, error) { &user.LastName, &user.Suffix, &user.EmailAddress, - &user.EmpID, - &user.IsLoggedIn, - &user.FirstLoggedIn, + + + &user.HomeAddress, &user.ContactNumber, - &user.DeviceID, + &user.RoleID, &user.IsDeleted, - &user.SecretKey, - &user.IsActivated, + + &user.CreatedAt, &user.UpdatedAt, ) diff --git a/repository/permission_repository_test.go b/repository/permission_repository_test.go index c6d7c56..0bab75a 100644 --- a/repository/permission_repository_test.go +++ b/repository/permission_repository_test.go @@ -109,8 +109,8 @@ func TestGetUserByIDSuccess(t *testing.T) { rows := sqlmock.NewRows([]string{ "user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at", + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at", }).AddRow( "user123", "John", "M", "Doe", "Jr", "john@example.com", "EMP001", "Y", "Y", "123 Main St", "1234567890", "device001", @@ -315,8 +315,8 @@ func TestGetUserByIDEmptyID(t *testing.T) { rows := sqlmock.NewRows([]string{ "user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at", + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at", }) // Match the actual query format with all the fields diff --git a/services/authorize_test.go b/services/authorize_test.go index f83fb75..f4eaa78 100644 --- a/services/authorize_test.go +++ b/services/authorize_test.go @@ -41,8 +41,8 @@ func TestAuthorize_PermissionNotFound(t *testing.T) { // Mock user query userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}). + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at"}). AddRow("user123", "John", "", "Doe", "", "john@example.com", "EMP123", "Y", "Y", "123 Street", "09123456789", "device1", 1, "N", "secret", "Y", time.Now(), time.Now()) @@ -83,8 +83,8 @@ func TestAuthorize_Success(t *testing.T) { // Mock user query userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}). + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at"}). AddRow("user123", "John", "", "Doe", "", "john@example.com", "EMP123", "Y", "Y", "123 Street", "09123456789", "device1", 1, "N", "secret", "Y", time.Now(), time.Now()) @@ -143,8 +143,8 @@ func TestAuthorize_UserAttributesError(t *testing.T) { // Mock user query userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}). + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at"}). AddRow("user123", "John", "", "Doe", "", "john@example.com", "EMP123", "Y", "Y", "123 Street", "09123456789", "device1", 1, "N", "secret", "Y", time.Now(), time.Now()) @@ -190,8 +190,8 @@ func TestAuthorize_PolicyAttributesError(t *testing.T) { // Mock user query userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}). + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at"}). AddRow("user123", "John", "", "Doe", "", "john@example.com", "EMP123", "Y", "Y", "123 Street", "09123456789", "device1", 1, "N", "secret", "Y", time.Now(), time.Now()) diff --git a/services/cached_authorization_test.go b/services/cached_authorization_test.go index 53ee769..2fa2507 100644 --- a/services/cached_authorization_test.go +++ b/services/cached_authorization_test.go @@ -220,8 +220,8 @@ func TestAuthorizeWithCache_Success(t *testing.T) { // Mock user query (needed to get role_id) userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}). + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at"}). AddRow("user123", "John", "", "Doe", "", "john@example.com", "EMP123", "Y", "Y", "123 Street", "09123456789", "device1", 1, "N", "secret", "Y", time.Now(), time.Now()) @@ -275,8 +275,8 @@ func TestAuthorizeWithCache_PermissionNotFound(t *testing.T) { // Mock user query userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address", - "emp_id", "is_logged_in", "first_logged_in", "home_address", "contact_number", "device_id", - "role_id", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}). + "home_address", "contact_number", + "role_id", "is_deleted", "created_at", "updated_at"}). AddRow("user123", "John", "", "Doe", "", "john@example.com", "EMP123", "Y", "Y", "123 Street", "09123456789", "device1", 1, "N", "secret", "Y", time.Now(), time.Now())