fix: resolved merge conflicts with fork/canary

apps/dokploy/pages/api/deploy/[refreshToken].ts

@@ -3,7 +3,7 @@ import { applications } from "@/server/db/schema";
 import type { DeploymentJob } from "@/server/queues/queue-types";
 import { myQueue } from "@/server/queues/queueSetup";
 import { deploy } from "@/server/utils/deploy";
-import { IS_CLOUD } from "@dokploy/server";
+import { IS_CLOUD, shouldDeploy } from "@dokploy/server";
 import { eq } from "drizzle-orm";
 import type { NextApiRequest, NextApiResponse } from "next";
 
@@ -21,6 +21,7 @@ export default async function handler(
 			where: eq(applications.refreshToken, refreshToken as string),
 			with: {
 				project: true,
+				bitbucket: true,
 			},
 		});
 
@@ -57,6 +58,20 @@ export default async function handler(
 				return;
 			}
 		} else if (sourceType === "github") {
+			const normalizedCommits = req.body?.commits?.flatMap(
+				(commit: any) => commit.modified,
+			);
+
+			const shouldDeployPaths = shouldDeploy(
+				application.watchPaths,
+				normalizedCommits,
+			);
+
+			if (!shouldDeployPaths) {
+				res.status(301).json({ message: "Watch Paths Not Match" });
+				return;
+			}
+
 			const branchName = extractBranchName(req.headers, req.body);
 			if (!branchName || branchName !== application.branch) {
 				res.status(301).json({ message: "Branch Not Match" });
@@ -64,27 +79,62 @@ export default async function handler(
 			}
 		} else if (sourceType === "git") {
 			const branchName = extractBranchName(req.headers, req.body);
+
 			if (!branchName || branchName !== application.customGitBranch) {
 				res.status(301).json({ message: "Branch Not Match" });
 				return;
 			}
 		} else if (sourceType === "gitlab") {
 			const branchName = extractBranchName(req.headers, req.body);
+
+			const normalizedCommits = req.body?.commits?.flatMap(
+				(commit: any) => commit.modified,
+			);
+
+			const shouldDeployPaths = shouldDeploy(
+				application.watchPaths,
+				normalizedCommits,
+			);
+
+			if (!shouldDeployPaths) {
+				res.status(301).json({ message: "Watch Paths Not Match" });
+				return;
+			}
+
 			if (!branchName || branchName !== application.gitlabBranch) {
 				res.status(301).json({ message: "Branch Not Match" });
 				return;
 			}
 		} else if (sourceType === "bitbucket") {
 			const branchName = extractBranchName(req.headers, req.body);
+
 			if (!branchName || branchName !== application.bitbucketBranch) {
 				res.status(301).json({ message: "Branch Not Match" });
 				return;
 			}
+<<<<<<< HEAD
 		} else if (sourceType === "gitea") {
 			const branchName = extractBranchName(req.headers, req.body);
 			if (!branchName || branchName !== application.giteaBranch) {
 			  res.status(301).json({ message: "Branch Not Match" });
 			  return;
+=======
+
+			const commitedPaths = await extractCommitedPaths(
+				req.body,
+				application.bitbucketOwner,
+				application.bitbucket?.appPassword || "",
+				application.bitbucketRepository || "",
+			);
+			const shouldDeployPaths = shouldDeploy(
+				application.watchPaths,
+				commitedPaths,
+			);
+
+			if (!shouldDeployPaths) {
+				res.status(301).json({ message: "Watch Paths Not Match" });
+				return;
+>>>>>>> fork/canary
 			}
 		}
 
@@ -237,3 +287,42 @@ export const extractBranchName = (headers: any, body: any) => {
 
 	return null;
 };
+
+export const extractCommitedPaths = async (
+	body: any,
+	bitbucketUsername: string | null,
+	bitbucketAppPassword: string | null,
+	repository: string | null,
+) => {
+	const changes = body.push?.changes || [];
+
+	const commitHashes = changes
+		.map((change: any) => change.new?.target?.hash)
+		.filter(Boolean);
+	const commitedPaths: string[] = [];
+	for (const commit of commitHashes) {
+		const url = `https://api.bitbucket.org/2.0/repositories/${bitbucketUsername}/${repository}/diffstat/${commit}`;
+
+		try {
+			const response = await fetch(url, {
+				headers: {
+					Authorization: `Basic ${Buffer.from(`${bitbucketUsername}:${bitbucketAppPassword}`).toString("base64")}`,
+				},
+			});
+
+			const data = await response.json();
+			for (const value of data.values) {
+				commitedPaths.push(value.new?.path);
+			}
+		} catch (error) {
+			console.error(
+				`Error fetching Bitbucket diffstat for commit ${commit}:`,
+				error instanceof Error ? error.message : "Unknown error",
+			);
+
+			return [];
+		}
+	}
+
+	return commitedPaths;
+};

apps/dokploy/pages/api/deploy/compose/[refreshToken].ts

@@ -3,11 +3,12 @@ import { compose } from "@/server/db/schema";
 import type { DeploymentJob } from "@/server/queues/queue-types";
 import { myQueue } from "@/server/queues/queueSetup";
 import { deploy } from "@/server/utils/deploy";
-import { IS_CLOUD } from "@dokploy/server";
+import { IS_CLOUD, shouldDeploy } from "@dokploy/server";
 import { eq } from "drizzle-orm";
 import type { NextApiRequest, NextApiResponse } from "next";
 import {
 	extractBranchName,
+	extractCommitedPaths,
 	extractCommitMessage,
 	extractHash,
 } from "../[refreshToken]";
@@ -26,6 +27,7 @@ export default async function handler(
 			where: eq(compose.refreshToken, refreshToken as string),
 			with: {
 				project: true,
+				bitbucket: true,
 			},
 		});
 
@@ -46,16 +48,71 @@ export default async function handler(
 
 		if (sourceType === "github") {
 			const branchName = extractBranchName(req.headers, req.body);
+			const normalizedCommits = req.body?.commits?.flatMap(
+				(commit: any) => commit.modified,
+			);
+
+			const shouldDeployPaths = shouldDeploy(
+				composeResult.watchPaths,
+				normalizedCommits,
+			);
+
+			if (!shouldDeployPaths) {
+				res.status(301).json({ message: "Watch Paths Not Match" });
+				return;
+			}
+
 			if (!branchName || branchName !== composeResult.branch) {
 				res.status(301).json({ message: "Branch Not Match" });
 				return;
 			}
+		} else if (sourceType === "gitlab") {
+			const branchName = extractBranchName(req.headers, req.body);
+			const normalizedCommits = req.body?.commits?.flatMap(
+				(commit: any) => commit.modified,
+			);
+
+			const shouldDeployPaths = shouldDeploy(
+				composeResult.watchPaths,
+				normalizedCommits,
+			);
+
+			if (!shouldDeployPaths) {
+				res.status(301).json({ message: "Watch Paths Not Match" });
+				return;
+			}
+			if (!branchName || branchName !== composeResult.gitlabBranch) {
+				res.status(301).json({ message: "Branch Not Match" });
+				return;
+			}
+		} else if (sourceType === "bitbucket") {
+			const branchName = extractBranchName(req.headers, req.body);
+			if (!branchName || branchName !== composeResult.bitbucketBranch) {
+				res.status(301).json({ message: "Branch Not Match" });
+				return;
+			}
 		} else if (sourceType === "git") {
 			const branchName = extractBranchName(req.headers, req.body);
 			if (!branchName || branchName !== composeResult.customGitBranch) {
 				res.status(301).json({ message: "Branch Not Match" });
 				return;
 			}
+
+			const commitedPaths = await extractCommitedPaths(
+				req.body,
+				composeResult.bitbucketOwner,
+				composeResult.bitbucket?.appPassword || "",
+				composeResult.bitbucketRepository || "",
+			);
+			const shouldDeployPaths = shouldDeploy(
+				composeResult.watchPaths,
+				commitedPaths,
+			);
+
+			if (!shouldDeployPaths) {
+				res.status(301).json({ message: "Watch Paths Not Match" });
+				return;
+			}
 		}
 
 		try {

apps/dokploy/pages/api/deploy/github.ts

@@ -9,6 +9,7 @@ import {
 	findPreviewDeploymentByApplicationId,
 	findPreviewDeploymentsByPullRequestId,
 	removePreviewDeployment,
+	shouldDeploy,
 } from "@dokploy/server";
 import { Webhooks } from "@octokit/webhooks";
 import { and, eq } from "drizzle-orm";
@@ -95,6 +96,9 @@ export default async function handler(
 			const deploymentTitle = extractCommitMessage(req.headers, req.body);
 			const deploymentHash = extractHash(req.headers, req.body);
 			const owner = githubBody?.repository?.owner?.name;
+			const normalizedCommits = githubBody?.commits?.flatMap(
+				(commit: any) => commit.modified,
+			);
 
 			const apps = await db.query.applications.findMany({
 				where: and(
@@ -116,6 +120,15 @@ export default async function handler(
 					server: !!app.serverId,
 				};
 
+				const shouldDeployPaths = shouldDeploy(
+					app.watchPaths,
+					normalizedCommits,
+				);
+
+				if (!shouldDeployPaths) {
+					continue;
+				}
+
 				if (IS_CLOUD && app.serverId) {
 					jobData.serverId = app.serverId;
 					await deploy(jobData);
@@ -151,6 +164,14 @@ export default async function handler(
 					server: !!composeApp.serverId,
 				};
 
+				const shouldDeployPaths = shouldDeploy(
+					composeApp.watchPaths,
+					normalizedCommits,
+				);
+
+				if (!shouldDeployPaths) {
+					continue;
+				}
 				if (IS_CLOUD && composeApp.serverId) {
 					jobData.serverId = composeApp.serverId;
 					await deploy(jobData);