@chevre/domain 25.0.0-alpha.14 → 25.0.0-alpha.15

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

@@ -69,6 +69,16 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
             id: string;
         };
     }): Promise<string>;
+    /**
+     * 注文取引からcustomerを参照する
+     * 存在しなければNotFoundError
+     */
+    findCustomerByIdentifier(params: {
+        identifier: string;
+        project: {
+            id: string;
+        };
+    }): Promise<Pick<IOrderInTransaction, 'customer'>>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する

package/lib/chevre/repo/orderInTransaction.js

@@ -61,12 +61,32 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         })
             .lean()
             .exec();
-        console.log('findOrderNumberByIdentifier:', JSON.stringify(doc));
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound('orderInTransaction');
         }
         return doc.orderNumber;
     }
+    /**
+     * 注文取引からcustomerを参照する
+     * 存在しなければNotFoundError
+     */
+    async findCustomerByIdentifier(params) {
+        const { project, identifier } = params;
+        const doc = await this.orderModel.findOne({
+            identifier: { $eq: identifier },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
+            'project.id': { $eq: project.id }
+        }, {
+            _id: 0,
+            customer: 1
+        })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
+        }
+        return doc;
+    }
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する

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

@@ -4,7 +4,6 @@ exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
 const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
-// export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
 function fixCustomer(params) {
     return async (repos) => {
         let formattedTelephone;
@@ -20,7 +19,7 @@ function fixCustomer(params) {
             throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : String(error));
         }
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: params.typeOf,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.id
         }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
@@ -29,20 +28,20 @@ function fixCustomer(params) {
         // 注文取引の場合、object.customerにも適用
         let customer;
         if (transaction.typeOf === factory_1.factory.transactionType.PlaceOrder) {
-            // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
-            const trasactionObject = transaction.object;
-            if (typeof trasactionObject.customer?.typeOf === 'string') {
+            // orderInTransaction.customer?.typeOfは取引開始時にセットされている前提で再実装(2026-06-24~)
+            const { customer: customerByTransaction } = await repos.orderInTransaction.findCustomerByIdentifier({
+                identifier: params.id,
+                project: { id: transaction.project.id }
+            });
+            // // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
+            // const customerByTransaction = transaction.object.customer;
+            if (typeof customerByTransaction?.typeOf === 'string') {
                 customer = {
-                    typeOf: trasactionObject.customer.typeOf,
-                    id: trasactionObject.customer.id,
-                    ...(Array.isArray(trasactionObject.customer.identifier))
-                        ? { identifier: trasactionObject.customer.identifier }
+                    typeOf: customerByTransaction.typeOf,
+                    id: customerByTransaction.id,
+                    ...(Array.isArray(customerByTransaction.identifier))
+                        ? { identifier: customerByTransaction.identifier }
                         : /* istanbul ignore next */ undefined,
-                    // discontinue(2024-05-16~)
-                    // ...(transaction.object.customer.typeOf === factory.personType.Person
-                    //     && typeof transaction.object.customer.memberOf?.typeOf === 'string')
-                    //     ? { memberOf: transaction.object.customer.memberOf }
-                    //     : undefined,
                     ...(Array.isArray(params.agent.additionalProperty))
                         ? { additionalProperty: params.agent.additionalProperty }
                         : /* istanbul ignore next */ undefined,

package/package.json

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