@chevre/domain 25.0.0-alpha.11 → 25.0.0-alpha.13

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

@@ -26,7 +26,7 @@ const schemaDefinition = {
     orderDate: { type: Date, required: true },
     dateReturned: Date,
     orderedItem: [mongoose_1.SchemaTypes.Mixed],
-    identifier: String, // 注文取引IDとして再定義(2026-06-22~)
+    identifier: { type: String, required: true }, // 注文取引IDとして再定義(2026-06-22~)
     // 以下廃止(2026-06-13~)
     // identifier: SchemaTypes.Mixed, // 廃止するためにMixed化(2026-06-12~)
     // isGift: Boolean,

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

@@ -10,6 +10,7 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'
     identifier: string;
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
+    seller?: factory.order.ISeller;
 };
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
@@ -57,7 +58,7 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
 export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
     constructor(connection: Connection);
-    createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
+    createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する

package/lib/chevre/repo/orderInTransaction.js

@@ -17,13 +17,15 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
     }
     async createPlaceOrderIfNotExists(params) {
-        const { orderNumber, project, identifier, broker } = params;
+        const { orderNumber, project, identifier, broker, seller, customer } = params;
         const setOnInsert = {
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             orderDate: new Date(), // orderDate required(2024-12-09~)
             orderNumber,
             project,
             identifier, // 取引ID(2026-06-22~)
+            ...((seller !== undefined) && { seller }),
+            ...((customer !== undefined) && { customer }),
             ...((broker !== undefined) && { broker })
         };
         try {
@@ -113,21 +115,23 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
             return;
         }
-        const setOnInsert = {
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            orderDate: new Date(), // orderDate required(2024-12-09~)
-            orderNumber: params.orderNumber,
-            project: params.project,
-            identifier: params.identifier // 取引ID(2026-06-22~)
-        };
-        return this.orderModel.updateOne({
+        const { orderNumber, project, identifier } = params;
+        await this.createPlaceOrderIfNotExists({ orderNumber, project, identifier });
+        // const setOnInsert: IInitalOrderInTransaction = {
+        //     typeOf: factory.transactionType.PlaceOrder,
+        //     orderDate: new Date(), // orderDate required(2024-12-09~)
+        //     orderNumber: params.orderNumber,
+        //     project: params.project,
+        //     identifier: params.identifier // 取引ID(2026-06-22~)
+        // };
+        const result = await this.orderModel.updateOne({
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             orderNumber: { $eq: params.orderNumber },
             // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
             // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
             'project.id': { $eq: params.project.id }
         }, {
-            $setOnInsert: setOnInsert,
+            // $setOnInsert: setOnInsert, // createPlaceOrderIfNotExistsへ移行(2026-06-24~)
             $push: {
                 acceptedOffers: {
                     $each: params.acceptedOffers
@@ -138,8 +142,15 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
                     broker: { id: params.broker.id, typeOf: params.broker.typeOf }
                 }) // set broker(2026-06-21~)
             }
-        }, { upsert: true })
+        }, {
+        // upsert: true // createPlaceOrderIfNotExistsへ移行(2026-06-24~)
+        })
             .exec();
+        if (result.matchedCount !== 1) {
+            console.error(params, result);
+            throw new factory_1.factory.errors.Internal(`orderInTransaction not found`);
+        }
+        return result;
     }
     /**
      * serialNumberからオファーを除外する
@@ -179,7 +190,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         }
     }
     async setCustomer(params) {
-        const { customer, orderNumber, project } = params;
+        const { customer, orderNumber, project, identifier } = params;
         const filter = {
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             orderNumber: { $eq: orderNumber },
@@ -187,19 +198,27 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
             'project.id': { $eq: project.id }
         };
-        const setOnInsert = {
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            orderDate: new Date(), // orderDate required(2024-12-09~)
-            orderNumber,
-            project,
-            identifier: params.identifier // 取引ID(2026-06-22~)
-        };
+        await this.createPlaceOrderIfNotExists({ orderNumber, project, identifier });
+        // const setOnInsert: IInitalOrderInTransaction = {
+        //     typeOf: factory.transactionType.PlaceOrder,
+        //     orderDate: new Date(), // orderDate required(2024-12-09~)
+        //     orderNumber,
+        //     project,
+        //     identifier: params.identifier // 取引ID(2026-06-22~)
+        // };
         const setKeys = { customer };
-        return this.orderModel.updateOne(filter, {
-            $setOnInsert: setOnInsert,
+        const result = await this.orderModel.updateOne(filter, {
+            // $setOnInsert: setOnInsert, // createPlaceOrderIfNotExistsへ移行(2026-06-24~)
             $set: setKeys
-        }, { upsert: true })
+        }, {
+        // upsert: true // createPlaceOrderIfNotExistsへ移行(2026-06-24~)
+        })
             .exec();
+        if (result.matchedCount !== 1) {
+            console.error(params, result);
+            throw new factory_1.factory.errors.Internal(`orderInTransaction not found`);
+        }
+        return result;
     }
     /**
      * 注文ドキュメントからcustomer属性を参照する

package/lib/chevre/service/transaction/placeOrder/start/factory.d.ts

@@ -13,6 +13,10 @@ type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithout
          */
         clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
     };
+    /**
+     * 注文ドキュメントに保管する代理人
+     */
+    broker?: factory.order.IBroker;
 };
 declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
 export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

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

@@ -1,7 +1,10 @@
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PassportRepo } from '../../../repo/passport';
+import type { ProjectRepo } from '../../../repo/project';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -14,10 +17,13 @@ interface IStartOperationRepos {
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
     placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    project: ProjectRepo;
+    orderNumber: OrderNumberRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 interface IStartOptions {
-    lockPassport: boolean;
+    createOrderDocument: boolean;
 }
 /**
  * 取引開始

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

@@ -4,6 +4,7 @@ exports.start = start;
 const factory_1 = require("../../../factory");
 const factory_2 = require("./start/factory");
 const validateStartRequest_1 = require("./start/validateStartRequest");
+const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 /**
  * 取引開始
  */
@@ -25,7 +26,7 @@ function start(params, options) {
         const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
-        if (options.lockPassport && passport !== undefined) {
+        if (passport !== undefined) {
             try {
                 await repos.passport.lock(passport);
             }
@@ -51,6 +52,28 @@ function start(params, options) {
         if (transaction === undefined) {
             transaction = await repos.placeOrder.startPlaceOrder(startParams);
         }
+        // support createOrderDocument(2026-06-23~)
+        if (options.createOrderDocument) {
+            const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+                project: { id: params.project.id },
+                id: transaction.id,
+                object: { orderDate: new Date() }
+            })(repos);
+            await repos.orderInTransaction.createPlaceOrderIfNotExists({
+                orderNumber,
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                identifier: transaction.id,
+                seller: {
+                    id: seller.id,
+                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
+                    typeOf: seller.typeOf,
+                    additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+                },
+                ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
+                ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
+            });
+            // console.log('createPlaceOrderResult:', createPlaceOrderResult);
+        }
         return transaction;
     };
 }

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

@@ -5,5 +5,4 @@ import { confirm } from './placeOrder/confirm';
 import { exportTasksById } from './placeOrder/exportTasksById';
 import { start, IStartPlaceOrderParams } from './placeOrder/start';
 import { updateAgent } from './placeOrder/updateAgent';
-import { issueOrderNumberIfNotExist } from './placeOrder/issueOrderNumberIfNotExist';
-export { confirm, start, IStartPlaceOrderParams, exportTasksById, updateAgent, issueOrderNumberIfNotExist };
+export { confirm, start, IStartPlaceOrderParams, exportTasksById, updateAgent };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.issueOrderNumberIfNotExist = exports.updateAgent = exports.exportTasksById = exports.start = exports.confirm = void 0;
+exports.updateAgent = exports.exportTasksById = exports.start = exports.confirm = void 0;
 /**
  * 注文取引サービス
  */
@@ -12,5 +12,3 @@ const start_1 = require("./placeOrder/start");
 Object.defineProperty(exports, "start", { enumerable: true, get: function () { return start_1.start; } });
 const updateAgent_1 = require("./placeOrder/updateAgent");
 Object.defineProperty(exports, "updateAgent", { enumerable: true, get: function () { return updateAgent_1.updateAgent; } });
-const issueOrderNumberIfNotExist_1 = require("./placeOrder/issueOrderNumberIfNotExist");
-Object.defineProperty(exports, "issueOrderNumberIfNotExist", { enumerable: true, get: function () { return issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist; } });

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.11"
+  "version": "25.0.0-alpha.13"
 }