lee/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-12-12 19:18:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix #1085

Browse Source
This commit is contained in:
Owen
2025-07-18 11:32:07 -07:00
parent 97b8e84143
commit dca2a29865
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
config/db/db.sqlite.bak Normal file
View File

Binary file not shown.

18
server/routers/site/createSite.ts
View File

@@ -164,14 +164,19 @@ export async function createSite(
const addressExistsSites = await db const addressExistsSites = await db
.select() .select()
.from(sites) .from(sites)
.where(eq(sites.address, updatedAddress)) .where(
and(
eq(sites.address, updatedAddress),
eq(sites.orgId, orgId)
)
)
.limit(1); .limit(1);
if (addressExistsSites.length > 0) { if (addressExistsSites.length > 0) {
return next( return next(
createHttpError( createHttpError(
HttpCode.CONFLICT, HttpCode.CONFLICT,
`Subnet ${subnet} already exists` `Subnet ${updatedAddress} already exists in sites`
) )
); );
} }
@@ -179,13 +184,18 @@ export async function createSite(
const addressExistsClients = await db const addressExistsClients = await db
.select() .select()
.from(clients) .from(clients)
.where(eq(clients.subnet, updatedAddress)) .where(
and(
eq(clients.subnet, updatedAddress),
eq(clients.orgId, orgId)
)
)
.limit(1); .limit(1);
if (addressExistsClients.length > 0) { if (addressExistsClients.length > 0) {
return next( return next(
createHttpError( createHttpError(
HttpCode.CONFLICT, HttpCode.CONFLICT,
`Subnet ${subnet} already exists` `Subnet ${updatedAddress} already exists in clients`
) )
); );
} }