fix: Update server queries for site and bench placement

- Prefer use_for_new_sites and use_for_new_benches via ordering instead of filtering to avoid selection failures

Author: AyshaHakeem

press/api/site.py

@@ -180,7 +180,7 @@ def _new(site, server: str | None = None, ignore_plan_validation: bool = False):
 	if server:
 		bench_query = bench_query.where(Server.name == server)
 	else:
-		bench_query = bench_query.where(Server.use_for_new_sites == 1)
+		bench_query.orderby(Server.use_for_new_sites, order=frappe.qb.desc)
 
 	bench = bench_query.run(as_dict=True).pop()
 

press/press/doctype/site/site.py

@@ -2924,7 +2924,7 @@ def _get_benches_for_(self, proxy_servers, release_group_names=None, host_on_sha
 
 		if host_on_shared_server:
 			bench_query = bench_query.where(servers.public == 1)
-			bench_query = bench_query.where(servers.use_for_new_sites == 1)
+			bench_query = bench_query.orderby(servers.use_for_new_sites, order=frappe.qb.desc)
 
 		if release_group_names:
 			groups = frappe.qb.DocType("Release Group")

press/press/doctype/site_group_deploy/site_group_deploy.py

@@ -81,17 +81,18 @@ def check_if_rg_or_site_exists(self):
 			frappe.throw(f"Site with subdomain {self.subdomain} already exists")
 
 	def get_optimal_server_for_private_bench(self):
-		server = frappe.get_all(
-			"Server",
-			filters={
-				"status": "Active",
-				"cluster": self.cluster,
-				"provider": self.provider,
-				"public": 1,
-				"use_for_new_benches": 1,
-			},
-			pluck="name",
-		)
+		Server = frappe.qb.doctype("Server")
+		server = (
+			frappe.qb.from_(Server)
+			.select(Server.name)
+			.where(
+				(Server.status == "Active")
+				& (Server.cluster == self.cluster)
+				& (Server.provider == self.provider)
+				& (Server.public == 1)
+			)
+			.orderby(Server.use_for_new_benches, order=frappe.qb.desc)
+		).run(pluck=True)
 
 		return server[0] if server else None