@chevre/domain 24.0.0-alpha.6 → 24.0.0-alpha.7

package/lib/chevre/repo/mongoose/schemas/transaction.js

@@ -163,6 +163,22 @@ const indexes = [
             }
         }
     ],
+    [
+        // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+        {
+            typeOf: 1,
+            'object.orderNumber': 1
+        },
+        {
+            name: 'uniquePlacingOrderNumber20260221',
+            unique: true,
+            partialFilterExpression: {
+                typeOf: factory.transactionType.PlaceOrder,
+                'object.orderNumber': { $exists: true },
+                startDate: { $gte: new Date('2026-02-21T11:00:00Z') }
+            }
+        }
+    ],
     [
         // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
         {

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

@@ -9,9 +9,10 @@ export declare class OrderNumberRepo {
         connection: Connection;
     });
     /**
-     * タイムスタンプから発行する
+     * 注文日時から新しい注文番号を発行する
+     * グローバルユニークである前提
      */
-    publishByTimestamp(params: {
+    issueOrderNumber(params: {
         project: {
             alternateName: string;
         };

package/lib/chevre/repo/orderNumber.js

@@ -54,17 +54,21 @@ class OrderNumberRepo {
     //     return orderNumber;
     // }
     /**
-     * タイムスタンプから発行する
+     * 注文日時から新しい注文番号を発行する
+     * グローバルユニークである前提
      */
-    async publishByTimestamp(params) {
-        const { fpeSecret, version, validFrom, versioningForceProjects
+    async issueOrderNumber(params) {
+        const { fpeSecret, version, validFrom
+        // versioningForceProjects
         // versioningExceptionProjects
          } = await this.findSetting();
         const timestamp = (0, moment_timezone_1.default)(params.orderDate)
             .valueOf()
             .toString();
+        // const projectPrefix = params.project.alternateName
+        //     .toUpperCase();
         const projectPrefix = params.project.alternateName
-            .toUpperCase();
+            .toUpperCase().at(0);
         // const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
         const dataFeedIdentifier = timestamp; // reconsider increment scope(2026-02-21~)
         const dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
@@ -77,13 +81,11 @@ class OrderNumberRepo {
         });
         let orderNumber;
         const useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
-            .isSameOrBefore(params.orderDate))
-            // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
-            || versioningForceProjects.includes(projectPrefix);
+            .isSameOrBefore(params.orderDate));
         if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
             const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
             orderNumber = transactionFactory.generate(timestamp, incrReply);
-            orderNumber = `${projectPrefix.at(0)}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
+            orderNumber = `${projectPrefix}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
             orderNumber = `${[
                 orderNumber.slice(0, 4),
                 orderNumber.slice(4, 11),
@@ -132,11 +134,11 @@ class OrderNumberRepo {
             .exec();
         if (setting === null || setting.orderNumber === undefined) {
             return {
-                versioningForceProjects: []
-                // versioningExceptionProjects: []
+            // versioningForceProjects: []
+            // versioningExceptionProjects: []
             };
         }
-        const { fpeSecret, version, validFrom, versioningForceProjects } = setting.orderNumber;
+        const { fpeSecret, version, validFrom } = setting.orderNumber;
         if (typeof fpeSecret !== 'string' || fpeSecret === '') {
             throw new factory.errors.NotFound('setting.orderNumber.secret');
         }
@@ -147,10 +149,10 @@ class OrderNumberRepo {
             throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
         }
         return {
-            fpeSecret, version, validFrom,
-            versioningForceProjects: [
-                ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : []
-            ]
+            fpeSecret, version, validFrom
+            // versioningForceProjects: [
+            //     ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : []
+            // ]
             // versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
         };
     }

package/lib/chevre/repo/transaction/placeOrder.d.ts

@@ -0,0 +1,76 @@
+import type { Connection } from 'mongoose';
+import * as factory from '../../factory';
+/**
+ * 注文取引リポジトリ
+ */
+export declare class PlaceOrderRepo {
+    private readonly transactionModel;
+    constructor(connection: Connection);
+    /**
+     * 進行中取引に保管された採用済決済方法を検索する
+     */
+    findInProgressPaymentMethodId(params: {
+        id: string;
+    }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined>;
+    /**
+     * 取引の注文番号を検索する
+     */
+    findInProgressOrderNumberById(params: {
+        id: string;
+    }): Promise<string | undefined>;
+    /**
+     * 取引の確認番号を検索する
+     */
+    findInProgressConfirmationNumberById(params: {
+        id: string;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
+    }): Promise<string | undefined>;
+    /**
+     * 取引期限変更
+     */
+    updateExpires<T extends factory.transactionType>(params: {
+        typeOf: T;
+        id: string;
+        expires: Date;
+    }): Promise<void>;
+    /**
+     * 取引オブジェクトを更新
+     * 注文名称など
+     */
+    updateObject<T extends factory.transactionType>(params: {
+        typeOf: T;
+        id: string;
+        object?: {
+            name?: string;
+        };
+    }): Promise<void>;
+    /**
+     * 特定の進行中取引を更新する(汎用)
+     */
+    findByIdAndUpdateInProgress(params: {
+        id: string;
+        update: {
+            $set?: {
+                'object.paymentMethods'?: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
+            };
+        };
+    }): Promise<void>;
+    /**
+     * 進行中取引のobjectに注文番号を保管する
+     */
+    saveOrderNumberIfNotExist(params: {
+        id: string;
+        orderNumber: string;
+    }): Promise<{
+        modifiedCount: number;
+    }>;
+    saveConfirmationNumberIfNotExist(params: {
+        id: string;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
+        confirmationNumber: string;
+    }): Promise<void>;
+}

package/lib/chevre/repo/transaction/placeOrder.js

@@ -0,0 +1,170 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlaceOrderRepo = void 0;
+const factory = __importStar(require("../../factory"));
+// import { MONGO_MAX_TIME_MS } from '../../settings';
+const transaction_1 = require("../mongoose/schemas/transaction");
+/**
+ * 注文取引リポジトリ
+ */
+class PlaceOrderRepo {
+    transactionModel;
+    constructor(connection) {
+        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
+    }
+    /**
+     * 進行中取引に保管された採用済決済方法を検索する
+     */
+    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 })
+            .lean() // 2024-08-26~
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
+        }
+        return doc.object.paymentMethods;
+    }
+    /**
+     * 取引の注文番号を検索する
+     */
+    async findInProgressOrderNumberById(params) {
+        const doc = await this.transactionModel.findOne({
+            _id: { $eq: params.id },
+            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            status: { $eq: factory.transactionStatusType.InProgress }
+        }, { 'object.orderNumber': 1 })
+            .lean() // 2024-08-26~
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
+        }
+        return doc.object.orderNumber;
+    }
+    /**
+     * 取引の確認番号を検索する
+     */
+    async findInProgressConfirmationNumberById(params) {
+        const doc = await this.transactionModel.findOne({
+            _id: { $eq: params.id },
+            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            status: { $in: params.status.$in }
+        }, { 'object.confirmationNumber': 1 })
+            .lean() // 2024-08-26~
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`);
+        }
+        return doc.object.confirmationNumber;
+    }
+    /**
+     * 取引期限変更
+     */
+    async updateExpires(params) {
+        const doc = await this.transactionModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            typeOf: { $eq: params.typeOf },
+            status: { $eq: factory.transactionStatusType.InProgress }
+        }, {
+            $set: {
+                expires: params.expires
+            }
+        }, {
+            projection: { _id: 1 }
+        })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
+        }
+    }
+    /**
+     * 取引オブジェクトを更新
+     * 注文名称など
+     */
+    async updateObject(params) {
+        const doc = await this.transactionModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            typeOf: { $eq: params.typeOf },
+            status: { $eq: factory.transactionStatusType.InProgress }
+        }, {
+            $set: {
+                ...(typeof params.object?.name === 'string') ? { 'object.name': params.object.name } : undefined
+            }
+        }, {
+            projection: { _id: 1 }
+        })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
+        }
+    }
+    /**
+     * 特定の進行中取引を更新する(汎用)
+     */
+    async findByIdAndUpdateInProgress(params) {
+        await this.transactionModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            status: { $eq: factory.transactionStatusType.InProgress }
+        }, params.update, {
+            // new: true,
+            projection: { _id: 1 }
+        })
+            .lean()
+            .exec()
+            .then((doc) => {
+            if (doc === null) {
+                throw new factory.errors.ArgumentNull(this.transactionModel.modelName);
+            }
+        });
+    }
+    /**
+     * 進行中取引のobjectに注文番号を保管する
+     */
+    async saveOrderNumberIfNotExist(params) {
+        const result = await this.transactionModel.updateOne({
+            _id: { $eq: params.id },
+            status: { $eq: factory.transactionStatusType.InProgress },
+            'object.orderNumber': { $exists: false }
+        }, { $set: { 'object.orderNumber': params.orderNumber } })
+            .exec();
+        return { modifiedCount: result.modifiedCount };
+    }
+    async saveConfirmationNumberIfNotExist(params) {
+        await this.transactionModel.updateOne({
+            _id: { $eq: params.id },
+            // status: { $eq: factory.transactionStatusType.InProgress },
+            status: { $in: params.status.$in },
+            'object.confirmationNumber': { $exists: false }
+        }, { $set: { 'object.confirmationNumber': params.confirmationNumber } })
+            .exec();
+    }
+}
+exports.PlaceOrderRepo = PlaceOrderRepo;

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

@@ -47,27 +47,6 @@ export declare class TransactionRepo {
         typeOf: T;
         id: string;
     }, inclusion: IKeyOfProjection<T>[]): Promise<ITransactionInProgress<T>>;
-    /**
-     * 進行中取引に保管された採用済決済方法を検索する
-     */
-    findInProgressPaymentMethodId(params: {
-        id: string;
-    }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined>;
-    /**
-     * 取引の注文番号を検索する
-     */
-    findInProgressOrderNumberById(params: {
-        id: string;
-    }): Promise<string | undefined>;
-    /**
-     * 取引の確認番号を検索する
-     */
-    findInProgressConfirmationNumberById(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-    }): Promise<string | undefined>;
     /**
      * 取引進行者プロフィールを更新
      */
@@ -79,25 +58,6 @@ export declare class TransactionRepo {
             customer?: factory.order.ICustomer;
         };
     }): Promise<void>;
-    /**
-     * 取引期限変更
-     */
-    updateExpires<T extends factory.transactionType>(params: {
-        typeOf: T;
-        id: string;
-        expires: Date;
-    }): Promise<void>;
-    /**
-     * 取引オブジェクトを更新
-     * 注文名称など
-     */
-    updateObject<T extends factory.transactionType>(params: {
-        typeOf: T;
-        id: string;
-        object?: {
-            name?: string;
-        };
-    }): Promise<void>;
     /**
      * 取引を確定する
      */
@@ -210,28 +170,6 @@ export declare class TransactionRepo {
     }): Promise<(Pick<factory.transaction.ITransaction<T>, F> & {
         id: string;
     })[]>;
-    /**
-     * 特定の進行中取引を更新する(汎用)
-     */
-    findByIdAndUpdateInProgress(params: {
-        id: string;
-        update: {
-            $set?: {
-                'object.paymentMethods'?: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
-            };
-        };
-    }): Promise<void>;
-    saveOrderNumberIfNotExist(params: {
-        id: string;
-        orderNumber: string;
-    }): Promise<void>;
-    saveConfirmationNumberIfNotExist(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-        confirmationNumber: string;
-    }): Promise<void>;
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;