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

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

@@ -59,6 +59,26 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
     constructor(connection: Connection);
     createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
+    /**
+     * 注文取引から注文番号を参照する
+     * 存在しなければNotFoundError
+     */
+    findOrderNumberByIdentifier(params: {
+        identifier: string;
+        project: {
+            id: string;
+        };
+    }): Promise<string>;
+    /**
+     * 注文取引からcustomerを参照する
+     * 存在しなければNotFoundError
+     */
+    findCustomerByIdentifier(params: {
+        identifier: string;
+        project: {
+            id: string;
+        };
+    }): Promise<Pick<IOrderInTransaction, 'customer'>>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する

package/lib/chevre/repo/orderInTransaction.js

@@ -45,6 +45,48 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             }
         }
     }
+    /**
+     * 注文取引から注文番号を参照する
+     * 存在しなければNotFoundError
+     */
+    async findOrderNumberByIdentifier(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,
+            orderNumber: 1
+        })
+            .lean()
+            .exec();
+        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/offer/event/authorize.js

@@ -29,7 +29,7 @@ function authorize(params, options) {
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }
-        })(repos);
+        }, { issueForce: false })(repos);
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts

@@ -2,6 +2,7 @@ import type { COA } from '@motionpicture/coa-service';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { EventRepo } from '../../../repo/event';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -9,6 +10,7 @@ import { factory } from '../../../factory';
 interface IAcceptRepos {
     action: AcceptCOAOfferActionRepo;
     event: EventRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -44,7 +44,7 @@ function acceptOffer(params) {
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
-        })(repos);
+        }, { issueForce: false })(repos);
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         const updTmpReserveSeatArgs = (0, factory_2.createUpdTmpReserveSeatArgs)({ object: params.object, coaInfo });
         let updTmpReserveSeatResult;

package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.d.ts

@@ -1,5 +1,6 @@
 import { factory } from '../../../../factory';
 import type { ConfirmationNumberRepo } from '../../../../repo/confirmationNumber';
+import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../../repo/project';
 import type { PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
@@ -12,6 +13,7 @@ declare function fixOrderAsNeeded(params: {
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     confirmationNumber: ConfirmationNumberRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
 }) => Promise<{
     confirmationNumber: string;

package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js

@@ -22,7 +22,7 @@ function fixOrderAsNeeded(params) {
             project: { id: params.project.id },
             id: params.purpose.id,
             object: { orderDate }
-        })(repos);
+        }, { issueForce: false })(repos);
         return { confirmationNumber, orderNumber };
     };
 }

package/lib/chevre/service/payment/any/authorize.d.ts

@@ -14,6 +14,7 @@ import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -43,6 +44,7 @@ interface IAuthorizeRepos {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts

@@ -7,6 +7,7 @@ import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -24,6 +25,7 @@ interface IPublishPaymentUrlRepos {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/any/publishPaymentUrl.js

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishPaymentUrl = publishPaymentUrl;
 const factory_1 = require("../../../factory");
-// import type { TransactionProcessRepo } from '../../repo/transactionProcess';
 const PayTransactionService = __importStar(require("../../assetTransaction/pay"));
 const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const fixTransactionNumberOnPublishPaymentUrl_1 = require("./publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl");
@@ -59,7 +58,7 @@ function publishPaymentUrl(params) {
                 project: { id: transaction.project.id },
                 id: transaction.id,
                 object: { orderDate: new Date() }
-            })(repos);
+            }, { issueForce: false })(repos);
             // 取引番号生成
             const { transactionNumber, ticketToken } = await (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
                 object: params.object,

package/lib/chevre/service/task/acceptCOAOffer.js

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const coa_service_1 = require("@motionpicture/coa-service");
 const factory_1 = require("../../factory");
-// import { ActionRepo } from '../../repo/action';
 const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const orderNumber_1 = require("../../repo/orderNumber");
 const project_1 = require("../../repo/project");
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
 let coaAuthClient;
@@ -90,7 +89,6 @@ function call(params) {
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });
@@ -106,10 +104,10 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
+                    orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });

package/lib/chevre/service/task/authorizePayment.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
-// import { ActionRepo } from '../../repo/action';
 const pay_1 = require("../../repo/action/pay");
 const refund_1 = require("../../repo/action/refund");
 const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
@@ -17,6 +16,7 @@ const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -27,10 +27,8 @@ const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -60,7 +58,6 @@ function call(params) {
                 sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
             })({
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-                // action: new ActionRepo(connection),
                 actions: {
                     pay: new pay_1.PayActionRepo(connection),
                     refund: new refund_1.RefundActionRepo(connection),
@@ -79,6 +76,7 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
+                orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
@@ -89,9 +87,7 @@ function call(params) {
                 task: new task_1.TaskRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                // transaction: new TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
-                // transactionProcess: transactionProcessRepo
             }, settings);
         }
         catch (error) {

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
-// import { ActionRepo } from '../../repo/action';
 const acceptPay_1 = require("../../repo/action/acceptPay");
 const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -10,6 +9,7 @@ const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -17,10 +17,8 @@ const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const ticket_1 = require("../../repo/ticket");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -43,7 +41,6 @@ function call(params) {
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 sameAs: { id: params.id }
             })({
-                // action: new ActionRepo(connection),
                 acceptPayAction: actionRepo,
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -51,6 +48,7 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
+                orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
@@ -58,7 +56,6 @@ function call(params) {
                 project: new project_1.ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                // transaction: new TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
             }, settings);
         }

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

@@ -1,3 +1,4 @@
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -15,9 +16,12 @@ declare function issueOrderNumberIfNotExist(params: {
     object: {
         orderDate: Date;
     };
+}, options: {
+    issueForce: boolean;
 }): (repos: {
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
 }) => Promise<string>;
 export { issueOrderNumberIfNotExist };

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

@@ -2,11 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.issueOrderNumberIfNotExist = issueOrderNumberIfNotExist;
 const factory_1 = require("../../../factory");
+const USE_LEGACY_ISSUE_ORDER_NUMBER = process.env.USE_LEGACY_ISSUE_ORDER_NUMBER === '1';
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
-function issueOrderNumberIfNotExist(params) {
+function issueOrderNumberIfNotExist(params, options) {
     return async (repos) => {
+        // issueForceオプションあるいは、廃止予定の発行オプションの場合、注文番号を新たに発行する
+        const issueOrderNumber = options?.issueForce === true || USE_LEGACY_ISSUE_ORDER_NUMBER;
+        if (!issueOrderNumber) {
+            // 注文ドキュメントを参照(2026-06-24~)
+            return repos.orderInTransaction.findOrderNumberByIdentifier({
+                identifier: params.id,
+                project: { id: params.project.id }
+            });
+        }
         // 1. 最初のチェック
         let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
         // すでに発行済であれば何もしない

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

@@ -58,7 +58,7 @@ function start(params, options) {
                 project: { id: params.project.id },
                 id: transaction.id,
                 object: { orderDate: new Date() }
-            })(repos);
+            }, { issueForce: true })(repos);
             await repos.orderInTransaction.createPlaceOrderIfNotExists({
                 orderNumber,
                 project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },

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,
@@ -79,7 +78,7 @@ function updateAgent(params) {
                 project: { id: transaction.project.id },
                 id: params.id,
                 object: { orderDate: new Date() }
-            })(repos);
+            }, { issueForce: false })(repos);
             const customerName = (typeof customer.name === 'string' && customer.name !== '')
                 ? customer.name
                 : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'

package/package.json

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