@chevre/domain 25.2.0-alpha.3 → 25.2.0-alpha.30

package/lib/chevre/repo/order.js

@@ -848,26 +848,19 @@ class OrderRepo {
         })
             .exec();
     }
-    // public async updateIdentifier4migration(params: {
-    //     project: { id: string };
-    //     orderNumber: string;
-    //     identifier: string;
-    // }) {
-    //     const { orderNumber, project, identifier } = params;
-    //     return this.orderModel.updateOne(
-    //         {
-    //             orderNumber: { $eq: orderNumber },
-    //             'project.id': { $eq: project.id },
-    //             typeOf: { $eq: factory.order.OrderType.Order }
-    //         },
-    //         {
-    //             $set: {
-    //                 ...(typeof identifier === 'string') ? { identifier } : undefined
-    //             }
-    //         }
-    //     )
-    //         .exec();
-    // }
+    async savePaymentMethodId4migaration(params) {
+        const { paymentMethodId } = params.paymentMethod;
+        if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+            throw new factory_1.factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
+        }
+        // 注文ドキュメントにも保管する(2026-07-12~)
+        return this.orderModel.findOneAndUpdate({
+            identifier: { $eq: params.id },
+            paymentMethodId: { $exists: false }
+        }, { $set: { paymentMethodId } }, { projection: { _id: 1 } })
+            .lean()
+            .exec();
+    }
     async aggregateOrder(params) {
         const matchConditions = {
             orderDate: {

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

@@ -11,6 +11,7 @@ export type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'pr
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
     seller?: factory.order.ISeller;
+    confirmationNumber?: string;
 };
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
@@ -61,6 +62,7 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
  */
 export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
+    private readonly transactionModel;
     constructor(connection: Connection);
     createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
@@ -127,6 +129,49 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     setCustomerByIdentifier(params: Pick<IOrderInTransaction, 'project' | 'identifier'> & {
         customer: factory.order.ICustomer;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 確認番号を参照する
+     */
+    findConfirmationNumberByIdentifier(params: {
+        identifier: string;
+    }): Promise<string | undefined>;
+    /**
+     * 注文ドキュメントに確認番号を保管する
+     * 確認番号未発行の場合のみ保管される
+     */
+    saveConfirmationNumberIfNotExist(params: {
+        identifier: string;
+        confirmationNumber: string;
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 特定の進行中取引の決済方法IDを保管する
+     * transactionsへの保管としてひとまず定義(2026-07-11~)
+     */
+    savePaymentMethodId(params: {
+        id: string;
+        paymentMethod: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
+    }, options: {
+        savePaymentMethodIdInTransaction: boolean;
+    }): Promise<void>;
+    /**
+     * 進行中取引に保管された採用済決済方法を検索する
+     * 注文ドキュメントから参照する(2026-07-13~)
+     */
+    findInProgressPaymentMethodId(params: {
+        id: string;
+    }): Promise<string | undefined>;
+    /**
+     * 保管された採用済決済方法を検索する
+     * 注文ドキュメントから参照する(2026-07-13~)
+     */
+    findPaymentMethodId(params: {
+        id: string;
+    }): Promise<string | undefined>;
     deleteByIdentifier(params: {
         identifier: string;
     }): Promise<import("mongodb").DeleteResult>;

package/lib/chevre/repo/orderInTransaction.js

@@ -5,6 +5,7 @@ exports.OrderInTransactionRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
+const transaction_1 = require("./mongoose/schemas/transaction");
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 // const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
@@ -12,9 +13,11 @@ const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
  */
 class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveRepo {
     orderModel;
+    transactionModel;
     constructor(connection) {
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
+        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
     }
     async createPlaceOrderIfNotExists(params) {
         const { orderNumber, project, identifier, broker, seller, customer } = params;
@@ -241,6 +244,178 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         }
         return result;
     }
+    /**
+     * 確認番号を参照する
+     */
+    async findConfirmationNumberByIdentifier(params) {
+        const { identifier } = params;
+        const doc = await this.orderModel.findOne({
+            identifier: { $eq: identifier },
+            // typeOf: { $eq: factory.transactionType.PlaceOrder }, // 取引確定の冪等性確保のためtypeOfを検証しない
+        }, { confirmationNumber: 1 })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
+        }
+        return doc.confirmationNumber;
+    }
+    /**
+     * 注文ドキュメントに確認番号を保管する
+     * 確認番号未発行の場合のみ保管される
+     */
+    async saveConfirmationNumberIfNotExist(params, options) {
+        const { identifier, confirmationNumber } = params;
+        const onlyPlaceOrder = options.onlyPlaceOrder === true;
+        if (typeof confirmationNumber !== 'string' || confirmationNumber === '') {
+            throw new factory_1.factory.errors.ArgumentNull('confirmationNumber');
+        }
+        return this.orderModel.updateOne({
+            identifier: { $eq: identifier },
+            confirmationNumber: { $exists: false },
+            ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })
+        }, { $set: { confirmationNumber } })
+            .exec();
+    }
+    /**
+     * 特定の進行中取引の決済方法IDを保管する
+     * transactionsへの保管としてひとまず定義(2026-07-11~)
+     */
+    async savePaymentMethodId(params, options) {
+        const { savePaymentMethodIdInTransaction } = options;
+        const { paymentMethodId } = params.paymentMethod;
+        if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+            throw new factory_1.factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
+        }
+        if (savePaymentMethodIdInTransaction) {
+            await this.transactionModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                status: { $eq: factory_1.factory.transactionStatusType.InProgress }
+            }, {
+                $set: { 'object.paymentMethods': { paymentMethodId } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .lean()
+                .exec()
+                .then((doc) => {
+                if (doc === null) {
+                    throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
+                }
+            });
+        }
+        // 注文ドキュメントにも保管する(2026-07-12~)
+        await this.orderModel.findOneAndUpdate({
+            identifier: { $eq: params.id },
+            paymentMethodId: { $exists: false },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
+        }, { $set: { paymentMethodId } }, { projection: { _id: 1 } })
+            .lean()
+            .exec()
+            .then((doc) => {
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound('orderInTransaction');
+            }
+        });
+    }
+    /**
+     * 進行中取引に保管された採用済決済方法を検索する
+     * 注文ドキュメントから参照する(2026-07-13~)
+     */
+    async findInProgressPaymentMethodId(params) {
+        // const doc = await this.transactionModel.findOne(
+        //     {
+        //         _id: { $eq: params.id },
+        //         typeOf: { $eq: factory.transactionType.PlaceOrder },
+        //         status: { $eq: factory.transactionStatusType.InProgress }
+        //     },
+        //     {
+        //         'object.paymentMethods': 1,
+        //         _id: 0
+        //     }
+        // )
+        //     .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'paymentMethods'> }>()
+        //     .exec();
+        // if (doc === null) {
+        //     throw new factory.errors.NotFound(
+        //         this.transactionModel.modelName,
+        //         `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`
+        //     );
+        // }
+        // return (typeof doc.object.paymentMethods?.paymentMethodId === 'string') ? doc.object.paymentMethods.paymentMethodId : undefined;
+        const doc = await this.orderModel.findOne({
+            identifier: { $eq: params.id },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
+        }, {
+            paymentMethodId: 1,
+            _id: 0
+        })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
+        }
+        return (typeof doc.paymentMethodId === 'string') ? doc.paymentMethodId : undefined;
+    }
+    /**
+     * 保管された採用済決済方法を検索する
+     * 注文ドキュメントから参照する(2026-07-13~)
+     */
+    async findPaymentMethodId(params) {
+        // const doc = await this.transactionModel.findOne(
+        //     {
+        //         _id: { $eq: params.id },
+        //         typeOf: { $eq: factory.transactionType.PlaceOrder }
+        //     },
+        //     {
+        //         'object.paymentMethods': 1,
+        //         _id: 0
+        //     }
+        // )
+        //     .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'paymentMethods'> }>()
+        //     .exec();
+        // if (doc === null) {
+        //     throw new factory.errors.NotFound(
+        //         this.transactionModel.modelName,
+        //         `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`
+        //     );
+        // }
+        // const paymentMethodId = doc.object.paymentMethods?.paymentMethodId;
+        // if (typeof paymentMethodId === 'string') {
+        //     // 注文ドキュメントにも発行済の場合、同一性を検証(2026-07-12~)
+        //     const orderDoc = await this.orderModel.findOne(
+        //         { identifier: { $eq: params.id } },
+        //         {
+        //             paymentMethodId: 1,
+        //             _id: 0
+        //         }
+        //     )
+        //         .lean<Pick<IDocType, 'paymentMethodId'>>()
+        //         .exec();
+        //     if (orderDoc === null) {
+        //         throw new factory.errors.NotFound('orderInTransaction');
+        //     }
+        //     const paymentMethodIdByOrder = orderDoc.paymentMethodId;
+        //     if (typeof paymentMethodIdByOrder === 'string') {
+        //         // console.log('paymentMethodId matched?', JSON.stringify(doc), JSON.stringify(orderDoc));
+        //         if (paymentMethodId !== paymentMethodIdByOrder) {
+        //             throw new factory.errors.Internal('paymentMethodId not matched unexpectedly');
+        //         }
+        //     }
+        // }
+        // return (typeof paymentMethodId === 'string') ? paymentMethodId : undefined;
+        const doc = await this.orderModel.findOne({ identifier: { $eq: params.id } }, {
+            paymentMethodId: 1,
+            _id: 0
+        })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
+        }
+        const paymentMethodId = doc.paymentMethodId;
+        return (typeof paymentMethodId === 'string') ? paymentMethodId : undefined;
+    }
     async deleteByIdentifier(params) {
         return this.orderModel.deleteOne({
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },

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();
+    //                 }
+    //             });
+    //     });
+    // }
     /**
      * 削除
      */