Admin/panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Refactor user management to replace email with username across the application

Browse Source
This commit is contained in:
RKWojs
2025-07-28 22:25:23 +02:00
parent 6fc2e6703b
commit 07b4af5f24
14 changed files with 298 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/queries/projects.js
View File

@@ -5,9 +5,9 @@ export function getAllProjects(contractId = null) {
SELECT
p.*,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM projects p
LEFT JOIN users creator ON p.created_by = creator.id
LEFT JOIN users assignee ON p.assigned_to = assignee.id
@@ -30,9 +30,9 @@ export function getProjectById(id) {
SELECT
p.*,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM projects p
LEFT JOIN users creator ON p.created_by = creator.id
LEFT JOIN users assignee ON p.assigned_to = assignee.id
@@ -136,7 +136,7 @@ export function getAllUsersForAssignment() {
return db
.prepare(
`
SELECT id, name, email, role
SELECT id, name, username, role
FROM users
WHERE is_active = 1
ORDER BY name
@@ -153,9 +153,9 @@ export function getProjectsByAssignedUser(userId) {
SELECT
p.*,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM projects p
LEFT JOIN users creator ON p.created_by = creator.id
LEFT JOIN users assignee ON p.assigned_to = assignee.id
@@ -174,9 +174,9 @@ export function getProjectsByCreator(userId) {
SELECT
p.*,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM projects p
LEFT JOIN users creator ON p.created_by = creator.id
LEFT JOIN users assignee ON p.assigned_to = assignee.id
@@ -224,7 +224,7 @@ export function getNotesForProject(projectId) {
`
SELECT n.*,
u.name as created_by_name,
u.email as created_by_email
u.username as created_by_username
FROM notes n
LEFT JOIN users u ON n.created_by = u.id
WHERE n.project_id = ?

18
src/lib/queries/tasks.js
View File

@@ -29,9 +29,9 @@ export function getAllProjectTasks() {
p.address,
p.finish_date,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM project_tasks pt
LEFT JOIN tasks t ON pt.task_template_id = t.task_id
LEFT JOIN projects p ON pt.project_id = p.project_id
@@ -58,9 +58,9 @@ export function getProjectTasks(projectId) {
ELSE 'custom'
END as task_type,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM project_tasks pt
LEFT JOIN tasks t ON pt.task_template_id = t.task_id
LEFT JOIN users creator ON pt.created_by = creator.id
@@ -222,9 +222,9 @@ export function getProjectTasksByAssignedUser(userId) {
p.address,
p.finish_date,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM project_tasks pt
LEFT JOIN tasks t ON pt.task_template_id = t.task_id
LEFT JOIN projects p ON pt.project_id = p.project_id
@@ -258,9 +258,9 @@ export function getProjectTasksByCreator(userId) {
p.address,
p.finish_date,
creator.name as created_by_name,
creator.email as created_by_email,
creator.username as created_by_username,
assignee.name as assigned_to_name,
assignee.email as assigned_to_email
assignee.username as assigned_to_username
FROM project_tasks pt
LEFT JOIN tasks t ON pt.task_template_id = t.task_id
LEFT JOIN projects p ON pt.project_id = p.project_id
@@ -288,7 +288,7 @@ export function getAllUsersForTaskAssignment() {
return db
.prepare(
`
SELECT id, name, email, role
SELECT id, name, username, role
FROM users
WHERE is_active = 1
ORDER BY name ASC