@chevre/domain 25.0.0-alpha.6 → 25.0.0-alpha.8

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

@@ -7,16 +7,10 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'>
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
 };
-type IAcceptedOffer = factory.order.IAcceptedOffer & {
-    /**
-     * 受け入れ時に指定必須
-     */
-    offeredThrough: factory.offer.IOfferedThrough;
-};
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
  */
-export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | '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' | 'seller' | 'typeOf'> & {
     url?: never;
     identifier?: never;
     name?: never;
@@ -28,6 +22,10 @@ export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationN
      * 上書きしてはいけない
      */
     customer?: never;
+    /**
+     * 上書きしてはいけない
+     */
+    broker?: never;
 };
 export type IMinimizedReservationFor = Pick<factory.order.IEventAsReservationFor, 'endDate' | 'id' | 'startDate' | 'typeOf'> & {
     location: Pick<factory.order.IEventAsReservationFor['location'], 'branchCode' | 'typeOf'>;
@@ -77,12 +75,8 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
      * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
      */
     acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
-        acceptedOffers: IMinimizedAcceptedOffer[] | (Omit<IAcceptedOffer, 'priceSpecification'> & {
-            /**
-             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
-             */
-            priceSpecification?: factory.order.ITicketPriceSpecification;
-        })[];
+        acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
+        broker?: factory.order.IBroker;
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する

package/lib/chevre/repo/orderInTransaction.js

@@ -123,6 +123,11 @@ 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 })
             .exec();

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

@@ -10,12 +10,8 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
-    acceptedOffers: IMinimizedAcceptedOffer[] | (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
-        /**
-         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
-         */
-        priceSpecification?: factory.order.ITicketPriceSpecification;
-    })[];
+    acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
+    broker?: factory.order.IBroker;
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**

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

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

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

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

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

@@ -95,7 +95,9 @@ function createPlacingOrder(params) {
     // discontinue(2026-06-11~)
     // const name: string | undefined =
     //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
-    const broker = (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
+    // discontinue(2026-06-22~)
+    // const broker: factory.order.IBroker | undefined =
+    //     (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
@@ -125,6 +127,6 @@ function createPlacingOrder(params) {
             .toDate(),
         orderedItem, // 2024-06-18~
         // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)
-        ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // 2024-06-17~
+        // ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // discontinue(2026-06-22~)
     };
 }

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

@@ -13,7 +13,6 @@ 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/factory.js

@@ -5,10 +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, 
-// broker?: factory.order.IBroker,
-customerType) {
-    const { broker } = params;
+function createStartParams(params, expiresInSeconds, passport, seller, customerType) {
+    // const { broker } = params;
     // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
     if (typeof params.object.clientUser?.client_id === 'string') {
@@ -21,7 +19,7 @@ customerType) {
         // ...(typeof passport?.scope === 'string') ? { passport } : undefined, // discontinue(2026-06-10~)
         // ...(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,
+        // ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined, // discontinue(2026-06-22~)
         ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
         ...(typeof customerType === 'string') ? { customerType } : undefined
     };

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.0.0-alpha.2",
+    "@chevre/factory": "9.0.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.6"
+  "version": "25.0.0-alpha.8"
 }