Merge remote-tracking branch 'origin/master'

svc/repository/mk_user_repository.go

@@ -45,6 +45,8 @@ func (r *MkUserRepository) GetByUsername(username string) (*models.MkUser, error
 		FILTER (WHERE d.code IS NOT NULL),
 		'{}'
 	) AS department_codes,
+	COALESCE(MAX(n.username), '') AS v3_username,
+	COALESCE(MAX(n.user_group_code::text), '') AS v3_usergroup,
 
 	u.password_updated_at,
 	u.created_at,
@@ -67,6 +69,13 @@ LEFT JOIN dfusr_dprt ud
 LEFT JOIN mk_dprt d
 	ON d.id = ud.dprt_id
 
+LEFT JOIN dfusr_nebim_user un
+	ON un.dfusr_id = u.id
+
+LEFT JOIN mk_nebim_user n
+	ON n.id = un.mk_nebim_user_id
+	AND n.is_active = true
+
 WHERE LOWER(u.username) = LOWER($1)
 
 GROUP BY
@@ -85,6 +94,8 @@ LIMIT 1
 		&u.RoleCode,
 
 		pq.Array(&u.DepartmentCodes), // ✅
+		&u.V3Username,
+		&u.V3UserGroup,
 
 		&u.PasswordUpdatedAt,
 
@@ -127,6 +138,8 @@ func (r *MkUserRepository) GetByID(id int64) (*models.MkUser, error) {
 		FILTER (WHERE d.code IS NOT NULL),
 		'{}'
 	) AS department_codes,
+	COALESCE(MAX(n.username), '') AS v3_username,
+	COALESCE(MAX(n.user_group_code::text), '') AS v3_usergroup,
 
 	u.password_updated_at,
 	u.created_at,
@@ -149,7 +162,14 @@ LEFT JOIN dfusr_dprt ud
 LEFT JOIN mk_dprt d
 	ON d.id = ud.dprt_id
 
-WHERE LOWER(u.username) = LOWER($1)
+LEFT JOIN dfusr_nebim_user un
+	ON un.dfusr_id = u.id
+
+LEFT JOIN mk_nebim_user n
+	ON n.id = un.mk_nebim_user_id
+	AND n.is_active = true
+
+WHERE u.id = $1
 
 GROUP BY
 	u.id, r.id
@@ -166,6 +186,8 @@ LIMIT 1
 		&u.RoleID,
 		&u.RoleCode,
 		pq.Array(&u.DepartmentCodes), // ✅
+		&u.V3Username,
+		&u.V3UserGroup,
 		&u.PasswordUpdatedAt,
 		&u.CreatedAt,
 		&u.UpdatedAt,