@@ -173,8 +173,15 @@ export async function PUT(
173173 }
174174
175175 const targetMember = await db
176- . select ( )
176+ . select ( {
177+ id : member . id ,
178+ role : member . role ,
179+ userId : member . userId ,
180+ email : user . email ,
181+ name : user . name ,
182+ } )
177183 . from ( member )
184+ . innerJoin ( user , eq ( member . userId , user . id ) )
178185 . where ( and ( eq ( member . organizationId , organizationId ) , eq ( member . userId , memberId ) ) )
179186 . limit ( 1 )
180187
@@ -223,7 +230,12 @@ export async function PUT(
223230 actorName : session . user . name ?? undefined ,
224231 actorEmail : session . user . email ?? undefined ,
225232 description : `Changed role for member ${ memberId } to ${ role } ` ,
226- metadata : { targetUserId : memberId , newRole : role } ,
233+ metadata : {
234+ targetUserId : memberId ,
235+ targetEmail : targetMember [ 0 ] . email ?? undefined ,
236+ targetName : targetMember [ 0 ] . name ?? undefined ,
237+ changes : [ { field : 'role' , from : targetMember [ 0 ] . role , to : role } ] ,
238+ } ,
227239 request,
228240 } )
229241
@@ -286,8 +298,9 @@ export async function DELETE(
286298 }
287299
288300 const targetMember = await db
289- . select ( { id : member . id , role : member . role } )
301+ . select ( { id : member . id , role : member . role , email : user . email , name : user . name } )
290302 . from ( member )
303+ . innerJoin ( user , eq ( member . userId , user . id ) )
291304 . where ( and ( eq ( member . organizationId , organizationId ) , eq ( member . userId , targetUserId ) ) )
292305 . limit ( 1 )
293306
@@ -331,7 +344,12 @@ export async function DELETE(
331344 session . user . id === targetUserId
332345 ? 'Left the organization'
333346 : `Removed member ${ targetUserId } from organization` ,
334- metadata : { targetUserId, wasSelfRemoval : session . user . id === targetUserId } ,
347+ metadata : {
348+ targetUserId,
349+ targetEmail : targetMember [ 0 ] . email ?? undefined ,
350+ targetName : targetMember [ 0 ] . name ?? undefined ,
351+ wasSelfRemoval : session . user . id === targetUserId ,
352+ } ,
335353 request,
336354 } )
337355
0 commit comments