Merge branch 'main' of https://github.com/omardoescode/Chronicle

Author: moha09-coder

backend/src/api/db.ts

@@ -32,19 +32,19 @@ const setAPIMetadata = async (
   editor: Editor,
   machine_name: string,
   os: string
-): Promise<void | ApiMetadataAlreadySet> => {
+): Promise<void | ApiMetadataAlreadySet | ApiNotFound> => {
   const keyRes = await client.query({
     text: "SELECT user_id, metadata_set FROM api_key WHERE value = $1 FOR UPDATE",
     values: [api_key],
   });
 
   if (keyRes.rowCount === 0) {
-    throw new ApiNotFound();
+    return new ApiNotFound();
   }
 
   const { user_id, metadata_set } = keyRes.rows[0];
 
-  if (metadata_set) throw new ApiMetadataAlreadySet();
+  if (metadata_set) return new ApiMetadataAlreadySet();
 
   // Create the machine
   const machineQ = await client.query({
@@ -78,7 +78,7 @@ const getUserByApi = async (
     values: [user_id],
   });
 
-  if (userRes.rowCount === 0) throw new ApiNotFound();
+  if (userRes.rowCount === 0) return new ApiNotFound();
   const { name, email } = userRes.rows[0];
 
   const user: User = {

backend/src/api/service.ts

@@ -2,9 +2,14 @@ import * as db from "./db";
 import crypto from "node:crypto";
 import { ApiKey, Editor } from "./validation";
 import { UserNotFound } from "@/auth/errors";
-import { ApiGenerationAfterAttempts } from "./errors";
+import {
+  ApiGenerationAfterAttempts,
+  ApiMetadataAlreadySet,
+  ApiNotFound,
+} from "./errors";
 import { DBError } from "@/pool";
 import pool from "@/pool";
+import { AppError } from "@/utils/error";
 
 const ATTEMPTS = 3;
 
@@ -37,11 +42,21 @@ const setApiMetadata = async (
   editor: Editor,
   machine_name: string,
   os: string
-): Promise<void | UserNotFound> => {
+): Promise<void | UserNotFound | ApiMetadataAlreadySet | ApiNotFound> => {
   const client = await pool.connect();
   try {
     await client.query("begin transaction");
-    await db.setAPIMetadata(client, api_key, editor, machine_name, os);
+    const res = await db.setAPIMetadata(
+      client,
+      api_key,
+      editor,
+      machine_name,
+      os
+    );
+    if (res instanceof AppError) {
+      await client.query("rollback");
+      return res;
+    }
     await client.query("commit");
   } catch (err) {
     await client.query("rollback");