From 0e08b046e2efc395f4217d46eed61a680a1bd199 Mon Sep 17 00:00:00 2001 From: Mhanif26 Date: Sat, 16 May 2026 21:42:52 +0700 Subject: [PATCH] tambah fitur riwayat aktifitas --- api/distributionRouter.ts | 40 ++++++++++++++++++++++- api/placeOfWorshipRouter.ts | 50 +++++++++++++++++++++++++++-- api/recipientRouter.ts | 63 +++++++++++++++++++++++++++++++++++-- 3 files changed, 147 insertions(+), 6 deletions(-) diff --git a/api/distributionRouter.ts b/api/distributionRouter.ts index 7eb2e6a..e1c7a37 100644 --- a/api/distributionRouter.ts +++ b/api/distributionRouter.ts @@ -2,9 +2,20 @@ import { z } from "zod"; import { createRouter, publicQuery } from "./middleware"; import { findAllDistributions, + findDistributionById, createDistribution, deleteDistribution, } from "./queries/distributions"; +import { findRecipientById } from "./queries/recipients"; +import { createActivityLog } from "./queries/activityLogs"; + +async function logActivitySafe(payload: Parameters[0]) { + try { + await createActivityLog(payload); + } catch (error) { + console.warn("[activity] failed to write distribution activity", error); + } +} export const distributionRouter = createRouter({ list: publicQuery @@ -32,18 +43,45 @@ export const distributionRouter = createRouter({ }) ) .mutation(async ({ input }) => { - return createDistribution({ + const created = await createDistribution({ ...input, amount: input.amount.toString(), distributedBy: input.distributedBy ?? null, notes: input.notes ?? null, }); + + if (created) { + const recipient = await findRecipientById(created.recipientId); + await logActivitySafe({ + userId: input.distributedBy ?? null, + action: "CREATE", + entityType: "distribution", + entityId: created.id, + details: recipient + ? `Distribusi ${created.aidType} ke ${recipient.name}` + : `Distribusi ${created.aidType}`, + }); + } + + return created; }), delete: publicQuery .input(z.object({ id: z.number() })) .mutation(async ({ input }) => { + const target = await findDistributionById(input.id); await deleteDistribution(input.id); + + if (target) { + await logActivitySafe({ + userId: target.distributedBy ?? null, + action: "DELETE", + entityType: "distribution", + entityId: target.id, + details: `Menghapus distribusi ${target.aidType}`, + }); + } + return { success: true }; }), }); diff --git a/api/placeOfWorshipRouter.ts b/api/placeOfWorshipRouter.ts index 36d547c..046c806 100644 --- a/api/placeOfWorshipRouter.ts +++ b/api/placeOfWorshipRouter.ts @@ -7,6 +7,15 @@ import { updatePlace, deletePlace, } from "./queries/placesOfWorship"; +import { createActivityLog } from "./queries/activityLogs"; + +async function logActivitySafe(payload: Parameters[0]) { + try { + await createActivityLog(payload); + } catch (error) { + console.warn("[activity] failed to write place activity", error); + } +} export const placeOfWorshipRouter = createRouter({ list: publicQuery @@ -43,12 +52,24 @@ export const placeOfWorshipRouter = createRouter({ }) ) .mutation(async ({ input }) => { - return createPlace({ + const created = await createPlace({ ...input, latitude: input.latitude.toString(), longitude: input.longitude.toString(), managerId: input.managerId ?? null, }); + + if (created) { + await logActivitySafe({ + userId: input.managerId ?? null, + action: "CREATE", + entityType: "place_of_worship", + entityId: created.id, + details: `Menambahkan ${created.name}`, + }); + } + + return created; }), update: publicQuery @@ -70,17 +91,42 @@ export const placeOfWorshipRouter = createRouter({ ) .mutation(async ({ input }) => { const { id, ...data } = input; + const beforeUpdate = await findPlaceById(id); const updateData: Record = { ...data }; if (data.latitude !== undefined) updateData.latitude = data.latitude.toString(); if (data.longitude !== undefined) updateData.longitude = data.longitude.toString(); if (data.managerId === undefined) delete updateData.managerId; - return updatePlace(id, updateData); + const updated = await updatePlace(id, updateData); + + if (updated) { + await logActivitySafe({ + userId: data.managerId ?? beforeUpdate?.managerId ?? null, + action: "UPDATE", + entityType: "place_of_worship", + entityId: updated.id, + details: `Memperbarui rumah ibadah ${updated.name}`, + }); + } + + return updated; }), delete: publicQuery .input(z.object({ id: z.number() })) .mutation(async ({ input }) => { + const target = await findPlaceById(input.id); await deletePlace(input.id); + + if (target) { + await logActivitySafe({ + userId: target.managerId ?? null, + action: "DELETE", + entityType: "place_of_worship", + entityId: target.id, + details: `Menghapus rumah ibadah ${target.name}`, + }); + } + return { success: true }; }), }); diff --git a/api/recipientRouter.ts b/api/recipientRouter.ts index 30377b0..4b958a5 100644 --- a/api/recipientRouter.ts +++ b/api/recipientRouter.ts @@ -9,6 +9,15 @@ import { verifyRecipient, deleteRecipient, } from "./queries/recipients"; +import { createActivityLog } from "./queries/activityLogs"; + +async function logActivitySafe(payload: Parameters[0]) { + try { + await createActivityLog(payload); + } catch (error) { + console.warn("[activity] failed to write recipient activity", error); + } +} export const recipientRouter = createRouter({ list: publicQuery @@ -54,7 +63,7 @@ export const recipientRouter = createRouter({ }) ) .mutation(async ({ input }) => { - return createRecipient({ + const created = await createRecipient({ ...input, latitude: input.latitude?.toString() ?? null, longitude: input.longitude?.toString() ?? null, @@ -66,6 +75,18 @@ export const recipientRouter = createRouter({ notes: input.notes ?? null, status: "pending", }); + + if (created) { + await logActivitySafe({ + userId: input.registeredBy ?? null, + action: "CREATE", + entityType: "recipient", + entityId: created.id, + details: `Mendaftarkan ${created.name}`, + }); + } + + return created; }), update: publicQuery @@ -88,10 +109,23 @@ export const recipientRouter = createRouter({ ) .mutation(async ({ input }) => { const { id, ...data } = input; + const beforeUpdate = await findRecipientById(id); const updateData: Record = { ...data }; if (data.latitude !== undefined) updateData.latitude = data.latitude.toString(); if (data.longitude !== undefined) updateData.longitude = data.longitude.toString(); - return updateRecipient(id, updateData); + const updated = await updateRecipient(id, updateData); + + if (updated) { + await logActivitySafe({ + userId: beforeUpdate?.registeredBy ?? null, + action: "UPDATE", + entityType: "recipient", + entityId: updated.id, + details: `Memperbarui data ${updated.name}`, + }); + } + + return updated; }), verify: publicQuery @@ -104,13 +138,36 @@ export const recipientRouter = createRouter({ }) ) .mutation(async ({ input }) => { - return verifyRecipient(input.id, input.status, input.verifiedBy, input.rejectionReason); + const verified = await verifyRecipient(input.id, input.status, input.verifiedBy, input.rejectionReason); + if (verified) { + const statusText = input.status === "active" ? "Diterima" : "Ditolak"; + await logActivitySafe({ + userId: input.verifiedBy, + action: "VERIFY", + entityType: "recipient", + entityId: verified.id, + details: `Memverifikasi ${verified.name} - ${statusText}`, + }); + } + return verified; }), delete: publicQuery .input(z.object({ id: z.number() })) .mutation(async ({ input }) => { + const target = await findRecipientById(input.id); await deleteRecipient(input.id); + + if (target) { + await logActivitySafe({ + userId: target.registeredBy ?? null, + action: "DELETE", + entityType: "recipient", + entityId: target.id, + details: `Menghapus penerima ${target.name}`, + }); + } + return { success: true }; }), });