pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-21 01:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove siteSiteResources

Browse Source
This commit is contained in:
Owen
2026-03-19 21:44:59 -07:00
parent 6f2e37948c
commit 2093bb5357
6 changed files with 87 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/routers/siteResource/updateSiteResource.ts
View File

@@ -8,8 +8,9 @@ import {
orgs,
roles,
roleSiteResources,
siteNetworks,
sites,
siteSiteResources,
networks,
Transaction,
userSiteResources
} from "@server/db";
@@ -257,10 +258,14 @@ export async function updateSiteResource(
}
let sitesChanged = false;
const existingSiteIds = await db
.select()
.from(siteSiteResources)
.where(eq(siteSiteResources.siteResourceId, siteResourceId));
const existingSiteIds = existingSiteResource.networkId
? await db
.select()
.from(siteNetworks)
.where(
eq(siteNetworks.networkId, existingSiteResource.networkId)
)
: [];
const existingSiteIdSet = new Set(existingSiteIds.map((s) => s.siteId));
const newSiteIdSet = new Set(siteIds);
@@ -460,15 +465,17 @@ export async function updateSiteResource(
// delete the site - site resources associations
await trx
.delete(siteSiteResources)
.delete(siteNetworks)
.where(
eq(siteSiteResources.siteResourceId, siteResourceId)
eq(siteNetworks.networkId, updatedSiteResource.networkId!)
// TODO: HERE WE FORCE THE NETWORK TO BE DEFINED BUT THE NETWORK CAN GET DELETED and we need to handle that
);
for (const siteId of siteIds) {
await trx.insert(siteSiteResources).values({
await trx.insert(siteNetworks).values({
siteId: siteId,
siteResourceId: siteResourceId
networkId: updatedSiteResource.networkId!
// TODO: HERE WE FORCE THE NETWORK TO BE DEFINED BUT THE NETWORK CAN GET DELETED and we need to handle that
});
}
@@ -664,10 +671,11 @@ export async function handleMessagingForUpdatedSiteResource(
)
)
.innerJoin(
siteSiteResources,
siteNetworks,
eq(
siteSiteResources.siteResourceId,
siteResources.siteResourceId
siteNetworks.networkId,
siteResources.networkId
// TODO: HERE WE FORCE THE NETWORK TO BE DEFINED BUT THE NETWORK CAN GET DELETED and we need to handle that
)
)
.where(
@@ -676,7 +684,7 @@ export async function handleMessagingForUpdatedSiteResource(
clientSiteResourcesAssociationsCache.clientId,
client.clientId
),
eq(siteSiteResources.siteId, site.siteId),
eq(siteNetworks.siteId, site.siteId),
eq(
siteResources.destination,
existingSiteResource.destination