dev
ci / docker_image (push) Successful in 1m38s
ci / deploy (push) Successful in 18s

This commit is contained in:
2025-01-29 22:38:07 -06:00
parent be83b7570d
commit fa14fe0496
65 changed files with 3318 additions and 708 deletions
+546 -9
View File
@@ -2,6 +2,14 @@ import bcrypt from 'bcrypt';
import sql from '$lib/db/db.server';
import { error } from '@sveltejs/kit';
import { saveAvatar } from '$lib/index.server';
import {
EmploymentType,
type User,
type Company,
type Tag,
type Posting,
type Application
} from '$lib/types';
export async function createUser(user: User): Promise<number> {
const password_hash: string = await bcrypt.hash(user.password!, 12);
@@ -48,7 +56,7 @@ export async function updateUser(user: User): Promise<number> {
export async function checkUserCreds(username: string, password: string): Promise<User | null> {
const [user] = await sql`
SELECT id, password_hash, perms, active
SELECT id, username, password_hash, perms, active, company_id AS "companyId"
FROM users
WHERE username = ${username}
`;
@@ -57,7 +65,8 @@ export async function checkUserCreds(username: string, password: string): Promis
return null;
}
if (await bcrypt.compare(password, user.password_hash)) {
return <User>{ id: user.id, perms: user.perms, active: user.active };
delete user.password_hash;
return <User>user;
}
return null;
}
@@ -87,6 +96,19 @@ export async function getUsers(searchQuery: string | null = null): Promise<User[
return <User[]>(<unknown>users);
}
export async function getCompanies(searchQuery: string | null = null): Promise<Company[]> {
return sql<Company[]>`
SELECT id,
name,
description,
website,
company_code AS "companyCode",
created_at AT TIME ZONE 'UTC' AS "createdAt"
FROM companies
WHERE name ILIKE ${searchQuery ? `%${searchQuery}%` : '%'};
`;
}
// should require MANAGE_USERS permission
export async function getUser(id: number): Promise<User> {
const [user] = await sql`
@@ -152,9 +174,84 @@ export async function getUserWithCompany(id: number): Promise<User> {
return <User>user;
}
export async function getUserWithCompanyAndApplications(
id: number
): Promise<{ user: User; applications: Application[] }> {
const data = await sql`
WITH company_data AS (
SELECT
id,
name,
description,
website,
created_at AT TIME ZONE 'UTC' AS "createdAt"
FROM companies
WHERE id = (SELECT company_id FROM users WHERE id = ${id})
),
user_data AS (
SELECT
username,
perms,
email,
phone,
full_name AS "fullName",
created_at AT TIME ZONE 'UTC' AS "createdAt",
last_signin AT TIME ZONE 'UTC' AS "lastSignIn",
active
FROM users
WHERE "id" = ${id}
),
application_data AS (
SELECT
id,
posting_id AS "postingId",
(SELECT title FROM postings WHERE id = posting_id) AS "postingTitle",
created_at AT TIME ZONE 'UTC' AS "createdAt"
FROM applications
WHERE "user_id" = ${id}
)
SELECT
(
SELECT row_to_json(company_data)
FROM company_data
) AS company,
(
SELECT row_to_json(user_data)
FROM user_data
) AS user,
(
SELECT json_agg(row_to_json(application_data))
FROM application_data
) AS applications;
`;
if (!data) {
error(404, 'User not found');
}
let user = data[0].user;
user.company = data[0].company;
user.createdAt = new Date(user.createdAt);
user.lastSignIn = new Date(user.lastSignIn);
if (user.company) {
user.company.createdAt = new Date(user.company.createdAt);
}
let applications = data[0].applications;
if (applications) {
applications.forEach((application: { createdAt: string | number | Date }) => {
application.createdAt = new Date(application.createdAt);
});
}
return {
user: <User>user,
applications: <Application[]>applications
};
}
// should require MANAGE_USERS permission
export async function deleteUser(id: number): Promise<void> {
const response = await sql`
await sql`
DELETE FROM users
WHERE id = ${id};
`;
@@ -177,16 +274,456 @@ export async function updateLastSignin(username: string): Promise<void> {
`;
}
export async function createCompany(
name: string,
description: string,
website: string
): Promise<number> {
export async function createCompany(company: Company): Promise<number> {
const response = await sql`
INSERT INTO companies (name, description, website, created_at, company_code)
VALUES (${name}, ${description}, ${website}, NOW(), generate_company_code(CAST(CURRVAL('companies_id_seq') AS INT)))
VALUES (${company.name}, ${company.description}, ${company.website}, NOW(), generate_company_code(CAST(CURRVAL('companies_id_seq') AS INT)))
RETURNING id;
`;
return response[0].id;
}
export async function editCompany(company: Company): Promise<number> {
const response = await sql`
UPDATE companies
SET name = ${company.name}, description = ${company.description}, website = ${company.website}
WHERE id = ${company.id}
RETURNING id;
`;
return response[0].id;
}
export async function deleteCompany(id: number): Promise<void> {
await sql`
DELETE FROM companies
WHERE id = ${id};
`;
}
export async function getCompany(id: number): Promise<Company> {
const [company] = await sql`
SELECT id, name, description, website, created_at AS "createdAt"
FROM companies
WHERE id = ${id};
`;
if (!company) {
error(404, 'Company not found');
}
return <Company>company;
}
export async function getCompanyFullData(
id: number
): Promise<{ company: Company; users: User[]; postings: Posting[] }> {
const data = await sql`
WITH company_data AS (
SELECT
id,
name,
description,
website,
created_at AT TIME ZONE 'UTC' AS "createdAt"
FROM companies
WHERE id = ${id}
),
user_data AS (
SELECT
username,
email,
phone,
full_name AS "fullName"
FROM users
WHERE "company_id" = ${id}
),
posting_data AS (
SELECT
id,
title,
description,
employer_id AS "employerId",
address,
employment_type AS "employmentType",
wage,
link,
tag_ids AS "tagIds",
created_at AT TIME ZONE 'UTC' AS "createdAt",
updated_at AT TIME ZONE 'UTC' AS "updatedAt",
flyer_link AS "flyerLink"
FROM postings
WHERE "company_id" = ${id}
)
SELECT
(
SELECT row_to_json(company_data)
FROM company_data
) AS company,
(
SELECT json_agg(row_to_json(user_data))
FROM user_data
) AS users,
(
SELECT json_agg(row_to_json(posting_data))
FROM posting_data
) AS postings;
`;
if (!data) {
error(404, 'Company not found');
}
if (data[0].company) {
data[0].company.createdAt = new Date(data[0].company.createdAt);
}
if (data[0].postings) {
data[0].postings.forEach(
(posting: {
createdAt: string | number | Date;
updatedAt: string | number | Date;
tagIds: number[] | undefined;
tags: { id: number; displayName: null; createdAt: null }[];
}) => {
posting.createdAt = new Date(posting.createdAt);
posting.updatedAt = new Date(posting.updatedAt);
if (posting.tagIds) {
posting.tagIds?.forEach((tagId: number) => {
posting.tags.push({ id: tagId, displayName: null, createdAt: null });
});
}
delete posting.tagIds;
}
);
}
return {
company: <Company>data[0].company,
users: <User[]>data[0].users,
postings: <Posting[]>data[0].postings
};
}
export async function createPosting(posting: Posting): Promise<number> {
if (posting.tagIds === null || posting.tagIds === undefined) {
posting.tagIds = [];
}
posting.tags?.forEach((tag) => {
posting.tagIds?.push(tag.id);
});
if (posting.companyId === null || posting.companyId === undefined) {
if (posting.company) {
posting.companyId = posting.company.id;
} else {
posting.companyId = null;
}
}
const response = await sql`
INSERT INTO postings (title, description, employer_id, address, employment_type, wage, link, tag_ids, created_at, updated_at, flyer_link, company_id)
VALUES (${posting.title}, ${posting.description}, ${posting.employerId}, ${posting.address}, ${posting.employmentType}, ${posting.wage}, ${posting.link}, ${posting.tagIds}, NOW(), NOW(), ${posting.flyerLink}, ${posting.companyId})
RETURNING id;
`;
return response[0].id;
}
export async function editPosting(posting: Posting): Promise<number> {
if (posting.tagIds === null || posting.tagIds === undefined) {
posting.tagIds = [];
}
posting.tags?.forEach((tag) => {
posting.tagIds?.push(tag.id);
});
if (posting.companyId === null || posting.companyId === undefined) {
if (posting.company) {
posting.companyId = posting.company.id;
} else {
posting.companyId = null;
}
}
const response = await sql`
UPDATE postings
SET title = ${posting.title}, description = ${posting.description}, employer_id = ${posting.employerId}, address = ${posting.address}, employment_type = ${posting.employmentType}, wage = ${posting.wage}, link = ${posting.link}, tag_ids = ${posting.tagIds}, updated_at = NOW(), flyer_link = ${posting.flyerLink}, company_id = ${posting.companyId}
WHERE id = ${posting.id}
RETURNING id;
`;
return response[0].id;
}
export async function deletePosting(id: number): Promise<void> {
await sql`
DELETE FROM postings
WHERE id = ${id};
`;
}
export async function getCompanyEmployers(
id: number
): Promise<{ company: Company; users: User[] }> {
const data = await sql`
WITH company_data AS (
SELECT
id,
name,
description,
website,
created_at AT TIME ZONE 'UTC' AS "createdAt",
company_code AS "companyCode"
FROM companies
WHERE id = ${id}
),
user_data AS (SELECT id,
username,
email,
phone,
full_name AS "fullName",
created_at AT TIME ZONE 'UTC' AS "createdAt",
last_signin AT TIME ZONE 'UTC' AS "lastSignIn",
company_id as "companyId"
FROM users
WHERE "company_code" = (SELECT company_code FROM companies WHERE id = ${id}))
SELECT
(
SELECT row_to_json(company_data)
FROM company_data
) AS company,
(
SELECT json_agg(row_to_json(user_data))
FROM user_data
) AS users;
`;
if (!data) {
error(404, 'Company not found');
}
if (data[0].users) {
data[0].users.forEach(
(user: {
company: { id: any };
companyId: any;
createdAt: string | number | Date;
lastSignIn: string | number | Date;
}) => {
user.company = {
id: user.companyId
};
user.createdAt = new Date(user.createdAt);
user.lastSignIn = new Date(user.lastSignIn);
delete user.companyId;
}
);
}
return {
company: <Company>data[0].company,
users: <User[]>data[0].users
};
}
export async function removeEmployerFromCompany(companyId: number, userId: number): Promise<void> {
await sql`
UPDATE users
SET company_id = NULL,
company_code = NULL
WHERE id = ${userId};
`;
}
export async function addEmployerToCompany(companyId: number, userId: number): Promise<void> {
await sql`
UPDATE users
SET company_id = ${companyId}
WHERE id = ${userId};
`;
}
export async function getPostings(searchQuery: string | null = null): Promise<Posting[]> {
const postings = await sql<Posting[]>`
SELECT p.id,
p.title,
p.description,
p.employer_id AS "employerId",
p.address,
p.employment_type AS "employmentType",
p.wage,
p.link,
p.tag_ids AS "tagIds",
p.created_at AT TIME ZONE 'UTC' AS "createdAt",
p.updated_at AT TIME ZONE 'UTC' AS "updatedAt",
p.flyer_link AS "flyerLink",
p.company_id AS "companyId",
c.name AS "companyName"
FROM postings p
LEFT JOIN companies c ON p.company_id = c.id
WHERE title ILIKE ${searchQuery ? `%${searchQuery}%` : '%'};
`;
postings.forEach((posting) => {
posting.company = <Company>{};
if (posting.companyName) {
posting.company.name = posting.companyName;
}
delete posting.companyName;
posting.tags = [];
posting.employmentType = EmploymentType[posting.employmentType as keyof typeof EmploymentType];
if (posting.tagIds) {
posting.tagIds?.forEach((tagId: number) => {
posting.tags.push({ id: tagId, displayName: null, createdAt: null });
});
}
delete posting.tagIds;
});
return <Posting[]>(<unknown>postings);
}
export async function getPosting(id: number): Promise<Posting> {
const data = await sql<Posting[]>`
SELECT id,
title,
description,
employer_id AS "employerId",
address,
employment_type AS "employmentType",
wage,
link,
tag_ids AS "tagIds",
created_at AT TIME ZONE 'UTC' AS "createdAt",
updated_at AT TIME ZONE 'UTC' AS "updatedAt",
flyer_link AS "flyerLink",
company_id AS "companyId"
FROM postings
WHERE id = ${id};
`;
const posting = data[0];
posting.tags = [];
posting.employmentType = EmploymentType[posting.employmentType as keyof typeof EmploymentType];
if (posting.tagIds) {
posting.tagIds?.forEach((tagId: number) => {
posting.tags.push({ id: tagId, displayName: null, createdAt: null });
});
}
delete posting.tagIds;
if (posting.createdAt) {
posting.createdAt = new Date(posting.createdAt);
}
if (posting.updatedAt) {
posting.updatedAt = new Date(posting.updatedAt);
}
return posting;
}
export async function getPostingFullData(id: number): Promise<Posting> {
const data = await sql`
WITH company_data AS (
SELECT
id,
name,
description,
website,
created_at AS "createdAt"
FROM companies
WHERE id = (SELECT company_id FROM postings WHERE id = ${id})
),
user_data AS (
SELECT
username,
email,
phone,
full_name AS "fullName"
FROM users
WHERE "company_id" = (SELECT company_id FROM postings WHERE id = ${id})
),
posting_data AS (
SELECT
id,
title,
description,
employer_id AS "employerId",
address,
employment_type AS "employmentType",
wage,
link,
tag_ids AS "tagIds",
created_at AT TIME ZONE 'UTC' AS "createdAt",
updated_at AT TIME ZONE 'UTC' AS "updatedAt",
flyer_link AS "flyerLink"
FROM postings
WHERE id = ${id}
)
SELECT
(
SELECT row_to_json(company_data)
FROM company_data
) AS company,
(
SELECT row_to_json(user_data)
FROM user_data
) AS user,
(
SELECT row_to_json(posting_data)
FROM posting_data
) AS posting;
`;
if (!data) {
error(404, 'Posting not found');
}
let posting = <Posting>data[0].posting;
posting.company = <Company>data[0].company;
posting.employer = <User>data[0].user;
if (posting.createdAt) {
posting.createdAt = new Date(posting.createdAt);
}
if (posting.updatedAt) {
posting.updatedAt = new Date(posting.updatedAt);
}
return posting;
}
export async function createApplication(application: Application): Promise<number> {
const response = await sql`
INSERT INTO applications (posting_id, user_id, candidate_statement, created_at)
VALUES (${application.postingId}, ${application.userId}, ${application.candidateStatement}, NOW())
RETURNING id;
`;
return response[0].id;
}
export async function deleteApplication(id: number): Promise<void> {
const response = await sql`
DELETE FROM applications
WHERE id = ${id};
`;
}
export async function deleteApplicationWithUser(
applicationId: number,
userId: number
): Promise<void> {
console.log(applicationId, userId);
const response = await sql`
DELETE FROM applications
WHERE id = ${applicationId} AND user_id = ${userId};
`;
}
export async function getApplications(postingId: number): Promise<Application[]> {
const applications = await sql<Application[]>`
SELECT id, posting_id AS "postingId", user_id AS "userId", candidate_statement AS "candidateStatement", created_at AS "createdAt"
FROM applications
WHERE posting_id = ${postingId};
`;
applications.forEach((application) => {
application.createdAt = new Date(application.createdAt);
});
return applications;
}