@chevre/domain 21.37.0-alpha.16 → 21.37.0-alpha.17

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

@@ -4,6 +4,7 @@ type IObject = factory.assetTransaction.reserve.IObject & {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 };
+type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     provider: {
         /**
@@ -13,6 +14,8 @@ declare function createStartParams(params: factory.assetTransaction.reserve.ISta
     };
     reservationNumber: string;
     event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    acceptedOffers4transactionObject: factory.assetTransaction.reserve.IAcceptedOffer4object[];
+    objectSubReservations: IObjectSubReservation[];
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve> & {
     object: IObject;
 };

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

@@ -4,7 +4,7 @@ exports.createStartParams = void 0;
 const factory = require("../../../../../factory");
 function createStartParams(params) {
     var _a;
-    const reservationNumber = params.reservationNumber;
+    const { reservationNumber, acceptedOffers4transactionObject, objectSubReservations, agent, expires, project } = params;
     const provider = {
         id: params.provider.id,
         typeOf: factory.organizationType.Corporation
@@ -14,14 +14,13 @@ function createStartParams(params) {
     const { issuedThrough } = createIssuedThrough({ reservationFor: params.event });
     const reservationPackage = Object.assign({ issuedThrough,
         provider,
-        reservationFor, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: true, useHoldStockByTransactionNumber: true, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+        reservationFor, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: true, useHoldStockByTransactionNumber: true, typeOf: factory.reservationType.ReservationPackage, acceptedOffer: acceptedOffers4transactionObject, subReservation: objectSubReservations }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
-        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+        project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
         transactionNumber: reservationNumber,
-        agent: params.agent,
-        object: reservationPackage,
-        expires: params.expires
+        agent, expires,
+        object: reservationPackage
     };
 }
 exports.createStartParams = createStartParams;

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

@@ -44,11 +44,9 @@ function start(params) {
             now,
             store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id }
         });
-        const startParams = (0, createStartParams_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber,
-            event }));
         // objectに必要な情報をそろえる
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createObjectAttributes({
-            reservationFor: startParams.object.reservationFor,
+            // reservationFor: startParams.object.reservationFor,
             transaction: { transactionNumber: reservationNumber },
             now,
             object: params.object,
@@ -59,6 +57,7 @@ function start(params) {
             validateAppliesToMovieTicket: params.validateAppliesToMovieTicket,
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         })(repos);
+        const startParams = (0, createStartParams_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber, event, acceptedOffers4transactionObject, objectSubReservations }));
         // reimplement using startWithMinimalResponse(2024-07-02~)
         // const transaction = await repos.assetTransaction.start<factory.assetTransactionType.Reserve>(startParams);
         const { id } = yield repos.assetTransaction.startWithMinimalResponse(startParams);
@@ -169,19 +168,22 @@ function addReservations(params) {
                 reservationFor,
                 reservationNumber
             })(repos);
-            // 上書きの必要なし(2024-07-01~)
-            // transaction = await repos.assetTransaction.addReservations({
-            yield repos.assetTransaction.addReservations({
-                typeOf: factory.assetTransactionType.Reserve,
-                id: params.transaction.id,
-                object: {
-                    acceptedOffer: acceptedOffers4transactionObject,
-                    // issuedThroughを追加(2023-06-05~)
-                    // issuedThrough, // start時保管へ移行(2024-07-01~)
-                    // reservationFor, // start時保管へ移行(2024-07-01~)
-                    subReservation: objectSubReservations
-                }
-            });
+            // start時保管へ移行(2024-07-06~)
+            if (!settings_1.USE_EXPERIMENTAL_FEATURE) {
+                // 上書きの必要なし(2024-07-01~)
+                // transaction = await repos.assetTransaction.addReservations({
+                yield repos.assetTransaction.addReservations({
+                    typeOf: factory.assetTransactionType.Reserve,
+                    id: params.transaction.id,
+                    object: {
+                        acceptedOffer: acceptedOffers4transactionObject,
+                        // issuedThroughを追加(2023-06-05~)
+                        // issuedThrough, // start時保管へ移行(2024-07-01~)
+                        // reservationFor, // start時保管へ移行(2024-07-01~)
+                        subReservation: objectSubReservations
+                    }
+                });
+            }
         }
         catch (error) {
             if (lockedOfferRateLimitKeys.length > 0) {

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.16"
+  "version": "21.37.0-alpha.17"
 }