farmcontrol/farmcontrol-api
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Audit log fixes.
All checks were successful
farmcontrol/farmcontrol-api/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Tom Butcher 2026-07-13 22:59:49 +01:00
parent bf3e23ddf1
commit ce6f396bcb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/database/database.js
View File

@ -833,7 +833,7 @@ export const editObject = async ({ model, id, updateData, user, populate, recalc
// Audit log before update // Audit log before update
await editAuditLog( await editAuditLog(
previousExpandedObject, previousExpandedObject,
{ ...previousExpandedObject, ...updateData }, { ...previousExpandedObject, ...expandObjectIds(updateData) },
id, id,
parentType, parentType,
user user
@ -846,7 +846,7 @@ export const editObject = async ({ model, id, updateData, user, populate, recalc
) { ) {
await editNotification( await editNotification(
previousExpandedObject, previousExpandedObject,
{ ...previousExpandedObject, ...updateData }, { ...previousExpandedObject, ...expandObjectIds(updateData) },
id, id,
parentType, parentType,
user user
@ -857,11 +857,11 @@ export const editObject = async ({ model, id, updateData, user, populate, recalc
// Call childUpdate event for any child objects // Call childUpdate event for any child objects
await distributeChildUpdate( await distributeChildUpdate(
previousExpandedObject, previousExpandedObject,
{ ...previousExpandedObject, ...updateData }, { ...previousExpandedObject, ...expandObjectIds(updateData) },
id, id,
model model
); );
const updatedObject = { ...previousExpandedObject, ...updateData }; const updatedObject = { ...previousExpandedObject, ...expandObjectIds(updateData) };
// Update cache with the new version // Update cache with the new version
await updateObjectCache({ await updateObjectCache({

10
src/utils.js
View File

@ -667,7 +667,7 @@ async function newAuditLog(newValue, parentId, parentType, user) {
await auditLog.save(); await auditLog.save();
await distributeNew(auditLog._id, 'auditLog'); await distributeNew(auditLog, 'auditLog');
} }
async function editAuditLog(oldValue, newValue, parentId, parentType, user) { async function editAuditLog(oldValue, newValue, parentId, parentType, user) {
@ -698,7 +698,7 @@ async function editAuditLog(oldValue, newValue, parentId, parentType, user) {
await auditLog.save(); await auditLog.save();
await distributeNew(auditLog._id, 'auditLog'); await distributeNew(auditLog, 'auditLog');
} }
async function editNotification(oldValue, newValue, parentId, parentType, user) { async function editNotification(oldValue, newValue, parentId, parentType, user) {
@ -747,7 +747,7 @@ async function deleteAuditLog(deleteValue, parentId, parentType, user) {
await auditLog.save(); await auditLog.save();
await distributeNew(auditLog._id, 'auditLog'); await distributeNew(auditLog, 'auditLog');
} }
async function deleteNotification(object, parentId, parentType, user) { async function deleteNotification(object, parentId, parentType, user) {
@ -799,7 +799,7 @@ async function subscribeAuditLog(parentId, parentType, user) {
operation: 'subscribe', operation: 'subscribe',
}); });
await auditLog.save(); await auditLog.save();
await distributeNew(auditLog._id, 'auditLog'); await distributeNew(auditLog, 'auditLog');
return auditLog; return auditLog;
} }
@ -812,7 +812,7 @@ async function unsubscribeAuditLog(parentId, parentType, user) {
operation: 'unsubscribe', operation: 'unsubscribe',
}); });
await auditLog.save(); await auditLog.save();
await distributeNew(auditLog._id, 'auditLog'); await distributeNew(auditLog, 'auditLog');
return auditLog; return auditLog;
} }