@chevre/domain 25.0.0-alpha.12 → 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.js

@@ -115,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
@@ -140,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からオファーを除外する
@@ -181,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 },
@@ -189,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/package.json

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