@openinc/parse-server-opendash 4.0.25 → 4.0.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -80,8 +80,8 @@ async function init() {
80
80
  scheduleOrderStartedStatusCheck("0 * * * * *");
81
81
  (0, index_js_2.beforeSaveHook)(index_js_3.MES_Order, async (request) => {
82
82
  const { object, original, user } = request;
83
- if (!object.id)
84
- return;
83
+ console.log("===".repeat(10) + " BEFORE SAVE HOOK " + "===".repeat(10));
84
+ console.log("[MES] - beforeSaveHook: Received order \n" + JSON.stringify(object.toJSON(), null, 2) + "\n with original \n" + JSON.stringify(original?.toJSON(), null, 2) + "\n by user " + user?.getEmail());
85
85
  await (0, index_js_2.defaultHandler)(request);
86
86
  await (0, index_js_2.defaultAclHandler)(request, {
87
87
  allowCustomACL: true,
@@ -115,6 +115,7 @@ async function init() {
115
115
  const currentStatus = object.get("status");
116
116
  const start = object.get("start");
117
117
  const hasSource = !!object.get("source");
118
+ console.log("[MES] - beforeSaveHook: Current status is " + currentStatus + ", start is " + start + ", hasSource is " + hasSource);
118
119
  if (currentStatus !== "done" && currentStatus !== "canceled" && start) {
119
120
  const startMs = start.getTime();
120
121
  const nowMs = Date.now();
@@ -132,12 +133,17 @@ async function init() {
132
133
  (object.get("status") === "running" || object.get("status") === "planned")) {
133
134
  object.set("status", "done");
134
135
  }
136
+ console.log("[MES] - beforeSaveHook: Updated status is " + object.get("status"));
135
137
  if (object.get("status") === "running") {
138
+ console.log("[MES] - beforeSaveHook: Checking for running orders with same tag to update their duration to end them if necessary.");
136
139
  const runningOrdersQ = new node_1.default.Query(index_js_3.MES_Order);
137
140
  runningOrdersQ.equalTo("tag", object.get("tag"));
138
- runningOrdersQ.notEqualTo("objectId", object.id);
141
+ if (object.id) {
142
+ runningOrdersQ.notEqualTo("objectId", object.id);
143
+ }
139
144
  runningOrdersQ.equalTo("status", "running");
140
145
  const runningOrders = await runningOrdersQ.find({ useMasterKey: true });
146
+ console.log("[MES] - beforeSaveHook: Found " + runningOrders.length + " running orders with same tag.");
141
147
  if (runningOrders.length > 0 && object.get("status") === "running") {
142
148
  for (const runningOrder of runningOrders) {
143
149
  runningOrder.set("duration", Date.now() - runningOrder.get("start").getTime());
@@ -146,9 +152,13 @@ async function init() {
146
152
  }
147
153
  }
148
154
  }
155
+ console.log("[MES] - beforeSaveHook: Finished processing order " + object.id + " with final status " + object.get("status"));
156
+ console.log("===".repeat(10) + " END BEFORE SAVE HOOK " + "===".repeat(10));
149
157
  });
150
158
  (0, index_js_2.afterSaveHook)(index_js_3.MES_Order, async (request) => {
151
159
  const { object, original, user } = request;
160
+ console.log("===".repeat(10) + " AFTER SAVE HOOK " + "===".repeat(10));
161
+ console.log("[MES] - afterSaveHook: Received order \n" + JSON.stringify(object.toJSON(), null, 2) + " with original \n" + JSON.stringify(original?.toJSON(), null, 2) + " by user \n" + user?.getEmail());
152
162
  try {
153
163
  if (original) {
154
164
  // If the order is canceled, publish it as canceled
@@ -183,7 +193,7 @@ async function init() {
183
193
  runningData.name = "Order_Running";
184
194
  console.log("-".repeat(20));
185
195
  console.log("Publishing running order " + object.id);
186
- console.log("Data:", runningData);
196
+ console.log("Data:", JSON.stringify(runningData));
187
197
  console.log("-".repeat(20));
188
198
  await (0, index_js_1.publishDataItem)(runningData, user?.getEmail() || undefined, true);
189
199
  }
@@ -192,9 +202,12 @@ async function init() {
192
202
  console.error(e);
193
203
  console.log("Order Data not published:" + e.message, e);
194
204
  }
205
+ console.log("[MES] - afterSaveHook: Finished processing order " + object.id);
206
+ console.log("===".repeat(10) + " END AFTER SAVE HOOK " + "===".repeat(10));
195
207
  });
196
208
  }
197
209
  async function object2OWItem(object) {
210
+ console.log("[MES] - object2OWItem: Converting order " + JSON.stringify(object.toJSON(), null, 2) + " to DataItemInterface");
198
211
  const tag = object.get("tag");
199
212
  const configString = await new node_1.default.Query("OD3_Config")
200
213
  .equalTo("key", "ow.mes.unitInfo")
@@ -267,6 +280,7 @@ function createCustomValueTypes(object, fields, fieldInfos) {
267
280
  });
268
281
  }
269
282
  async function createValueArrayForObject(object, extraValues, fields) {
283
+ console.log("[MES] - createValueArrayForObject: Creating values object " + JSON.stringify(object.toJSON(), null, 2) + " with extraValues " + JSON.stringify(extraValues));
270
284
  const values = [];
271
285
  const status = object.get("status");
272
286
  const ordernr = object.get("ordernr");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openinc/parse-server-opendash",
3
- "version": "4.0.25",
3
+ "version": "4.0.27",
4
4
  "description": "Parse Server Cloud Code for open.INC Stack.",
5
5
  "packageManager": "pnpm@10.33.0",
6
6
  "keywords": [
@@ -70,6 +70,7 @@
70
70
  "amqplib": "^0.10.9",
71
71
  "cron": "^4.4.0",
72
72
  "dayjs": "^1.11.20",
73
+ "dotenv": "^17.4.2",
73
74
  "fast-equals": "^6.0.0",
74
75
  "i18next": "^26.0.6",
75
76
  "i18next-fs-backend": "^2.6.4",
@@ -77,7 +78,7 @@
77
78
  "jwks-rsa": "^4.0.1",
78
79
  "nodemailer": "^8.0.5",
79
80
  "nunjucks": "^3.2.4",
80
- "parse": "^8.6.0",
81
+ "parse": "8.5.0",
81
82
  "parse-server": "9.8.0",
82
83
  "pdf-img-convert": "2.0.0",
83
84
  "rimraf": "^6.1.3",