Skip to content

Commit 89516fd

Browse files
author
VuXfi
committed
add more logs for notification manager
1 parent 4c70b99 commit 89516fd

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

libs/NotificationManager.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ class Channel {
3131
async trySendMessage(badge, message, user, subject, data) {
3232
try {
3333
await this.send(badge, message, user, subject, data);
34+
sails.log.debug(`Notification manager > ${this.type}: ${badge}, ${message}, ${user}`);
3435
return true;
3536
}
3637
catch (error) {
37-
sails.log.error(`Failed to send message through channel with sortOrder ${this.sortOrder}. Error: ${error}`);
38+
sails.log.error(`Failed to send message via ${this.type}. Error: ${error}`);
39+
sails.log.warn(`✉️ Notification manager > console: ${badge}, ${message}, ${user}`);
3840
return false;
3941
}
4042
}
@@ -47,6 +49,7 @@ class NotificationManager {
4749
await _a.send(badge, "manager", text, null);
4850
}
4951
catch (error) {
52+
sails.log.error(`Failed to send message to delivery manager. Error: ${error}`);
5053
sails.log.warn(`✉️ Notification manager > console: ${badge}, ${text}`);
5154
}
5255
}

libs/NotificationManager.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ export abstract class Channel {
5252
public async trySendMessage(badge: Badge, message: string, user: UserRecord, subject?: string, data?: object): Promise<boolean> {
5353
try {
5454
await this.send(badge, message, user, subject, data);
55+
sails.log.debug(`Notification manager > ${this.type}: ${badge}, ${message}, ${user}`);
5556
return true;
5657
} catch (error) {
57-
sails.log.error(`Failed to send message through channel with sortOrder ${this.sortOrder}. Error: ${error}`);
58+
sails.log.error(`Failed to send message via ${this.type}. Error: ${error}`);
59+
sails.log.warn(`✉️ Notification manager > console: ${badge}, ${message}, ${user}`)
5860
return false;
5961
}
6062
}
@@ -67,6 +69,7 @@ export class NotificationManager {
6769
try {
6870
await NotificationManager.send(badge, "manager", text, null);
6971
} catch (error) {
72+
sails.log.error(`Failed to send message to delivery manager. Error: ${error}`);
7073
sails.log.warn(`✉️ Notification manager > console: ${badge}, ${text}`)
7174
}
7275
}

models/Order.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,13 @@ let Model = {
13171317
order.promotionCode = order.promotionCode.id;
13181318
}
13191319
// Calculate delivery costs
1320-
let delivery = {};
1320+
let delivery = {
1321+
deliveryTimeMinutes: 0,
1322+
allowed: false,
1323+
cost: 0,
1324+
item: "",
1325+
message: ""
1326+
};
13211327
let softDeliveryCalculation = null;
13221328
if (order.selfService === false) {
13231329
// The SOFT_DELIVERY_CALCULATION setting disables strict checking of the delivery address.

models/Order.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,13 @@ let Model = {
15911591
}
15921592

15931593
// Calculate delivery costs
1594-
let delivery = {} as Delivery
1594+
let delivery:Delivery = {
1595+
deliveryTimeMinutes: 0,
1596+
allowed: false,
1597+
cost: 0,
1598+
item: "",
1599+
message: ""
1600+
}
15951601
let softDeliveryCalculation = null;
15961602
if (order.selfService === false) {
15971603

0 commit comments

Comments
 (0)