apps/webapp/app/services/archiveBranch.server.ts (2)

13-26: Consolidate the identity type (OrgFilter) in a shared module.

The discriminated union is duplicated across services. Export a single OrgFilter type (e.g., app/services/authz.ts) to prevent drift and ease future changes.

---

28-41: Push the “must be a branch” check into the query (optional).

Adding parentEnvironmentId: { not: null } to the where clause avoids fetching non-branch envs only to reject them later.

Apply this diff:

       const environment = await this.#prismaClient.runtimeEnvironment.findFirstOrThrow({
         where: {
           id: environmentId,
+          parentEnvironmentId: { not: null },
           organization:
             orgFilter.type === "userMembership"
               ? {
                   members: {
                     some: {
                       userId: orgFilter.userId,
                     },
                   },
                 }
               : { id: orgFilter.organizationId },
         },

apps/webapp/app/services/upsertBranch.server.ts (3)

17-26: Unify OrgFilter type and decouple from route schema.

• Export a shared OrgFilter type to avoid duplication with ArchiveBranchService.
• Avoid importing CreateBranchOptions from a route; define a local/service‑level type or move the schema to a shared module to fix dependency direction.

---

151-156: Fix logger message to reflect the service name.

Rename the log label for clarity.

Apply this diff:

-      logger.error("CreateBranchService error", { error: e });
+      logger.error("UpsertBranchService error", { error: e });

---

167-179: Use COUNT instead of fetching rows for limits (optional).

Replace findMany + length with count queries to reduce I/O for large projects.

Apply this diff:

-  const usedEnvs = await prisma.runtimeEnvironment.findMany({
-    where: {
-      projectId,
-      branchName: {
-        not: null,
-      },
-      archivedAt: null,
-    },
-  });
-
-  const count = newBranchName
-    ? usedEnvs.filter((env) => env.branchName !== newBranchName).length
-    : usedEnvs.length;
+  const totalCount = await prisma.runtimeEnvironment.count({
+    where: { projectId, branchName: { not: null }, archivedAt: null },
+  });
+  const existingWithSameName = newBranchName
+    ? await prisma.runtimeEnvironment.count({
+        where: { projectId, branchName: newBranchName, archivedAt: null },
+      })
+    : 0;
+  const count = totalCount - existingWithSameName;

apps/webapp/app/routes/api.v1.projects.$projectRef.branches.archive.ts (1)

52-73: Minor perf tidy: filter archived in SQL and use findFirst (optional).

You can avoid fetching multiple rows and in‑memory filtering by adding archivedAt: null and switching to findFirst. If you still need the “already archived” distinction, fall back to a second quick existence check when no active env is found.

apps/webapp/app/routes/api.v1.projects.$projectRef.branches.ts (3)

5-5: Consider unifying loader auth to authenticateRequest as well

Action now accepts org tokens; loader still uses PAT-only. If OATs should work for GET too, switch loader to authenticateRequest for consistency.

Is the intent to allow OATs on the GET endpoint as well?

---

46-56: Tighten Prisma filter: prefer scalar key for org path; use explicit relation filter for membership

For clarity and query planning, filter by organizationId when you already have it, and use an explicit relation filter for the membership branch.

Apply this diff:

-      organization:
-        authenticationResult.type === "organizationAccessToken"
-          ? { id: authenticationResult.result.organizationId }
-          : {
-              members: {
-                some: {
-                  userId: authenticationResult.result.userId,
-                },
-              },
-            },
+      ...(authenticationResult.type === "organizationAccessToken"
+        ? { organizationId: authenticationResult.result.organizationId }
+        : {
+            organization: {
+              members: {
+                some: { userId: authenticationResult.result.userId },
+              },
+            },
+          }),

Note: If you prefer relation filters everywhere, use organization: { is: { id: ... } } explicitly for the org branch.

---

92-101: Service identity handoff looks correct; drop unused env var above

Passing { type: "orgId" | "userMembership", ... } matches the new service signature. The destructured env from Line 89 is unused; remove to satisfy noUnusedLocals.

Example:

// Line 89
const { branch, git } = parsed.data;

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro