Apply some good 🐰 suggestions

Author: myftija

apps/webapp/app/routes/api.v1.deployments.$deploymentId.start.ts

@@ -43,24 +43,29 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   const deploymentService = new DeploymentService();
 
-  const result = await deploymentService.startDeployment(authenticatedEnv, deploymentId, body.data);
-  return result.match(
-    () => {
-      return json(null, { status: 204 });
-    },
-    (error) => {
-      switch (error.type) {
-        case "failed_to_extend_deployment_timeout":
-          return json(null, { status: 204 }); // ignore these errors for now
-        case "deployment_not_found":
-          return json({ error: "Deployment not found" }, { status: 404 });
-        case "deployment_not_pending":
-          return json({ error: "Deployment is not pending" }, { status: 409 });
-        case "other":
-        default:
-          error.type satisfies "other";
-          return json({ error: "Internal server error" }, { status: 500 });
+  await deploymentService
+    .startDeployment(authenticatedEnv, deploymentId, {
+      contentHash: body.data.contentHash,
+      git: body.data.gitMeta,
+      runtime: body.data.runtime,
+    })
+    .match(
+      () => {
+        return json(null, { status: 204 });
+      },
+      (error) => {
+        switch (error.type) {
+          case "failed_to_extend_deployment_timeout":
+            return json(null, { status: 204 }); // ignore these errors for now
+          case "deployment_not_found":
+            return json({ error: "Deployment not found" }, { status: 404 });
+          case "deployment_not_pending":
+            return json({ error: "Deployment is not pending" }, { status: 409 });
+          case "other":
+          default:
+            error.type satisfies "other";
+            return json({ error: "Internal server error" }, { status: 500 });
+        }
       }
-    }
-  );
+    );
 }

apps/webapp/app/v3/services/deployment.server.ts

@@ -7,7 +7,7 @@ import { TimeoutDeploymentService } from "./timeoutDeployment.server";
 import { env } from "~/env.server";
 
 export class DeploymentService extends BaseService {
-  public async startDeployment(
+  public startDeployment(
     authenticatedEnv: AuthenticatedEnvironment,
     friendlyId: string,
     updates: Partial<Pick<WorkerDeployment, "contentHash" | "runtime"> & { git: GitMeta }>
@@ -75,7 +75,7 @@ export class DeploymentService extends BaseService {
           type: "failed_to_extend_deployment_timeout" as const,
           cause: error,
         })
-      );
+      ).map(() => undefined);
 
     return getDeployment()
       .andThen(validateDeployment)

apps/webapp/app/v3/services/initializeDeployment.server.ts

@@ -135,15 +135,14 @@ export class InitializeDeploymentService extends BaseService {
         },
       });
 
+      const timeoutMs =
+        deployment.status === "PENDING" ? env.DEPLOY_QUEUE_TIMEOUT_MS : env.DEPLOY_TIMEOUT_MS;
+
       await TimeoutDeploymentService.enqueue(
         deployment.id,
         deployment.status,
         "Building timed out",
-        new Date(
-          Date.now() + deployment.status === "PENDING"
-            ? env.DEPLOY_QUEUE_TIMEOUT_MS
-            : env.DEPLOY_TIMEOUT_MS
-        )
+        new Date(Date.now() + timeoutMs)
       );
 
       return {