updated

instead middle_name it's middle_initial

docs/database_schema.sql

@@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS user_attributes (
 CREATE TABLE IF NOT EXISTS users (
     user_id CHAR(11) PRIMARY KEY,
     first_name VARCHAR(50) NOT NULL,
-    middle_name VARCHAR(50),
+    middle_initial CHAR(1),
     last_name VARCHAR(50) NOT NULL,
     suffix VARCHAR(10),
     email_address VARCHAR(60) NOT NULL,

models/rbac.go

@@ -40,7 +40,7 @@ type UserAttribute struct {
 type User struct {
 	UserID        string    `json:"user_id" db:"user_id"`
 	FirstName     string    `json:"first_name" db:"first_name"`
-	MiddleName    string    `json:"middle_name" db:"middle_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"`

repository/permission_repository.go

@@ -99,7 +99,7 @@ func GetUserAttributes(userID string) (map[string]string, error) {
 // GetUserByID retrieves user details
 func GetUserByID(userID string) (*models.User, error) {
 	query := `
-		SELECT user_id, first_name, middle_name, last_name, suffix, email_address,
+		SELECT user_id, first_name, middle_initial, last_name, suffix, email_address,
 		       account_type, emp_id, reg, prov, aProv, mun, bgy, is_logged_in,
 		       first_logged_in, address, contact_number, device_id, role_id,
 		       role_dps, is_deleted, secret_key, is_activated, created_at, updated_at
@@ -112,7 +112,7 @@ func GetUserByID(userID string) (*models.User, error) {
 	err := db.DB.QueryRow(query, userID).Scan(
 		&user.UserID,
 		&user.FirstName,
-		&user.MiddleName,
+		&user.MiddleInitial,
 		&user.LastName,
 		&user.Suffix,
 		&user.EmailAddress,

repository/permission_repository_test.go

@@ -108,7 +108,7 @@ func TestGetUserByIDSuccess(t *testing.T) {
 	testTime := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC)
 
 	rows := sqlmock.NewRows([]string{
-		"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+		"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at",
@@ -316,14 +316,14 @@ func TestGetUserByIDEmptyID(t *testing.T) {
 	defer cleanup()
 
 	rows := sqlmock.NewRows([]string{
-		"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+		"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at",
 	})
 
 	// Match the actual query format with all the fields
-	mock.ExpectQuery(`SELECT user_id, first_name, middle_name, last_name, suffix, email_address`).
+	mock.ExpectQuery(`SELECT user_id, first_name, middle_initial, last_name, suffix, email_address`).
 		WithArgs("").
 		WillReturnRows(rows)
 

services/authorize_test.go

@@ -40,7 +40,7 @@ func TestAuthorize_PermissionNotFound(t *testing.T) {
 	}
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -49,7 +49,7 @@ func TestAuthorize_PermissionNotFound(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 
@@ -84,7 +84,7 @@ func TestAuthorize_Success(t *testing.T) {
 	}
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -93,7 +93,7 @@ func TestAuthorize_Success(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 
@@ -146,7 +146,7 @@ func TestAuthorize_UserAttributesError(t *testing.T) {
 	}
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -155,7 +155,7 @@ func TestAuthorize_UserAttributesError(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 
@@ -195,7 +195,7 @@ func TestAuthorize_PolicyAttributesError(t *testing.T) {
 	}
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -204,7 +204,7 @@ func TestAuthorize_PolicyAttributesError(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 
@@ -244,7 +244,7 @@ func TestCheckPermission_Success(t *testing.T) {
 	defer cleanup()
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -253,7 +253,7 @@ func TestCheckPermission_Success(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 
@@ -299,7 +299,7 @@ func TestCheckPermission_Denied(t *testing.T) {
 	defer cleanup()
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -308,7 +308,7 @@ func TestCheckPermission_Denied(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 
@@ -336,7 +336,7 @@ func TestCheckPermission_NilResourceData(t *testing.T) {
 	defer cleanup()
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -345,7 +345,7 @@ func TestCheckPermission_NilResourceData(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 

services/cached_authorization_test.go

@@ -219,7 +219,7 @@ func TestAuthorizeWithCache_Success(t *testing.T) {
 	service.PolicyCache[1] = []models.PolicyAttribute{}
 
 	// Mock user query (needed to get role_id)
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -228,7 +228,7 @@ func TestAuthorizeWithCache_Success(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)
 
@@ -276,7 +276,7 @@ func TestAuthorizeWithCache_PermissionNotFound(t *testing.T) {
 	}
 
 	// Mock user query
-	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_name", "last_name", "suffix", "email_address",
+	userRows := sqlmock.NewRows([]string{"user_id", "first_name", "middle_initial", "last_name", "suffix", "email_address",
 		"account_type", "emp_id", "reg", "prov", "aProv", "mun", "bgy", "is_logged_in",
 		"first_logged_in", "address", "contact_number", "device_id", "role_id",
 		"role_dps", "is_deleted", "secret_key", "is_activated", "created_at", "updated_at"}).
@@ -285,7 +285,7 @@ func TestAuthorizeWithCache_PermissionNotFound(t *testing.T) {
 			"Y", "123 Street", "09123456789", "device1", 1,
 			0, "N", "secret", "Y", time.Now(), time.Now())
 
-	mock.ExpectQuery("SELECT user_id, first_name, middle_name, last_name, suffix, email_address").
+	mock.ExpectQuery("SELECT user_id, first_name, middle_initial, last_name, suffix, email_address").
 		WithArgs("user123").
 		WillReturnRows(userRows)