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

package/lib/chevre/factory/customerTelephone2COATelNum.d.ts

@@ -0,0 +1,3 @@
+export declare function customerTelephone2COATelNum(params: {
+    telephone: string;
+}): string;

package/lib/chevre/factory/customerTelephone2COATelNum.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.customerTelephone2COATelNum = customerTelephone2COATelNum;
+// import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber';
+const libphonenumber_js_1 = require("libphonenumber-js");
+const factory_1 = require("../factory");
+function customerTelephone2COATelNum(params) {
+    const { telephone } = params;
+    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
+    // const phoneUtil = PhoneNumberUtil.getInstance();
+    // const phoneNumber = phoneUtil.parse(telephone, 'JP');
+    // let telNum = phoneUtil.format(phoneNumber, PhoneNumberFormat.NATIONAL);
+    const phoneNumber = (0, libphonenumber_js_1.parsePhoneNumberFromString)(telephone, 'JP');
+    // isValid検証はgoogle-libphonenumber時代にしていなかったため、ひとまずなし
+    // if (phoneNumber === undefined || !phoneNumber.isValid()) {
+    if (phoneNumber === undefined) {
+        throw new factory_1.factory.errors.Internal(`phoneNumber undefined. telephone: ${telephone}`);
+    }
+    let telNum = phoneNumber.format('NATIONAL');
+    // COAでは数字のみ受け付けるので数字以外を除去
+    telNum = telNum.replace(/[^\d]/g, '');
+    return telNum;
+}

package/lib/chevre/repo/message.d.ts

@@ -43,7 +43,7 @@ export declare class MessageRepo {
     /**
      * 検索
      */
-    projectFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(IEmailMessage & {
+    findMessages(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(IEmailMessage & {
         id: string;
     })[]>;
     /**

package/lib/chevre/repo/message.js

@@ -53,7 +53,7 @@ class MessageRepo {
     /**
      * 検索
      */
-    async projectFields(params, inclusion) {
+    async findMessages(params, inclusion) {
         const conditions = MessageRepo.CREATE_MONGO_CONDITIONS(params);
         let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {

package/lib/chevre/repo/person.d.ts

@@ -21,20 +21,12 @@ export declare class PersonRepo {
         userPoolId?: string;
         attributes?: AttributeType[];
     }): factory.person.IPerson;
-    static PROFILE2ATTRIBUTE(params: factory.person.IProfile): AttributeType[];
     /**
      * 管理者権限でユーザー属性を取得する
      */
     getUserAttributes(params: {
         username: string;
     }): Promise<factory.person.IProfile>;
-    /**
-     * 管理者権限でプロフィール更新
-     */
-    updateProfile(params: {
-        username: string;
-        profile: factory.person.IProfile;
-    }): Promise<void>;
     /**
      * 管理者権限でsubでユーザーを検索する
      */
@@ -45,13 +37,6 @@ export declare class PersonRepo {
      * アクセストークンでユーザー属性を取得する
      */
     getUserAttributesByAccessToken(accessToken: string): Promise<factory.person.IProfile>;
-    /**
-     * 会員プロフィール更新
-     */
-    updateProfileByAccessToken(params: {
-        accessToken: string;
-        profile: factory.person.IProfile;
-    }): Promise<void>;
     /**
      * 削除
      */

package/lib/chevre/repo/person.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PersonRepo = void 0;
-// import { fromEnv } from '@aws-sdk/credential-providers';
-const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../factory");
 /**
  * 会員リポジトリ
@@ -92,73 +90,81 @@ class PersonRepo {
         }
         return person;
     }
-    static PROFILE2ATTRIBUTE(params) {
-        let formatedPhoneNumber;
-        if (typeof params.telephone === 'string' && params.telephone.length > 0) {
-            try {
-                const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                const phoneNumber = phoneUtil.parse(params.telephone);
-                /* istanbul ignore if */
-                if (!phoneUtil.isValidNumber(phoneNumber)) {
-                    throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
-                }
-                formatedPhoneNumber = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
-            }
-            catch (_error) {
-                throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
-            }
-        }
-        const userAttributes = [];
-        if (typeof params.givenName === 'string') {
-            userAttributes.push({
-                Name: 'given_name',
-                Value: params.givenName
-            });
-        }
-        if (typeof params.familyName === 'string') {
-            userAttributes.push({
-                Name: 'family_name',
-                Value: params.familyName
-            });
-        }
-        if (typeof params.email === 'string') {
-            userAttributes.push({
-                Name: 'email',
-                Value: params.email
-            });
-        }
-        if (typeof formatedPhoneNumber === 'string') {
-            userAttributes.push({
-                Name: 'phone_number',
-                Value: formatedPhoneNumber
-            });
-        }
-        if (Array.isArray(params.additionalProperty)) {
-            userAttributes.push(...params.additionalProperty.map((a) => {
-                let userAttributesValue = a.value;
-                // custom:telephoneに関してもtelephoneと同様のバリデーションを追加
-                if (a.name === 'custom:telephone') {
-                    try {
-                        const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                        const phoneNumber = phoneUtil.parse(String(a.value));
-                        /* istanbul ignore if */
-                        if (!phoneUtil.isValidNumber(phoneNumber)) {
-                            throw new factory_1.factory.errors.Argument('custom:telephone', 'Invalid phone number');
-                        }
-                        userAttributesValue = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
-                    }
-                    catch (_error) {
-                        throw new factory_1.factory.errors.Argument('custome:telephone', 'Invalid phone number');
-                    }
-                }
-                return {
-                    Name: a.name,
-                    Value: userAttributesValue
-                };
-            }));
-        }
-        return userAttributes;
-    }
+    // public static PROFILE2ATTRIBUTE(params: factory.person.IProfile): AttributeType[] {
+    //     let formatedPhoneNumber: string | undefined;
+    //     if (typeof params.telephone === 'string' && params.telephone.length > 0) {
+    //         try {
+    //             // const phoneUtil = PhoneNumberUtil.getInstance();
+    //             // const phoneNumber = phoneUtil.parse(params.telephone);
+    //             // /* istanbul ignore if */
+    //             // if (!phoneUtil.isValidNumber(phoneNumber)) {
+    //             //     throw new factory.errors.Argument('telephone', 'Invalid phone number');
+    //             // }
+    //             // formatedPhoneNumber = phoneUtil.format(phoneNumber, PhoneNumberFormat.E164);
+    //             const phoneNumber = parsePhoneNumberFromString(params.telephone);
+    //             if (phoneNumber === undefined || !phoneNumber.isValid()) {
+    //                 throw new factory.errors.Argument('telephone', 'Invalid phone number');
+    //             }
+    //             formatedPhoneNumber = phoneNumber.format('E.164');
+    //         } catch (_error) {
+    //             throw new factory.errors.Argument('telephone', 'Invalid phone number');
+    //         }
+    //     }
+    //     const userAttributes: AttributeType[] = [];
+    //     if (typeof params.givenName === 'string') {
+    //         userAttributes.push({
+    //             Name: 'given_name',
+    //             Value: params.givenName
+    //         });
+    //     }
+    //     if (typeof params.familyName === 'string') {
+    //         userAttributes.push({
+    //             Name: 'family_name',
+    //             Value: params.familyName
+    //         });
+    //     }
+    //     if (typeof params.email === 'string') {
+    //         userAttributes.push({
+    //             Name: 'email',
+    //             Value: params.email
+    //         });
+    //     }
+    //     if (typeof formatedPhoneNumber === 'string') {
+    //         userAttributes.push({
+    //             Name: 'phone_number',
+    //             Value: formatedPhoneNumber
+    //         });
+    //     }
+    //     if (Array.isArray(params.additionalProperty)) {
+    //         userAttributes.push(...params.additionalProperty.map((a) => {
+    //             let userAttributesValue: string = a.value;
+    //             // custom:telephoneに関してもtelephoneと同様のバリデーションを追加
+    //             if (a.name === 'custom:telephone') {
+    //                 try {
+    //                     // const phoneUtil = PhoneNumberUtil.getInstance();
+    //                     // const phoneNumber = phoneUtil.parse(String(a.value));
+    //                     // /* istanbul ignore if */
+    //                     // if (!phoneUtil.isValidNumber(phoneNumber)) {
+    //                     //     throw new factory.errors.Argument('custom:telephone', 'Invalid phone number');
+    //                     // }
+    //                     // userAttributesValue = phoneUtil.format(phoneNumber, PhoneNumberFormat.E164);
+    //                     const phoneNumber = parsePhoneNumberFromString(String(a.value));
+    //                     if (phoneNumber === undefined || !phoneNumber.isValid()) {
+    //                         throw new factory.errors.Argument('telephone', 'Invalid phone number');
+    //                     }
+    //                     userAttributesValue = phoneNumber.format('E.164');
+    //                 } catch (_error) {
+    //                     throw new factory.errors.Argument('custome:telephone', 'Invalid phone number');
+    //                 }
+    //             }
+    //             return {
+    //                 Name: a.name,
+    //                 Value: userAttributesValue
+    //             };
+    //         }));
+    //     }
+    //     return userAttributes;
+    // }
     /**
      * 管理者権限でユーザー属性を取得する
      */
@@ -177,26 +183,30 @@ class PersonRepo {
             });
         });
     }
-    /**
-     * 管理者権限でプロフィール更新
-     */
-    async updateProfile(params) {
-        return new Promise((resolve, reject) => {
-            const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
-            this.cognitoIdentityServiceProvider.adminUpdateUserAttributes({
-                UserPoolId: this.userPoolId,
-                Username: params.username,
-                UserAttributes: userAttributes
-            }, (err) => {
-                if (err instanceof Error) {
-                    reject(new factory_1.factory.errors.Argument('profile', err.message));
-                }
-                else {
-                    resolve();
-                }
-            });
-        });
-    }
+    // /**
+    //  * 管理者権限でプロフィール更新
+    //  */
+    // public async updateProfile(params: {
+    //     username: string;
+    //     profile: factory.person.IProfile;
+    // }): Promise<void> {
+    //     return new Promise<void>((resolve, reject) => {
+    //         const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
+    //         this.cognitoIdentityServiceProvider.adminUpdateUserAttributes(
+    //             {
+    //                 UserPoolId: this.userPoolId,
+    //                 Username: params.username,
+    //                 UserAttributes: userAttributes
+    //             },
+    //             (err) => {
+    //                 if (err instanceof Error) {
+    //                     reject(new factory.errors.Argument('profile', err.message));
+    //                 } else {
+    //                     resolve();
+    //                 }
+    //             });
+    //     });
+    // }
     /**
      * 管理者権限でsubでユーザーを検索する
      */
@@ -249,25 +259,29 @@ class PersonRepo {
             });
         });
     }
-    /**
-     * 会員プロフィール更新
-     */
-    async updateProfileByAccessToken(params) {
-        return new Promise((resolve, reject) => {
-            const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
-            this.cognitoIdentityServiceProvider.updateUserAttributes({
-                AccessToken: params.accessToken,
-                UserAttributes: userAttributes
-            }, (err) => {
-                if (err instanceof Error) {
-                    reject(new factory_1.factory.errors.Argument('profile', err.message));
-                }
-                else {
-                    resolve();
-                }
-            });
-        });
-    }
+    // /**
+    //  * 会員プロフィール更新
+    //  */
+    // public async updateProfileByAccessToken(params: {
+    //     accessToken: string;
+    //     profile: factory.person.IProfile;
+    // }): Promise<void> {
+    //     return new Promise<void>((resolve, reject) => {
+    //         const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
+    //         this.cognitoIdentityServiceProvider.updateUserAttributes(
+    //             {
+    //                 AccessToken: params.accessToken,
+    //                 UserAttributes: userAttributes
+    //             },
+    //             (err) => {
+    //                 if (err instanceof Error) {
+    //                     reject(new factory.errors.Argument('profile', err.message));
+    //                 } else {
+    //                     resolve();
+    //                 }
+    //             });
+    //     });
+    // }
     /**
      * 削除
      */

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.d.ts

@@ -1,5 +1,6 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
@@ -9,6 +10,7 @@ import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/i
 interface IOnPayTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts

@@ -1,4 +1,5 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
@@ -6,6 +7,7 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPaymentDue2ProcessingRepos {
     acceptedOffer: AcceptedOfferRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts

@@ -1,5 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -11,6 +12,7 @@ import type { IntegrationSettingRepo as Settings } from '../../repo/setting/inte
 interface IOnAssetTransactionStatusChangedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts

@@ -1,9 +1,13 @@
+import type { MessageRepo } from '../../../../repo/message';
 import type { TaskRepo } from '../../../../repo/task';
 import { factory } from '../../../../factory';
 declare function createSendEmailMessageTaskIfNotExist(params: {
-    sendEmailMessage?: Pick<factory.action.transfer.send.message.email.IAttributes, 'object'>[];
+    sendEmailMessage?: {
+        object: factory.action.transfer.send.message.email.IOptimizedObject;
+    }[];
     order: Pick<factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'project' | 'typeOf'>;
 }): (repos: {
+    message: MessageRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { createSendEmailMessageTaskIfNotExist };

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

@@ -1,45 +1,107 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageTaskIfNotExist = createSendEmailMessageTaskIfNotExist;
+const debug_1 = __importDefault(require("debug"));
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
+const debug = (0, debug_1.default)('chevre-domain:service:order');
 function createSendEmailMessageTaskIfNotExist(params) {
     return async (repos) => {
         const sendEmailMessageActions = params.sendEmailMessage;
         const now = new Date();
-        if (Array.isArray(sendEmailMessageActions)) {
-            await Promise.all(sendEmailMessageActions.map(async (sendEmailMessageAction, index) => {
-                const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', params.order.project.id, factory_1.factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory_1.factory.orderStatus.OrderProcessing, index);
-                const simpleOrder = {
-                    typeOf: params.order.typeOf,
-                    orderNumber: params.order.orderNumber,
-                    // price: params.order.price,
-                    // priceCurrency: params.order.priceCurrency,
-                    orderDate: params.order.orderDate
-                };
-                const actionAttributes = {
-                    project: params.order.project,
-                    typeOf: factory_1.factory.actionType.SendAction,
-                    object: sendEmailMessageAction.object,
-                    agent: params.order.project,
-                    recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
-                    // potentialActions: {}, // discontinue(2024-06-25~)
-                    purpose: simpleOrder
-                };
-                const sendEmailMessageTask = {
-                    alternateName: taskIdentifier,
-                    identifier: taskIdentifier,
-                    project: params.order.project,
-                    name: factory_1.factory.taskName.SendEmailMessage,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: now, // なるはやで実行
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: { actionAttributes }
-                };
-                await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
-            }));
+        // 取引のpotentialActions参照を廃止して、messageリポジトリを参照して存在すればタスクを作成(2026-07-16~)
+        const message4order = (await repos.message.findMessages({
+            limit: 1,
+            page: 1,
+            about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } },
+            mainEntity: { orderNumber: { $eq: params.order.orderNumber } }
+        }, ['identifier'])).shift();
+        debug('createSendEmailMessageTaskIfNotExist: message4order:', JSON.stringify(message4order));
+        if (typeof message4order?.identifier === 'string') {
+            // 取引のpotentialActionsが存在する間は、メッセージ識別子が想定通りか確認する
+            const messageIdentifierByTransaction = sendEmailMessageActions?.at(0)?.object.identifier;
+            if (typeof messageIdentifierByTransaction === 'string') {
+                debug('createSendEmailMessageTaskIfNotExist: identifier matched?', message4order.identifier, messageIdentifierByTransaction);
+                if (message4order.identifier !== messageIdentifierByTransaction) {
+                    throw new factory_1.factory.errors.Internal(`message identifier not matched. ${message4order.identifier} ${messageIdentifierByTransaction}`);
+                }
+            }
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', params.order.project.id, factory_1.factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory_1.factory.orderStatus.OrderProcessing, 0 // 複数メッセージに対応していた時期の名残(2026-07-16~)
+            );
+            const simpleOrder = {
+                typeOf: params.order.typeOf,
+                orderNumber: params.order.orderNumber,
+                orderDate: params.order.orderDate
+            };
+            const actionAttributes = {
+                project: params.order.project,
+                typeOf: factory_1.factory.actionType.SendAction,
+                object: {
+                    identifier: message4order.identifier,
+                    typeOf: factory_1.factory.creativeWorkType.EmailMessage
+                },
+                agent: params.order.project,
+                recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+                purpose: simpleOrder
+            };
+            const sendEmailMessageTask = {
+                alternateName: taskIdentifier,
+                identifier: taskIdentifier,
+                project: params.order.project,
+                name: factory_1.factory.taskName.SendEmailMessage,
+                status: factory_1.factory.taskStatus.Ready,
+                runsAt: now, // なるはやで実行
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: { actionAttributes }
+            };
+            await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
         }
+        // if (Array.isArray(sendEmailMessageActions)) {
+        //     await Promise.all(sendEmailMessageActions.map(async (sendEmailMessageAction, index) => {
+        //         const taskIdentifier: string = format(
+        //             '%s:%s:%s:%s:%s:%s',
+        //             params.order.project.id,
+        //             factory.taskName.SendEmailMessage,
+        //             params.order.typeOf,
+        //             params.order.orderNumber,
+        //             factory.orderStatus.OrderProcessing,
+        //             index
+        //         );
+        //         const simpleOrder: factory.order.ISimpleOrder = {
+        //             typeOf: params.order.typeOf,
+        //             orderNumber: params.order.orderNumber,
+        //             orderDate: params.order.orderDate
+        //         };
+        //         const actionAttributes: factory.task.sendEmailMessage.IData['actionAttributes'] = {
+        //             project: params.order.project,
+        //             typeOf: factory.actionType.SendAction,
+        //             object: sendEmailMessageAction.object,
+        //             agent: params.order.project,
+        //             recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+        //             purpose: simpleOrder
+        //         };
+        //         const sendEmailMessageTask: factory.task.IAttributes<factory.taskName.SendEmailMessage> & {
+        //             alternateName: string;
+        //             identifier: string;
+        //         } = {
+        //             alternateName: taskIdentifier,
+        //             identifier: taskIdentifier,
+        //             project: params.order.project,
+        //             name: factory.taskName.SendEmailMessage,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now, // なるはやで実行
+        //             remainingNumberOfTries: 10,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: { actionAttributes }
+        //         };
+        //         await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
+        //     }));
+        // }
     };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts

@@ -1,3 +1,4 @@
+import type { MessageRepo } from '../../../repo/message';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
@@ -13,6 +14,7 @@ declare function onOrderProcessing(params: {
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
+    message: MessageRepo;
     setting: SettingRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -8,7 +8,7 @@ exports.onOrderReturned = onOrderReturned;
  * 注文返品時処理
  */
 const debug_1 = __importDefault(require("debug"));
-const google_libphonenumber_1 = require("google-libphonenumber");
+const customerTelephone2COATelNum_1 = require("../../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../../factory");
 // import { createMaskedCustomer } from '../../../factory/order';
 const factory_2 = require("./onOrderReturned/factory");
@@ -104,11 +104,7 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
                 if (typeof superEventLocationBranchCode !== 'string') {
                     throw new factory_1.factory.errors.ArgumentNull('order.reservationForSuperEventLocationBranchCodes');
                 }
-                const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                // COAでは数字のみ受け付けるので数字以外を除去
-                telNum = telNum.replace(/[^\d]/g, '');
+                const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(order.customer.telephone) });
                 returnReserveTransactionAction = {
                     project: order.project,
                     typeOf: factory_1.factory.actionType.ReturnAction,

package/lib/chevre/service/order/payOrder.d.ts

@@ -1,4 +1,5 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -10,6 +11,7 @@ import type { IntegrationSettingRepo as Settings } from '../../repo/setting/inte
  */
 declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
     acceptedOffer: AcceptedOfferRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/placeOrder.d.ts

@@ -3,6 +3,7 @@ import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AuthorizeOfferActionRepo } from '../../repo/action/authorizeOffer';
 import type { AuthorizePaymentMethodActionRepo } from '../../repo/action/authorizePaymentMethod';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { SettingRepo } from '../../repo/setting';
@@ -17,6 +18,7 @@ interface IPlaceOrderRepos {
     action: ActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     orderInTransaction: OrderInTransactionRepo;
     setting: SettingRepo;

package/lib/chevre/service/reserve/searchByOrder.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchByOrder = searchByOrder;
-const google_libphonenumber_1 = require("google-libphonenumber");
+const customerTelephone2COATelNum_1 = require("../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../factory");
 function searchByOrder(params) {
     return async (repos) => {
@@ -42,11 +42,7 @@ function searchByOrder(params) {
                     if (order === undefined) {
                         throw new factory_1.factory.errors.NotFound(factory_1.factory.order.OrderType.Order);
                     }
-                    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                    const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                    // COAでは数字のみ受け付けるので数字以外を除去
-                    telNum = telNum.replace(/[^\d]/g, '');
+                    const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(order.customer.telephone) });
                     const reservationNumber = (await repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [params.orderNumber] }
                     }, 'acceptedOffers.itemOffered.reservationNumber')).shift();

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 exports.confirmReserveTransaction = confirmReserveTransaction;
 const coa_service_1 = require("@motionpicture/coa-service");
-const google_libphonenumber_1 = require("google-libphonenumber");
 const util_1 = require("util");
+const customerTelephone2COATelNum_1 = require("../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../factory");
 const confirm_1 = require("../assetTransaction/reserve/confirm");
 const reserveCOA_1 = require("../assetTransaction/reserveCOA");
@@ -71,12 +71,7 @@ function createConfirmObject4COAByOrder(params) {
             && o.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA;
     });
     const customer = params.order.customer;
-    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
-    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-    const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
-    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-    // COAでは数字のみ受け付けるので数字以外を除去
-    telNum = telNum.replace(/[^\d]/g, '');
+    const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(customer.telephone) });
     const mailAddr = customer.email;
     if (mailAddr === undefined) {
         throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');

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

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionStatusChanged");
 /**
@@ -19,10 +19,10 @@ function call(data) {
         await (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            // transaction: new TransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
@@ -16,6 +17,7 @@ function call(data) {
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, payOrder_1.payOrder)(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),

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

@@ -6,12 +6,12 @@ const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const placeOrder_2 = require("../order/placeOrder");
 /**
@@ -29,11 +29,11 @@ function call(data) {
             action: new action_1.ActionRepo(connection),
             authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
             authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            // transaction: new TransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };

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

@@ -13,6 +13,8 @@ export declare function updateAgent(params: {
     agent: factory.order.ICustomer & {
         telephoneRegion?: string;
     };
+}, options: {
+    useLibphonenumber: boolean;
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -2,17 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
+const libphonenumber_js_1 = require("libphonenumber-js");
 const factory_1 = require("../../../factory");
-function fixCustomer(params) {
+function fixCustomer(params, options) {
     return async (repos) => {
+        const { useLibphonenumber } = options;
         let formattedTelephone;
         try {
-            const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-            const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
-            if (!phoneUtil.isValidNumber(phoneNumber)) {
-                throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
+            if (useLibphonenumber) {
+                const phoneNumber = (0, libphonenumber_js_1.parsePhoneNumberFromString)(String(params.agent.telephone), params.agent.telephoneRegion);
+                if (phoneNumber === undefined || !phoneNumber.isValid()) {
+                    throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
+                }
+                formattedTelephone = phoneNumber.format('E.164');
+            }
+            else {
+                const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
+                const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
+                if (!phoneUtil.isValidNumber(phoneNumber)) {
+                    throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
+                }
+                formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
             }
-            formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
         }
         catch (error) {
             throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : String(error));
@@ -68,9 +79,9 @@ function fixCustomer(params) {
 /**
  * 取引人プロフィール更新
  */
-function updateAgent(params) {
+function updateAgent(params, options) {
     return async (repos) => {
-        const { customer, transaction } = await fixCustomer(params)(repos);
+        const { customer, transaction } = await fixCustomer(params, options)(repos);
         // also save in orderInTransaction(2024-06-20~)
         if (customer !== undefined) {
             // // 注文ドキュメントを参照(2026-06-24~)
@@ -95,6 +106,5 @@ function updateAgent(params) {
                 customer: customerInOrder
             });
         }
-        // return newAgent;
     };
 }

package/package.json

@@ -11,15 +11,16 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.5.0-alpha.9",
+    "@chevre/factory": "9.5.0-alpha.10",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
     "@surfrock/sdk": "2.0.0",
     "debug": "4.4.3",
-    "google-libphonenumber": "^3.2.18",
+    "google-libphonenumber": "3.2.18",
     "http-status": "2.1.0",
     "jsonwebtoken": "9.0.0",
+    "libphonenumber-js": "1.13.8",
     "lodash.difference": "^4.5.0",
     "moment": "^2.29.1",
     "moment-timezone": "^0.5.33",
@@ -34,7 +35,7 @@
     "@sendgrid/helpers": "8.0.0",
     "@size-limit/preset-big-lib": "12.0.0",
     "@types/debug": "4.1.13",
-    "@types/google-libphonenumber": "^7.4.19",
+    "@types/google-libphonenumber": "7.4.19",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.difference": "^4.5.6",
     "@types/node": "22.19.7",
@@ -91,5 +92,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.26"
+  "version": "25.2.0-alpha.28"
 }