@chevre/domain 21.35.0-alpha.8 → 21.35.0

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) {
-    validateProfile(transaction);
+function validateTransaction(transaction, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
+    // validateProfile(transaction);
+    validateProfile({ customer });
     validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
     // 利用可能な通貨単位に対して取引検証
     validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions);
@@ -33,9 +34,17 @@ function validateTransaction(transaction, authorizePaymentActions, authorizeEven
                         // 決済方法区分は必ず存在するはず(2023-08-15~)
                         && ((_a = resultAsInvoice.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethodType;
                 });
+                // 決済承認アクションobject.movieTicketsではなく、payTransaction.object参照で再実装(2024-06-20~)
                 const authorizedMovieTickets = [];
-                authorizeMovieTicketActions.forEach((a) => {
-                    authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
+                // authorizeMovieTicketActions.forEach((a) => {
+                //     authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
+                // });
+                const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
+                payTransactions.filter(({ object }) => payTransactionNumbers.includes(object.paymentMethodId))
+                    .forEach(({ object }) => {
+                    if (Array.isArray(object.paymentMethod.movieTickets)) {
+                        authorizedMovieTickets.push(...object.paymentMethod.movieTickets);
+                    }
                 });
                 debug(authorizedMovieTickets.length, 'movie tickets authorized', 'transaction:', transaction.id);
                 // validateMovieTicket(paymentMethodType, { id: transaction.id }, authorizePaymentActions, eventReservationAcceptedOffers);
@@ -81,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
@@ -92,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;
@@ -186,14 +210,16 @@ function validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOf
         const requiredMonetaryAmount = requiredMonetaryAmountByCurrencyType
             .filter((m) => m.currency === currencyType)
             .reduce((a, b) => a + b.value, 0);
-        const authorizedMonetaryAmount = authorizeMonetaryAmountActions.filter(({ result }) => {
+        let authorizedMonetaryAmount = 0;
+        authorizeMonetaryAmountActions.forEach(({ result }) => {
             var _a;
             const resultAsInvoice = (Array.isArray(result))
                 ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
                 : undefined;
-            return ((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === currencyType;
-        })
-            .reduce((a, b) => a + b.object.amount, 0);
+            if (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === currencyType) {
+                authorizedMonetaryAmount += resultAsInvoice.totalPaymentDue.value;
+            }
+        });
         return requiredMonetaryAmount === authorizedMonetaryAmount;
     });
     if (!requireMonetaryAmountSatisfied) {
@@ -325,21 +351,16 @@ function validateEventOffers(params) {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
+    // tslint:disable-next-line:max-func-body-length
     params.authorizeEventServiceOfferActions.forEach((a) => {
-        // オファーIDごとにオファー適用条件を確認
-        const offerIds = [...new Set(a.object.acceptedOffer.map((o) => o.id))];
-        offerIds.forEach((offerId) => {
-            var _a, _b, _c, _d;
-            let unitPriceSpec;
-            if (a.instrument.identifier === factory.service.webAPI.Identifier.Chevre) {
-                const acceptedOffer = a.object.acceptedOffer.find((o) => o.id === offerId);
-                if (acceptedOffer === undefined) {
-                    throw new factory.errors.ServiceUnavailable(`authorizeEventServiceOfferAction.object.acceptedOffer not found. [id:${offerId}]`);
-                }
-                // Chevre予約の場合、priceSpecificationに複合価格仕様が含まれるので、そこから単価仕様を取り出す
-                unitPriceSpec = acceptedOffer.priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-                    && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
-                );
+        var _a;
+        // support result.offers(2024-06-18~)
+        const acceptedOffersInResult = (_a = a.result) === null || _a === void 0 ? void 0 : _a.offers;
+        if (Array.isArray(acceptedOffersInResult) && acceptedOffersInResult.length > 0) {
+            acceptedOffersInResult.forEach((acceptedOfferInResult) => {
+                var _a, _b, _c, _d;
+                const offerId = acceptedOfferInResult.id;
+                const unitPriceSpec = acceptedOfferInResult.priceSpecification;
                 // 適用金額要件を満たしていなければエラー
                 const eligibleTransactionVolumePrice = (_a = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _a === void 0 ? void 0 : _a.price;
                 const eligibleTransactionVolumePriceCurrency = (_b = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _b === void 0 ? void 0 : _b.priceCurrency;
@@ -350,33 +371,38 @@ function validateEventOffers(params) {
                 }
                 // 適用数量検証(全興行オファー承認アクションについて)(2023-11-15~)
                 // 適用数量要件を満たしていなければエラー
-                const numAcceptedOffersByOfferId = params.authorizeEventServiceOfferActions.reduce((previousNumOffer, currentAction) => {
-                    return previousNumOffer + currentAction.object.acceptedOffer.filter((o) => o.id === offerId).length;
+                const numAcceptedOffersByOfferId = params.authorizeEventServiceOfferActions.reduce((previousNumOffer, { result }) => {
+                    var _a, _b;
+                    const numOfferOnCurrentAction = (_b = (_a = result === null || result === void 0 ? void 0 : result.offers) === null || _a === void 0 ? void 0 : _a.find(({ id }) => id === offerId)) === null || _b === void 0 ? void 0 : _b.includesObject.amountOfThisGood;
+                    return previousNumOffer + ((typeof numOfferOnCurrentAction === 'number') ? numOfferOnCurrentAction : 0);
                 }, 0);
                 const eligibleQuantityMaxValue = (_c = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) === null || _c === void 0 ? void 0 : _c.maxValue;
                 if (typeof eligibleQuantityMaxValue === 'number') {
+                    debug('validateEventOffers: numAcceptedOffersByOfferId > eligibleQuantityMaxValue?', numAcceptedOffersByOfferId, eligibleQuantityMaxValue);
                     if (numAcceptedOffersByOfferId > eligibleQuantityMaxValue) {
                         throw new factory.errors.Argument('Transaction', `Number of offer:${offerId} must be less than or equal to ${eligibleQuantityMaxValue}`);
                     }
                 }
                 const eligibleQuantityMinValue = (_d = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) === null || _d === void 0 ? void 0 : _d.minValue;
                 if (typeof eligibleQuantityMinValue === 'number') {
+                    debug('validateEventOffers: numAcceptedOffersByOfferId < eligibleQuantityMinValue?', numAcceptedOffersByOfferId, eligibleQuantityMinValue);
                     if (numAcceptedOffersByOfferId < eligibleQuantityMinValue) {
                         throw new factory.errors.Argument('Transaction', `Number of offer:${offerId} must be more than or equal to ${eligibleQuantityMinValue}`);
                     }
                 }
                 // 利用可能決済方法検証(2023-11-15~)
-                if (Array.isArray(acceptedOffer.acceptedPaymentMethod)) {
-                    const acceptedPaymentMethodTypes = acceptedOffer.acceptedPaymentMethod.map((paymentMethod) => paymentMethod.identifier);
+                if (Array.isArray(acceptedOfferInResult.acceptedPaymentMethod)) {
+                    const acceptedPaymentMethodTypes = acceptedOfferInResult.acceptedPaymentMethod.map(({ identifier }) => identifier);
                     const satisfyAcceptedPaymentMethod = numCreditCardOrFaceToFacePaymentMethod === 1
                         && typeof firstCreditCardPaymentMethodIdentifier === 'string'
                         && acceptedPaymentMethodTypes.includes(firstCreditCardPaymentMethodIdentifier);
+                    debug('validateEventOffers: satisfyAcceptedPaymentMethod?', JSON.stringify(acceptedPaymentMethodTypes));
                     if (!satisfyAcceptedPaymentMethod) {
                         throw new factory.errors.Argument('Transaction', `acceptedPaymentMethod requirement not satisfied`);
                     }
                 }
-            }
-        });
+            });
+        }
     });
 }
 exports.validateEventOffers = validateEventOffers;

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -49,24 +49,24 @@ function createReturnInvoicePotentialActions(params) {
                 email: emailCustomization,
                 paymentMethodId: params.paymentMethod.paymentMethodId
             });
-            const sendActionPurpose = {
-                typeOf: order.typeOf,
-                orderNumber: order.orderNumber,
-                price: order.price,
-                priceCurrency: order.priceCurrency,
-                orderDate: order.orderDate
-            };
+            // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
+            //     typeOf: order.typeOf,
+            //     orderNumber: order.orderNumber,
+            //     price: order.price,
+            //     priceCurrency: order.priceCurrency,
+            //     orderDate: order.orderDate
+            // };
             sendEmailMessageOnRefund.push({
-                project: order.project,
-                typeOf: factory.actionType.SendAction,
-                object: emailMessage,
-                agent: order.project,
-                recipient: {
-                    typeOf: order.customer.typeOf,
-                    id: order.customer.id
-                },
-                potentialActions: {},
-                purpose: sendActionPurpose
+                // project: order.project, // discontinue(2024-06-26~)
+                // typeOf: factory.actionType.SendAction, // discontinue(2024-06-26~)
+                object: emailMessage
+                // agent: order.project, // discontinue(2024-06-26~)
+                // recipient: { // discontinue(2024-06-26~)
+                //     typeOf: order.customer.typeOf,
+                //     id: order.customer.id
+                // },
+                // potentialActions: {}, // discontinue(2024-06-25~)
+                // purpose: sendActionPurpose // discontinue(2024-06-26~)
             });
         }
         return {
@@ -76,15 +76,15 @@ function createReturnInvoicePotentialActions(params) {
 }
 function createReturnPaymentMethodActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const order = params.order;
+        // const order = params.order;
         const potentialReturnInvoiceActions = [];
-        const returnPaymentMethodPurpose = {
-            typeOf: order.typeOf,
-            orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
-            orderDate: order.orderDate
-        };
+        // const returnPaymentMethodPurpose: factory.order.ISimpleOrder = {
+        //     typeOf: order.typeOf,
+        //     orderNumber: order.orderNumber,
+        //     price: order.price,
+        //     priceCurrency: order.priceCurrency,
+        //     orderDate: order.orderDate
+        // };
         // MovieTicket決済以外について返品ポリシーのreturnFeesを適用する(2022-08-10~)
         const returnFees = params.transaction.object.returnPolicy.returnFees;
         // ReturnFeesCustomerResponsibilityであれば返金はなし、それ以外は返金する
@@ -102,19 +102,21 @@ function createReturnPaymentMethodActions(params) {
                         : undefined));
                     const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
                     const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
-                    return {
-                        project: order.project,
-                        typeOf: factory.actionType.ReturnAction,
-                        object,
-                        agent: order.project,
-                        recipient: {
-                            typeOf: order.customer.typeOf,
-                            id: order.customer.id,
-                            name: String(order.customer.name)
-                        },
-                        purpose: returnPaymentMethodPurpose,
-                        potentialActions: potentialActionsOnRefund
-                    };
+                    // optimize(2024-06-19~)
+                    return { object, potentialActions: potentialActionsOnRefund };
+                    // return {
+                    //     project: order.project,
+                    //     typeOf: factory.actionType.ReturnAction,
+                    //     object,
+                    //     agent: order.project,
+                    //     recipient: {
+                    //         typeOf: order.customer.typeOf,
+                    //         id: order.customer.id,
+                    //         name: String(order.customer.name)
+                    //     },
+                    //     purpose: returnPaymentMethodPurpose,
+                    //     potentialActions: potentialActionsOnRefund
+                    // };
                 }))));
         }
         // MovieTicket決済について
@@ -128,7 +130,7 @@ exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
  */
 function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const order = params.order;
+        // const order = params.order;
         const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
         return Promise.all(params.order.paymentMethods
             .filter((invoice) => {
@@ -170,25 +172,27 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
                 : undefined));
             const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
             const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
-            return {
-                project: order.project,
-                typeOf: factory.actionType.ReturnAction,
-                object,
-                agent: order.project,
-                recipient: {
-                    typeOf: order.customer.typeOf,
-                    id: order.customer.id,
-                    name: String(order.customer.name)
-                },
-                purpose: {
-                    typeOf: order.typeOf,
-                    orderNumber: order.orderNumber,
-                    price: order.price,
-                    priceCurrency: order.priceCurrency,
-                    orderDate: order.orderDate
-                },
-                potentialActions: potentialActionsOnRefund
-            };
+            // optimize(2024-06-19~)
+            return { object, potentialActions: potentialActionsOnRefund };
+            // return {
+            //     project: order.project,
+            //     typeOf: factory.actionType.ReturnAction,
+            //     object,
+            //     agent: order.project,
+            //     recipient: {
+            //         typeOf: order.customer.typeOf,
+            //         id: order.customer.id,
+            //         name: String(order.customer.name)
+            //     },
+            //     purpose: {
+            //         typeOf: order.typeOf,
+            //         orderNumber: order.orderNumber,
+            //         price: order.price,
+            //         priceCurrency: order.priceCurrency,
+            //         orderDate: order.orderDate
+            //     },
+            //     potentialActions: potentialActionsOnRefund
+            // };
         })));
     });
 }

package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.d.ts

@@ -1,6 +1,8 @@
 import * as factory from '../../../../factory';
+type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: factory.order.IOrder;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}): Promise<factory.action.transfer.send.message.email.IAttributes[]>;
+}): Promise<IPotentialSendEmailMessageAction[]>;
+export {};

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

@@ -11,26 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessaegActionsOnReturn = void 0;
 const emailMessageBuilder = require("../../../../emailMessageBuilder");
-const factory = require("../../../../factory");
-// import { createMaskedCustomer } from '../../../../factory/order';
 function createSendEmailMessaegActionsOnReturn(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
-        const sendActionPurpose = {
-            typeOf: order.typeOf,
-            // seller: {
-            //     id: order.seller.id,
-            //     typeOf: order.seller.typeOf,
-            //     name: order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // mask
-            // customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
-            orderNumber: order.orderNumber,
-            price: order.price,
-            priceCurrency: order.priceCurrency,
-            orderDate: order.orderDate
-        };
+        // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
+        //     typeOf: order.typeOf,
+        //     orderNumber: order.orderNumber,
+        //     price: order.price,
+        //     priceCurrency: order.priceCurrency,
+        //     orderDate: order.orderDate
+        // };
         // 返品後のEメール送信アクション
         const sendEmailMessaegActionsOnReturn = [];
         const sendEmailMessage = (_b = (_a = params.returnOrderActionParams) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.sendEmailMessage;
@@ -40,17 +31,13 @@ function createSendEmailMessaegActionsOnReturn(params) {
                     ? { emailMessage: params.emailMessageOnOrderReturned }
                     : undefined));
                 return {
-                    project: order.project,
-                    typeOf: factory.actionType.SendAction,
-                    object: emailMessage,
-                    agent: order.project,
-                    recipient: {
-                        typeOf: order.customer.typeOf,
-                        id: order.customer.id
-                        // name: String(order.customer.name)
-                    },
-                    potentialActions: {},
-                    purpose: sendActionPurpose
+                    // project: order.project, // optimize(2024-06-25~)
+                    // typeOf: factory.actionType.SendAction, // optimize(2024-06-25~)
+                    object: emailMessage
+                    // agent: order.project, // optimize(2024-06-25~)
+                    // recipient: { typeOf: order.customer.typeOf, id: order.customer.id }, // optimize(2024-06-25~)
+                    // potentialActions: {} // optimize(2024-06-25~)
+                    // purpose: sendActionPurpose // optimize(2024-06-25~)
                 };
             }))));
         }

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -91,11 +91,8 @@ function preStart(params) {
         validateAppliedReturnPolicy({ merchantReturnPolicy: appliedReturnPolicy });
         // アイテム検証
         yield validateItems({ orders, reason: params.object.reason })({ order: repos.order, reservation: repos.reservation });
-        const transactionObject = {
-            order: orders.map(({ confirmationNumber, orderNumber }) => ({ confirmationNumber, orderNumber })),
-            returnPolicy: appliedReturnPolicy,
-            reason: params.object.reason
-        };
+        const transactionObject = Object.assign({ order: orders.map(({ confirmationNumber, orderNumber }) => ({ confirmationNumber, orderNumber })), returnPolicy: appliedReturnPolicy, reason: params.object.reason }, { usedReservationExists } // for debug(2024-06-26~)
+        );
         // fix expiresInSeconds(2022-11-30~)
         let expiresInSeconds;
         if (typeof params.expiresInSeconds === 'number') {
@@ -286,7 +283,8 @@ function getReturnPolicyByProject(params) {
     return __awaiter(this, void 0, void 0, function* () {
         // implement with fetch(2024-01-20~)
         try {
-            const res = yield fetch(params.sameAs, {
+            const { identifier, sameAs } = params;
+            const res = yield fetch(sameAs, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json'
@@ -314,14 +312,11 @@ function getReturnPolicyByProject(params) {
                         throw new Error('invalid return policy');
                     }
                     else {
-                        returnPolicy = {
-                            typeOf: 'MerchantReturnPolicy',
-                            restockingFee: {
+                        returnPolicy = Object.assign({ typeOf: 'MerchantReturnPolicy', restockingFee: {
                                 currency: factory.priceCurrency.JPY,
                                 typeOf: 'MonetaryAmount',
                                 value: body.restockingFee.value
-                            }
-                        };
+                            } }, (typeof identifier === 'string') ? { identifier } : undefined);
                     }
                     break;
                 case http_status_1.NOT_FOUND:
@@ -344,13 +339,14 @@ function getReturnPolicyByProject(params) {
  */
 // tslint:disable-next-line:max-func-body-length
 function findApplicableReturnPolicy(params) {
-    var _a, _b;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
             // 販売者都合の場合、手数料なしの返金返品ポリシーを適用
             return {
                 typeOf: 'MerchantReturnPolicy',
                 returnFees: factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn
+                // no identifier in this case
             };
         }
         const returnPolicies = params.returnPolicies;
@@ -360,6 +356,7 @@ function findApplicableReturnPolicy(params) {
             const returnPolicySameAsByPoject = (_a = params.returnPolicySettingsByProject) === null || _a === void 0 ? void 0 : _a.sameAs;
             if (typeof returnPolicySameAsByPoject === 'string' && returnPolicySameAsByPoject.length > 0) {
                 const returnPolicyByProject = yield getReturnPolicyByProject({
+                    identifier: (_b = params.returnPolicySettingsByProject) === null || _b === void 0 ? void 0 : _b.identifier,
                     sameAs: returnPolicySameAsByPoject,
                     order: Object.assign(Object.assign({}, params.orders[0]), { acceptedOffers: params.acceptedOffers })
                 });
@@ -399,23 +396,24 @@ function findApplicableReturnPolicy(params) {
             const appliedReturnPolicyRestockingFee = (typeof appliedReturnPolicyRestockingFeeValue === 'number')
                 ? appliedReturnPolicyRestockingFeeValue
                 : 0;
-            const restockingFee = (typeof restockingFeeValue === 'number') ? restockingFeeValue : 0;
-            if (restockingFee < appliedReturnPolicyRestockingFee) {
+            const restockingFeeAsNumber = (typeof restockingFeeValue === 'number') ? restockingFeeValue : 0;
+            if (restockingFeeAsNumber < appliedReturnPolicyRestockingFee) {
                 appliedReturnPolicy = returnPolicy;
             }
         });
         let appliedItemCondition;
-        const appliedItemConditionId = (_b = appliedReturnPolicy.itemCondition) === null || _b === void 0 ? void 0 : _b.id;
+        const appliedItemConditionId = (_c = appliedReturnPolicy.itemCondition) === null || _c === void 0 ? void 0 : _c.id;
         if (typeof appliedItemConditionId === 'string') {
             appliedItemCondition = params.offerItemConditions.find((o) => o.id === appliedItemConditionId);
             if (appliedItemCondition === undefined) {
                 throw new factory.errors.NotFound('OfferItemCondition');
             }
         }
-        return Object.assign(Object.assign({ restockingFee: appliedReturnPolicy.restockingFee, returnFees,
-            returnFeesMovieTicket, typeOf: appliedReturnPolicy.typeOf }, (typeof appliedReturnPolicy.merchantReturnDays === 'number')
-            ? { merchantReturnDays: appliedReturnPolicy.merchantReturnDays }
-            : undefined), (typeof (appliedItemCondition === null || appliedItemCondition === void 0 ? void 0 : appliedItemCondition.typeOf) === 'string') ? { itemCondition: appliedItemCondition } : undefined);
+        const { restockingFee, typeOf, identifier, merchantReturnDays } = appliedReturnPolicy;
+        return Object.assign(Object.assign(Object.assign({ restockingFee,
+            returnFees,
+            returnFeesMovieTicket,
+            typeOf }, (typeof identifier === 'string') ? { identifier } : undefined), (typeof merchantReturnDays === 'number') ? { merchantReturnDays } : undefined), (typeof (appliedItemCondition === null || appliedItemCondition === void 0 ? void 0 : appliedItemCondition.typeOf) === 'string') ? { itemCondition: appliedItemCondition } : undefined);
     });
 }
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length

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

@@ -1,4 +1,7 @@
 import * as factory from '../factory';
+import type { MongoRepository as OrderInTransactionRepo } from '../repo/orderInTransaction';
+import type { RedisRepository as OrderNumberRepo } from '../repo/orderNumber';
+import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { MongoRepository as TaskRepo } from '../repo/task';
 import type { MongoRepository as TransactionRepo } from '../repo/transaction';
 import { deleteTransaction } from './transaction/deleteTransaction';
@@ -19,11 +22,19 @@ export { deleteTransaction };
  */
 export declare function updateAgent(params: {
     typeOf: factory.transactionType;
+    /**
+     * 取引ID
+     */
     id: string;
-    agent: factory.transaction.placeOrder.ICustomer & {
+    agent: factory.order.ICustomer & {
         telephoneRegion?: string;
     };
-}): ITransactionOperation<factory.transaction.placeOrder.ICustomer>;
+}): (repos: {
+    orderInTransaction: OrderInTransactionRepo;
+    orderNumber: OrderNumberRepo;
+    project: ProjectRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
 export type IExportTasksOperation<T> = (repos: {
     task: TaskRepo;
     transaction: TransactionRepo;

package/lib/chevre/service/transaction.js

@@ -26,11 +26,7 @@ exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
 exports.placeOrderInProgress = PlaceOrderInProgressTransactionService;
 exports.returnOrder = ReturnOrderTransactionService;
-/**
- * 取引人プロフィール更新
- */
-function updateAgent(params) {
-    // tslint:disable-next-line:cyclomatic-complexity
+function fixCustomer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         let formattedTelephone;
@@ -48,15 +44,10 @@ function updateAgent(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: params.typeOf,
             id: params.id
-        }, ['agent', 'object', 'typeOf']);
+        }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        // 新プロフィール作成
-        const newAgent = {
-            typeOf: transaction.agent.typeOf,
-            id: transaction.agent.id
-        };
         // 注文取引の場合、object.customerにも適用
         let customer;
         if (transaction.typeOf === factory.transactionType.PlaceOrder) {
@@ -68,8 +59,46 @@ function updateAgent(params) {
                     : undefined), (Array.isArray(params.agent.additionalProperty)) ? { additionalProperty: params.agent.additionalProperty } : {}), (typeof params.agent.age === 'string') ? { age: params.agent.age } : {}), (typeof params.agent.address === 'string') ? { address: params.agent.address } : {}), (typeof params.agent.email === 'string') ? { email: params.agent.email } : {}), (typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName } : {}), (typeof params.agent.gender === 'string') ? { gender: params.agent.gender } : {}), (typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName } : {}), (typeof params.agent.name === 'string') ? { name: params.agent.name } : {}), (typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : {}), (typeof params.agent.url === 'string') ? { url: params.agent.url } : {});
             }
         }
-        yield repos.transaction.updateAgent(Object.assign({ typeOf: params.typeOf, id: params.id, agent: newAgent }, (customer !== undefined) ? { object: { customer } } : undefined));
-        return newAgent;
+        return { customer, transaction };
+    });
+}
+/**
+ * 取引人プロフィール更新
+ */
+function updateAgent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { customer, transaction } = yield fixCustomer(params)(repos);
+        // 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({
+                project: { id: transaction.project.id },
+                id: params.id,
+                object: { orderDate: new Date() }
+            })(repos);
+            const customerName = (typeof customer.name === 'string' && customer.name !== '')
+                ? customer.name
+                : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'
+                    && customer.givenName !== '' && customer.familyName !== '')
+                    ? `${customer.givenName} ${customer.familyName}`
+                    : undefined;
+            const customerInOrder = Object.assign(Object.assign(Object.assign({}, customer), { identifier: (Array.isArray(customer.identifier)) ? customer.identifier : [] }), (typeof customerName === 'string') ? { name: customerName } : undefined);
+            yield repos.orderInTransaction.setCustomer({
+                orderNumber,
+                project: transaction.project,
+                customer: customerInOrder
+            });
+        }
+        // return newAgent;
     });
 }
 exports.updateAgent = updateAgent;

package/lib/chevre/service.d.ts

@@ -5,6 +5,7 @@ import * as AccountTransactionIdentifierFactory from './factory/accountTransacti
 import * as EventFactory from './factory/event';
 import * as OrderFactory from './factory/order';
 import * as ReservedAgentIdentifireNamesFactory from './factory/reservedAgentIdentifireNames';
+import * as TaskIdentifierFactory from './factory/taskIdentifier';
 import * as TransactionFactory from './factory/transaction';
 import type * as AccountService from './service/account';
 import type * as AccountTransactionService from './service/accountTransaction';
@@ -85,5 +86,6 @@ export declare namespace factory {
     export import event = EventFactory;
     export import order = OrderFactory;
     export import reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
+    export import taskIdentifier = TaskIdentifierFactory;
     export import transaction = TransactionFactory;
 }

package/lib/chevre/service.js

@@ -17,6 +17,7 @@ const AccountTransactionIdentifierFactory = require("./factory/accountTransactio
 const EventFactory = require("./factory/event");
 const OrderFactory = require("./factory/order");
 const ReservedAgentIdentifireNamesFactory = require("./factory/reservedAgentIdentifireNames");
+const TaskIdentifierFactory = require("./factory/taskIdentifier");
 const TransactionFactory = require("./factory/transaction");
 // import all lazily(2023-10-11~)
 var account;
@@ -264,6 +265,7 @@ var factory;
     // tslint:disable-next-line:no-shadowed-variable
     factory.order = OrderFactory;
     factory.reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
+    factory.taskIdentifier = TaskIdentifierFactory;
     // tslint:disable-next-line:no-shadowed-variable
     factory.transaction = TransactionFactory;
 })(factory = exports.factory || (exports.factory = {}));