@chevre/domain 21.6.0-alpha.0 → 21.6.0-alpha.10

package/lib/chevre/service/event.js

@@ -455,14 +455,13 @@ function createScreeningEventFromCOA(params) {
             .toDate();
     }
     const offers = {
-        // 不要なので廃止(2022-12-19~)
-        // project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.offerType.Offer,
         offeredThrough: {
             typeOf: 'WebAPI',
             identifier: factory.service.webAPI.Identifier.COA
         },
-        priceCurrency: factory.priceCurrency.JPY,
+        // 廃止(2023-08-07~)
+        // priceCurrency: factory.priceCurrency.JPY,
         itemOffered: {
             serviceOutput: {
                 reservedTicket: {
@@ -605,10 +604,7 @@ function createScreeningEventSeriesFromCOA(params) {
         endDate: endDate,
         startDate: startDate,
         coaInfo,
-        offers: Object.assign({ 
-            // 不要なので廃止(2023-06-09~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
-            typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
+        offers: Object.assign({ typeOf: factory.offerType.Offer }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
         additionalProperty
     };
 }

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -27,10 +27,12 @@ function onOrderStatusChanged(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/order/placeOrder.js

@@ -107,12 +107,13 @@ function placeOrderWithoutTransaction(params) {
         // アクションを作成する(2022-04-11~)
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
-            // project: order.project,
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -171,7 +172,11 @@ function placeOrder(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             orderNumber: order.orderNumber,
             price: order.price,

package/lib/chevre/service/order/returnOrder.js

@@ -49,7 +49,11 @@ function returnOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
             orderNumber: order.orderNumber,
             price: order.price,

package/lib/chevre/service/order/sendOrder.js

@@ -48,7 +48,11 @@ function sendOrder(params) {
             const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
             const simpleOrder = {
                 typeOf: order.typeOf,
-                seller: order.seller,
+                seller: {
+                    id: order.seller.id,
+                    typeOf: order.seller.typeOf,
+                    name: order.seller.name
+                },
                 customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
                 orderNumber: order.orderNumber,
                 price: order.price,

package/lib/chevre/service/payment/any/factory.js

@@ -80,27 +80,28 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const payTransactionObject = params.payTransaction.object;
     const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
         throw new factory.errors.ServiceUnavailable('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
+    const issuedThrough = Object.assign({ typeOf: payTransactionObject.typeOf, id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : '' }, (typeof ((_c = (_b = payTransactionObject.serviceOutput) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency) === 'string')
+        ? { serviceOutput: payTransactionObject.serviceOutput }
+        : undefined);
     return {
-        accountId: (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId) === 'string')
+        accountId: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
-        amount: params.object.amount,
-        issuedThrough: {
-            typeOf: payTransactionObject.typeOf,
-            id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : ''
-        },
+        // 廃止(2023-08-07~)
+        // amount: params.object.amount,
+        issuedThrough,
         paymentMethod: params.object.paymentMethod,
         paymentStatus: factory.paymentStatusType.PaymentDue,
-        paymentMethodId: (typeof ((_c = payTransactionObject.paymentMethod) === null || _c === void 0 ? void 0 : _c.paymentMethodId) === 'string')
+        paymentMethodId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId
             : '',
-        name: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.name) === 'string')
+        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,

package/lib/chevre/service/payment/movieTicket.js

@@ -113,7 +113,7 @@ exports.checkMovieTicket = checkMovieTicket;
  */
 function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         let accountId;
         let payAction;
         let accountsReceivablesByServiceType = [];
@@ -138,7 +138,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
                 paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.unitCode.C62,
-                        value: (_b = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets) === null || _b === void 0 ? void 0 : _b.length
+                        value: (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? paymentMethod.movieTickets.length : 0
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -5,6 +5,8 @@ import { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode'
 import { MongoRepository as CreativeWorkRepo } from '../../../repo/creativeWork';
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as MemberRepo } from '../../../repo/member';
+import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
@@ -18,6 +20,8 @@ export declare function onResourceDeleted(params: factory.task.onResourceUpdated
     event: EventRepo;
     member: MemberRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
+    offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     place: PlaceRepo;
     product: ProductRepo;
     productOffer: ProductOfferRepo;

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -41,8 +41,30 @@ function onResourceDeleted(params) {
                         ids: params.id
                     })(repos);
                     break;
+                case factory.offerType.Offer:
+                    yield deleteResourcesByOffer({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                case 'OfferCatalog':
+                    yield deleteResourcesByOfferCatalog({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                case factory.product.ProductType.EventService:
+                case factory.product.ProductType.Product:
+                case factory.product.ProductType.Transportation:
+                    yield deleteResourcesByProduct({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf
+                    })(repos);
+                    break;
                 default:
-                // no op
+                    // no op
+                    throw new factory.errors.NotImplemented(`${params.typeOf} onDeleted not implemented`);
             }
         }
     });
@@ -228,3 +250,138 @@ function deleteResourcesBySeller(params) {
         }
     });
 }
+function deleteResourcesByOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.ids.length !== 1) {
+            throw new factory.errors.Argument('id', 'id.length must be 1');
+        }
+        for (const offerId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: offerId, typeOf: factory.offerType.Offer },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // カタログからpullItemListElement
+                const updateCatalogResult = yield repos.offerCatalog.pullItemListElement({
+                    project: { id: params.project.id },
+                    $pull: { itemListElement: { $elemMatch: { id: { $in: [offerId] } } } }
+                });
+                deleteResult = { updateCatalogResult };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}
+function deleteResourcesByOfferCatalog(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.ids.length !== 1) {
+            throw new factory.errors.Argument('id', 'id.length must be 1');
+        }
+        for (const catalogId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: catalogId, typeOf: 'OfferCatalog' },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // カタログからプロダクト検索
+                const productsWithCatalog = yield repos.product.search({
+                    project: { id: { $eq: params.project.id } },
+                    hasOfferCatalog: { id: { $eq: catalogId } }
+                }, ['_id'], []);
+                let deleteEventResult;
+                let updateOfferResult;
+                if (productsWithCatalog.length > 0) {
+                    const deletingProductIds = productsWithCatalog.map((product) => product.id);
+                    // 興行を設定されたイベント削除
+                    deleteEventResult = yield repos.event.deleteManyByItemOfferedId({
+                        project: { id: params.project.id },
+                        offers: { itemOffered: { id: { $in: deletingProductIds } } }
+                    });
+                    // アドオンから除外
+                    updateOfferResult = yield repos.offer.pullAddOns({
+                        project: { id: params.project.id },
+                        addOn: { itemOffered: { id: { $in: deletingProductIds } } }
+                    });
+                }
+                // プロダクト削除
+                const deleteProductResult = yield repos.product.deleteByHasOfferCatalog({
+                    project: { id: params.project.id },
+                    hasOfferCatalog: { id: catalogId }
+                });
+                deleteResult = { deleteEventResult, deleteProductResult, updateOfferResult };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}
+function deleteResourcesByProduct(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.ids.length !== 1) {
+            throw new factory.errors.Argument('id', 'id.length must be 1');
+        }
+        for (const productId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: productId, typeOf: params.typeOf },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                let deleteEventResult;
+                let updateOfferResult;
+                // 興行を設定されたイベント削除
+                deleteEventResult = yield repos.event.deleteManyByItemOfferedId({
+                    project: { id: params.project.id },
+                    offers: { itemOffered: { id: { $in: [productId] } } }
+                });
+                // アドオンから除外
+                updateOfferResult = yield repos.offer.pullAddOns({
+                    project: { id: params.project.id },
+                    addOn: { itemOffered: { id: { $in: [productId] } } }
+                });
+                deleteResult = { deleteEventResult, updateOfferResult };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}

package/lib/chevre/service/task/onResourceUpdated.js

@@ -17,6 +17,8 @@ const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const event_1 = require("../../repo/event");
 const member_1 = require("../../repo/member");
+const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
@@ -37,6 +39,8 @@ function call(data) {
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
             event: new event_1.MongoRepository(connectionSettings.connection),
             member: new member_1.MongoRepository(connectionSettings.connection),
+            offer: new offer_1.MongoRepository(connectionSettings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(connectionSettings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(connectionSettings.connection),
             place: new place_1.MongoRepository(connectionSettings.connection),
             product: new product_1.MongoRepository(connectionSettings.connection),

package/lib/chevre/service/transaction/placeOrderInProgress/factory.d.ts

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;
+export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/factory.js

@@ -20,15 +20,12 @@ function createStartParams(params, passport, seller, broker) {
         seller: {
             id: seller.id,
             name: seller.name,
-            typeOf: seller.typeOf
+            typeOf: seller.typeOf,
+            // 追加特性を追加(2023-08-08~)
+            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
         },
         object: transactionObject,
-        // expires: params.expires,
         expiresInSeconds: params.expiresInSeconds
-        // 販売者にexpires設定があれば適用
-        // ...(typeof makesOfferFromClient?.eligibleTransactionDuration?.maxValue === 'number')
-        //     ? { expiresInSeconds: makesOfferFromClient.eligibleTransactionDuration.maxValue }
-        //     : undefined
     };
 }
 exports.createStartParams = createStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js

@@ -19,6 +19,20 @@ function createGivePointAwardActions(params) {
         // インセンティブ付与アクションの指定があればそちらを反映
         const givePointAwardParams = (_a = params.transaction.object.potentialActions) === null || _a === void 0 ? void 0 : _a.givePointAward;
         if (Array.isArray(givePointAwardParams)) {
+            const givePointAwardPurpose = {
+                typeOf: params.order.typeOf,
+                seller: {
+                    id: params.order.seller.id,
+                    typeOf: params.order.seller.typeOf,
+                    name: params.order.seller.name
+                },
+                // mask
+                customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
+                orderNumber: params.order.orderNumber,
+                price: params.order.price,
+                priceCurrency: params.order.priceCurrency,
+                orderDate: params.order.orderDate
+            };
             // メンバーシップごとに、特典を確認してインセンティブ付与
             givePointAwardParams.forEach((givePointAwardParam) => {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -31,8 +45,6 @@ function createGivePointAwardActions(params) {
                         project: params.transaction.project,
                         typeOf: factory.actionType.GiveAction,
                         agent: params.transaction.project,
-                        // order.customerからrecipientを生成する(2022-05-25~)
-                        // recipient: params.transaction.agent,
                         recipient: {
                             typeOf: params.order.customer.typeOf,
                             id: params.order.customer.id,
@@ -42,19 +54,7 @@ function createGivePointAwardActions(params) {
                                 accountNumber: accountNumber,
                                 issuedThrough: { id: String((_h = (_g = (_f = givePointAwardParam.object) === null || _f === void 0 ? void 0 : _f.toLocation) === null || _g === void 0 ? void 0 : _g.issuedThrough) === null || _h === void 0 ? void 0 : _h.id) }
                             }, description: (typeof description === 'string') ? description : '' }, (typeof pointAwardIdentifier === 'string') ? { identifier: pointAwardIdentifier } : undefined),
-                        purpose: {
-                            // project: params.order.project,
-                            typeOf: params.order.typeOf,
-                            seller: params.order.seller,
-                            // mask
-                            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-                            // IOrderへ移行(2022-11-17~)
-                            // confirmationNumber: params.order.confirmationNumber,
-                            orderNumber: params.order.orderNumber,
-                            price: params.order.price,
-                            priceCurrency: params.order.priceCurrency,
-                            orderDate: params.order.orderDate
-                        }
+                        purpose: givePointAwardPurpose
                     });
                 }
             });

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.js

@@ -19,6 +19,20 @@ function createMoneyTransferActions(params) {
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => a.object.typeOf === factory.offerType.Offer)
             .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
+        const moneyTransferPurpose = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            // mask
+            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
         // const paymentMethod = params.order.paymentMethods[0];
         authorizeMoneyTransferActions.forEach((a) => {
             var _a;
@@ -33,49 +47,8 @@ function createMoneyTransferActions(params) {
                         transactionNumber: pendingTransaction.transactionNumber,
                         typeOf: factory.assetTransactionType.MoneyTransfer
                     },
-                    // agent: Projectに統一(2022-05-16~)
                     agent: params.transaction.project,
-                    // agent: params.transaction.agent,
-                    // ↓recipient廃止(2022-05-16~)
-                    // recipient: a.recipient,
-                    // amount: {
-                    //     typeOf: 'MonetaryAmount',
-                    //     currency: pendingTransaction.object.amount.currency,
-                    //     value: pendingTransaction.object.amount.value
-                    // },
-                    // fromLocation: (paymentMethod !== undefined)
-                    //     ? {
-                    //         accountId: paymentMethod.accountId,
-                    //         typeOf: paymentMethod.typeOf,
-                    //         name: paymentMethod.name,
-                    //         paymentMethodId: paymentMethod.paymentMethodId,
-                    //         additionalProperty: paymentMethod.additionalProperty
-                    //     }
-                    //     : {
-                    //         typeOf: params.transaction.agent.typeOf,
-                    //         id: params.transaction.agent.id,
-                    //         name: <string>params.transaction.agent.name
-                    //     },
-                    // toLocation: {
-                    //     typeOf: pendingTransaction.object.toLocation.typeOf,
-                    //     identifier: pendingTransaction.object.toLocation.identifier
-                    // },
-                    purpose: {
-                        // project: params.order.project,
-                        typeOf: params.order.typeOf,
-                        seller: params.order.seller,
-                        // mask
-                        customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-                        // IOrderへ移行(2022-11-17~)
-                        // confirmationNumber: params.order.confirmationNumber,
-                        orderNumber: params.order.orderNumber,
-                        price: params.order.price,
-                        priceCurrency: params.order.priceCurrency,
-                        orderDate: params.order.orderDate
-                    }
-                    // ...(typeof pendingTransaction.object.description === 'string')
-                    //     ? { description: pendingTransaction.object.description }
-                    //     : {}
+                    purpose: moneyTransferPurpose
                 });
             }
         });

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -23,6 +23,20 @@ function createRegisterServiceActions(params) {
             && a.object.length > 0
             && a.object[0].typeOf === factory.offerType.Offer
             && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0);
+        const registerServicePurpose = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            // mask
+            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
         authorizeProductOfferActions.forEach((a) => {
             var _a;
             const actionResult = a.result;
@@ -42,22 +56,8 @@ function createRegisterServiceActions(params) {
                     project: params.transaction.project,
                     typeOf: factory.actionType.ConfirmAction,
                     object: registerServiceObject,
-                    // agent: Projectに統一(2022-05-16~)
                     agent: params.transaction.project,
-                    // agent: params.transaction.agent,
-                    purpose: {
-                        // project: params.order.project,
-                        typeOf: params.order.typeOf,
-                        seller: params.order.seller,
-                        // mask
-                        customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-                        // IOrderへ移行(2022-11-17~)
-                        // confirmationNumber: params.order.confirmationNumber,
-                        orderNumber: params.order.orderNumber,
-                        price: params.order.price,
-                        priceCurrency: params.order.priceCurrency,
-                        orderDate: params.order.orderDate
-                    },
+                    purpose: registerServicePurpose,
                     potentialActions: Object.assign({}, (orderProgramMembershipTask !== undefined)
                         ? { orderProgramMembership: [orderProgramMembershipTask] }
                         : undefined)

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js

@@ -22,11 +22,13 @@ function createSendEmailMessageActions(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const sendActionPurpose = {
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.js

@@ -30,13 +30,14 @@ function createPotentialActions(params) {
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -34,11 +34,11 @@ function createSeller(params) {
     var _a;
     const seller = params.transaction.seller;
     return {
-        // 最適化(2022-11-15~)
-        // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
         id: seller.id,
         name: (typeof seller.name === 'string') ? seller.name : String((_a = seller.name) === null || _a === void 0 ? void 0 : _a.ja),
-        typeOf: seller.typeOf
+        typeOf: seller.typeOf,
+        // 追加特性を追加(2023-08-08~)
+        additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
     };
 }
 function createCustomer(params) {
@@ -82,11 +82,18 @@ function createPaymentMethods(params) {
         });
     });
     // 決済方法から注文金額の計算
+    // price += authorizePaymentActions
+    //     .filter((a) => {
+    //         return a.result?.totalPaymentDue?.currency === factory.priceCurrency.JPY;
+    //     })
+    //     .reduce((a, b) => a + (<IAuthorizeAnyPaymentResult>b.result).amount, 0);
     price += authorizePaymentActions
-        .filter((a) => {
+        .reduce((a, b) => {
         var _a, _b;
-        return ((_b = (_a = a.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY;
-    })
-        .reduce((a, b) => a + b.result.amount, 0);
+        const jpyAmount = (((_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
+            ? b.result.totalPaymentDue.value
+            : 0;
+        return a + jpyAmount;
+    }, 0);
     return { paymentMethods, price };
 }