Refactor out transactions and always call rebuild on update

server/routers/siteResource/addClientToSiteResource.ts

@@ -148,12 +148,10 @@ export async function addClientToSiteResource(
             );
         }
 
-        await db.transaction(async (trx) => {
+        await db.insert(clientSiteResources).values({
-            await trx.insert(clientSiteResources).values({
             clientId,
             siteResourceId
         });
-        });
 
         rebuildClientAssociationsFromSiteResource(siteResource).catch((e) => {
             logger.error(

server/routers/siteResource/addRoleToSiteResource.ts

@@ -155,12 +155,10 @@ export async function addRoleToSiteResource(
             );
         }
 
-        await db.transaction(async (trx) => {
+        await db.insert(roleSiteResources).values({
-            await trx.insert(roleSiteResources).values({
             roleId,
             siteResourceId
         });
-        });
 
         rebuildClientAssociationsFromSiteResource(siteResource).catch((e) => {
             logger.error(

server/routers/siteResource/addUserToSiteResource.ts

@@ -124,12 +124,10 @@ export async function addUserToSiteResource(
             );
         }
 
-        await db.transaction(async (trx) => {
+        await db.insert(userSiteResources).values({
-            await trx.insert(userSiteResources).values({
             userId,
             siteResourceId
         });
-        });
 
         rebuildClientAssociationsFromSiteResource(siteResource).catch((e) => {
             logger.error(

server/routers/siteResource/removeClientFromSiteResource.ts

@@ -148,8 +148,7 @@ export async function removeClientFromSiteResource(
             );
         }
 
-        await db.transaction(async (trx) => {
+        await db
-            await trx
             .delete(clientSiteResources)
             .where(
                 and(
@@ -157,7 +156,6 @@ export async function removeClientFromSiteResource(
                     eq(clientSiteResources.clientId, clientId)
                 )
             );
-        });
 
         rebuildClientAssociationsFromSiteResource(siteResource).catch((e) => {
             logger.error(

server/routers/siteResource/removeRoleFromSiteResource.ts

@@ -156,8 +156,7 @@ export async function removeRoleFromSiteResource(
             );
         }
 
-        await db.transaction(async (trx) => {
+        await db
-            await trx
             .delete(roleSiteResources)
             .where(
                 and(
@@ -165,7 +164,6 @@ export async function removeRoleFromSiteResource(
                     eq(roleSiteResources.roleId, roleId)
                 )
             );
-        });
 
         rebuildClientAssociationsFromSiteResource(siteResource).catch((e) => {
             logger.error(

server/routers/siteResource/removeUserFromSiteResource.ts

@@ -126,8 +126,7 @@ export async function removeUserFromSiteResource(
             );
         }
 
-        await db.transaction(async (trx) => {
+        await db
-            await trx
             .delete(userSiteResources)
             .where(
                 and(
@@ -135,7 +134,6 @@ export async function removeUserFromSiteResource(
                     eq(userSiteResources.userId, userId)
                 )
             );
-        });
 
         rebuildClientAssociationsFromSiteResource(siteResource).catch((e) => {
             logger.error(

server/routers/siteResource/updateSiteResource.ts

@@ -390,7 +390,6 @@ export async function updateSiteResource(
             );
         }
 
-        let sitesChanged = false;
         const existingSiteIds = existingSiteResource.networkId
             ? await db
                   .select()
@@ -399,16 +398,7 @@ export async function updateSiteResource(
                       eq(siteNetworks.networkId, existingSiteResource.networkId)
                   )
             : [];
-
         const existingSiteIdSet = new Set(existingSiteIds.map((s) => s.siteId));
-        const newSiteIdSet = new Set(siteIds);
-
-        if (
-            existingSiteIdSet.size !== newSiteIdSet.size ||
-            ![...existingSiteIdSet].every((id) => newSiteIdSet.has(id))
-        ) {
-            sitesChanged = true;
-        }
 
         let fullDomain: string | null = null;
         let finalSubdomain: string | null = null;
@@ -615,15 +605,13 @@ export async function updateSiteResource(
             throw new Error("No updated resource found after update");
         }
 
-        if (sitesChanged) {
+        rebuildClientAssociationsFromSiteResource(updatedSiteResource).catch(
-            rebuildClientAssociationsFromSiteResource(
+            (e) => {
-                updatedSiteResource
-            ).catch((e) => {
                 logger.error(
                     `Failed to rebuild client associations for site resource ${siteResourceId}. Error: ${e}`
                 );
-            });
             }
+        );
 
         handleMessagingForUpdatedSiteResource(
             existingSiteResource,