Move API handler implementations to service directory (#6)

Author: FluxCapacitor2

backend/src/db/models.ts

@@ -1,6 +1,7 @@
 import type {
   DeploymentSource,
   DeploymentStatus,
+  GitHubOAuthAction,
   ImageBuilder,
   PermissionLevel,
   WebhookEvent,
@@ -157,3 +158,11 @@ export interface RepoImportState {
   userId: number;
   orgId: number;
 }
+
+export interface GitHubOAuthState {
+  id: number;
+  random: string;
+  userId: number;
+  orgId: number;
+  action: GitHubOAuthAction;
+}

backend/src/db/repo/appGroup.ts

@@ -1,4 +1,5 @@
-import type { PrismaClientType } from "../index.ts";
+import { PrismaClientKnownRequestError } from "../../generated/prisma/internal/prismaNamespace.ts";
+import { ConflictError, type PrismaClientType } from "../index.ts";
 import type { AppGroup } from "../models.ts";
 
 export class AppGroupRepo {
@@ -9,16 +10,24 @@ export class AppGroupRepo {
   }
 
   async create(orgId: number, name: string, isMono: boolean) {
-    const group = await this.client.appGroup.create({
-      data: {
-        orgId: orgId,
-        name: name,
-        isMono: isMono,
-      },
-      select: { id: true },
-    });
+    try {
+      const group = await this.client.appGroup.create({
+        data: {
+          orgId: orgId,
+          name: name,
+          isMono: isMono,
+        },
+        select: { id: true },
+      });
 
-    return group.id;
+      return group.id;
+    } catch (e) {
+      if (e instanceof PrismaClientKnownRequestError && e.code === "P2002") {
+        // P2002 is "Unique Constraint Failed" - https://www.prisma.io/docs/orm/reference/error-reference#p2002
+        throw new ConflictError("name", e);
+      }
+      throw e;
+    }
   }
 
   async getById(appGroupId: number): Promise<AppGroup> {

backend/src/db/repo/invitation.ts

@@ -91,11 +91,11 @@ export class InvitationRepo {
       if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") {
         // https://www.prisma.io/docs/orm/reference/error-reference#p2025
         // "An operation failed because it depends on one or more records that were required but not found."
-        throw new NotFoundError("organization");
+        throw new NotFoundError("organization", e);
       }
       if (e instanceof PrismaClientKnownRequestError && e.code === "P2002") {
         // Unique constraint failed
-        throw new ConflictError("user");
+        throw new ConflictError("user", e);
       }
       throw e;
     }

backend/src/handlers/acceptInvitation.ts

@@ -1,20 +1,21 @@
-import { db, NotFoundError } from "../db/index.ts";
+import { acceptInvitation } from "../service/acceptInvitation.ts";
+import { InvitationNotFoundError } from "../service/common/errors.ts";
 import { json, type HandlerMap } from "../types.ts";
 import type { AuthenticatedRequest } from "./index.ts";
 
-export const acceptInvitation: HandlerMap["acceptInvitation"] = async (
+export const acceptInvitationHandler: HandlerMap["acceptInvitation"] = async (
   ctx,
   req: AuthenticatedRequest,
   res,
 ) => {
   try {
-    await db.invitation.accept(
+    await acceptInvitation(
       ctx.request.params.invId,
       ctx.request.params.orgId,
       req.user.id,
     );
   } catch (e: any) {
-    if (e instanceof NotFoundError) {
+    if (e instanceof InvitationNotFoundError) {
       return json(404, res, { code: 404, message: "Invitation not found." });
     }
     throw e;

backend/src/handlers/claimOrg.ts

@@ -1,8 +1,10 @@
-import { db, NotFoundError } from "../db/index.ts";
+import { InstallationNotFoundError } from "../lib/octokit.ts";
+import { claimOrg } from "../service/claimOrg.ts";
+import { OrgNotFoundError } from "../service/common/errors.ts";
 import { json, type HandlerMap } from "../types.ts";
 import type { AuthenticatedRequest } from "./index.ts";
 
-export const claimOrg: HandlerMap["claimOrg"] = async (
+export const claimOrgHandler: HandlerMap["claimOrg"] = async (
   ctx,
   req: AuthenticatedRequest,
   res,
@@ -11,27 +13,19 @@ export const claimOrg: HandlerMap["claimOrg"] = async (
     ctx.request.requestBody.unclaimedInstallationId;
   const orgId = ctx.request.params.orgId;
   try {
-    await db.org.claimInstallation(
-      orgId,
-      unassignedInstallationId,
-      req.user.id,
-    );
+    await claimOrg(orgId, unassignedInstallationId, req.user.id);
   } catch (e) {
-    if (e instanceof NotFoundError) {
-      switch (e.message) {
-        case "installation":
-          return json(404, res, {
-            code: 404,
-            message: "Installation does not exist.",
-          });
-        case "organization":
-          return json(404, res, {
-            code: 404,
-            message: "Organization does not exist.",
-          });
-      }
+    if (e instanceof InstallationNotFoundError) {
+      return json(404, res, {
+        code: 404,
+        message: "Installation does not exist.",
+      });
+    } else if (e instanceof OrgNotFoundError) {
+      return json(404, res, {
+        code: 404,
+        message: "Organization does not exist.",
+      });
     }
-
     throw e;
   }
   return json(200, res, {});