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

package/lib/chevre/service/assetTransaction/reserveCOA.js

@@ -1,20 +1,11 @@
 "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.confirm = confirm;
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let stateReserveArgs;
         let stateReserveResult;
         let updReserveArgs;
@@ -27,10 +18,10 @@ function confirm(params) {
             reserveNum: params.object.tmpReserveNum,
             telNum: params.object.telNum
         };
-        stateReserveResult = yield repos.reserveService.stateReserve(stateReserveArgs);
+        stateReserveResult = await repos.reserveService.stateReserve(stateReserveArgs);
         if (stateReserveResult === null) {
             updReserveArgs = params.object;
-            updReserveResult = yield repos.reserveService.updReserve(updReserveArgs);
+            updReserveResult = await repos.reserveService.updReserve(updReserveArgs);
         }
         return {
             stateReserveArgs,
@@ -38,5 +29,5 @@ function confirm(params) {
             updReserveArgs,
             updReserveResult
         };
-    });
+    };
 }

package/lib/chevre/service/assetTransaction.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.reserve = exports.registerService = exports.refund = exports.pay = exports.moneyTransfer = exports.cancelReservation = void 0;
 exports.exportOneTransactionTasksIfExists = exportOneTransactionTasksIfExists;
@@ -28,11 +19,16 @@ exports.reserve = ReserveTransactionService;
  * reimplement as exportOneTransactionTasksIfExists(2025-03-18~)
  */
 function exportOneTransactionTasksIfExists(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.assetTransaction.startExportTasks(Object.assign(Object.assign(Object.assign({ tasksExportAction: {
+    return async (repos) => {
+        const transaction = await repos.assetTransaction.startExportTasks({
+            tasksExportAction: {
                 agent: { name: params.tasksExportAction.agent.name }
-            }, endDate: { $lt: params.endDate.$lt } }, (typeof params.id === 'string') ? { id: params.id } : undefined), (typeof ((_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { status: params.status } : undefined), (params.sort !== undefined) ? { sort: params.sort } : undefined));
+            },
+            endDate: { $lt: params.endDate.$lt },
+            ...(typeof params.id === 'string') ? { id: params.id } : undefined,
+            ...(typeof params.status?.$eq === 'string') ? { status: params.status } : undefined,
+            ...(params.sort !== undefined) ? { sort: params.sort } : undefined
+        });
         if (transaction === null) {
             return;
         }
@@ -41,50 +37,50 @@ function exportOneTransactionTasksIfExists(params) {
         switch (transaction.typeOf) {
             case factory.assetTransactionType.CancelReservation:
                 // createdTasks =
-                yield CancelReservationTransactionService.exportTasksById({
+                await CancelReservationTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.MoneyTransfer:
                 // createdTasks =
-                yield MoneyTransferTransactionService.exportTasksById({
+                await MoneyTransferTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.Pay:
                 // createdTasks =
-                yield PayTransactionService.exportTasksById({
+                await PayTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.Refund:
                 // createdTasks =
-                yield RefundTransactionService.exportTasksById({
+                await RefundTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.RegisterService:
                 // createdTasks =
-                yield RegisterServiceTransactionService.exportTasksById({
+                await RegisterServiceTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.Reserve:
                 // createdTasks =
-                yield ReserveTransactionService.exportTasksById({
+                await ReserveTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             default:
         }
-        yield repos.assetTransaction.setTasksExportedById({ id: transaction.id });
+        await repos.assetTransaction.setTasksExportedById({ id: transaction.id });
         return transaction;
         // return createdTasks;
-    });
+    };
 }

package/lib/chevre/service/delivery/factory.js

@@ -15,7 +15,6 @@ function createOwnershipInfosFromOrder(params) {
         throw new factory.errors.ArgumentNull('order.acceptedOffers');
     }
     params.order.acceptedOffers.forEach((acceptedOffer, offerIndex) => {
-        var _a;
         const itemOffered = acceptedOffer.itemOffered;
         let ownershipInfo;
         const ownedFrom = moment(params.order.orderDate)
@@ -32,7 +31,7 @@ function createOwnershipInfosFromOrder(params) {
         switch (itemOfferedType) {
             case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
-                const excludeCOAReservation = ((_a = acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
+                const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
                 if (excludeCOAReservation) {
                     // bookingService:COAでは作成しない(2024-12-31~)
                 }
@@ -40,7 +39,7 @@ function createOwnershipInfosFromOrder(params) {
                     ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
                         project: params.order.project,
                         ownedBy: ownedBy,
-                        acceptedOffer: Object.assign(Object.assign({}, acceptedOffer), { itemOffered }),
+                        acceptedOffer: { ...acceptedOffer, itemOffered },
                         ownedFrom: ownedFrom,
                         identifier: identifier,
                         acquiredFrom: acquiredFrom
@@ -51,7 +50,7 @@ function createOwnershipInfosFromOrder(params) {
                 ownershipInfo = (0, factory_1.createProductOwnershipInfo)({
                     project: params.order.project,
                     ownedBy: ownedBy,
-                    acceptedOffer: Object.assign(Object.assign({}, acceptedOffer), { itemOffered }),
+                    acceptedOffer: { ...acceptedOffer, itemOffered },
                     ownedFrom: ownedFrom,
                     identifier: identifier,
                     acquiredFrom: acquiredFrom

package/lib/chevre/service/delivery/product/factory.js

@@ -5,7 +5,6 @@ const moment = require("moment");
 const factory = require("../../../factory");
 const MAX_OWNED_THROUGH = '3000-01-01T00:00:00Z';
 function createProductOwnershipInfo(params) {
-    var _a, _b;
     let ownershipInfo;
     let ownedThrough;
     // どういう期間でいくらのオファーなのか
@@ -50,13 +49,23 @@ function createProductOwnershipInfo(params) {
     }
     const itemOffered = params.acceptedOffer.itemOffered;
     // 最適化(2023-02-01~)
-    const issuedThrough = (typeof ((_a = itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? Object.assign({ id: itemOffered.issuedThrough.id, typeOf: itemOffered.issuedThrough.typeOf }, (typeof ((_b = itemOffered.issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
-            ? { serviceType: itemOffered.issuedThrough.serviceType }
-            : undefined) : undefined;
-    const typeOfGood = Object.assign(Object.assign(Object.assign({ 
+    const issuedThrough = (typeof itemOffered.issuedThrough?.typeOf === 'string')
+        ? {
+            id: itemOffered.issuedThrough.id,
+            typeOf: itemOffered.issuedThrough.typeOf,
+            ...(typeof itemOffered.issuedThrough.serviceType?.typeOf === 'string')
+                ? { serviceType: itemOffered.issuedThrough.serviceType }
+                : undefined
+        }
+        : undefined;
+    const typeOfGood = {
         // project: itemOffered.project, // 最適化(2023-02-01~)
-        identifier: itemOffered.identifier, typeOf: itemOffered.typeOf }, (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') ? { issuedThrough } : undefined), (itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined), (itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined);
+        identifier: itemOffered.identifier,
+        typeOf: itemOffered.typeOf,
+        ...(typeof issuedThrough?.typeOf === 'string') ? { issuedThrough } : undefined,
+        ...(itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined,
+        ...(itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
+    };
     ownershipInfo = {
         project: params.project,
         typeOf: 'OwnershipInfo',

package/lib/chevre/service/delivery/reservation/factory.js

@@ -4,7 +4,6 @@ exports.createReservationOwnershipInfo = createReservationOwnershipInfo;
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
 function createReservationOwnershipInfo(params) {
-    var _a, _b;
     const itemOffered = params.acceptedOffer.itemOffered;
     let ownershipInfo;
     // イベント予約に対する所有権の有効期限はイベント終了日時までで十分だろう
@@ -32,10 +31,22 @@ function createReservationOwnershipInfo(params) {
     }
     let typeOfGood;
     if (itemOffered.typeOf === factory.reservationType.EventReservation) {
-        typeOfGood = Object.assign({ typeOf: itemOffered.typeOf, id: itemOffered.id, reservationNumber: itemOffered.reservationNumber, bookingService: bookingService }, (typeof ((_a = itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined);
+        typeOfGood = {
+            typeOf: itemOffered.typeOf,
+            id: itemOffered.id,
+            reservationNumber: itemOffered.reservationNumber,
+            bookingService: bookingService,
+            ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
+        };
     }
     else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
-        typeOfGood = Object.assign({ typeOf: itemOffered.typeOf, id: itemOffered.id, reservationNumber: itemOffered.reservationNumber, bookingService: bookingService }, (typeof ((_b = itemOffered.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined);
+        typeOfGood = {
+            typeOf: itemOffered.typeOf,
+            id: itemOffered.id,
+            reservationNumber: itemOffered.reservationNumber,
+            bookingService: bookingService,
+            ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
+        };
     }
     else {
         throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);

package/lib/chevre/service/delivery.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.givePointAward = givePointAward;
 exports.returnPointAward = returnPointAward;
@@ -27,12 +18,12 @@ const accountTransactionIdentifier_1 = require("../factory/accountTransactionIde
  * 特典付与
  */
 function givePointAward(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 入金識別子が存在する場合、冪等性の確保(2023-08-24~)
         const pendingTransactionIdentifier = params.object.identifier;
         if (typeof pendingTransactionIdentifier === 'string' && pendingTransactionIdentifier.length > 0) {
             // すでにConfirmedのMoneyTransfer取引が存在すれば何もしない
-            const assetTransactions = yield repos.assetTransaction.search({
+            const assetTransactions = await repos.assetTransaction.search({
                 limit: 1,
                 project: { id: { $eq: params.project.id } },
                 typeOf: factory.assetTransactionType.MoneyTransfer,
@@ -46,16 +37,16 @@ function givePointAward(params) {
             }
         }
         // アクション開始
-        const action = yield repos.action.start(params);
+        const action = await repos.action.start(params);
         try {
-            const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             const startParams = createGivePointAwardStartParams4moneyTransfer(params, transactionNumber);
-            yield MoneyTransferAssetTransactionService.start(startParams)(repos);
-            yield MoneyTransferAssetTransactionService.confirm({ transactionNumber })(repos);
+            await MoneyTransferAssetTransactionService.start(startParams)(repos);
+            await MoneyTransferAssetTransactionService.confirm({ transactionNumber })(repos);
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: params.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: params.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -64,11 +55,10 @@ function givePointAward(params) {
         }
         // アクション完了
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: params.typeOf, id: action.id, result: actionResult });
-    });
+        await repos.action.completeWithVoid({ typeOf: params.typeOf, id: action.id, result: actionResult });
+    };
 }
 function createGivePointAwardStartParams4moneyTransfer(params, transactionNumber) {
-    var _a;
     // Sellerに変更(2022-05-30~)
     const agent = {
         typeOf: params.agent.typeOf,
@@ -85,12 +75,19 @@ function createGivePointAwardStartParams4moneyTransfer(params, transactionNumber
     const toLocation = {
         typeOf: factory.permit.PermitType.Permit,
         identifier: params.object.toLocation.accountNumber,
-        issuedThrough: { id: (_a = params.object.toLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id },
+        issuedThrough: { id: params.object.toLocation.issuedThrough?.id },
         hasNoPermit: false // Permitが存在するはず
     };
-    return Object.assign({ transactionNumber: transactionNumber, project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.assetTransactionType.MoneyTransfer, agent: agent, expires: moment()
+    return {
+        transactionNumber: transactionNumber,
+        project: { typeOf: params.project.typeOf, id: params.project.id },
+        typeOf: factory.assetTransactionType.MoneyTransfer,
+        agent: agent,
+        expires: moment()
             .add(1, 'minutes')
-            .toDate(), recipient: recipient, object: {
+            .toDate(),
+        recipient: recipient,
+        object: {
             amount: {
                 typeOf: 'MonetaryAmount',
                 value: params.object.amount,
@@ -105,31 +102,33 @@ function createGivePointAwardStartParams4moneyTransfer(params, transactionNumber
                 typeOf: factory.account.transactionType.Deposit,
                 transactionNumber
             }
-        } }, (typeof params.object.identifier === 'string') ? { identifier: params.object.identifier } : undefined);
+        },
+        // ユニークネスを保証するために識別子を指定する
+        ...(typeof params.object.identifier === 'string') ? { identifier: params.object.identifier } : undefined
+    };
 }
 /**
  * 特典返却
  */
 function returnPointAward(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         // アクション開始
         const moneyTransferTransactions = [];
-        const action = yield repos.action.start(params);
+        const action = await repos.action.start(params);
         try {
             const moenyTransferAssetTransactionIdentifier = params.object.identifier;
-            const moenyTransferAssetTransactionFromLocationIdentifier = (_b = (_a = params.object
-                .object) === null || _a === void 0 ? void 0 : _a.fromLocation) === null || _b === void 0 ? void 0 : _b.identifier;
+            const moenyTransferAssetTransactionFromLocationIdentifier = params.object
+                .object?.fromLocation?.identifier;
             if (typeof moenyTransferAssetTransactionIdentifier === 'string') {
-                moneyTransferTransactions.push(yield processReturnPointAwardByTransactionIdentifier(params)(repos));
+                moneyTransferTransactions.push(await processReturnPointAwardByTransactionIdentifier(params)(repos));
             }
             if (typeof moenyTransferAssetTransactionFromLocationIdentifier === 'string') {
-                moneyTransferTransactions.push(...yield processReturnPointAwardByTransactionFromLocationIdentifier(params)(repos));
+                moneyTransferTransactions.push(...await processReturnPointAwardByTransactionFromLocationIdentifier(params)(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 (__) {
                 // 失敗したら仕方ない
@@ -140,14 +139,14 @@ function returnPointAward(params) {
         const actionResult = {
             moneyTransferTransaction: moneyTransferTransactions
         };
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+    };
 }
 function processReturnPointAwardByTransactionIdentifier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let moneyTransferTransaction;
         const moenyTransferAssetTransactionIdentifier = params.object.identifier;
-        const assetTransactions = yield repos.assetTransaction.search({
+        const assetTransactions = await repos.assetTransaction.search({
             limit: 1,
             project: { id: { $eq: params.project.id } },
             typeOf: factory.assetTransactionType.MoneyTransfer,
@@ -159,7 +158,7 @@ function processReturnPointAwardByTransactionIdentifier(params) {
         // 資産取引が存在すれば、出金取引を実行
         const depositTransaction = assetTransactions.shift();
         if (depositTransaction !== undefined) {
-            const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             // 冪等性の確保
             // 入金時の資産取引に対して一意な識別子をMoneyTransfer資産取引指定する
             const identifier2withdrawAssetTransaction = (0, accountTransactionIdentifier_1.createReturnPointAwardIdentifier)({
@@ -172,7 +171,7 @@ function processReturnPointAwardByTransactionIdentifier(params) {
                 issuedThrough: depositTransaction.object.toLocation.issuedThrough,
                 hasNoPermit: false // Permitが存在するはず
             };
-            moneyTransferTransaction = yield MoneyTransferAssetTransactionService.start({
+            moneyTransferTransaction = await MoneyTransferAssetTransactionService.start({
                 transactionNumber: transactionNumber,
                 identifier: identifier2withdrawAssetTransaction,
                 project: depositTransaction.project,
@@ -199,21 +198,20 @@ function processReturnPointAwardByTransactionIdentifier(params) {
                     force: true
                 }
             })(repos);
-            yield MoneyTransferAssetTransactionService.confirm({ transactionNumber })(repos);
+            await MoneyTransferAssetTransactionService.confirm({ transactionNumber })(repos);
         }
         else {
             throw new factory.errors.NotFound('AssetTransaction', `Deposit transaction '${moenyTransferAssetTransactionIdentifier}' not found`);
         }
         return moneyTransferTransaction;
-    });
+    };
 }
 function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const moneyTransferTransactions = [];
-        const moenyTransferAssetTransactionFromLocationIdentifier = (_b = (_a = params.object
-            .object) === null || _a === void 0 ? void 0 : _a.fromLocation) === null || _b === void 0 ? void 0 : _b.identifier;
-        const assetTransactions = yield repos.assetTransaction.search({
+        const moenyTransferAssetTransactionFromLocationIdentifier = params.object
+            .object?.fromLocation?.identifier;
+        const assetTransactions = await repos.assetTransaction.search({
             // limit: 100,
             project: { id: { $eq: params.project.id } },
             typeOf: factory.assetTransactionType.MoneyTransfer,
@@ -225,9 +223,9 @@ function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
         // 資産取引が存在すれば、逆の取引を実行
         if (assetTransactions.length > 0) {
             // 返却対象取引はTransfer取引(注文口座→Permit)のはず
-            const returningTransactions = assetTransactions.filter((d) => { var _a; return ((_a = d.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.account.transactionType.Transfer; });
+            const returningTransactions = assetTransactions.filter((d) => d.object.pendingTransaction?.typeOf === factory.account.transactionType.Transfer);
             for (const returningTransaction of returningTransactions) {
-                const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+                const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
                 // 冪等性の確保
                 // 入金時の資産取引に対して一意な識別子をMoneyTransfer資産取引指定する
                 const identifier2withdrawAssetTransaction = (0, accountTransactionIdentifier_1.createReturnPointAwardIdentifier)({
@@ -247,7 +245,7 @@ function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
                     hasNoPermit: true,
                     issuedThrough: { id: fromLocation.issuedThrough.id }
                 };
-                const moneyTransferTransaction = yield MoneyTransferAssetTransactionService.start({
+                const moneyTransferTransaction = await MoneyTransferAssetTransactionService.start({
                     transactionNumber: transactionNumber,
                     identifier: identifier2withdrawAssetTransaction,
                     project: returningTransaction.project,
@@ -274,10 +272,10 @@ function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
                         force: true
                     }
                 })(repos);
-                yield MoneyTransferAssetTransactionService.confirm({ transactionNumber })(repos);
+                await MoneyTransferAssetTransactionService.confirm({ transactionNumber })(repos);
                 moneyTransferTransactions.push(moneyTransferTransaction);
             }
         }
         return moneyTransferTransactions;
-    });
+    };
 }

package/lib/chevre/service/event/processUpdateMovieTheater.js

@@ -1,24 +1,19 @@
 "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.processUpdateMovieTheater = processUpdateMovieTheater;
 const factory = require("../../factory");
 // tslint:disable-next-line:max-func-body-length
 function processUpdateMovieTheater(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const actionAttributes = {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
             typeOf: factory.actionType.ReplaceAction,
             agent: { typeOf: factory.organizationType.Project, id: params.project.id },
-            object: Object.assign(Object.assign({}, params), { branchCode: params.locationBranchCode, typeOf: factory.placeType.MovieTheater }),
+            object: {
+                ...params,
+                branchCode: params.locationBranchCode,
+                typeOf: factory.placeType.MovieTheater
+            },
             instrument: {
                 theaterCode: params.locationBranchCode,
                 typeOf: 'WebAPI',
@@ -26,34 +21,34 @@ function processUpdateMovieTheater(params) {
             },
             targetCollection: { typeOf: factory.placeType.MovieTheater }
         };
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         let seller;
         let movieTheater;
         let screeningRooms;
         let processTime;
         try {
             // 同ブランチコードの販売者を検索する
-            const sellersWithSameBranchCode = yield repos.seller.projectFields({
+            const sellersWithSameBranchCode = await repos.seller.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
                 branchCode: { $eq: params.locationBranchCode }
             }, ['id']);
             const sellerWithSameBranchCode = sellersWithSameBranchCode.shift();
-            if (typeof (sellerWithSameBranchCode === null || sellerWithSameBranchCode === void 0 ? void 0 : sellerWithSameBranchCode.id) !== 'string') {
+            if (typeof sellerWithSameBranchCode?.id !== 'string') {
                 throw new factory.errors.NotFound('Seller', `Seller with branchCode '${params.locationBranchCode}' not found`);
             }
             seller = { id: sellerWithSameBranchCode.id };
             // saveMovieTheater:trueの場合のみ、施設保管(2022-10-10~)
             if (params.saveMovieTheater === true) {
                 const processStart = process.hrtime.bigint();
-                const savingMovieTheater = createMovieTheaterFromCOA(params.project, { id: seller.id }, yield repos.masterService.theater({ theaterCode: params.locationBranchCode }), yield repos.masterService.screen({ theaterCode: params.locationBranchCode }));
-                yield repos.movieTheater.saveMovieTheaterByBranchCode4coa(savingMovieTheater);
-                yield repos.screeningRoom.saveScreeningRooms4coa(savingMovieTheater);
+                const savingMovieTheater = createMovieTheaterFromCOA(params.project, { id: seller.id }, await repos.masterService.theater({ theaterCode: params.locationBranchCode }), await repos.masterService.screen({ theaterCode: params.locationBranchCode }));
+                await repos.movieTheater.saveMovieTheaterByBranchCode4coa(savingMovieTheater);
+                await repos.screeningRoom.saveScreeningRooms4coa(savingMovieTheater);
                 const processEnd = process.hrtime.bigint();
                 processTime = processEnd - processStart;
             }
-            const movieTheaters = yield repos.movieTheater.projectFields({
+            const movieTheaters = await repos.movieTheater.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
@@ -65,24 +60,27 @@ function processUpdateMovieTheater(params) {
             if (movieTheater === undefined) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            screeningRooms = yield repos.screeningRoom.findRooms({
+            screeningRooms = await repos.screeningRoom.findRooms({
                 project: { id: { $eq: params.project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
             });
         }
         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 (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        const actionResult = Object.assign({ screeningRoomsCount: screeningRooms.length }, (processTime !== undefined) ? { processTime } : undefined);
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        const actionResult = {
+            screeningRoomsCount: screeningRooms.length,
+            ...(processTime !== undefined) ? { processTime } : undefined
+        };
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         return { seller, movieTheater, screeningRooms };
-    });
+    };
 }
 /**
  * コアマスター抽出結果から作成する