@chevre/domain 21.37.0-alpha.4 → 21.37.0-alpha.5

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

@@ -68,10 +68,7 @@ export declare class MongoRepository {
     addReservations(params: {
         typeOf: factory.assetTransactionType.Reserve;
         id: string;
-        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'issuedThrough' | 'reservationFor' | 'subReservation'> & {
-            issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
-            reservationFor: factory.assetTransaction.reserve.IReservationFor;
-        };
+        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'subReservation'>;
     }): Promise<void>;
     /**
      * 取引を確定する

package/lib/chevre/repo/assetTransaction.js

@@ -360,8 +360,8 @@ class MongoRepository {
             }, {
                 $set: {
                     'object.acceptedOffer': params.object.acceptedOffer,
-                    'object.issuedThrough': params.object.issuedThrough,
-                    'object.reservationFor': params.object.reservationFor,
+                    // 'object.issuedThrough': params.object.issuedThrough, // start時保管へ移行(2024-07-01~)
+                    // 'object.reservationFor': params.object.reservationFor, // start時保管へ移行(2024-07-01~)
                     'object.subReservation': params.object.subReservation
                 }
             }, { new: false, projection: { _id: 1 } })

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -3,6 +3,10 @@ import { IMinimizedIndividualEvent } from '../../../factory/event';
 import { IAcceptedAddOn } from './factory/price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export { IAcceptedAddOn };
+type IObject = factory.assetTransaction.reserve.IObject & {
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+    reservationFor: factory.assetTransaction.reserve.IReservationFor;
+};
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     provider: {
         /**
@@ -12,7 +16,10 @@ export declare function createStartParams(params: factory.assetTransaction.reser
     };
     reservationNumber: string;
     useHoldStockByTransactionNumber: boolean;
-}): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
+    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+}): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve> & {
+    object: IObject;
+};
 /**
  * ポイント特典を作成する
  */

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -16,7 +16,12 @@ function createStartParams(params) {
         id: params.provider.id,
         typeOf: factory.organizationType.Corporation
     };
-    const reservationPackage = Object.assign({ provider, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, 
+    // reservationFor,issuedThrough保管をaddReservationsから移行(2024-07-01~)
+    const reservationFor = createReservationFor(params.event, true);
+    const { issuedThrough } = createIssuedThrough({ reservationFor: params.event });
+    const reservationPackage = Object.assign({ issuedThrough,
+        provider,
+        reservationFor, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, 
         // trueで固定(2023-07-19~)
         disablePendingReservations: true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {

package/lib/chevre/service/assetTransaction/reserve.js

@@ -57,7 +57,8 @@ function start(params) {
             now,
             store: { id: (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id }
         });
-        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber }));
+        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber,
+            event }));
         // 取引作成
         let transaction;
         try {
@@ -84,7 +85,8 @@ function start(params) {
         return {
             transaction: { id: transaction.id },
             objectSubReservations,
-            issuedThrough: addReservationsResult.issuedThrough
+            // issuedThrough: addReservationsResult.issuedThrough
+            issuedThrough: startParams.object.issuedThrough
         };
     });
 }
@@ -137,17 +139,18 @@ function addReservations(params) {
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({
-            acceptedOffers,
-            ticketOffers,
-            availableOffers, now,
-            event, availableSeatOffers,
-            transaction,
+            acceptedOffers, ticketOffers, availableOffers, now,
+            event, availableSeatOffers, transaction,
             availableAtOrFrom: params.availableAtOrFrom,
             validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
         })(repos);
-        // 予約イベント最適化
-        const reservationFor = (0, factory_1.createReservationFor)(event, true);
-        const { issuedThrough } = (0, factory_1.createIssuedThrough)({ reservationFor: event });
+        // const reservationFor = createReservationFor(event, true);
+        // const { issuedThrough } = createIssuedThrough({ reservationFor: event });
+        const reservationFor = transaction.object.reservationFor;
+        if (reservationFor === undefined) {
+            // 必ずstart時に保管されているはず
+            throw new factory.errors.Internal('transaction.object.reservationFor undefined unexpectedly');
+        }
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -164,8 +167,8 @@ function addReservations(params) {
                 object: {
                     acceptedOffer: acceptedOffers4transactionObject,
                     // issuedThroughを追加(2023-06-05~)
-                    issuedThrough,
-                    reservationFor,
+                    // issuedThrough, // start時保管へ移行(2024-07-01~)
+                    // reservationFor, // start時保管へ移行(2024-07-01~)
                     subReservation: objectSubReservations
                 }
             });
@@ -198,7 +201,7 @@ function addReservations(params) {
         })(repos);
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event, transaction: { transactionNumber: transaction.transactionNumber } })(repos);
-        return { objectSubReservations, issuedThrough };
+        return { objectSubReservations };
     });
 }
 /**

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.37.0-alpha.4"
+  "version": "21.37.0-alpha.5"
 }