@chevre/domain 21.35.0-alpha.26 → 21.35.0-alpha.28

package/example/src/chevre/investigateCheckMovieTicketActions.ts

@@ -19,7 +19,7 @@ async function main() {
             startDate: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-30, 'days')
+                    .add(-4, 'days')
                     .toDate()
             }
         },

package/example/src/chevre/migrateAuthorizeEventServiceOfferCOA.ts

@@ -22,7 +22,7 @@ async function main() {
             //         .add(-180, 'days')
             // },
             'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.offer.eventService.ObjectType.SeatReservation },
-            'instrument.typeOf': { $exists: true, $eq: 'COAReserveTransaction' }
+            'instrument.typeOf': { $exists: true, $eq: chevre.factory.assetTransactionType.COAReserveTransaction }
         },
         {
             __id: 1, startDate: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1, object: 1

package/example/src/chevre/migrateAuthorizeEventServiceOfferChevre.ts

@@ -42,7 +42,7 @@ async function main() {
         >>doc.toObject();
 
         let migrated = false;
-        if (authorizeAction.instrument.typeOf === 'COAReserveTransaction') {
+        if (authorizeAction.instrument.typeOf === chevre.factory.assetTransactionType.COAReserveTransaction) {
             migrated = true;
         } else {
             const pendingTransaction = authorizeAction.object.pendingTransaction;

package/example/src/chevre/migrateAuthorizeEventServiceOfferInstrument.ts

@@ -18,14 +18,18 @@ async function main() {
             typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
             // actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
             startDate: {
-                $lte: moment()
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-90, 'days'),
+                $lte: moment('2023-07-22T01:17:42.541Z')
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-90, 'days'),
+                    .toDate()
                 // $gte: moment()
                 //     // tslint:disable-next-line:no-magic-numbers
                 //     .add(-180, 'days')
             },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.offer.eventService.ObjectType.SeatReservation }
+            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.offer.eventService.ObjectType.SeatReservation },
+            'project.id': { $ne: 'sskts-production' }
         },
         {
             __id: 1, startDate: 1, endDate: 1, result: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1, object: 1
@@ -46,7 +50,7 @@ async function main() {
         const { instrument } = authorizeAction;
 
         let migrated = false;
-        if ((instrument.typeOf === 'COAReserveTransaction'
+        if ((instrument.typeOf === chevre.factory.assetTransactionType.COAReserveTransaction
             || instrument.typeOf === chevre.factory.assetTransactionType.Reserve)
             && typeof instrument.transactionNumber === 'string'
         ) {
@@ -66,24 +70,32 @@ async function main() {
             }
             const pendingTransaction = (authorizeAction.object).pendingTransaction;
             const transactionNumber = pendingTransaction?.transactionNumber;
-            if (typeof transactionNumber !== 'string' || transactionNumber === '') {
-                throw new Error(`pendingTransaction must exist [${authorizeAction.id}]`);
-            }
             let newInstrument: IInstrumentAsAssetTransaction;
-            if (pendingTransaction?.typeOf === 'COAReserveTransaction') {
+            if (pendingTransaction?.typeOf === chevre.factory.assetTransactionType.COAReserveTransaction) {
                 newInstrument = {
-                    typeOf: 'COAReserveTransaction',
+                    typeOf: chevre.factory.assetTransactionType.COAReserveTransaction,
                     identifier: chevre.factory.service.webAPI.Identifier.COA,
-                    transactionNumber
+                    ...(typeof transactionNumber === 'string') ? { transactionNumber } : { transactionNumber: '' }
                 };
             } else if (pendingTransaction?.typeOf === chevre.factory.assetTransactionType.Reserve) {
+                if (typeof transactionNumber !== 'string' || transactionNumber === '') {
+                    throw new Error(`pendingTransaction must exist [${authorizeAction.id}]`);
+                }
                 newInstrument = {
                     typeOf: chevre.factory.assetTransactionType.Reserve,
                     identifier: chevre.factory.service.webAPI.Identifier.Chevre,
                     transactionNumber
                 };
             } else {
-                throw new Error(`invalid pendingTransaction [${(<any>pendingTransaction).typeOf}] [${authorizeAction.id}]`);
+                if (instrument.identifier === chevre.factory.service.webAPI.Identifier.COA) {
+                    newInstrument = {
+                        typeOf: chevre.factory.assetTransactionType.COAReserveTransaction,
+                        identifier: chevre.factory.service.webAPI.Identifier.COA,
+                        ...(typeof transactionNumber === 'string') ? { transactionNumber } : { transactionNumber: '' }
+                    };
+                } else {
+                    throw new Error(`invalid pendingTransaction [${(<any>pendingTransaction)?.typeOf}] [${authorizeAction.id}]`);
+                }
             }
 
             console.log(

package/example/src/chevre/migrateAuthorizeEventServiceOfferResult.ts

@@ -51,7 +51,7 @@ async function main() {
         }
 
         let migrated = false;
-        if (authorizeAction.instrument.typeOf === 'COAReserveTransaction'
+        if (authorizeAction.instrument.typeOf === chevre.factory.assetTransactionType.COAReserveTransaction
             || (<any>authorizeAction.instrument).identifier === chevre.factory.service.webAPI.Identifier.COA) {
             migrated = true;
         } else {

package/lib/chevre/service/offer/event/factory.js

@@ -88,10 +88,24 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         // },
         typeOf: event.typeOf
     };
+    const object = {
+        typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+        event: authorizeObjectEvent
+        // pendingTransaction: params.pendingTransaction, // discontinue(2024-06-22~)
+        // ...(params.broker !== undefined) ? { broker: params.broker } : undefined // discontinue(2024-06-24~)
+        // useResultAcceptedOffers: false // discontinue(2024-06-24~)
+        // acceptedOffer: acceptedOffers // discontinue(2024-06-19~)
+    };
+    const instrument = {
+        // typeOf: 'WebAPI',
+        typeOf: factory.assetTransactionType.Reserve,
+        identifier: factory.service.webAPI.Identifier.Chevre,
+        transactionNumber: params.instrument.transactionNumber
+    };
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        object: Object.assign(Object.assign({ typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation, event: authorizeObjectEvent }, (params.broker !== undefined) ? { broker: params.broker } : undefined), { useResultAcceptedOffers: false }),
+        object,
         agent: {
             id: transaction.seller.id,
             typeOf: transaction.seller.typeOf,
@@ -104,12 +118,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
             id: transaction.agent.id
         },
         purpose: { typeOf: transaction.typeOf, id: transaction.id },
-        instrument: {
-            // typeOf: 'WebAPI',
-            typeOf: factory.assetTransactionType.Reserve,
-            identifier: factory.service.webAPI.Identifier.Chevre,
-            transactionNumber: params.instrument.transactionNumber
-        }
+        instrument
     };
 }
 exports.createAuthorizeSeatReservationActionAttributes = createAuthorizeSeatReservationActionAttributes;

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -63,7 +63,7 @@ function acceptOffer(params) {
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
             potentialActions: params.potentialActions,
             instrument: {
-                typeOf: 'COAReserveTransaction'
+                typeOf: factory.assetTransactionType.COAReserveTransaction
                 // requestBody: updTmpReserveSeatArgs // discontinue(2024-06-11~)
             }
         };
@@ -136,7 +136,7 @@ function reAcceptOffer(params) {
             purpose: { id: transaction.id, typeOf: transaction.typeOf },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' },
             potentialActions: params.potentialActions,
-            instrument: { typeOf: 'COAReserveTransaction' }
+            instrument: { typeOf: factory.assetTransactionType.COAReserveTransaction }
         };
         let acceptedOffer;
         const action = yield repos.action.start(actionAttributes);

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -48,7 +48,7 @@ function authorize(params) {
             timeBegin: params.result.requestBody.timeBegin,
             tmpReserveNum: params.result.responseBody.tmpReserveNum,
             transactionNumber: params.result.responseBody.tmpReserveNum,
-            typeOf: 'COAReserveTransaction'
+            typeOf: factory.assetTransactionType.COAReserveTransaction
         };
         try {
             // イベント取得属性最適化(2023-01-23~)

package/lib/chevre/service/offer/eventServiceByCOA/factory.js

@@ -25,8 +25,14 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         id: params.acceptAction.id,
         // acceptedOffer: params.acceptedOffers, // discontinue acceptedOffers(2024-06-21~)
         event: authorizeObjectEvent,
-        pendingTransaction: params.pendingTransaction,
-        useResultAcceptedOffers: false
+        pendingTransaction: params.pendingTransaction
+        // useResultAcceptedOffers: false // discontinue(2024-06-24~)
+    };
+    const instrument = {
+        // typeOf: 'WebAPI',
+        typeOf: factory.assetTransactionType.COAReserveTransaction,
+        identifier: factory.service.webAPI.Identifier.COA,
+        transactionNumber: params.pendingTransaction.transactionNumber
     };
     return {
         project: transaction.project,
@@ -44,12 +50,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
             id: transaction.agent.id
         },
         purpose: { typeOf: transaction.typeOf, id: transaction.id },
-        instrument: {
-            // typeOf: 'WebAPI',
-            typeOf: 'COAReserveTransaction',
-            identifier: factory.service.webAPI.Identifier.COA,
-            transactionNumber: params.pendingTransaction.transactionNumber
-        }
+        instrument
     };
 }
 exports.createAuthorizeSeatReservationActionAttributes = createAuthorizeSeatReservationActionAttributes;

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

@@ -51,7 +51,7 @@ function onAssetTransactionStatusChanged(params) {
                             }
                         }
                         break;
-                    case 'COAReserveTransaction':
+                    case factory.assetTransactionType.COAReserveTransaction:
                         if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
                             // 基本的に1注文に1予約番号なのでdeliverable = true
                             const deliverable = true;

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

@@ -99,7 +99,7 @@ function createConfirmReservationActionObject4COAByOrder(params) {
         return {
             optimized: true,
             transactionNumber: reservationNumber,
-            typeOf: 'COAReserveTransaction'
+            typeOf: factory.assetTransactionType.COAReserveTransaction
         };
     });
 }

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

@@ -100,7 +100,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                 // instrument廃止(2024-03-13~)
                 // instrument: {
                 //     typeOf: 'WebAPI',
-                //     identifier: (confirmObject.typeOf === 'COAReserveTransaction')
+                //     identifier: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction)
                 //         ? factory.service.webAPI.Identifier.COA
                 //         : factory.service.webAPI.Identifier.Chevre
                 // }
@@ -111,7 +111,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                 project: order.project,
                 name: factory.taskName.ConfirmReserveTransaction,
                 status: factory.taskStatus.Ready,
-                runsAt: (confirmObject.typeOf === 'COAReserveTransaction') ? taskRunsAt4coa : taskRunsAt,
+                runsAt: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],

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

@@ -105,7 +105,7 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
                         theaterCode: superEventLocationBranchCode,
                         reserveNum: reservationNumber,
                         telNum: telNum,
-                        typeOf: 'COAReserveTransaction'
+                        typeOf: factory.assetTransactionType.COAReserveTransaction
                     },
                     agent: order.project,
                     purpose: simpleOrder,
@@ -131,7 +131,7 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
             project: order.project,
             name: factory.taskName.ReturnReserveTransaction,
             status: factory.taskStatus.Ready,
-            runsAt: (returnReserveTransactionAction.object.typeOf === 'COAReserveTransaction')
+            runsAt: (returnReserveTransactionAction.object.typeOf === factory.assetTransactionType.COAReserveTransaction)
                 ? taskRunsAt4coa
                 : taskRunsAt,
             remainingNumberOfTries: 10,

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPlacingOrder = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
-const settings_1 = require("../../../settings");
 const result_1 = require("../../transaction/placeOrderInProgress/result");
 const orderedItem_1 = require("../../transaction/placeOrderInProgress/result/orderedItem");
 function createPlacingOrder(params) {
@@ -15,7 +14,7 @@ function createPlacingOrder(params) {
     }
     // const orderedItems: factory.order.IOrderedItem[]
     //     = (Array.isArray(orderByTransaction.orderedItem)) ? orderByTransaction.orderedItem : [];
-    const customer = (0, result_1.createCustomer)({ transaction });
+    // const customer = createCustomer({ transaction }); // no overwrite(2024-06-24~)
     const seller = (0, result_1.createSeller)({ transaction });
     const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
     const broker = (typeof ((_b = transaction.object.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? transaction.object.broker : undefined;
@@ -45,14 +44,13 @@ function createPlacingOrder(params) {
         productAcceptedOffers,
         moneyTransferAcceptedOffers
     });
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, orderByTransaction), { seller,
+    return Object.assign(Object.assign(Object.assign(Object.assign({}, orderByTransaction), { seller,
         paymentMethods,
         price, orderDate: moment(orderByTransaction.orderDate)
             .toDate(), 
         // orderedItem: orderedItems,
-        orderedItem }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined), (settings_1.USE_EXPERIMENTAL_FEATURE)
-        ? {} // 上書きしないケースに対応
-        : { customer } // 2024-06-17~
+        orderedItem }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined // 2024-06-17~
+    // customer // no overwrite(2024-06-24~)
     // discontinue(2024-06-17~)
     // ...(params.dateReturned !== null && params.dateReturned !== undefined)
     //     ? {

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

@@ -134,14 +134,14 @@ function confirmReserveTransaction(params, options) {
         // let updReserveResult: COA.factory.reserve.IUpdReserveResult | undefined;
         let recipe;
         switch (params.object.typeOf) {
-            case 'COAReserveTransaction':
+            case factory.assetTransactionType.COAReserveTransaction:
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
                 const order = yield fixOrderAsPurpose({
                     project: { id: params.project.id },
                     purpose: params.purpose
                 })(repos);
                 const updReserveArgs = createConfirmObject4COAByOrder({ order, reservationNumber: params.object.transactionNumber });
-                const object4coa = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: 'COAReserveTransaction' });
+                const object4coa = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: factory.assetTransactionType.COAReserveTransaction });
                 confirmActionObject = object4coa;
                 recipe = (0, factory_1.processConfirmCOAReserveResult2recipe)({
                     processConfirmCOAReserveResult: { updReserveArgs: object4coa },
@@ -159,7 +159,7 @@ function confirmReserveTransaction(params, options) {
         try {
             const object = confirmActionAttributes.object;
             switch (object.typeOf) {
-                case 'COAReserveTransaction':
+                case factory.assetTransactionType.COAReserveTransaction:
                     // COA本予約
                     const processConfirmCOAReserveResult = yield COAReserveService.confirm({
                         project: { id: confirmActionAttributes.project.id },

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

@@ -15,7 +15,6 @@ const moment = require("moment");
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
 const availableProductTypes_1 = require("../../../factory/availableProductTypes");
-const settings_1 = require("../../../settings");
 const potentialActions_1 = require("./potentialActions");
 const publishCode_1 = require("./publishCode");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
@@ -27,12 +26,11 @@ const debug = createDebug('chevre-domain:service:transaction');
 function processTransactionNotInProgress(transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (transaction.status === factory.transactionStatusType.Confirmed) {
-            let resultCustomer = (0, result_1.createCustomer)({ transaction });
-            if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-                resultCustomer = yield repos.orderInTransaction.findCustomerByOrderNumber({
-                    orderNumber: { $eq: String(transaction.object.orderNumber) }
-                });
-            }
+            // retrieve customer from orderInTransaction(2024-06-24~)
+            // let resultCustomer: factory.order.ICustomer | undefined = createCustomer({ transaction });
+            const resultCustomer = yield repos.orderInTransaction.findCustomerByOrderNumber({
+                orderNumber: { $eq: String(transaction.object.orderNumber) }
+            });
             if (resultCustomer === undefined) {
                 throw new factory.errors.ServiceUnavailable('resultCustomer undefined'); // impossible process
             }
@@ -107,14 +105,13 @@ function confirm(params) {
                 transactionNumber: { $in: payTransactionNumbers }
             }, ['object']);
         }
+        // retrieve customer from orderInTransaction(2024-06-24~)
+        // let customer: factory.order.ICustomer = createCustomer({ transaction });
+        const customer = yield repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
+        const seller = (0, result_1.createSeller)({ transaction });
         const { paymentMethods, result, eventId, reservationIds } = createResult(Object.assign(Object.assign(Object.assign({}, params), { orderNumber, transaction,
             authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions,
-            acceptedOffers, payTransactions }), (typeof code === 'string') ? { code } : undefined));
-        let customer = (0, result_1.createCustomer)({ transaction });
-        if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-            customer = yield repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
-        }
-        const seller = (0, result_1.createSeller)({ transaction });
+            acceptedOffers, payTransactions, customer }), (typeof code === 'string') ? { code } : undefined));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -285,7 +282,7 @@ function createResult(params) {
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers, params.payTransactions);
+    (0, validation_1.validateTransaction)(transaction, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer);
     const { paymentMethods, price } = (0, result_1.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,

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

@@ -15,13 +15,10 @@ declare function createOrder(params: {
 declare function createSeller(params: {
     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'seller'>;
 }): factory.order.ISeller;
-declare function createCustomer(params: {
-    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object'>;
-}): factory.order.ICustomer;
 declare function createPaymentMethods(params: {
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
 }): {
     paymentMethods: factory.order.IReferencedInvoice[];
     price: number;
 };
-export { createOrder, createCustomer, createSeller, createPaymentMethods };
+export { createOrder, createSeller, createPaymentMethods };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPaymentMethods = exports.createSeller = exports.createCustomer = exports.createOrder = void 0;
+exports.createPaymentMethods = exports.createSeller = exports.createOrder = void 0;
 const factory = require("../../../factory");
 // import { acceptedOffers2orderedItem } from './result/orderedItem';
 /**
@@ -52,25 +52,30 @@ function createSeller(params) {
     };
 }
 exports.createSeller = createSeller;
-function createCustomer(params) {
-    // transaction.object.customerはstart時点でapiが自動的に指定、あるいは、その後クライアントから変更されるか
-    const customerByTransaction = params.transaction.object.customer;
-    if (typeof (customerByTransaction === null || customerByTransaction === void 0 ? void 0 : customerByTransaction.id) !== 'string') {
-        throw new factory.errors.Argument('transaction', 'object.customer.id undefined');
-    }
-    if (typeof (customerByTransaction === null || customerByTransaction === void 0 ? void 0 : customerByTransaction.typeOf) !== 'string') {
-        throw new factory.errors.Argument('transaction', 'object.customer.typeOf undefined');
-    }
-    const customerName = (typeof customerByTransaction.name === 'string' && customerByTransaction.name.length > 0)
-        ? customerByTransaction.name
-        : `${customerByTransaction.givenName} ${customerByTransaction.familyName}`;
-    // customer.nameが必ず存在するように
-    if (customerName.length === 0) {
-        throw new factory.errors.Argument('object.customer', 'customer name length: 0');
-    }
-    return Object.assign(Object.assign({}, customerByTransaction), { identifier: (Array.isArray(customerByTransaction.identifier)) ? customerByTransaction.identifier : [], name: customerName });
-}
-exports.createCustomer = createCustomer;
+// function createCustomer(params: {
+//     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object'>;
+// }): factory.order.ICustomer {
+//     // transaction.object.customerはstart時点でapiが自動的に指定、あるいは、その後クライアントから変更されるか
+//     const customerByTransaction = params.transaction.object.customer;
+//     if (typeof customerByTransaction?.id !== 'string') {
+//         throw new factory.errors.Argument('transaction', 'object.customer.id undefined');
+//     }
+//     if (typeof customerByTransaction?.typeOf !== 'string') {
+//         throw new factory.errors.Argument('transaction', 'object.customer.typeOf undefined');
+//     }
+//     const customerName: string = (typeof customerByTransaction.name === 'string' && customerByTransaction.name.length > 0)
+//         ? customerByTransaction.name
+//         : `${customerByTransaction.givenName} ${customerByTransaction.familyName}`;
+//     // customer.nameが必ず存在するように
+//     if (customerName.length === 0) {
+//         throw new factory.errors.Argument('object.customer', 'customer name length: 0');
+//     }
+//     return {
+//         ...customerByTransaction,
+//         identifier: (Array.isArray(customerByTransaction.identifier)) ? customerByTransaction.identifier : [],
+//         name: customerName
+//     };
+// }
 function createPaymentMethods(params) {
     const paymentMethods = [];
     let price = 0;

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

@@ -10,7 +10,7 @@ export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'o
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[]): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証

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

@@ -13,8 +13,9 @@ const debug = createDebug('chevre-domain:service:transaction');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions) {
-    validateProfile(transaction);
+function validateTransaction(transaction, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
+    // validateProfile(transaction);
+    validateProfile({ customer });
     validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
     // 利用可能な通貨単位に対して取引検証
     validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions);
@@ -89,9 +90,20 @@ function findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentAction
     // ];
     return [...new Set(paymentMethodTypes)];
 }
-function validateProfile(transaction) {
-    // object.customerで検証(2022-05-26~)
-    const profile = transaction.object.customer;
+// function validateProfile(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object'>) {
+//     // object.customerで検証(2022-05-26~)
+//     const profile = transaction.object.customer;
+//     const profileSatisfied = typeof profile?.typeOf === 'string' && profile.typeOf.length > 0
+//         && typeof profile.email === 'string' && profile.email.length > 0
+//         && typeof profile.familyName === 'string' && profile.familyName.length > 0
+//         && typeof profile.givenName === 'string' && profile.givenName.length > 0
+//         && typeof profile.telephone === 'string' && profile.telephone.length > 0;
+//     if (!profileSatisfied) {
+//         throw new factory.errors.Argument('Transaction', 'Customer Profile Required');
+//     }
+// }
+function validateProfile(params) {
+    const profile = params.customer;
     const profileSatisfied = typeof (profile === null || profile === void 0 ? void 0 : profile.typeOf) === 'string' && profile.typeOf.length > 0
         && typeof profile.email === 'string' && profile.email.length > 0
         && typeof profile.familyName === 'string' && profile.familyName.length > 0
@@ -100,6 +112,10 @@ function validateProfile(transaction) {
     if (!profileSatisfied) {
         throw new factory.errors.Argument('Transaction', 'Customer Profile Required');
     }
+    // customer.nameが必ず存在するように
+    if (typeof profile.name !== 'string' && profile.name === '') {
+        throw new factory.errors.Argument('Transaction', 'customer name required');
+    }
 }
 function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions) {
     let priceByAgent = 0;

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

@@ -26,7 +26,7 @@ export declare function updateAgent(params: {
      * 取引ID
      */
     id: string;
-    agent: factory.transaction.placeOrder.ICustomer & {
+    agent: factory.order.ICustomer & {
         telephoneRegion?: string;
     };
 }): (repos: {

package/lib/chevre/service/transaction.js

@@ -68,11 +68,16 @@ function fixCustomer(params) {
 function updateAgent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const { customer, transaction } = yield fixCustomer(params)(repos);
-        const newAgent = {
-            // typeOf: transaction.agent.typeOf,
-            id: transaction.agent.id
-        };
-        yield repos.transaction.updateAgent(Object.assign({ typeOf: params.typeOf, id: params.id, agent: newAgent }, (customer !== undefined) ? { object: { customer } } : undefined));
+        // const newAgent: Pick<factory.transaction.placeOrder.IAgent, 'id'> = {
+        //     id: transaction.agent.id
+        // };
+        // discontinue saving in transaction(2024-06-24~)
+        // await repos.transaction.updateAgent({
+        //     typeOf: params.typeOf,
+        //     id: params.id,
+        //     agent: newAgent,
+        //     ...(customer !== undefined) ? { object: { customer } } : undefined
+        // });
         // also save in orderInTransaction(2024-06-20~)
         if (customer !== undefined) {
             const orderNumber = yield PlaceOrderInProgressTransactionService.publishOrderNumberIfNotExist({

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.375.0-alpha.18",
+    "@chevre/factory": "4.375.0-alpha.20",
     "@cinerino/sdk": "7.3.0-alpha.2",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.26"
+  "version": "21.35.0-alpha.28"
 }