return null if deleted

sinamics · Mar 10, 2024 · 1bc117a · 1bc117a
1 parent 42e83dc
commit 1bc117a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/server/api/routers/networkRouter.ts b/src/server/api/routers/networkRouter.ts
@@ -134,7 +134,7 @@ export const networkRouter = createTRPCRouter({
 			 */
 			const zombieMembers = await fetchZombieMembers(
 				input.nwid,
-				membersWithStatusAndPeers,
+				ztControllerResponse.members,
 			);
 
 			// Generate CIDR options for IP configuration

diff --git a/src/server/api/services/memberService.ts b/src/server/api/services/memberService.ts
@@ -76,10 +76,16 @@ export const syncMemberPeersAndStatus = async (
 				await addNetworkMember(ctx, updatedMember).catch(console.error);
 			}
 
+			// Return null if the member is deleted.
+			if (!dbMember) {
+				return null;
+			}
+
+			// Return the updated member
 			return updatedMember;
 		}),
 	);
-
+	// console.log(updatedMembers);
 	return updatedMembers.filter(Boolean); // Filter out any null values
 };
 
@@ -166,7 +172,7 @@ export const retrieveActiveMemberFromDatabase = async (
 	memberId: string,
 ) => {
 	const dbMember = await prisma.network_members.findFirst({
-		where: { nwid, id: memberId },
+		where: { nwid, id: memberId, deleted: false },
 		include: { notations: { include: { label: true } } },
 	});
 	return dbMember && !dbMember.deleted ? dbMember : null;