diff --git a/db/notification_error_log.db.js b/db/notification_error_log.db.js index 84dc0e2..fb40e3e 100644 --- a/db/notification_error_log.db.js +++ b/db/notification_error_log.db.js @@ -32,11 +32,15 @@ const getNotificationErrorLogByIdDb = async (id) => { const getNotificationErrorLogByNotificationErrorIdDb = async (notificationErrorId) => { const queryText = ` SELECT - a.*, - b.contact_name, - b.contact_type + a.notification_error_log_description, + a.created_at, + b.contact_type, + c.user_fullname as created_by_name, + case when a.created_by is not null then c.user_fullname else b.contact_name end as contact_name, + case when a.created_by is not null then c.user_phone else a.contact_phone end as contact_phone FROM notification_error_log a LEFT JOIN contact b ON a.contact_phone = b.contact_phone + LEFT JOIN m_users c ON a.created_by = c.user_id WHERE a.notification_error_id = $1 AND a.deleted_at IS NULL ORDER BY a.created_at DESC `; diff --git a/middleware/verifyAccess.js b/middleware/verifyAccess.js index e260a83..107216f 100644 --- a/middleware/verifyAccess.js +++ b/middleware/verifyAccess.js @@ -15,7 +15,8 @@ const verifyAccess = (minLevel = 1, allowUnapprovedReadOnly = false) => { // Super Admin bypass semua if (user.is_sa) return next(); - if (!isPhoneNumberID(user.user_id)) { + + if (!isPhoneNumberID(user.user_id) && user.user_id) { const fullUser = await getUserByIdDb(user.user_id); if (!fullUser) throw new ErrorHandler(403, "Forbidden: User not found"); diff --git a/services/error_code.service.js b/services/error_code.service.js index 1c2c68f..01b9c2f 100644 --- a/services/error_code.service.js +++ b/services/error_code.service.js @@ -119,17 +119,6 @@ class ErrorCodeService { try { if (!data || typeof data !== "object") data = {}; - if ( - !data.solution || - !Array.isArray(data.solution) || - data.solution.length === 0 - ) { - throw new ErrorHandler( - 400, - "Error code must have at least 1 solution" - ); - } - const errorId = await createErrorCodeDb(brandId, { error_code: data.error_code, error_code_name: data.error_code_name, diff --git a/services/notifikasi-wa.service.js b/services/notifikasi-wa.service.js index 28976f6..f7d3a51 100644 --- a/services/notifikasi-wa.service.js +++ b/services/notifikasi-wa.service.js @@ -69,7 +69,7 @@ class NotifikasiWaService { const tokenRedirect = await generateTokenRedirect( dataUser.userPhone, dataUser.userName, - dataUser.idData + resultNotificationError.notification_error_id ); const encodedToken = encodeURIComponent(tokenRedirect); diff --git a/validate/error_code.schema.js b/validate/error_code.schema.js index 0b53de1..f92bf33 100644 --- a/validate/error_code.schema.js +++ b/validate/error_code.schema.js @@ -31,11 +31,12 @@ const insertErrorCodeSchema = Joi.object({ is_active: Joi.boolean().default(true), solution: Joi.array() .items(solutionSchema) - .min(1) - .required() - .messages({ - "array.min": "Error code must have at least 1 solution", - }), + .optional(), + // .min(1) + // .required() + // .messages({ + // "array.min": "Error code must have at least 1 solution", + // }), spareparts: Joi.array() .items(Joi.number().integer()) .optional(),