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

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

@@ -12,7 +12,7 @@ const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     name: String,
-    seller: mongoose_1.SchemaTypes.Mixed,
+    seller: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     customer: mongoose_1.SchemaTypes.Mixed,
     returner: mongoose_1.SchemaTypes.Mixed,
     confirmationNumber: String,

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

@@ -15,7 +15,7 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
  */
-export type IPlacingOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {
+export type IPlacingOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'typeOf'> & {
     url?: never;
     identifier?: never;
     name?: never;
@@ -31,6 +31,10 @@ export type IPlacingOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'o
      * 上書きしてはいけない
      */
     broker?: never;
+    /**
+     * 上書きしてはいけない
+     */
+    seller?: never;
 };
 export type IMinimizedReservationFor = Pick<factory.order.IEventAsReservationFor, 'endDate' | 'id' | 'startDate' | 'typeOf'> & {
     location: Pick<factory.order.IEventAsReservationFor['location'], 'branchCode' | 'typeOf'>;
@@ -102,7 +106,6 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
      */
     acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier'> & {
         acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
-        broker?: factory.order.IBroker;
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する

package/lib/chevre/repo/orderInTransaction.js

@@ -157,15 +157,8 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
             return;
         }
-        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 { orderNumber, project, identifier } = params;
+        // await this.createPlaceOrderIfNotExists({ orderNumber, project, identifier }); // 取引開始時に完全移行(2026-06-25~)
         const result = await this.orderModel.updateOne({
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             orderNumber: { $eq: params.orderNumber },
@@ -178,11 +171,6 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
                 acceptedOffers: {
                     $each: params.acceptedOffers
                 }
-            },
-            $set: {
-                ...((params.broker !== undefined) && {
-                    broker: { id: params.broker.id, typeOf: params.broker.typeOf }
-                }) // set broker(2026-06-21~)
             }
         }, {
         // upsert: true // createPlaceOrderIfNotExistsへ移行(2026-06-24~)
@@ -232,7 +220,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         }
     }
     async setCustomer(params) {
-        const { customer, orderNumber, project, identifier } = params;
+        const { customer, orderNumber, project } = params;
         const filter = {
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             orderNumber: { $eq: orderNumber },
@@ -240,14 +228,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
             'project.id': { $eq: project.id }
         };
-        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~)
-        // };
+        // await this.createPlaceOrderIfNotExists({ orderNumber, project, identifier }); // 取引開始時に完全移行(2026-06-25~)
         const setKeys = { customer };
         const result = await this.orderModel.updateOne(filter, {
             // $setOnInsert: setOnInsert, // createPlaceOrderIfNotExistsへ移行(2026-06-24~)

package/lib/chevre/service/offer/any.d.ts

@@ -12,7 +12,6 @@ export declare function acceptOffer(params: {
     };
     placeOrderId: string;
     acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
-    broker?: factory.order.IBroker;
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**

package/lib/chevre/service/offer/any.js

@@ -14,8 +14,7 @@ function acceptOffer(params) {
             orderNumber: params.orderNumber,
             project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             identifier: params.placeOrderId,
-            acceptedOffers: params.acceptedOffers,
-            ...((params.broker !== undefined) && { broker: params.broker })
+            acceptedOffers: params.acceptedOffers
         });
     };
 }

package/lib/chevre/service/offer/event/authorize.js

@@ -67,8 +67,7 @@ function authorize(params, options) {
                     orderNumber,
                     project: transaction.project,
                     placeOrderId: transaction.id,
-                    acceptedOffers: minimizedAcceptedOffers,
-                    ...((typeof params.object.broker?.typeOf === 'string') && { broker: params.object.broker })
+                    acceptedOffers: minimizedAcceptedOffers
                 })(repos);
             }
         }

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -32,7 +32,7 @@ export declare function responseBody2acceptedOffers4result(params: {
     responseBody: IResponseBody;
     acceptedOffer: IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
-    seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
+    seller?: never;
     bookingTime: Date;
     totalPrice: number;
 }): IResultAcceptedOffer[];

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

@@ -103,7 +103,7 @@ function authorize(params) {
                 responseBody: params.result.responseBody,
                 acceptedOffer: acceptedOffers,
                 event: screeningEvent,
-                seller: transaction.seller,
+                // seller: transaction.seller,
                 bookingTime: (0, moment_1.default)(action.startDate)
                     .toDate(),
                 totalPrice: price

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

@@ -126,7 +126,7 @@ function changeOffers(params) {
             responseBody: updTmpReserveSeatResult,
             acceptedOffer: acceptedOffers,
             event: screeningEvent,
-            seller: transaction.seller,
+            // seller: transaction.seller,
             bookingTime: (0, moment_1.default)(authorizeAction.startDate)
                 .toDate(),
             totalPrice: price

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.d.ts

@@ -1,7 +1,10 @@
+/**
+ * 注文決済時処理
+ */
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 declare function onOrderPaymentDue(params: {
-    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'orderDate' | 'seller' | 'typeOf' | 'price' | 'priceCurrency'> & {
+    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'orderDate' | 'typeOf'> & {
         orderStatus: factory.orderStatus.OrderPaymentDue;
     };
 }): (repos: {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -1,32 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderPaymentDue = onOrderPaymentDue;
-/**
- * 注文決済時処理
- */
-const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { createMaskedCustomer } from '../../../factory/order';
-const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderPaymentDue(params) {
     return async (repos) => {
-        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
-        // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
-            // seller: {
-            //     id: params.order.seller.id,
-            //     typeOf: params.order.seller.typeOf,
-            //     name: params.order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
             orderNumber: params.order.orderNumber,
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
             orderDate: params.order.orderDate
         };
         switch (params.order.orderStatus) {
@@ -62,12 +43,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     object: { transactionNumber: { $eq: invoice.paymentMethodId } },
                     purpose: { orderNumber: { $eq: order.orderNumber } }
                 }
-            }, ['id']
-            // {
-            //     data: 0, executionResults: 0, name: 0, numberOfTried: 0,
-            //     remainingNumberOfTries: 0, runsAt: 0, status: 0
-            // }
-            );
+            }, ['id']);
             if (existingTasks.length === 0) {
                 const data = {
                     project: order.project,
@@ -114,7 +90,6 @@ function createCreateAccountingReportTask(order) {
         executionResults: [],
         data: {
             object: { mainEntity: { orderNumber: order.orderNumber } }
-            // project: { id: order.project.id }
         }
     };
     return [task];

package/lib/chevre/service/order/placeOrder/factory.d.ts

@@ -10,7 +10,7 @@ declare function createPaymentMethods(params: {
 };
 declare function createSeller(params: {
     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'seller'>;
-}): factory.order.ISeller;
+}): Pick<factory.order.ISeller, 'id' | 'name' | 'typeOf'>;
 declare function createPlacingOrder(params: {
     transaction: IPlaceOrderTransaction;
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];

package/lib/chevre/service/order/placeOrder/factory.js

@@ -61,9 +61,9 @@ function createSeller(params) {
     return {
         id: seller.id,
         name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
-        typeOf: seller.typeOf,
-        // 追加特性を追加(2023-08-08~)
-        additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
+        typeOf: seller.typeOf
+        // // 追加特性を追加(2023-08-08~)
+        // additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
     };
 }
 function createPlacingOrder(params) {
@@ -91,7 +91,7 @@ function createPlacingOrder(params) {
     // if (orderByTransaction === undefined) {
     //     throw new factory.errors.NotFound('transaction.result.order');
     // }
-    const seller = createSeller({ transaction });
+    // const seller = createSeller({ transaction });
     // discontinue(2026-06-11~)
     // const name: string | undefined =
     //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
@@ -119,7 +119,7 @@ function createPlacingOrder(params) {
         orderNumber,
         typeOf: factory_1.factory.order.OrderType.Order, // 取引保管を廃止するためにここで指定(2026-06-14~)
         orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 取引保管を廃止するためにここで指定(2026-06-14~)
-        seller, // 2024-06-17~
+        // seller, // 取引開始時の注文ドキュメント作成へ移行(2026-06-25~)
         paymentMethods, // 2024-06-17~
         price, // 2024-06-17~
         priceCurrency: factory_1.factory.priceCurrency.JPY, // 取引保管を廃止するためにここで指定(2026-06-14~)

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

@@ -89,10 +89,10 @@ function placeOrder(params) {
                         orderNumber: order.orderNumber,
                         confirmationNumber: order.confirmationNumber,
                         orderDate: order.orderDate,
-                        seller: order.seller,
+                        // seller: order.seller,
                         typeOf: order.typeOf,
-                        price: order.price,
-                        priceCurrency: order.priceCurrency,
+                        // price: order.price,
+                        // priceCurrency: order.priceCurrency,
                         orderStatus: order.orderStatus
                     }
                 })({

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts

@@ -9,7 +9,7 @@ export declare function createSendEmailMessageActions(params: {
         typeOf: factory.order.OrderType;
     };
     customer: factory.order.ICustomer;
-    seller: factory.order.ISeller;
+    seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{

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

@@ -12,7 +12,7 @@ export declare function createPotentialActions(params: {
         typeOf: factory.order.OrderType;
     };
     customer: factory.order.ICustomer;
-    seller: factory.order.ISeller;
+    seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{

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

@@ -18,5 +18,7 @@ type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithout
      */
     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;
+declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, options: {
+    minimizeStartPlaceOrderParams: boolean;
+}, customerType?: string): factory.transaction.placeOrder.IStartParams;
 export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

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

@@ -5,7 +5,8 @@ exports.createStartParams = createStartParams;
 const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
-function createStartParams(params, expiresInSeconds, passport, seller, customerType) {
+function createStartParams(params, expiresInSeconds, passport, seller, options, customerType) {
+    const { minimizeStartPlaceOrderParams } = options;
     // const { broker } = params;
     // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
@@ -20,7 +21,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, customerT
         // ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined, // discontinue(2026-06-10~)
         // ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined, // discontinue(2026-06-11~)
         // ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined, // discontinue(2026-06-22~)
-        ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
+        ...(!minimizeStartPlaceOrderParams && typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
         ...(typeof customerType === 'string') ? { customerType } : undefined
     };
     if (typeof seller.id !== 'string') {
@@ -43,12 +44,18 @@ function createStartParams(params, expiresInSeconds, passport, seller, customerT
         project: { typeOf: seller.project.typeOf, id: seller.project.id },
         typeOf: factory_1.factory.transactionType.PlaceOrder,
         agent,
-        seller: {
-            id: seller.id,
-            name: seller.name,
-            typeOf: seller.typeOf,
-            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
-        },
+        seller: (minimizeStartPlaceOrderParams)
+            ? {
+                id: seller.id,
+                name: { ja: String(seller.name.ja) },
+                typeOf: seller.typeOf
+            }
+            : {
+                id: seller.id,
+                name: seller.name,
+                typeOf: seller.typeOf,
+                additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+            },
         object: transactionObject,
         expiresInSeconds,
         ...(typeof instrument?.id === 'string') ? { instrument } : undefined

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

@@ -24,6 +24,7 @@ interface IStartOperationRepos {
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 interface IStartOptions {
     createOrderDocument: boolean;
+    minimizeStartPlaceOrderParams: boolean;
 }
 /**
  * 取引開始

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

@@ -23,7 +23,8 @@ function start(params, options) {
             throw new factory_1.factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
+        const { minimizeStartPlaceOrderParams } = options;
+        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, { minimizeStartPlaceOrderParams }, customerType);
         let transaction;
         // lock passport(2024-07-05~)
         if (passport !== 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.15"
+  "version": "25.0.0-alpha.16"
 }