@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyAbortedTasksByEmail = notifyAbortedTasksByEmail;
 const createDebug = require("debug");
@@ -20,19 +11,24 @@ const debug = createDebug('chevre-domain:service:notification');
  * add(2025-03-13~)
  */
 function notifyAbortedTasksByEmail(params) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings, credentials) => {
         const { abortedTasksWithoutReport } = settings;
-        const abortedTasks = yield repos.task.projectFields(Object.assign({ status: { $eq: factory.taskStatus.Aborted }, dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
-            ? { name: { $nin: abortedTasksWithoutReport } }
-            : undefined), []);
+        const abortedTasks = await repos.task.projectFields({
+            status: { $eq: factory.taskStatus.Aborted },
+            dateAborted: { $gte: params.dateAbortedGte },
+            // 中止を報告しないタスク以外にフィルター
+            ...(abortedTasksWithoutReport.length > 0)
+                ? { name: { $nin: abortedTasksWithoutReport } }
+                : undefined
+        }, []);
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            const notifyResult = yield (0, notifyByEmail_1.notifyByEmail)({
+            const notifyResult = await (0, notifyByEmail_1.notifyByEmail)({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
             })({}, credentials);
             debug('notifyResult:', notifyResult);
         }
-    });
+    };
 }

package/lib/chevre/service/notification/notifyByEmail.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyByEmail = notifyByEmail;
 const client_1 = require("@sendgrid/client");
@@ -23,8 +14,7 @@ const factory = require("../../factory");
 // tslint:disable-next-line:max-func-body-length
 function notifyByEmail(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+    return async (__, credentials) => {
         const { logLevel } = params;
         const shortSubject = params.subject;
         const message = util.format('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
@@ -36,10 +26,10 @@ function notifyByEmail(params) {
             if (typeof apiKey !== 'string') {
                 throw new factory.errors.Internal('API Key not found');
             }
-            const senderName = (_b = (_a = credentials.sendGrid.alert) === null || _a === void 0 ? void 0 : _a.sender) === null || _b === void 0 ? void 0 : _b.name;
-            const senderEmail = (_d = (_c = credentials.sendGrid.alert) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
-            const toRecipientEmail = (Array.isArray((_e = credentials.sendGrid.alert) === null || _e === void 0 ? void 0 : _e.toRecipient))
-                ? (_g = (_f = credentials.sendGrid.alert) === null || _f === void 0 ? void 0 : _f.toRecipient.at(0)) === null || _g === void 0 ? void 0 : _g.email
+            const senderName = credentials.sendGrid.alert?.sender?.name;
+            const senderEmail = credentials.sendGrid.alert?.sender?.email;
+            const toRecipientEmail = (Array.isArray(credentials.sendGrid.alert?.toRecipient))
+                ? credentials.sendGrid.alert?.toRecipient.at(0)?.email
                 : undefined;
             if (typeof senderName !== 'string') {
                 throw new factory.errors.Internal('senderName not found');
@@ -62,7 +52,7 @@ function notifyByEmail(params) {
             const sgClient = new client_1.Client();
             sgClient.setApiKey(apiKey);
             // const response = await sgMail.sendMultiple(msg);
-            const response = yield sgClient.request({
+            const response = await sgClient.request({
                 body: {
                     content: [{ type: 'text/plain', value: message }],
                     from: emailMessageFrom,
@@ -89,5 +79,5 @@ function notifyByEmail(params) {
             throw error;
         }
         return { result };
-    });
+    };
 }

package/lib/chevre/service/notification/sendEmailMessage.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendEmailMessage = sendEmailMessage;
 const client_1 = require("@sendgrid/client");
@@ -17,21 +8,22 @@ const util = require("util");
 const factory = require("../../factory");
 const factory_1 = require("./factory");
 function createSendEmailMessageActionAttributes(params) {
-    var _a;
     const { agent, object, project, purpose, recipient, typeOf } = params;
-    return Object.assign({ agent, object, project, purpose, recipient, typeOf }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
+    return {
+        agent, object, project, purpose, recipient, typeOf,
+        ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+    };
 }
 function createMailData(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const project = yield repos.project.findById({
+    return async (repos, credentials) => {
+        const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['settings']
         });
         let mailData;
         let apiKey = credentials.sendGrid.apiKey;
         // プロジェクト固有のSendGrid設定があれば、そちらを使用
-        if (typeof ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string' && project.settings.sendgridApiKey.length > 0) {
+        if (typeof project.settings?.sendgridApiKey === 'string' && project.settings.sendgridApiKey.length > 0) {
             apiKey = project.settings.sendgridApiKey;
         }
         if (typeof apiKey !== 'string') {
@@ -44,7 +36,7 @@ function createMailData(params) {
         }
         else {
             // メッセージリポジトリに対応(2024-04-29~)
-            emailMessage = yield repos.message.findByIdentifier({
+            emailMessage = await repos.message.findByIdentifier({
                 identifier: params.object.identifier,
                 project: { id: project.id }
             });
@@ -54,7 +46,7 @@ function createMailData(params) {
             email: emailMessage.sender.email
         };
         // プロジェクト設定対応(2023-08-21~)
-        const senderEmailByProjectSettings = (_d = (_c = (_b = project.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
+        const senderEmailByProjectSettings = project.settings?.sendEmailMessage?.sender?.email;
         if (typeof senderEmailByProjectSettings === 'string' && senderEmailByProjectSettings.length > 0) {
             emailMessageFrom.email = senderEmailByProjectSettings;
         }
@@ -67,23 +59,28 @@ function createMailData(params) {
                 };
             })
             : [];
-        mailData = Object.assign({ to: emailDatas, from: emailMessageFrom, subject }, (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined);
+        mailData = {
+            to: emailDatas,
+            from: emailMessageFrom,
+            subject,
+            ...(String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined
+        };
         return { mailData, emailMessage, apiKey };
-    });
+    };
 }
 /**
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
 function sendEmailMessage(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { mailData, emailMessage, apiKey } = yield createMailData(params)(repos, credentials);
+    return async (repos, credentials) => {
+        const { mailData, emailMessage, apiKey } = await createMailData(params)(repos, credentials);
         // add recipe(2025-03-12~)
         let recipe = (0, factory_1.createSendEmailMessageRecipe)({
             mailData,
             project: { id: params.project.id }
         });
         const startingAction = createSendEmailMessageActionAttributes(params);
-        const action = yield repos.action.start(startingAction, { recipe });
+        const action = await repos.action.start(startingAction, { recipe });
         let result = {};
         try {
             mailData.customArgs = {
@@ -95,7 +92,7 @@ function sendEmailMessage(params) {
             // const response = await sgMail.sendMultiple(mailData);
             const sgClient = new client_1.Client();
             sgClient.setApiKey(apiKey);
-            const response = yield sgClient.request({
+            const response = await sgClient.request({
                 body: {
                     content: [{ type: 'text/plain', value: mailData.text }],
                     from: mailData.from,
@@ -124,13 +121,13 @@ function sendEmailMessage(params) {
                     mailData,
                     project: { id: params.project.id }
                 });
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result, recipe });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result, recipe });
+    };
 }

package/lib/chevre/service/notification/triggerWebhook.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = triggerWebhook;
 const crypto = require("crypto");
@@ -15,11 +6,10 @@ const http_status_1 = require("http-status");
 const factory = require("../../factory");
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
-        const retryCountMax = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.retryCountMax;
-        const retryIntervalInMS = (_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.retryIntervalInMS;
+    return async (repos) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
+        const retryCountMax = setting?.triggerWebhook?.retryCountMax;
+        const retryIntervalInMS = setting?.triggerWebhook?.retryIntervalInMS;
         if (typeof retryCountMax !== 'number') {
             throw new factory.errors.NotFound('setting.triggerWebhook.retryCountMax');
         }
@@ -37,9 +27,9 @@ function triggerWebhook(params) {
                 }
                 // retryInterval
                 if (numberOfTry > 1) {
-                    yield sleep(retryIntervalInMS * (numberOfTry - 1));
+                    await sleep(retryIntervalInMS * (numberOfTry - 1));
                 }
-                yield processInformAction(params, setting)(repos);
+                await processInformAction(params, setting)(repos);
                 break;
             }
             catch (error) {
@@ -51,20 +41,17 @@ function triggerWebhook(params) {
                 }
             }
         }
-    });
+    };
 }
-function sleep(waitTime) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve) => {
-            setTimeout(() => {
-                resolve();
-            }, waitTime);
-        });
+async function sleep(waitTime) {
+    return new Promise((resolve) => {
+        setTimeout(() => {
+            resolve();
+        }, waitTime);
     });
 }
 function createInformActionAttributes(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const { about, object, purpose, recipient, project, id, typeOf } = params;
         // redefine recipient(2025-02-15~)
         let informRecipient;
@@ -72,14 +59,14 @@ function createInformActionAttributes(params) {
         //     ...recipient
         //     // url: target.urlTemplate // discontinue(2025-02-15~)
         // };
-        if ((recipient === null || recipient === void 0 ? void 0 : recipient.typeOf) === factory.organizationType.Corporation && typeof recipient.id === 'string') {
+        if (recipient?.typeOf === factory.organizationType.Corporation && typeof recipient.id === 'string') {
             informRecipient = {
                 id: recipient.id,
                 name: recipient.name,
                 typeOf: recipient.typeOf
             };
         }
-        else if ((recipient === null || recipient === void 0 ? void 0 : recipient.typeOf) === factory.creativeWorkType.WebApplication) {
+        else if (recipient?.typeOf === factory.creativeWorkType.WebApplication) {
             informRecipient = {
                 name: recipient.name,
                 typeOf: recipient.typeOf
@@ -88,7 +75,7 @@ function createInformActionAttributes(params) {
         let target;
         if (typeOf === factory.actionType.InformAction && typeof id === 'string' && id !== '') {
             // find target from potentialAction(2025-02-06~)
-            const potentialInformAction = (yield repos.potentialAction.projectFields({
+            const potentialInformAction = (await repos.potentialAction.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: id },
@@ -97,13 +84,13 @@ function createInformActionAttributes(params) {
             if (potentialInformAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.InformAction);
             }
-            if (typeof ((_a = potentialInformAction.recipient) === null || _a === void 0 ? void 0 : _a.name) === 'string') {
+            if (typeof potentialInformAction.recipient?.name === 'string') {
                 informRecipient = { name: potentialInformAction.recipient.name, typeOf: potentialInformAction.recipient.typeOf };
             }
             target = potentialInformAction.target;
         }
         else {
-            if (((_b = params.target) === null || _b === void 0 ? void 0 : _b.typeOf) === 'EntryPoint') {
+            if (params.target?.typeOf === 'EntryPoint') {
                 target = params.target;
             }
         }
@@ -113,9 +100,17 @@ function createInformActionAttributes(params) {
         if (target === undefined) {
             throw new factory.errors.ArgumentNull('target');
         }
-        return Object.assign(Object.assign(Object.assign({ agent: { id: project.id, typeOf: factory.organizationType.Project }, object, project: { id: project.id, typeOf: factory.organizationType.Project }, recipient: informRecipient, typeOf: factory.actionType.InformAction }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined), (typeof (about === null || about === void 0 ? void 0 : about.typeOf) === 'string') ? { about } : undefined), (typeof (target === null || target === void 0 ? void 0 : target.typeOf) === 'string') ? { target } : undefined // add(2025-02-06~)
-        );
-    });
+        return {
+            agent: { id: project.id, typeOf: factory.organizationType.Project },
+            object,
+            project: { id: project.id, typeOf: factory.organizationType.Project },
+            recipient: informRecipient,
+            typeOf: factory.actionType.InformAction,
+            ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
+            ...(typeof about?.typeOf === 'string') ? { about } : undefined, // add(2025-01-23~)
+            ...(typeof target?.typeOf === 'string') ? { target } : undefined // add(2025-02-06~)
+        };
+    };
 }
 function signRequest(params) {
     const { requestBody, timestamp, secretKey } = params;
@@ -127,22 +122,26 @@ function signRequest(params) {
 // tslint:disable-next-line:max-func-body-length
 function processInformAction(params, options) {
     // tslint:disable-next-line:cyclomatic-complexity
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const timeout = (_a = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
-        const useFetchAPI = ((_b = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
-        const secretKey = (_c = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _c === void 0 ? void 0 : _c.secretKey;
-        const headerIdentifier = (_d = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _d === void 0 ? void 0 : _d.headerIdentifier;
+    return async (repos) => {
+        const timeout = options?.triggerWebhook?.timeout;
+        const useFetchAPI = options?.triggerWebhook?.useFetchAPI === true;
+        const secretKey = options?.triggerWebhook?.secretKey;
+        const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
         const { identifier } = params;
-        const informActionAttributes = yield createInformActionAttributes(params)(repos);
-        const action = yield repos.action.start(informActionAttributes);
+        const informActionAttributes = await createInformActionAttributes(params)(repos);
+        const action = await repos.action.start(informActionAttributes);
         let result = {};
         try {
-            const urlTemplate = (_e = informActionAttributes.target) === null || _e === void 0 ? void 0 : _e.urlTemplate;
+            const urlTemplate = informActionAttributes.target?.urlTemplate;
             if (typeof urlTemplate === 'string') {
-                const requestBody = JSON.stringify(Object.assign({ data: informActionAttributes.object, id: action.id }, (typeof identifier === 'string' && identifier !== '')
-                    ? { identifier }
-                    : undefined));
+                const requestBody = JSON.stringify({
+                    data: informActionAttributes.object,
+                    id: action.id, // support informAction ID(2025-02-20~)
+                    // 通知識別子を追加(2024-10-24~)
+                    ...(typeof identifier === 'string' && identifier !== '')
+                        ? { identifier }
+                        : undefined
+                });
                 const timestamp = action.startDate.valueOf();
                 // sign request(2024-10-28~)
                 let signature;
@@ -159,12 +158,17 @@ function processInformAction(params, options) {
                                 headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
                             }
                         }
-                        const res = yield fetch(urlTemplate, Object.assign({ method: 'POST', headers, body: requestBody }, (typeof timeout === 'number')
-                            ? { signal: AbortSignal.timeout(timeout) }
-                            : undefined));
+                        const res = await fetch(urlTemplate, {
+                            method: 'POST',
+                            headers,
+                            body: requestBody, // body data type must match "Content-Type" header
+                            ...(typeof timeout === 'number')
+                                ? { signal: AbortSignal.timeout(timeout) }
+                                : undefined
+                        });
                         let body;
                         try {
-                            body = yield res.text();
+                            body = await res.text();
                         }
                         catch (error) {
                             // no op
@@ -195,12 +199,12 @@ function processInformAction(params, options) {
         catch (error) {
             let throwsError = true;
             // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_f = error.body) === null || _f === void 0 ? void 0 : _f.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
+            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && error.body?.message === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
                 throwsError = false;
             }
             if (throwsError) {
                 try {
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -208,6 +212,6 @@ function processInformAction(params, options) {
                 throw error;
             }
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+    };
 }

package/lib/chevre/service/offer/any.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.acceptOffer = acceptOffer;
 exports.voidAcceptedOffer = voidAcceptedOffer;
@@ -15,16 +6,16 @@ const createDebug = require("debug");
 const factory = require("../../factory");
 const debug = createDebug('chevre-domain:service:offer');
 function acceptOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.orderInTransaction.acceptOffer({
+    return async (repos) => {
+        await repos.orderInTransaction.acceptOffer({
             orderNumber: params.orderNumber,
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             acceptedOffers: params.acceptedOffers
         });
-    });
+    };
 }
 function voidAcceptedOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { orderNumber } = params;
         // let reservationNumbers: string[] = [];
         // authorizeActions.forEach((authorizeAction) => {
@@ -48,12 +39,12 @@ function voidAcceptedOffer(params) {
                 .map(({ instrument }) => String(instrument.transactionNumber));
             debug('removing acceptedOffers from PlaceOrder...', orderNumber, 'serialNumbers:', serialNumbers);
             if (serialNumbers.length > 0) {
-                const result = yield repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
+                const result = await repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
                     orderNumber,
                     acceptedOffers: { serialNumber: { $in: serialNumbers } }
                 });
                 debug('acceptedOffers removed from PlaceOrder by serialNumbers.', result);
             }
         }
-    });
+    };
 }