diff options
Diffstat (limited to 'app/src/lib/server/assignments.ts')
| -rw-r--r-- | app/src/lib/server/assignments.ts | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/src/lib/server/assignments.ts b/app/src/lib/server/assignments.ts index 787865c..c66f25c 100644 --- a/app/src/lib/server/assignments.ts +++ b/app/src/lib/server/assignments.ts @@ -5,11 +5,11 @@ import type { CemetaryPlot, Assignment, AssignmentState } from "../common/assign /** * Retrieves all assignments for the given user. * - * @param dbConn Connection to database. + * @param dbClient Connection to database. * @param userId ID used to identify user. */ -export async function getAssignments(dbConn: ClientBase, userId: number): Promise<Assignment[]> { - const result = await dbConn.query( +export async function getAssignments(dbClient: ClientBase, userId: number): Promise<Assignment[]> { + const result = await dbClient.query( "SELECT * FROM assignments WHERE gardener_id = $1 ORDER BY date", [userId], ); @@ -33,7 +33,7 @@ type GetAssignmentResult = * Retrieves a specfic assignment, along with relevant cemetary plot. */ export async function getAssignmentAndCemetaryById( - dbConn: ClientBase, + dbClient: ClientBase, assignmentId: number, ): Promise<GetAssignmentResult> { const queryText = `SELECT @@ -51,7 +51,7 @@ export async function getAssignmentAndCemetaryById( INNER JOIN cemetary_plots AS C ON c.id = a.cemetary_plot_id WHERE c.id = $1`; - const result = await dbConn.query({ rowMode: "array", text: queryText }, [assignmentId]); + const result = await dbClient.query({ rowMode: "array", text: queryText }, [assignmentId]); if (result.rowCount == 0) { return { assignment: null, cemetaryPlot: null }; } @@ -80,7 +80,7 @@ export interface FinishAssignmentArgs { // TODO: Error recovery. export async function finishAssignment( - dbConn: ClientBase, + dbClient: ClientBase, s3Client: S3Client, { images, note, assignmentId }: FinishAssignmentArgs, ): Promise<void> { @@ -103,13 +103,13 @@ export async function finishAssignment( // TODO: Add beanstalkd job - await dbConn.query("BEGIN"); + await dbClient.query("BEGIN"); try { // Create 'images' row for each image. // FIXME: Apparently node-pg doesn't have an equivalent to Python's `insert_many`?? for (const image of uploadedImages) { - dbConn.query({ + dbClient.query({ name: "insert-assignment-image", text: "INSERT INTO images(s3_path, original_filename, assignment_id) VALUES ($1, $2, $3)", values: [image.key, image.name, assignmentId], @@ -117,7 +117,7 @@ export async function finishAssignment( } // Update the assingment's state. - dbConn.query( + dbClient.query( `UPDATE assignments SET @@ -128,13 +128,13 @@ export async function finishAssignment( [note, assignmentId], ); - dbConn.query("COMMIT"); + dbClient.query("COMMIT"); } catch (err) { // We should probably try to delete S3 objects. // We should probably try to delete the job. - await dbConn.query("ROLLBACK"); + await dbClient.query("ROLLBACK"); throw err; } } |