@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/service/task/confirmPayTransaction.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.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
@@ -25,8 +16,11 @@ const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
  */
 function call(params) {
     // export function call(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): IOperationExecute<void> {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield (0, confirmPayTransaction_1.confirmPayTransaction)(Object.assign(Object.assign({}, params.data), { project: params.project }), {})({
+    return async ({ connection }) => {
+        await (0, confirmPayTransaction_1.confirmPayTransaction)({
+            ...params.data,
+            project: params.project
+        }, {})({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -37,5 +31,5 @@ function call(params) {
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection)
         });
-    });
+    };
 }

package/lib/chevre/service/task/confirmRegisterService.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.call = call;
 const action_1 = require("../../repo/action");
@@ -18,11 +9,11 @@ const confirmRegisterServiceTransaction_1 = require("./confirmRegisterServiceTra
  * タスク実行関数
  */
 function call(data) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield (0, confirmRegisterServiceTransaction_1.confirmRegisterServiceTransaction)(data)({
+    return async ({ connection }) => {
+        await (0, confirmRegisterServiceTransaction_1.confirmRegisterServiceTransaction)(data)({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             task: new task_1.TaskRepo(connection)
         });
-    });
+    };
 }

package/lib/chevre/service/task/confirmRegisterServiceTransaction.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.call = call;
 exports.confirmRegisterServiceTransaction = confirmRegisterServiceTransaction;
@@ -22,26 +13,25 @@ const registerService_1 = require("../assetTransaction/registerService");
  * タスク実行関数
  */
 function call(data) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield confirmRegisterServiceTransaction(data)({
+    return async ({ connection }) => {
+        await confirmRegisterServiceTransaction(data)({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             task: new task_1.TaskRepo(connection)
         });
-    });
+    };
 }
 function confirmRegisterServiceTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         // アクション開始
         const confirmActionAttributes = params;
-        const action = yield repos.action.start(confirmActionAttributes);
+        const action = await repos.action.start(confirmActionAttributes);
         try {
             let transactionNumber;
-            const serviceOutputIdentifier = (_c = (_b = (_a = params.object.object) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.identifier;
+            const serviceOutputIdentifier = params.object.object?.itemOffered?.serviceOutput?.identifier;
             if (typeof serviceOutputIdentifier === 'string') {
                 // serviceOutput.identifierで資産取引検索
-                const assetTransactions = yield repos.assetTransaction.search({
+                const assetTransactions = await repos.assetTransaction.search({
                     limit: 1,
                     page: 1,
                     typeOf: factory.assetTransactionType.RegisterService,
@@ -57,12 +47,15 @@ function confirmRegisterServiceTransaction(params) {
                 transactionNumber = params.object.transactionNumber;
             }
             if (typeof transactionNumber === 'string') {
-                yield (0, registerService_1.confirm)(Object.assign({ transactionNumber }, (confirmActionAttributes.object.endDate !== undefined)
-                    ? {
-                        endDate: moment(confirmActionAttributes.object.endDate)
-                            .toDate()
-                    }
-                    : undefined))(repos);
+                await (0, registerService_1.confirm)({
+                    transactionNumber,
+                    ...(confirmActionAttributes.object.endDate !== undefined)
+                        ? {
+                            endDate: moment(confirmActionAttributes.object.endDate)
+                                .toDate()
+                        }
+                        : undefined
+                })(repos);
             }
             else {
                 throw new factory.errors.Argument('transactionNumber not specified');
@@ -70,7 +63,7 @@ function confirmRegisterServiceTransaction(params) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: confirmActionAttributes.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: confirmActionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -79,15 +72,15 @@ function confirmRegisterServiceTransaction(params) {
         }
         // アクション完了
         const result = {};
-        yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
-        yield onRegistered(confirmActionAttributes)(repos);
-    });
+        await repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        await onRegistered(confirmActionAttributes)(repos);
+    };
 }
 function onRegistered(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const taskAttributes = [];
         // タスク保管
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+        await repos.task.saveMany(taskAttributes, { emitImmediately: true });
         if (params.purpose.typeOf === factory.order.OrderType.Order) {
             // タスク冪等作成
             const onAssetTransactionStatusChangedTaskData = {
@@ -114,7 +107,7 @@ function onRegistered(params) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
         }
-    });
+    };
 }

package/lib/chevre/service/task/confirmReserveTransaction.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.call = call;
 exports.confirmReserveTransaction = confirmReserveTransaction;
@@ -37,13 +28,12 @@ let coaAuthClient = new COA.auth.RefreshToken({
  * タスク実行関数
  */
 function call(params) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, settings }) {
-        var _b;
+    return async ({ connection, settings }) => {
         if (!coaAuthClientCreated) {
             const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
-            const coaAPI = yield reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
-            const credentials = (_b = coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials;
-            if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) === 'string') {
+            const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+            const credentials = coaAPI?.availableChannel?.credentials;
+            if (typeof credentials?.refreshToken === 'string') {
                 coaAuthClient = new COA.auth.RefreshToken(credentials);
                 coaAuthClientCreated = true;
             }
@@ -52,7 +42,11 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: settings.coa.timeout });
-        yield confirmReserveTransaction(Object.assign(Object.assign({}, params.data), { project: params.project, sameAs: { id: params.id } }), {
+        await confirmReserveTransaction({
+            ...params.data,
+            project: params.project,
+            sameAs: { id: params.id }
+        }, {
             sendOrder: true,
             useOnOrderStatusChanged: true
         })({
@@ -66,14 +60,13 @@ function call(params) {
             task: new task_1.TaskRepo(connection),
             reserveService
         }, settings);
-    });
+    };
 }
 function createConfirmObject4COAByOrder(params) {
     // COA予約のみ
     const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
-        var _a;
         return o.itemOffered.typeOf === factory.reservationType.EventReservation
-            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
+            && o.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
     });
     const customer = params.order.customer;
     // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
@@ -101,8 +94,7 @@ function createConfirmObject4COAByOrder(params) {
         throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
     }
     const listTicket = coaReservations.map((r) => {
-        var _a;
-        if (typeof ((_a = r.reservedTicket.coaTicketInfo) === null || _a === void 0 ? void 0 : _a.ticketCode) !== 'string') {
+        if (typeof r.reservedTicket.coaTicketInfo?.ticketCode !== 'string') {
             throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
         }
         // 冗長な属性を排除(2023-03-20~)
@@ -121,9 +113,7 @@ function createConfirmObject4COAByOrder(params) {
         titleBranchNum: reservationForCOAInfo.titleBranchNum,
         timeBegin: reservationForCOAInfo.timeBegin,
         tmpReserveNum: params.reservationNumber,
-        // tslint:disable-next-line:no-irregular-whitespace
         reserveName: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
-        // tslint:disable-next-line:no-irregular-whitespace
         reserveNameJkana: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
         telNum: telNum,
         mailAddr: mailAddr,
@@ -132,10 +122,10 @@ function createConfirmObject4COAByOrder(params) {
     };
 }
 function fixOrderAsPurpose(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let order;
         const purposeOrderNumber = params.purpose.orderNumber;
-        const orders = yield repos.order.projectFields({
+        const orders = await repos.order.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -145,31 +135,37 @@ function fixOrderAsPurpose(params) {
         if (order === undefined) {
             throw new factory.errors.NotFound('Order as purpose');
         }
-        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+        const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
         }, ['itemOffered', 'offeredThrough']);
-        return Object.assign(Object.assign({}, order), { acceptedOffers });
-    });
+        return {
+            ...order,
+            acceptedOffers
+        };
+    };
 }
 /**
  * 予約を確定する
  */
-// tslint:disable-next-line:max-func-body-length
 function confirmReserveTransaction(params, options) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         let confirmActionObject;
         // let updReserveResult: COA.factory.reserve.IUpdReserveResult | undefined;
         let recipe;
         switch (params.object.typeOf) {
             case factory.assetTransactionType.COAReserveTransaction:
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
-                const order = yield fixOrderAsPurpose({
+                const order = await fixOrderAsPurpose({
                     project: { id: params.project.id },
                     purpose: params.purpose
                 })(repos);
                 const updReserveArgs = createConfirmObject4COAByOrder({ order, reservationNumber: params.object.transactionNumber });
-                const object4coa = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: factory.assetTransactionType.COAReserveTransaction });
+                const object4coa = {
+                    ...updReserveArgs,
+                    transactionNumber: params.object.transactionNumber,
+                    typeOf: factory.assetTransactionType.COAReserveTransaction
+                };
                 confirmActionObject = object4coa;
                 recipe = (0, factory_1.processConfirmCOAReserveResult2recipe)({
                     processConfirmCOAReserveResult: { updReserveArgs: object4coa },
@@ -180,16 +176,21 @@ function confirmReserveTransaction(params, options) {
                 confirmActionObject = params.object;
         }
         const { project, purpose, typeOf, sameAs } = params;
-        const confirmActionAttributes = Object.assign({ agent: project, project, purpose, typeOf, object: confirmActionObject }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined // link sameAs(2024-06-10~)
-        );
-        const action = yield repos.action.start(confirmActionAttributes, Object.assign({}, (recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
-        ));
+        const confirmActionAttributes = {
+            agent: project,
+            project, purpose, typeOf,
+            object: confirmActionObject,
+            ...(typeof sameAs?.id === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined // link sameAs(2024-06-10~)
+        };
+        const action = await repos.action.start(confirmActionAttributes, {
+            ...(recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
+        });
         try {
             const object = confirmActionAttributes.object;
             switch (object.typeOf) {
                 case factory.assetTransactionType.COAReserveTransaction:
                     // COA本予約
-                    const processConfirmCOAReserveResult = yield (0, reserveCOA_1.confirm)({
+                    const processConfirmCOAReserveResult = await (0, reserveCOA_1.confirm)({
                         project: { id: confirmActionAttributes.project.id },
                         object: object,
                         purpose: confirmActionAttributes.purpose
@@ -202,7 +203,7 @@ function confirmReserveTransaction(params, options) {
                     break;
                 default:
                     // 予約取引確定
-                    yield (0, confirm_1.confirm)({
+                    await (0, confirm_1.confirm)({
                         transactionNumber: object.transactionNumber,
                         potentialActions: object.potentialActions
                     })(repos, settings);
@@ -210,7 +211,7 @@ function confirmReserveTransaction(params, options) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: confirmActionAttributes.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: confirmActionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -220,16 +221,18 @@ function confirmReserveTransaction(params, options) {
         const result = {
         // ...(updReserveResult !== undefined) ? { updReserveResult } : {} // discontinue(2024-06-11~)
         };
-        yield repos.action.completeWithVoid(Object.assign({ typeOf: confirmActionAttributes.typeOf, id: action.id, result }, (recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
-        ));
+        await repos.action.completeWithVoid({
+            typeOf: confirmActionAttributes.typeOf, id: action.id, result,
+            ...(recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
+        });
         // sendOrder連携(2024-01-11~)
-        yield onConfirmed(confirmActionAttributes, options)({
+        await onConfirmed(confirmActionAttributes, options)({
             task: repos.task
         });
-    });
+    };
 }
 function onConfirmed(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (options.sendOrder === true) {
             // タスク冪等作成
             const onAssetTransactionStatusChangedTaskData = {
@@ -256,7 +259,7 @@ function onConfirmed(params, options) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
         }
-    });
+    };
 }

package/lib/chevre/service/task/createAccountingReport.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.call = call;
 const factory = require("../../factory");
@@ -20,19 +11,19 @@ const createAccountingReportIfNotExist_1 = require("../order/createAccountingRep
  * タスク実行関数
  */
 function call(params) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield createAccountingReport(params)({
+    return async ({ connection }) => {
+        await createAccountingReport(params)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             order: new order_1.OrderRepo(connection)
         });
-    });
+    };
 }
 function createAccountingReport(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { data } = params;
-        const order = yield repos.order.projectFieldsByOrderNumber({
+        const order = await repos.order.projectFieldsByOrderNumber({
             orderNumber: data.object.mainEntity.orderNumber,
             project: { id: params.project.id },
             inclusion: [
@@ -58,17 +49,20 @@ function createAccountingReport(params) {
             purpose: simpleOrder,
             sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-21~)
         };
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         try {
-            const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
                 orderNumber: { $eq: data.object.mainEntity.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
-            yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(Object.assign(Object.assign({}, order), { acceptedOffers }))(repos);
+            await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)({
+                ...order,
+                acceptedOffers
+            })(repos);
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -76,6 +70,6 @@ function createAccountingReport(params) {
             throw error;
         }
         const result = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+    };
 }