@chevre/domain 25.2.0-alpha.5 → 25.2.0-alpha.50

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection, FilterQuery, mongo } from 'mongoose';
 import { factory } from '../factory';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'relatedOffer'> & {
     numberOfItems?: number;
@@ -42,7 +41,7 @@ export declare class OfferCatalogItemRepo {
          */
         productType: factory.product.ProductType;
     }): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         modifiedCatalogs?: {
             id: string;
         }[];

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

@@ -135,6 +135,7 @@ export declare class OrderRepo {
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer[];
         identifier?: string;
+        paymentMethodId?: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -142,6 +143,7 @@ export declare class OrderRepo {
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer[];
         identifier?: string;
+        paymentMethodId?: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/repo/order.js

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

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

@@ -11,14 +11,25 @@ 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へドキュメント変換時の編集フィールド
  */
-export type IPlacingOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'typeOf'> & {
+export type IPlacingOrder = Pick<factory.order.IOrder, 'orderDate' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'typeOf'> & {
     url?: never;
     identifier?: never;
     name?: never;
+    /**
+     * 上書きしてはいけない
+     * 注文取引進行中にセット済であり上書きしてはいけない
+     */
+    orderNumber?: never;
+    /**
+     * 上書きしてはいけない
+     * 注文取引進行中にセット済であり上書きしてはいけない
+     */
+    confirmationNumber?: never;
     /**
      * 上書きしてはいけない
      */
@@ -56,11 +67,19 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
     priceSpecification?: never;
     name?: never;
 };
+export interface IPaymentMethodByPaymentUrl {
+    /**
+     * 決済採用時に発行済の決済方法ID
+     * 決済承認時に指定が可能
+     */
+    paymentMethodId: string;
+}
 /**
  * 取引中注文リポジトリ
  */
 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>;
     /**
@@ -94,6 +113,11 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
         project: {
             id: string;
         };
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
     }): Promise<(Pick<factory.order.IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'typeOf'> & {
         priceSpecification?: factory.order.ITicketPriceSpecification;
     })[]>;
@@ -127,6 +151,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: 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;
@@ -93,10 +96,12 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する
      */
-    async findAcceptedOffersWithPriceByIdentifier(params) {
+    async findAcceptedOffersWithPriceByIdentifier(params, options) {
+        const onlyPlaceOrder = options.onlyPlaceOrder === true;
         const doc = await this.orderModel.findOne({
             identifier: { $eq: params.identifier },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
+            'project.id': { $eq: params.project.id },
+            ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })
         }, { acceptedOffers: 1 })
             .lean()
             .exec();
@@ -142,7 +147,8 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         if (!(order.orderDate instanceof Date)) {
             throw new factory_1.factory.errors.Argument('orderDate', 'must be Date');
         }
-        const setFields = order;
+        const { confirmationNumber: _confirmationNumber, orderNumber: _orderNumber, ...setFields } = order;
+        // const setFields: AnyKeys<factory.order.IOrder> = order;
         // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
         await this.orderModel.updateOne({
             identifier: { $eq: identifier },
@@ -241,6 +247,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/passport.d.ts

@@ -1,5 +1,5 @@
 import { JwtPayload } from 'jsonwebtoken';
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { factory } from '../factory';
 import { IPassportValidator } from '../factory/transaction';
 export type IVerifiedPassport = factory.waiter.passport.IPassport & {
@@ -20,6 +20,7 @@ interface IOptions {
     secret: string;
     passportValidator?: IPassportValidator;
 }
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 取引許可証リポジトリ
  */

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>;
     /**
      * 削除
      */