feat: new user resource integrating postgresql
This commit is contained in:
50
server/resources/user/UserCollection.ts
Normal file
50
server/resources/user/UserCollection.ts
Normal file
@@ -0,0 +1,50 @@
|
||||
import * as bcrypt from "bcrypt";
|
||||
import { StoccaTreDbConn, WithoutId } from "../../database.ts";
|
||||
import { UserModel } from "./UserModel.ts";
|
||||
import { Maybe } from "../../Maybe.ts";
|
||||
|
||||
export default class UserCollection {
|
||||
private db: StoccaTreDbConn;
|
||||
private mapById: Map<number, UserModel> = new Map<number, UserModel>();
|
||||
|
||||
constructor(database: StoccaTreDbConn) {
|
||||
this.db = database;
|
||||
}
|
||||
|
||||
async addUser(user: WithoutId<UserModel>): Promise<Maybe<{ insertedId: number }>> {
|
||||
let hash: string;
|
||||
try {
|
||||
hash = await bcrypt.hash(user.password);
|
||||
} catch (e: unknown) {
|
||||
const error = e as { message?: string };
|
||||
if (typeof error.message === "string") {
|
||||
return { error: { message: error.message }};
|
||||
}
|
||||
return { error: new Error("Failed to create user") };
|
||||
}
|
||||
user.password = hash;
|
||||
const result: Maybe<UserModel[]> = await this.db.query(sql => sql`
|
||||
INSERT INTO users ${ sql(user, "displayName") }
|
||||
RETURNING *
|
||||
`);
|
||||
if (result.error) {
|
||||
return result;
|
||||
}
|
||||
return {
|
||||
just: { insertedId: result.just[0]?.id ?? NaN }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async getAllUsers(): Promise<Maybe<UserModel[]>> {
|
||||
const result = await this.db.query((sql) => sql<UserModel[]>`SELECT * FROM users`);
|
||||
if (!result.error) {
|
||||
result.just.forEach(user => this.mapById.set(user.id, user));
|
||||
} else {
|
||||
return result;
|
||||
}
|
||||
return {
|
||||
just: Array.from(this.mapById.values()),
|
||||
};
|
||||
}
|
||||
}
|
||||
12
server/resources/user/UserModel.ts
Normal file
12
server/resources/user/UserModel.ts
Normal file
@@ -0,0 +1,12 @@
|
||||
import { z } from "zod";
|
||||
|
||||
export const UserSchema = z.object({
|
||||
id: z.number(),
|
||||
displayName: z.string(),
|
||||
email: z.string().email(),
|
||||
password: z.string().min(256).max(256),
|
||||
});
|
||||
|
||||
export const UserSchemaWithoutId = UserSchema.omit({ id: true });
|
||||
|
||||
export type UserModel = z.infer<typeof UserSchema>;
|
||||
56
server/resources/user/UserResource.ts
Normal file
56
server/resources/user/UserResource.ts
Normal file
@@ -0,0 +1,56 @@
|
||||
import {StoccaTreDbConn} from "../../database.ts";
|
||||
import StoccaTreRequest, {RouteDefinition} from "../../StoccaTreRequest.ts";
|
||||
import {Maybe} from "../../Maybe.ts";
|
||||
import {JSONObject} from "../../JSON.ts";
|
||||
import UserCollection from "./UserCollection.ts";
|
||||
import {UserSchemaWithoutId} from "./UserModel.ts";
|
||||
|
||||
export default class UserResource {
|
||||
private dbConnection: StoccaTreDbConn;
|
||||
private collection: UserCollection;
|
||||
private routes: Readonly<Record<string, RouteDefinition>> = {
|
||||
Add: {
|
||||
pattern: /\/add/,
|
||||
method: "POST"
|
||||
},
|
||||
GetAll: {
|
||||
pattern: /\/all/,
|
||||
method: "GET"
|
||||
},
|
||||
} as const;
|
||||
|
||||
constructor(dbConnection: StoccaTreDbConn) {
|
||||
this.dbConnection = dbConnection;
|
||||
this.collection = new UserCollection(dbConnection);
|
||||
}
|
||||
|
||||
async handleRequest(request: StoccaTreRequest): Promise<Maybe<JSONObject>> {
|
||||
if (request.match(this.routes.Add)) {
|
||||
return await this.addUser(request);
|
||||
}
|
||||
if (request.match(this.routes.GetAll)) {
|
||||
return await this.allUsers(request);
|
||||
}
|
||||
return { error: { message: "Invalid route" }};
|
||||
}
|
||||
|
||||
private async addUser(request: StoccaTreRequest): Promise<Maybe<{ insertedId: number }>> {
|
||||
const user = UserSchemaWithoutId.safeParse(JSON.parse(request.body ?? "{}"));
|
||||
if (!user.success) {
|
||||
return { error: new Error("Ingredient was malformed.") };
|
||||
}
|
||||
return await this.collection.addUser(user.data);
|
||||
}
|
||||
|
||||
private async allUsers(request: StoccaTreRequest): Promise<Maybe<JSONObject>> {
|
||||
const allUsers = await this.collection.getAllUsers();
|
||||
if (allUsers.error) {
|
||||
return allUsers;
|
||||
}
|
||||
return {
|
||||
just: {
|
||||
ingredients: Array.from(allUsers.just),
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
3
server/resources/user/main.ts
Normal file
3
server/resources/user/main.ts
Normal file
@@ -0,0 +1,3 @@
|
||||
export * from "./UserModel.ts";
|
||||
export * from "./UserCollection.ts";
|
||||
export * from "./UserResource.ts";
|
||||
Reference in New Issue
Block a user