@chevre/domain 20.1.0-alpha.32 → 20.1.0-alpha.34

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

@@ -145,10 +145,14 @@ exports.createReservedTicket = createReservedTicket;
 function createTicketType(params) {
     var _a;
     const availableOffer = params.availableOffer;
-    return Object.assign(Object.assign(Object.assign(Object.assign({ description: availableOffer.description, id: availableOffer.id, identifier: availableOffer.identifier, name: availableOffer.name, priceCurrency: availableOffer.priceCurrency, 
+    return Object.assign(Object.assign(Object.assign(Object.assign({ description: availableOffer.description, id: availableOffer.id, identifier: availableOffer.identifier, name: availableOffer.name, 
+        // 不要なので廃止(2022-12-17~)
+        // priceCurrency: availableOffer.priceCurrency,
         // priceSpecificationを最適化(accounting不要)
         // accounting: { typeOf: "Accounting", … }
-        project: availableOffer.project, typeOf: availableOffer.typeOf }, (Array.isArray(availableOffer.additionalProperty)) ? { additionalProperty: availableOffer.additionalProperty } : undefined), (typeof ((_a = availableOffer.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: availableOffer.category } : undefined), (typeof availableOffer.color === 'string') ? { color: availableOffer.color } : undefined), (availableOffer.validRateLimit !== undefined) ? { validRateLimit: availableOffer.validRateLimit } : undefined);
+        // 不要なので廃止(2022-12-17~)
+        // project: availableOffer.project,
+        typeOf: availableOffer.typeOf }, (Array.isArray(availableOffer.additionalProperty)) ? { additionalProperty: availableOffer.additionalProperty } : undefined), (typeof ((_a = availableOffer.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: availableOffer.category } : undefined), (typeof availableOffer.color === 'string') ? { color: availableOffer.color } : undefined), (availableOffer.validRateLimit !== undefined) ? { validRateLimit: availableOffer.validRateLimit } : undefined);
 }
 function createIssuedBy(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h;

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

@@ -31,8 +31,8 @@ function authorize(params) {
             transaction,
             store: params.store
         })(repos);
-        let requestBody;
-        let responseBody;
+        // let requestBody: factory.assetTransaction.reserve.IStartParamsWithoutDetail;
+        // let responseBody: factory.assetTransaction.reserve.ITransaction;
         let acceptedOffers4result = [];
         let transactionNumber;
         switch (bookingServiceIdentifire) {
@@ -65,8 +65,8 @@ function authorize(params) {
                         transactionNumber,
                         transaction
                     })(repos);
-                    requestBody = processStartReserveResult.requestBody;
-                    responseBody = processStartReserveResult.responseBody;
+                    // requestBody = processStartReserveResult.requestBody;
+                    // responseBody = processStartReserveResult.responseBody;
                     acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
                     break;
                 default:
@@ -95,7 +95,17 @@ function authorize(params) {
         // 金額計算
         const amount = (0, factory_1.acceptedOffers2amount)({ acceptedOffers: acceptedOffers4result });
         // アクションを完了
-        const result = Object.assign({ price: amount, priceCurrency: acceptedOffers[0].priceCurrency, amount: [], requestBody: requestBody, responseBody: responseBody }, (acceptedOffers4result !== undefined) ? { acceptedOffers: acceptedOffers4result } : undefined);
+        const result = {
+            price: amount,
+            priceCurrency: acceptedOffers[0].priceCurrency,
+            amount: [],
+            // 不要なので廃止(2022-12-14~)
+            // requestBody: requestBody,
+            // responseBody: responseBody,
+            requestBody: {},
+            responseBody: {},
+            acceptedOffers: acceptedOffers4result
+        };
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
@@ -137,7 +147,7 @@ function processStartReserve4chevre(params) {
         const event = params.event;
         const transactionNumber = params.transactionNumber;
         const transaction = params.transaction;
-        let requestBody;
+        // let requestBody: factory.assetTransaction.reserve.IStartParamsWithoutDetail;
         let responseBody;
         let acceptedOffers4result = [];
         if (typeof transactionNumber !== 'string') {
@@ -151,10 +161,9 @@ function processStartReserve4chevre(params) {
             transaction,
             transactionNumber
         });
-        requestBody = startParams;
+        // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
-        // 予約取引サービス開始
-        // responseBody = await repos.reserveTransaction.start(startParams);
+        // 予約取引開始
         responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, validateAppliesToMovieTicket: true }))(repos);
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
@@ -163,19 +172,12 @@ function processStartReserve4chevre(params) {
             project: transaction.project,
             seller: transaction.seller
         });
-        return { requestBody, responseBody, acceptedOffers4result };
+        return { acceptedOffers4result };
     });
 }
 function validateObjectWithoutDetail(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        // const objectWithoutDetail: factory.assetTransaction.reserve.IObjectWithoutDetail = {
-        //     ...params.object,
-        //     // 互換性維持対応として、event.idをreservationFor.idに置換
-        //     ...(typeof params.object?.event?.id === 'string')
-        //         ? { reservationFor: { id: <string>params.object.event.id } }
-        //         : undefined
-        // };
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
             for (let acceptedOffer of objectWithoutDetail.acceptedOffer) {

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

@@ -24,7 +24,7 @@ export declare function acceptedOffers2amount(params: {
 }): number;
 declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
-    responseBody: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.Chevre>;
+    responseBody: factory.assetTransaction.reserve.ITransaction;
     event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
     project: {
         id: string;

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

@@ -159,7 +159,6 @@ function responseBody2acceptedOffers4result(params) {
             var _a;
             const reservation = createReservation({ project: params.project, itemOffered, event: params.event });
             // appliesToMovieTicketがArrayでないケースは廃止(2022-09-12~)
-            // const priceSpecification = <IReservationPriceSpecification>itemOffered.price;
             const priceSpecification = itemOffered.price;
             const priceComponent = priceSpecification.priceComponent.map((c) => {
                 var _a;
@@ -181,7 +180,6 @@ function responseBody2acceptedOffers4result(params) {
                     : undefined);
             });
             return {
-                // project: { typeOf: params.project.typeOf, id: params.project.id },
                 typeOf: factory.offerType.Offer,
                 id: itemOffered.reservedTicket.ticketType.id,
                 name: itemOffered.reservedTicket.ticketType.name,
@@ -190,8 +188,6 @@ function responseBody2acceptedOffers4result(params) {
                 priceSpecification: {
                     priceComponent: priceComponent,
                     priceCurrency: priceSpecification.priceCurrency,
-                    // 不要な属性を除外(2022-11-02~)
-                    // project: priceSpecification.project,
                     typeOf: priceSpecification.typeOf,
                     valueAddedTaxIncluded: priceSpecification.valueAddedTaxIncluded
                 },
@@ -199,7 +195,6 @@ function responseBody2acceptedOffers4result(params) {
                     ? itemOffered.priceCurrency
                     : factory.priceCurrency.JPY,
                 seller: {
-                    // project: { typeOf: params.project.typeOf, id: params.project.id },
                     typeOf: params.seller.typeOf,
                     name: (typeof params.seller.name === 'string')
                         ? params.seller.name
@@ -242,14 +237,16 @@ function createReservation(params) {
         // workPerformed: {},
     };
     const reservedTicket = Object.assign({ typeOf: itemOffered.reservedTicket.typeOf, ticketType: {
-            project: { typeOf: params.project.typeOf, id: params.project.id },
+            // 不要なので廃止(2022-12-17~)
+            // project: { typeOf: params.project.typeOf, id: params.project.id },
             typeOf: itemOffered.reservedTicket.ticketType.typeOf,
             id: itemOffered.reservedTicket.ticketType.id,
             identifier: itemOffered.reservedTicket.ticketType.identifier,
             name: itemOffered.reservedTicket.ticketType.name,
             description: itemOffered.reservedTicket.ticketType.description,
-            additionalProperty: itemOffered.reservedTicket.ticketType.additionalProperty,
-            priceCurrency: itemOffered.reservedTicket.ticketType.priceCurrency
+            additionalProperty: itemOffered.reservedTicket.ticketType.additionalProperty
+            // 不要なので廃止(2022-12-17~)
+            // priceCurrency: itemOffered.reservedTicket.ticketType.priceCurrency
         } }, (itemOffered.reservedTicket.ticketedSeat !== undefined)
         ? { ticketedSeat: itemOffered.reservedTicket.ticketedSeat }
         : undefined);

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

@@ -151,12 +151,14 @@ function responseBody2acceptedOffers4result(params) {
             ticketNumber: ticketToken,
             ticketToken: ticketToken,
             ticketType: {
-                project: { typeOf: event.project.typeOf, id: event.project.id },
+                // 不要なので廃止(2022-12-17~)
+                // project: { typeOf: event.project.typeOf, id: event.project.id },
                 typeOf: factory.offerType.Offer,
                 id: requestedOffer.id,
                 identifier: String(requestedOffer.identifier),
-                name: requestedOffer.name,
-                priceCurrency: factory.priceCurrency.JPY
+                name: requestedOffer.name
+                // 不要なので廃止(2022-12-17~)
+                // priceCurrency: factory.priceCurrency.JPY
             }
         };
         const additionalProperty = (_c = (_b = requestedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.additionalProperty;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.280.0-alpha.4",
-    "@cinerino/sdk": "3.135.0-alpha.1",
+    "@chevre/factory": "4.280.0-alpha.6",
+    "@cinerino/sdk": "3.135.0-alpha.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.32"
+  "version": "20.1.0-alpha.34"
 }