merge main

Author: msukkari

package.json

@@ -23,8 +23,5 @@
         "dotenv-cli": "^8.0.0",
         "npm-run-all": "^4.1.5"
     },
-    "packageManager": "yarn@4.7.0",
-    "dependencies": {
-        "@coderabbitai/bitbucket": "^1.1.3"
-    }
+    "packageManager": "yarn@4.7.0"
 }

packages/backend/package.json

@@ -22,6 +22,7 @@
         "vitest": "^2.1.9"
     },
     "dependencies": {
+        "@coderabbitai/bitbucket": "^1.1.3",
         "@gitbeaker/rest": "^40.5.1",
         "@octokit/rest": "^21.0.2",
         "@sentry/cli": "^2.42.2",

packages/web/src/actions.ts

@@ -1278,8 +1278,10 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
             // Delete the account request if it exists since we've redeemed an invite
             const accountRequest = await tx.accountRequest.findUnique({
                 where: {
-                    requestedById: user.id,
-                    orgId: invite.orgId,
+                    requestedById_orgId: {
+                        requestedById: user.id,
+                        orgId: invite.orgId,
+                    }
                 },
             });
 

yarn.lock

@@ -5758,6 +5758,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sourcebot/backend@workspace:packages/backend"
   dependencies:
+    "@coderabbitai/bitbucket": "npm:^1.1.3"
     "@gitbeaker/rest": "npm:^40.5.1"
     "@octokit/rest": "npm:^21.0.2"
     "@sentry/cli": "npm:^2.42.2"
@@ -14396,7 +14397,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@coderabbitai/bitbucket": "npm:^1.1.3"
     cross-env: "npm:^7.0.3"
     dotenv-cli: "npm:^8.0.0"
     npm-run-all: "npm:^4.1.5"