Refactor from Promises to async/await

backend/internal/audit-log.js

@@ -9,31 +9,31 @@ const internalAuditLog = {
 	 *
 	 * @param   {Access}  access
 	 * @param   {Array}   [expand]
-	 * @param   {String}  [search_query]
+	 * @param   {String}  [searchQuery]
 	 * @returns {Promise}
 	 */
-	getAll: (access, expand, search_query) => {
-		return access.can("auditlog:list").then(() => {
-			const query = auditLogModel
-				.query()
-				.orderBy("created_on", "DESC")
-				.orderBy("id", "DESC")
-				.limit(100)
-				.allowGraph("[user]");
+	getAll: async (access, expand, searchQuery) => {
+		await access.can("auditlog:list");
 
-			// Query is used for searching
-			if (typeof search_query === "string" && search_query.length > 0) {
-				query.where(function () {
-					this.where(castJsonIfNeed("meta"), "like", `%${search_query}`);
-				});
-			}
+		const query = auditLogModel
+			.query()
+			.orderBy("created_on", "DESC")
+			.orderBy("id", "DESC")
+			.limit(100)
+			.allowGraph("[user]");
 
-			if (typeof expand !== "undefined" && expand !== null) {
-				query.withGraphFetched(`[${expand.join(", ")}]`);
-			}
+		// Query is used for searching
+		if (typeof searchQuery === "string" && searchQuery.length > 0) {
+			query.where(function () {
+				this.where(castJsonIfNeed("meta"), "like", `%${searchQuery}`);
+			});
+		}
 
-			return query;
-		});
+		if (typeof expand !== "undefined" && expand !== null) {
+			query.withGraphFetched(`[${expand.join(", ")}]`);
+		}
+
+		return await query;
 	},
 
 	/**
@@ -50,27 +50,22 @@ const internalAuditLog = {
 	 * @param   {Object}   [data.meta]
 	 * @returns {Promise}
 	 */
-	add: (access, data) => {
-		return new Promise((resolve, reject) => {
-			// Default the user id
-			if (typeof data.user_id === "undefined" || !data.user_id) {
-				data.user_id = access.token.getUserId(1);
-			}
+	add: async (access, data) => {
+		if (typeof data.user_id === "undefined" || !data.user_id) {
+			data.user_id = access.token.getUserId(1);
+		}
 
-			if (typeof data.action === "undefined" || !data.action) {
-				reject(new errs.InternalValidationError("Audit log entry must contain an Action"));
-			} else {
-				// Make sure at least 1 of the IDs are set and action
-				resolve(
-					auditLogModel.query().insert({
-						user_id: data.user_id,
-						action: data.action,
-						object_type: data.object_type || "",
-						object_id: data.object_id || 0,
-						meta: data.meta || {},
-					}),
-				);
-			}
+		if (typeof data.action === "undefined" || !data.action) {
+			throw new errs.InternalValidationError("Audit log entry must contain an Action");
+		}
+
+		// Make sure at least 1 of the IDs are set and action
+		return await auditLogModel.query().insert({
+			user_id: data.user_id,
+			action: data.action,
+			object_type: data.object_type || "",
+			object_id: data.object_id || 0,
+			meta: data.meta || {},
 		});
 	},
 };