@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/repo/orderInTransaction.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderInTransactionRepo = void 0;
 const factory = require("../factory");
@@ -16,157 +7,143 @@ const order_1 = require("./mongoose/schemas/order");
  * 取引中注文リポジトリ
  */
 class OrderInTransactionRepo {
+    orderModel;
     constructor(connection) {
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
     }
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      */
-    findAcceptedOffersByOrderNumber(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.orderModel.findOne({
-                orderNumber: { $eq: params.orderNumber.$eq },
-                typeOf: { $eq: factory.transactionType.PlaceOrder }
-            }, { acceptedOffers: 1 })
-                .lean()
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound('orderInTransaction');
-            }
-            return doc.acceptedOffers;
-        });
+    async findAcceptedOffersByOrderNumber(params) {
+        const doc = await this.orderModel.findOne({
+            orderNumber: { $eq: params.orderNumber.$eq },
+            typeOf: { $eq: factory.transactionType.PlaceOrder }
+        }, { acceptedOffers: 1 })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound('orderInTransaction');
+        }
+        return doc.acceptedOffers;
     }
     /**
      * 注文を受注する
      */
-    placeOrder(order) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(order.orderDate instanceof Date)) {
-                throw new factory.errors.Argument('orderDate', 'must be Date');
-            }
-            let setFields;
-            // acceptedOffersを上書きしない
-            // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
-            setFields = order;
-            // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
-            yield this.orderModel.updateOne({
-                orderNumber: { $eq: order.orderNumber },
-                typeOf: { $eq: factory.transactionType.PlaceOrder }
-            }, { $set: setFields }, {})
-                .exec();
-        });
+    async placeOrder(order) {
+        if (!(order.orderDate instanceof Date)) {
+            throw new factory.errors.Argument('orderDate', 'must be Date');
+        }
+        let setFields;
+        // acceptedOffersを上書きしない
+        // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
+        setFields = order;
+        // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
+        await this.orderModel.updateOne({
+            orderNumber: { $eq: order.orderNumber },
+            typeOf: { $eq: factory.transactionType.PlaceOrder }
+        }, { $set: setFields }, {})
+            .exec();
     }
-    acceptOffer(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
-                return;
+    async acceptOffer(params) {
+        if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
+            return;
+        }
+        const setOnInsert = {
+            typeOf: factory.transactionType.PlaceOrder,
+            orderDate: new Date(), // orderDate required(2024-12-09~)
+            orderNumber: params.orderNumber,
+            project: params.project
+        };
+        return this.orderModel.updateOne({
+            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            orderNumber: { $eq: params.orderNumber }
+        }, {
+            $setOnInsert: setOnInsert,
+            $push: {
+                acceptedOffers: {
+                    $each: params.acceptedOffers
+                }
             }
-            const setOnInsert = {
-                typeOf: factory.transactionType.PlaceOrder,
-                orderDate: new Date(), // orderDate required(2024-12-09~)
-                orderNumber: params.orderNumber,
-                project: params.project
-            };
+        }, { upsert: true })
+            .exec();
+    }
+    /**
+     * serialNumberからオファーを除外する
+     * ホワイトリストとブラックリスト両方に対応
+     */
+    async voidAcceptedOfferBySerialNumber(params) {
+        const serialNumberIn = params.acceptedOffers.serialNumber.$in;
+        const serialNumberNin = params.acceptedOffers.serialNumber.$nin;
+        if (Array.isArray(serialNumberIn) && serialNumberIn.length > 0) {
             return this.orderModel.updateOne({
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
                 orderNumber: { $eq: params.orderNumber }
             }, {
-                $setOnInsert: setOnInsert,
-                $push: {
+                $pull: {
                     acceptedOffers: {
-                        $each: params.acceptedOffers
+                        serialNumber: { $exists: true, $in: serialNumberIn }
                     }
                 }
-            }, { upsert: true })
-                .exec();
-        });
-    }
-    /**
-     * serialNumberからオファーを除外する
-     * ホワイトリストとブラックリスト両方に対応
-     */
-    voidAcceptedOfferBySerialNumber(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const serialNumberIn = params.acceptedOffers.serialNumber.$in;
-            const serialNumberNin = params.acceptedOffers.serialNumber.$nin;
-            if (Array.isArray(serialNumberIn) && serialNumberIn.length > 0) {
-                return this.orderModel.updateOne({
-                    typeOf: { $eq: factory.transactionType.PlaceOrder },
-                    orderNumber: { $eq: params.orderNumber }
-                }, {
-                    $pull: {
-                        acceptedOffers: {
-                            serialNumber: { $exists: true, $in: serialNumberIn }
-                        }
-                    }
-                })
-                    .exec();
-            }
-            else if (Array.isArray(serialNumberNin) && serialNumberNin.length > 0) {
-                return this.orderModel.updateOne({
-                    typeOf: { $eq: factory.transactionType.PlaceOrder },
-                    orderNumber: { $eq: params.orderNumber }
-                }, {
-                    $pull: {
-                        acceptedOffers: {
-                            serialNumber: { $nin: serialNumberNin }
-                        }
-                    }
-                })
-                    .exec();
-            }
-            else {
-                return;
-            }
-        });
-    }
-    setCustomer(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { customer, orderNumber, project } = params;
-            const filter = {
-                typeOf: { $eq: factory.transactionType.PlaceOrder },
-                orderNumber: { $eq: orderNumber }
-            };
-            const setOnInsert = {
-                typeOf: factory.transactionType.PlaceOrder,
-                orderDate: new Date(), // orderDate required(2024-12-09~)
-                orderNumber,
-                project
-            };
-            const setKeys = { customer };
-            return this.orderModel.updateOne(filter, {
-                $setOnInsert: setOnInsert,
-                $set: setKeys
-            }, { upsert: true })
-                .exec();
-        });
-    }
-    findCustomerByOrderNumber(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const doc = yield this.orderModel.findOne({
-                orderNumber: { $eq: params.orderNumber.$eq }
-                // typeOf: { $eq: factory.transactionType.PlaceOrder } // 検証しない
-            }, { customer: 1 })
-                .lean()
+            })
                 .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound('orderInTransaction');
-            }
-            if (typeof ((_a = doc.customer) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string') {
-                throw new factory.errors.NotFound('orderInTransaction.customer');
-            }
-            return doc.customer;
-        });
-    }
-    deleteByOrderNumber(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.orderModel.deleteOne({
+        }
+        else if (Array.isArray(serialNumberNin) && serialNumberNin.length > 0) {
+            return this.orderModel.updateOne({
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
                 orderNumber: { $eq: params.orderNumber }
+            }, {
+                $pull: {
+                    acceptedOffers: {
+                        serialNumber: { $nin: serialNumberNin }
+                    }
+                }
             })
                 .exec();
-        });
+        }
+        else {
+            return;
+        }
+    }
+    async setCustomer(params) {
+        const { customer, orderNumber, project } = params;
+        const filter = {
+            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            orderNumber: { $eq: orderNumber }
+        };
+        const setOnInsert = {
+            typeOf: factory.transactionType.PlaceOrder,
+            orderDate: new Date(), // orderDate required(2024-12-09~)
+            orderNumber,
+            project
+        };
+        const setKeys = { customer };
+        return this.orderModel.updateOne(filter, {
+            $setOnInsert: setOnInsert,
+            $set: setKeys
+        }, { upsert: true })
+            .exec();
+    }
+    async findCustomerByOrderNumber(params) {
+        const doc = await this.orderModel.findOne({
+            orderNumber: { $eq: params.orderNumber.$eq }
+            // typeOf: { $eq: factory.transactionType.PlaceOrder } // 検証しない
+        }, { customer: 1 })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound('orderInTransaction');
+        }
+        if (typeof doc.customer?.typeOf !== 'string') {
+            throw new factory.errors.NotFound('orderInTransaction.customer');
+        }
+        return doc.customer;
+    }
+    async deleteByOrderNumber(params) {
+        return this.orderModel.deleteOne({
+            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            orderNumber: { $eq: params.orderNumber }
+        })
+            .exec();
     }
 }
 exports.OrderInTransactionRepo = OrderInTransactionRepo;

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

@@ -8,7 +8,6 @@ export declare class OrderNumberRepo {
     constructor(params: {
         connection: Connection;
     });
-    static GENERATE_VERSION0(timestamp: string, seq: number): string;
     /**
      * タイムスタンプから発行する
      */

package/lib/chevre/repo/orderNumber.js

@@ -1,19 +1,7 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderNumberRepo = void 0;
-const cdigit = require("cdigit");
 const moment = require("moment-timezone");
-// tslint:disable-next-line:no-require-imports no-var-requires
-const fpe = require('node-fpe-v1');
 const factory = require("../factory");
 const transactionNumber_1 = require("../factory/transactionNumber");
 const setting_1 = require("./mongoose/schemas/setting");
@@ -29,131 +17,129 @@ const defaultVersioningForceProjects = [
  * 注文番号リポジトリ
  */
 class OrderNumberRepo {
+    counterRepo;
+    settingModel;
     constructor(params) {
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
         this.settingModel = params.connection.model(setting_1.modelName, (0, setting_1.createSchema)());
     }
-    static GENERATE_VERSION0(timestamp, seq) {
-        let orderNumber = `${timestamp}${seq}`;
-        // checkdigit
-        const cd = cdigit.luhn.compute(orderNumber);
-        orderNumber = fpe({ password: cd })
-            .encrypt(orderNumber);
-        orderNumber = `${cd}${orderNumber}`;
-        return orderNumber;
-    }
+    // public static GENERATE_VERSION0(timestamp: string, seq: number): string {
+    //     let orderNumber = `${timestamp}${seq}`;
+    //     // checkdigit
+    //     const cd = cdigit.luhn.compute(orderNumber);
+    //     orderNumber = fpe({ password: cd })
+    //         .encrypt(orderNumber);
+    //     orderNumber = `${cd}${orderNumber}`;
+    //     return orderNumber;
+    // }
     /**
      * タイムスタンプから発行する
      */
-    publishByTimestamp(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = yield this.findSetting();
-            const timestamp = moment(params.orderDate)
-                .valueOf()
-                .toString();
-            const projectPrefix = params.project.alternateName
-                .toUpperCase();
-            let dataFeedExpires;
-            const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
-            let incrReply;
-            dataFeedExpires = moment(params.orderDate)
-                .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                .toDate();
-            incrReply = yield this.counterRepo.incrementByMongo({
-                identifier: dataFeedIdentifier,
-                includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.orderNumber },
-                expires: dataFeedExpires
-            });
-            let orderNumber;
-            let useVersioning = (validFrom instanceof Date && moment(validFrom)
-                .isSameOrBefore(params.orderDate))
-                // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
-                || versioningForceProjects.includes(projectPrefix);
-            // versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
-            if (versioningExceptionProjects.includes(projectPrefix)) {
-                useVersioning = false;
-            }
-            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 = `${[
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(0, 4),
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(4, 11),
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(11)
-                ].join(ORDER_NUMBER_SEPARATOR)}`;
-            }
-            else {
-                orderNumber = OrderNumberRepo.GENERATE_VERSION0(timestamp, incrReply);
-                orderNumber = `${projectPrefix}${orderNumber}`;
-                orderNumber = `${[
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(0, 4),
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(4, 11),
-                    // tslint:disable-next-line:no-magic-numbers
-                    orderNumber.slice(11)
-                ].join(ORDER_NUMBER_SEPARATOR)}`;
-            }
-            return orderNumber;
+    async publishByTimestamp(params) {
+        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = await this.findSetting();
+        const timestamp = moment(params.orderDate)
+            .valueOf()
+            .toString();
+        const projectPrefix = params.project.alternateName
+            .toUpperCase();
+        let dataFeedExpires;
+        const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+        let incrReply;
+        dataFeedExpires = moment(params.orderDate)
+            .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
+            .toDate();
+        incrReply = await this.counterRepo.incrementByMongo({
+            identifier: dataFeedIdentifier,
+            includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.orderNumber },
+            expires: dataFeedExpires
         });
+        let orderNumber;
+        let useVersioning = (validFrom instanceof Date && moment(validFrom)
+            .isSameOrBefore(params.orderDate))
+            // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
+            || versioningForceProjects.includes(projectPrefix);
+        // versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
+        if (versioningExceptionProjects.includes(projectPrefix)) {
+            useVersioning = false;
+        }
+        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 = `${[
+                // tslint:disable-next-line:no-magic-numbers
+                orderNumber.slice(0, 4),
+                // tslint:disable-next-line:no-magic-numbers
+                orderNumber.slice(4, 11),
+                // tslint:disable-next-line:no-magic-numbers
+                orderNumber.slice(11)
+            ].join(ORDER_NUMBER_SEPARATOR)}`;
+        }
+        else {
+            // discontinue version0(2026-02-13~)
+            throw new factory.errors.NotImplemented('orderNumber with no version discontinued');
+            // orderNumber = OrderNumberRepo.GENERATE_VERSION0(timestamp, incrReply);
+            // orderNumber = `${projectPrefix}${orderNumber}`;
+            // orderNumber = `${[
+            //     // tslint:disable-next-line:no-magic-numbers
+            //     orderNumber.slice(0, 4),
+            //     // tslint:disable-next-line:no-magic-numbers
+            //     orderNumber.slice(4, 11),
+            //     // tslint:disable-next-line:no-magic-numbers
+            //     orderNumber.slice(11)
+            // ].join(ORDER_NUMBER_SEPARATOR)}`;
+        }
+        return orderNumber;
     }
-    decrypt(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { fpeSecret, version } = yield this.findSetting();
-            if (typeof fpeSecret === 'string' && typeof version === 'string') {
-                const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
-                const originalOrderNumber = id.replace(/-/g, '')
-                    // tslint:disable-next-line:no-magic-numbers
-                    .slice(1);
-                return transactionFactory.decrypt(originalOrderNumber);
-            }
-            else {
-                throw new factory.errors.NotImplemented('no version not implemented');
-            }
-        });
+    async decrypt(id) {
+        const { fpeSecret, version } = await this.findSetting();
+        if (typeof fpeSecret === 'string' && typeof version === 'string') {
+            const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+            const originalOrderNumber = id.replace(/-/g, '')
+                // tslint:disable-next-line:no-magic-numbers
+                .slice(1);
+            return transactionFactory.decrypt(originalOrderNumber);
+        }
+        else {
+            throw new factory.errors.NotImplemented('no version not implemented');
+        }
     }
     /**
      * 注文番号生成設定を検索する
      */
-    findSetting() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const filterQuery = { 'project.id': { $eq: '*' } };
-            const projection = {
-                _id: 0,
-                orderNumber: 1
-            };
-            const setting = yield this.settingModel.findOne(filterQuery, projection)
-                .lean()
-                .exec();
-            if (setting === null || setting.orderNumber === undefined) {
-                return {
-                    versioningForceProjects: [],
-                    versioningExceptionProjects: []
-                };
-            }
-            const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
-            if (typeof fpeSecret !== 'string' || fpeSecret === '') {
-                throw new factory.errors.NotFound('setting.orderNumber.secret');
-            }
-            if (typeof version !== 'string' || version === '') {
-                throw new factory.errors.NotFound('setting.orderNumber.version');
-            }
-            if (!(validFrom instanceof Date)) {
-                throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
-            }
+    async findSetting() {
+        const filterQuery = { 'project.id': { $eq: '*' } };
+        const projection = {
+            _id: 0,
+            orderNumber: 1
+        };
+        const setting = await this.settingModel.findOne(filterQuery, projection)
+            .lean()
+            .exec();
+        if (setting === null || setting.orderNumber === undefined) {
             return {
-                fpeSecret, version, validFrom,
-                versioningForceProjects: [
-                    ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
-                    ...defaultVersioningForceProjects
-                ],
-                versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
+                versioningForceProjects: [],
+                versioningExceptionProjects: []
             };
-        });
+        }
+        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
+        if (typeof fpeSecret !== 'string' || fpeSecret === '') {
+            throw new factory.errors.NotFound('setting.orderNumber.secret');
+        }
+        if (typeof version !== 'string' || version === '') {
+            throw new factory.errors.NotFound('setting.orderNumber.version');
+        }
+        if (!(validFrom instanceof Date)) {
+            throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
+        }
+        return {
+            fpeSecret, version, validFrom,
+            versioningForceProjects: [
+                ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
+                ...defaultVersioningForceProjects
+            ],
+            versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
+        };
     }
 }
 exports.OrderNumberRepo = OrderNumberRepo;