controller precedence

sinamics · Sep 5, 2024 · bf237f3 · bf237f3
1 parent 433df5c
commit bf237f3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/pages/api/v1/org/[orgid]/network/[nwid]/member/[memberId]/index.ts b/src/pages/api/v1/org/[orgid]/network/[nwid]/member/[memberId]/index.ts
@@ -135,7 +135,7 @@ export const POST_orgUpdateNetworkMember = SecuredOrganizationApiRoute(
 								where: {
 									id_nwid: {
 										id: memberId,
-										nwid: networkId, // this should be the value of `nwid` you are looking for
+										nwid: networkId,
 									},
 								},
 								data: {
@@ -225,14 +225,24 @@ export const GET_orgNetworkMemberById = SecuredOrganizationApiRoute(
 			const validatedContext = HandlerContextSchema.parse(context);
 			const { networkId, memberId, ctx } = validatedContext;
 
+			const controllerMember = await ztController.local_network_detail(
+				// @ts-expect-error: fake request object
+				ctx,
+				networkId,
+				false,
+			);
+
+			const findControllermemberById = controllerMember.members.find(
+				(member) => member.id === memberId,
+			);
 			// @ts-expect-error
 			const caller = appRouter.createCaller(ctx);
 			const networkAndMembers = await caller.networkMember.getMemberById({
 				nwid: networkId,
 				id: memberId,
 			});
 
-			return res.status(200).json(networkAndMembers);
+			return res.status(200).json({ ...networkAndMembers, ...findControllermemberById });
 		} catch (cause) {
 			return handleApiErrors(cause, res);
 		}

diff --git a/src/server/api/__tests__/networkMembers/updateDatabaseOnly.test.ts b/src/server/api/__tests__/networkMembers/updateDatabaseOnly.test.ts
@@ -68,7 +68,7 @@ test("updateDatabaseOnly test", async () => {
 					where: {
 						id_nwid: {
 							id: input.id,
-							nwid: input.nwid, // this should be the value of `nwid` you are looking for
+							nwid: input.nwid,
 						},
 					},
 					data: {

diff --git a/src/server/api/routers/memberRouter.ts b/src/server/api/routers/memberRouter.ts
@@ -51,7 +51,7 @@ export const networkMemberRouter = createTRPCRouter({
 			const dbMember = await ctx.prisma.network_members.findFirst({
 				where: {
 					id: input.id,
-					nwid: input.nwid, // this should be the value of `nwid` you are looking for
+					nwid: input.nwid,
 				},
 			});
 			return {

diff --git a/src/utils/ztApi.ts b/src/utils/ztApi.ts
@@ -618,7 +618,7 @@ export const member_details = async (
 
 		return await getData<MemberEntity>(addr, headers);
 	} catch (error) {
-		const message = `${error} (member_details)`;
+		const message = "Member not found!";
 		throw new APIError(message, error as AxiosError);
 	}
 };