@chevre/domain 21.2.0-alpha.97 → 21.2.0-alpha.98

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

@@ -50,7 +50,7 @@ export declare function createReservationFor(params: factory.event.screeningEven
 export declare function createIssuedThrough(params: {
     reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
 }): {
-    issuedThrough: factory.reservation.busReservation.IIssuedThrough | factory.reservation.eventReservation.IIssuedThrough;
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
 export declare function createReservation(params: {
     project: {
@@ -60,7 +60,6 @@ export declare function createReservation(params: {
     id: string;
     reserveDate: Date;
     agent: factory.assetTransaction.reserve.IAgent;
-    broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
     reservationNumber: string;
     reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
     reservedTicket: factory.reservation.ITicket;

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

@@ -394,7 +394,7 @@ function createIssuedThrough(params) {
 exports.createIssuedThrough = createIssuedThrough;
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createReservation(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     // 適用メンバーシップ確認
     validateEligibleMembershipType({
         availableOffer: params.availableOffer,
@@ -409,27 +409,36 @@ function createReservation(params) {
     }
     // priceを最適化
     const price4reservation = (0, price_1.createPrice)(params);
-    const eventOffers = params.reservationFor.offers;
-    // offersは必ず存在するはず
-    if (eventOffers === undefined) {
-        throw new factory.errors.NotFound('reservationFor.offers');
-    }
-    const serviceTypeOfIssuedThrough = (typeof ((_a = eventOffers.itemOffered.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string')
-        ? {
-            codeValue: eventOffers.itemOffered.serviceType.codeValue,
-            inCodeSet: {
-                typeOf: 'CategoryCodeSet',
-                identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
-            },
-            typeOf: 'CategoryCode'
-        }
-        : undefined;
-    const availableChannel = eventOffers.itemOffered.availableChannel;
+    // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>params.reservationFor.offers;
+    // // offersは必ず存在するはず
+    // if (eventOffers === undefined) {
+    //     throw new factory.errors.NotFound('reservationFor.offers');
+    // }
+    // const serviceTypeOfIssuedThrough: factory.reservation.eventReservation.IServiceTypeOfIssuedThrough | undefined
+    //     = (typeof eventOffers.itemOffered.serviceType?.codeValue === 'string')
+    //         ? {
+    //             codeValue: eventOffers.itemOffered.serviceType.codeValue,
+    //             inCodeSet: {
+    //                 typeOf: 'CategoryCodeSet',
+    //                 identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
+    //             },
+    //             typeOf: 'CategoryCode'
+    //         }
+    //         : undefined;
+    // const availableChannel: factory.reservation.IServiceChannel = eventOffers.itemOffered.availableChannel;
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.EventService, 
-            // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
-        return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, 
+        // const issuedThrough: factory.reservation.eventReservation.IIssuedThrough = {
+        //     typeOf: factory.product.ProductType.EventService,
+        //     // 興行IDを追加(2022-09-08~)
+        //     id: eventOffers.itemOffered.id,
+        //     availableChannel,
+        //     // issuedThrough.serviceTypeを連携
+        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        // };
+        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, 
+            // reservationPackage保管に移行(2023-06-06~)
+            // issuedThrough,
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, 
             // 最適化(2022-12-19~)
             underName: {
                 typeOf: params.agent.typeOf,
@@ -445,15 +454,23 @@ function createReservation(params) {
                     };
                 })
             }
-            : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
+            : undefined), (typeof ((_a = params.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }
     else {
-        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.Transportation, 
-            // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
-        return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: {
+        // const issuedThrough: factory.reservation.busReservation.IIssuedThrough = {
+        //     typeOf: factory.product.ProductType.Transportation,
+        //     // 興行IDを追加(2022-09-08~)
+        //     id: eventOffers.itemOffered.id,
+        //     availableChannel,
+        //     // issuedThrough.serviceTypeを連携
+        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        // };
+        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, 
+            // reservationPackage保管に移行(2023-06-06~)
+            // issuedThrough,
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: {
                 typeOf: params.agent.typeOf,
                 name: params.agent.name
             }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
@@ -467,7 +484,7 @@ function createReservation(params) {
                     };
                 })
             }
-            : undefined), (typeof ((_d = params.broker) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_e = params.programMembershipUsed) === null || _e === void 0 ? void 0 : _e.identifier) === 'string')
+            : undefined), (typeof ((_b = params.programMembershipUsed) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }

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

@@ -102,6 +102,7 @@ export declare function start(params: IStartParams & {
 }): IStartOperation<{
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
     objectSubReservations: IObjectSubReservation[];
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 }>;
 /**
  * 取引確定

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

@@ -27,7 +27,7 @@ const validateStartRequest_1 = require("./reserve/validateStartRequest");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const now = new Date();
         // 自動発行廃止(2022-05-17~)
         const reservationNumber = params.transactionNumber;
@@ -35,7 +35,8 @@ function start(params) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         // eventをfix
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
+        const reservationForId = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof reservationForId !== 'string' || reservationForId.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         let event;
@@ -43,7 +44,7 @@ function start(params) {
             event = params.preSearchedEvent;
         }
         else {
-            event = yield repos.event.findMinimizedIndividualEventById({ id: params.object.reservationFor.id });
+            event = yield repos.event.findMinimizedIndividualEventById({ id: reservationForId });
         }
         // validationを承認アクション開始前から移行(2023-01-27~)
         (0, validateStartRequest_1.validateStartRequest)({
@@ -64,22 +65,23 @@ function start(params) {
             throw error;
         }
         let objectSubReservations = [];
-        // 指定があれば予約追加
-        if (typeof ((_d = params.object.reservationFor) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
-            const addReservationsResult = yield addReservations({
-                id: transaction.id,
-                object: params.object,
-                event,
-                preSearchedTicketOffers: params.preSearchedTicketOffers,
-                preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
-                availableAtOrFrom: { id: (_e = params.availableAtOrFrom) === null || _e === void 0 ? void 0 : _e.id },
-                validateAppliesToMovieTicket: params.validateAppliesToMovieTicket,
-                stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
-            })(repos);
-            transaction = addReservationsResult.transaction;
-            objectSubReservations = addReservationsResult.objectSubReservations;
-        }
-        return { transaction, objectSubReservations };
+        const addReservationsResult = yield addReservations({
+            id: transaction.id,
+            object: params.object,
+            event,
+            preSearchedTicketOffers: params.preSearchedTicketOffers,
+            preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
+            availableAtOrFrom: { id: (_d = params.availableAtOrFrom) === null || _d === void 0 ? void 0 : _d.id },
+            validateAppliesToMovieTicket: params.validateAppliesToMovieTicket,
+            stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
+        })(repos);
+        transaction = addReservationsResult.transaction;
+        objectSubReservations = addReservationsResult.objectSubReservations;
+        return {
+            transaction,
+            objectSubReservations,
+            issuedThrough: addReservationsResult.issuedThrough
+        };
     });
 }
 exports.start = start;
@@ -195,7 +197,7 @@ function addReservations(params) {
         }
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event })(repos);
-        return { transaction, objectSubReservations };
+        return { transaction, objectSubReservations, issuedThrough };
     });
 }
 /**
@@ -412,7 +414,7 @@ function createReservations4transactionObject(params) {
                 id: reservationId,
                 reserveDate: params.now,
                 agent: params.transaction.agent,
-                broker: params.transaction.object.broker,
+                // broker: params.transaction.object.broker,
                 reservationNumber: reservationNumber,
                 reservationFor: params.event,
                 reservedTicket: reservedTicket,

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

@@ -169,6 +169,7 @@ function processStartReserve4chevre(params) {
         responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
+            issuedThrough: startReserveTransactionResult.issuedThrough,
             objectSubReservations: startReserveTransactionResult.objectSubReservations,
             responseBody: responseBody,
             event: event,

package/lib/chevre/service/offer/event/factory.d.ts

@@ -26,6 +26,7 @@ export declare function acceptedOffers2amount(params: {
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
     objectSubReservations: IObjectSubReservation[];
     responseBody: factory.assetTransaction.reserve.ITransaction;
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;

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

@@ -157,7 +157,12 @@ function responseBody2acceptedOffers4result(params) {
     if (Array.isArray(params.objectSubReservations)) {
         acceptedOffers4result = params.objectSubReservations.map((itemOffered) => {
             var _a;
-            const reservation = createReservation({ project: params.project, itemOffered, event: params.event });
+            const reservation = createReservation({
+                project: params.project,
+                itemOffered,
+                event: params.event,
+                issuedThrough: params.issuedThrough
+            });
             // appliesToMovieTicketがArrayでないケースは廃止(2022-09-12~)
             const priceSpecification = itemOffered.price;
             const priceComponent = priceSpecification.priceComponent.map((c) => {
@@ -244,7 +249,10 @@ function createReservation(params) {
             // 最適化(2022-05-31~)
             superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
@@ -269,7 +277,10 @@ function createReservation(params) {
             busNumber: tripByEvent.busNumber,
             identifier: tripByEvent.identifier
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.26",
-    "@cinerino/sdk": "3.157.0-alpha.7",
+    "@chevre/factory": "4.313.0-alpha.27",
+    "@cinerino/sdk": "3.157.0-alpha.8",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.97"
+  "version": "21.2.0-alpha.98"
 }