@chevre/domain 23.2.0-alpha.9 → 24.0.0-alpha.0

package/lib/chevre/service/assetTransaction/registerService/potentialActions.js

@@ -1,18 +1,35 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
 // import * as pecorinoapi from '@pecorino/api-nodejs-client';
-const moment = require("moment");
-const factory = require("../../../factory");
+const moment_1 = __importDefault(require("moment"));
+const factory = __importStar(require("../../../factory"));
 const MAX_VALID_UNTIL = '3000-01-01T00:00:00Z';
 function createMoneyTransferActions(__) {
     return [];
@@ -45,68 +62,86 @@ function createMoneyTransferActions(__) {
     //         };
     //     });
 }
-// tslint:disable-next-line:max-func-body-length
 function createRegisterServiceActions(params) {
     const validFrom = (params.endDate instanceof Date) ? params.endDate : new Date();
     return params.transaction.object.map((o) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const pointAward = o.itemOffered.pointAward;
         const serviceOutput = o.itemOffered.serviceOutput;
         // validFor:undefinedに対応
         let validUntil;
-        if (typeof (serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.validFor) === 'string') {
+        if (typeof serviceOutput?.validFor === 'string') {
             // オファーの単価単位で有効期限を決定
-            validUntil = moment(validFrom)
-                .add(moment.duration(serviceOutput.validFor))
+            validUntil = (0, moment_1.default)(validFrom)
+                .add(moment_1.default.duration(serviceOutput.validFor))
                 .toDate();
         }
         else {
-            validUntil = moment(MAX_VALID_UNTIL)
+            validUntil = (0, moment_1.default)(MAX_VALID_UNTIL)
                 .toDate();
         }
         const moneyTransfer = [];
         // ポイント特典があれば適用
-        const pointAwardToLocationIdentifier = (_a = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _a === void 0 ? void 0 : _a.identifier;
-        const pointAwardToLocationTypeOf = (_b = pointAward === null || pointAward === void 0 ? void 0 : pointAward.toLocation) === null || _b === void 0 ? void 0 : _b.typeOf;
-        if (typeof ((_c = pointAward === null || pointAward === void 0 ? void 0 : pointAward.amount) === null || _c === void 0 ? void 0 : _c.value) === 'number'
+        const pointAwardToLocationIdentifier = pointAward?.toLocation?.identifier;
+        const pointAwardToLocationTypeOf = pointAward?.toLocation?.typeOf;
+        if (typeof pointAward?.amount?.value === 'number'
             && typeof pointAwardToLocationIdentifier === 'string'
             && typeof pointAwardToLocationTypeOf === 'string') {
             const fromLocation = {
-                typeOf: (typeof ((_d = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
-                    ? (_e = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _e === void 0 ? void 0 : _e.typeOf
+                typeOf: (typeof serviceOutput?.issuedBy?.typeOf === 'string')
+                    ? serviceOutput?.issuedBy?.typeOf
                     : params.transaction.typeOf,
-                name: (((_f = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _f === void 0 ? void 0 : _f.name) !== undefined)
-                    ? (typeof ((_g = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
-                        ? (_h = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _h === void 0 ? void 0 : _h.name
-                        : (_j = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.issuedBy) === null || _j === void 0 ? void 0 : _j.name.ja
+                name: (serviceOutput?.issuedBy?.name !== undefined)
+                    ? (typeof serviceOutput?.issuedBy?.name === 'string')
+                        ? serviceOutput?.issuedBy?.name
+                        : serviceOutput?.issuedBy?.name.ja
                     : params.transaction.id
             };
             const toLocation = {
                 identifier: pointAwardToLocationIdentifier,
                 typeOf: factory.permit.PermitType.Permit,
-                issuedThrough: { id: String((_l = (_k = pointAward.toLocation) === null || _k === void 0 ? void 0 : _k.issuedThrough) === null || _l === void 0 ? void 0 : _l.id) }
+                issuedThrough: { id: String(pointAward.toLocation?.issuedThrough?.id) }
             };
             const recipient = {
                 typeOf: factory.personType.Person,
                 id: '',
                 name: String(fromLocation)
             };
-            moneyTransfer.push(Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.actionType.MoneyTransfer, agent: params.transaction.project, recipient, object: {
+            moneyTransfer.push({
+                project: params.transaction.project,
+                typeOf: factory.actionType.MoneyTransfer,
+                agent: params.transaction.project,
+                recipient,
+                object: {
                     typeOf: factory.account.transactionType.Deposit
-                }, purpose: Object.assign({ typeOf: params.transaction.typeOf, id: params.transaction.id }, (typeof ((_m = pointAward.purpose) === null || _m === void 0 ? void 0 : _m.identifier) === 'string') ? { identifier: pointAward.purpose.identifier } : undefined), amount: {
+                },
+                purpose: {
+                    typeOf: params.transaction.typeOf,
+                    id: params.transaction.id,
+                    // 入金取引に識別子を指定する
+                    ...(typeof pointAward.purpose?.identifier === 'string') ? { identifier: pointAward.purpose.identifier } : undefined
+                },
+                amount: {
                     typeOf: 'MonetaryAmount',
-                    value: (_o = pointAward.amount) === null || _o === void 0 ? void 0 : _o.value,
-                    currency: (_p = pointAward.amount) === null || _p === void 0 ? void 0 : _p.currency
-                }, fromLocation: fromLocation, toLocation: toLocation }, (typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined), (pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined));
+                    value: pointAward.amount?.value,
+                    currency: pointAward.amount?.currency
+                },
+                fromLocation: fromLocation,
+                toLocation: toLocation,
+                ...(typeof pointAward.description === 'string') ? { description: pointAward.description } : undefined,
+                ...(pointAward.recipient !== undefined) ? { recipient: pointAward.recipient } : undefined
+            });
         }
-        const object = Object.assign(Object.assign({}, serviceOutput), { validFrom: validFrom, validUntil: validUntil });
+        const object = {
+            ...serviceOutput,
+            validFrom: validFrom,
+            validUntil: validUntil
+        };
         return {
             project: params.transaction.project,
             typeOf: factory.actionType.RegisterAction,
             result: {},
             object,
             // プロジェクトに変更(2022-05-26~)
-            // tslint:disable-next-line:max-line-length
             // agent: <factory.creativeWork.softwareApplication.webApplication.ICreativeWork | factory.person.IPerson>params.transaction.agent,
             agent: params.transaction.project,
             potentialActions: {
@@ -122,18 +157,16 @@ function createRegisterServiceActions(params) {
 /**
  * 取引のポストアクションを作成する
  */
-function createPotentialActions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // 通貨転送アクション属性作成
-        const moneyTransferActionAttributesList = createMoneyTransferActions(params);
-        // まずは1転送アクションのみ対応
-        if (moneyTransferActionAttributesList.length > 1) {
-            throw new factory.errors.Argument('Transaction', 'Number of moneyTransfer actions must be 1');
-        }
-        const registerServiceActionAttributes = createRegisterServiceActions(params);
-        return {
-            moneyTransfer: moneyTransferActionAttributesList,
-            registerService: registerServiceActionAttributes
-        };
-    });
+async function createPotentialActions(params) {
+    // 通貨転送アクション属性作成
+    const moneyTransferActionAttributesList = createMoneyTransferActions(params);
+    // まずは1転送アクションのみ対応
+    if (moneyTransferActionAttributesList.length > 1) {
+        throw new factory.errors.Argument('Transaction', 'Number of moneyTransfer actions must be 1');
+    }
+    const registerServiceActionAttributes = createRegisterServiceActions(params);
+    return {
+        moneyTransfer: moneyTransferActionAttributesList,
+        registerService: registerServiceActionAttributes
+    };
 }

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

@@ -1,12 +1,26 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
@@ -16,19 +30,19 @@ exports.exportTasksById = exportTasksById;
 /**
  * サービス登録取引サービス
  */
-const pecorinoapi = require("../../pecorinoapi");
-const factory = require("../../factory");
+const pecorinoapi = __importStar(require("../../pecorinoapi"));
+const factory = __importStar(require("../../factory"));
 const searchProductOffers_1 = require("../offer/product/searchProductOffers");
 const factory_1 = require("./registerService/factory");
 const potentialActions_1 = require("./registerService/potentialActions");
 // import * as AccountService from '../account';
-const PermitService = require("../permit");
+const PermitService = __importStar(require("../permit"));
 /**
  * 取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield repos.project.findById({
+    return async (repos) => {
+        const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['typeOf']
         });
@@ -46,7 +60,7 @@ function start(params) {
             throw new factory.errors.ArgumentNull('object.itemOffered.id');
         }
         // プロダクト確認
-        const product = (yield repos.product.projectFields({
+        const product = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: productId }
@@ -66,7 +80,7 @@ function start(params) {
         }
         // サービスアウトプット作成
         const dateIssued = new Date();
-        const transactionObject = yield createTransactionObject({
+        const transactionObject = await createTransactionObject({
             acceptedOffers,
             dateIssued,
             product,
@@ -85,26 +99,26 @@ function start(params) {
         // 取引作成
         let transaction;
         try {
-            transaction = yield repos.assetTransaction.start(startParams);
+            transaction = await repos.assetTransaction.start(startParams);
         }
         catch (error) {
             throw error;
         }
         // 必要あれば在庫確認など
-        const serviceOutputs = transactionObject.map((o) => { var _a; return (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput; });
+        const serviceOutputs = transactionObject.map((o) => o.itemOffered?.serviceOutput);
         // サービスアウトプット保管
-        yield PermitService.issue({
+        await PermitService.issue({
             project: { id: project.id },
             issuedThrough: { typeOf: product.typeOf },
             serviceOutputs
         })(repos);
         return transaction;
-    });
+    };
 }
 function createTransactionObject(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // オファー検索
-        const offers = yield (0, searchProductOffers_1.searchProductOffers)({
+        const offers = await (0, searchProductOffers_1.searchProductOffers)({
             ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
             onlyValid: true,
@@ -118,7 +132,7 @@ function createTransactionObject(params) {
             if (offer === undefined) {
                 throw new factory.errors.NotFound('Offer', `Offer ${acceptedOffer.id} not found`);
             }
-            yield validatePointAward({ project: { id: params.project.id }, acceptedOffer })(repos);
+            await validatePointAward({ project: { id: params.project.id }, acceptedOffer })(repos);
             const pointAward = (0, factory_1.createPointAward)({
                 acceptedOffer: acceptedOffer,
                 offer: offer
@@ -133,18 +147,21 @@ function createTransactionObject(params) {
             transactionObject.push({
                 typeOf: factory.offerType.Offer,
                 id: String(offer.id),
-                itemOffered: Object.assign({ 
+                itemOffered: {
                     // project: params.product.project,
-                    typeOf: params.product.typeOf, id: String(params.product.id), serviceOutput: serviceOutput }, (pointAward !== undefined) ? { pointAward } : undefined)
+                    typeOf: params.product.typeOf,
+                    id: String(params.product.id),
+                    serviceOutput: serviceOutput,
+                    ...(pointAward !== undefined) ? { pointAward } : undefined
+                }
             });
         }
         return transactionObject;
-    });
+    };
 }
 function createPermitService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const product = (yield repos.product.projectFields({
+    return async (repos) => {
+        const product = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
@@ -154,19 +171,19 @@ function createPermitService(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
-        const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
-        const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;
-        const permitServiceClientSecret = (_g = (_f = product.availableChannel) === null || _f === void 0 ? void 0 : _f.credentials) === null || _g === void 0 ? void 0 : _g.clientSecret;
+        const permitServiceEndpoint = product.availableChannel?.serviceUrl;
+        const permitServiceAuthorizeServerDomain = product.availableChannel?.credentials?.authorizeServerDomain;
+        const permitServiceClientId = product.availableChannel?.credentials?.clientId;
+        const permitServiceClientSecret = product.availableChannel?.credentials?.clientSecret;
         if (typeof permitServiceEndpoint !== 'string' || permitServiceEndpoint.length === 0
             || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
             || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
             throw new factory.errors.Internal('product availableChannel invalid');
         }
-        return new (yield pecorinoapi.loadPecorino()).service.Permit({
+        return new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,
@@ -174,43 +191,42 @@ function createPermitService(params) {
                 state: ''
             })
         });
-    });
+    };
 }
 function validatePointAward(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return async (repos) => {
         // Permit識別子確認
-        const permitIdentifier = (_c = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.pointAward) === null || _b === void 0 ? void 0 : _b.toLocation) === null || _c === void 0 ? void 0 : _c.identifier;
-        const issuedThroughId = (_e = (_d = params.acceptedOffer.itemOffered.pointAward) === null || _d === void 0 ? void 0 : _d.toLocation) === null || _e === void 0 ? void 0 : _e.issuedThrough.id;
+        const permitIdentifier = params.acceptedOffer.itemOffered?.pointAward?.toLocation?.identifier;
+        const issuedThroughId = params.acceptedOffer.itemOffered.pointAward?.toLocation?.issuedThrough.id;
         if (typeof permitIdentifier === 'string' && permitIdentifier.length > 0) {
             if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.pointAward.toLocation.issuedThrough.id');
             }
             // pointAwardの指定がある場合、Permitの存在確認
-            const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
-            yield permitService.findByIdentifier({
+            const permitService = await createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
+            await permitService.findByIdentifier({
                 project: { id: params.project.id },
                 identifier: permitIdentifier,
                 issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
             });
         }
-    });
+    };
 }
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
-            transaction = yield repos.assetTransaction.findById({
+            transaction = await repos.assetTransaction.findById({
                 typeOf: factory.assetTransactionType.RegisterService,
                 id: params.id
             });
         }
         else if (typeof params.transactionNumber === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
+            transaction = await repos.assetTransaction.findByTransactionNumber({
                 typeOf: factory.assetTransactionType.RegisterService,
                 transactionNumber: params.transactionNumber
             });
@@ -218,38 +234,38 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
+        const potentialActions = await (0, potentialActions_1.createPotentialActions)({
             transaction: transaction,
             endDate: params.endDate
         });
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm({
+        await repos.assetTransaction.confirm({
             typeOf: factory.assetTransactionType.RegisterService,
             id: transaction.id,
             result: result,
             potentialActions: potentialActions
         });
-    });
+    };
 }
 /**
  * 取引中止
  */
 function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield repos.assetTransaction.cancel({
+    return async (repos) => {
+        await repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.RegisterService,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-    });
+    };
 }
 /**
  * 取引タスク出力
  */
 function exportTasksById(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.findById({
+    return async (repos) => {
+        const transaction = await repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.RegisterService,
             id: params.id
         });
@@ -258,10 +274,8 @@ function exportTasksById(params) {
         const taskRunsAt = new Date();
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (potentialActions !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (Array.isArray(potentialActions.registerService)
                         && potentialActions.registerService.length > 0) {
@@ -278,10 +292,8 @@ function exportTasksById(params) {
                         taskAttributes.push(registerServiceTask);
                     }
                 }
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (potentialActions !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore else */
                     if (potentialActions.moneyTransfer !== undefined) {
                         taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
@@ -306,5 +318,5 @@ function exportTasksById(params) {
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/cancel.js

@@ -1,26 +1,40 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancel = cancel;
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 const cancelReservation_1 = require("../../reserve/cancelReservation");
 /**
  * 取引中止
  */
 function cancel(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         // まず取引状態変更
-        const { id } = yield repos.assetTransaction.cancel({
+        const { id } = await repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Reserve,
             id: params.id,
             transactionNumber: params.transactionNumber
@@ -32,11 +46,11 @@ function cancel(params) {
         // if (cancelActionAttributes !== undefined) {
         //     await cancelPendingReservation(cancelActionAttributes)(repos);
         // }
-        yield (0, cancelReservation_1.cancelPendingReservation)({
+        await (0, cancelReservation_1.cancelPendingReservation)({
             purpose: {
                 id,
                 typeOf: factory.assetTransactionType.Reserve
             }
         })(repos);
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/confirm/factory.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
-// tslint:disable-next-line:max-func-body-length
 function createPotentialActions(params) {
     // const transaction = params.transaction;
     // const reservationFor = transaction.object.reservationFor;
     // if (reservationFor === undefined) {
     //     throw new factory.errors.NotFound('transaction.object.reservationFor');
     // }
-    var _a;
     // discontinue(2024-07-01~)
     // const useOptimizeReservation: boolean = !USE_OPTIMIZE_RESERVATION_EXCEPTIONS.includes(transaction.project.id);
     // 予約アクション属性作成
@@ -17,7 +15,7 @@ function createPotentialActions(params) {
     // let reservationPackage: factory.action.reserve.IObject | undefined;
     let underName;
     // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
-    if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+    if (typeof params.order?.typeOf === 'string') {
         const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
         underName = ordre2reservationUnderNameResult.underName;
     }
@@ -81,7 +79,20 @@ function createReservationUnderNameIdentifier(params) {
     ];
 }
 function createReservationUnderName(params) {
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: createReservationUnderNameIdentifier({ order: params.order }), name: String(params.order.customer.name), typeOf: params.order.customer.typeOf }, (typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined), (typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined), (typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined), (typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined), (typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined), (typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined), (typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined), (typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined), (typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined);
+    return {
+        identifier: createReservationUnderNameIdentifier({ order: params.order }),
+        name: String(params.order.customer.name),
+        typeOf: params.order.customer.typeOf,
+        ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
+        ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
+        ...(typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined,
+        ...(typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined,
+        ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
+        ...(typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined,
+        ...(typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined,
+        ...(typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined,
+        ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined
+    };
 }
 /**
  * 注文者情報を予約者情報へ変換する