@chevre/domain 20.0.0-alpha.2 → 20.0.0-alpha.3

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

@@ -281,7 +281,7 @@ function coaTicket2offer(params) {
             }]
         : undefined;
     const unitPriceSpec = {
-        project: { typeOf: factory.organizationType.Project, id: params.project.id },
+        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.priceSpecificationType.UnitPriceSpecification,
         price: 0,
         priceCurrency: factory.priceCurrency.JPY,

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

@@ -2,18 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.responseBody2acceptedOffers4result = exports.offers2resultPrice = exports.createAuthorizeSeatReservationActionAttributes = exports.WebAPIIdentifier = void 0;
 const moment = require("moment");
-// import * as COA from '../../../coa';
 const factory = require("../../../factory");
 exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
-// export type IAcceptedOfferWithoutDetail =
-//     factory.action.authorize.offer.seatReservation.IAcceptedOfferWithoutDetail<WebAPIIdentifier.COA> & {
-//         additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
-//         ticketInfo: factory.offer.seatReservation.ICOATicketInfo & {
-//             spseatAdd1: number;
-//             spseatAdd2: number;
-//             spseatKbn: string;
-//         };
-//     };
 function createAuthorizeSeatReservationActionAttributes(params) {
     var _a;
     const transaction = params.transaction;
@@ -68,25 +58,6 @@ function offers2resultPrice(offers) {
     return { price, requiredPoint };
 }
 exports.offers2resultPrice = offers2resultPrice;
-// export function createUpdTmpReserveSeatArgs(params: {
-//     object: factory.action.authorize.offer.seatReservation.IObjectWithoutDetail<WebAPIIdentifier.COA>;
-//     coaInfo: factory.event.screeningEvent.ICOAInfo;
-// }): COA.factory.reserve.IUpdTmpReserveSeatArgs {
-//     return {
-//         theaterCode: params.coaInfo.theaterCode,
-//         dateJouei: params.coaInfo.dateJouei,
-//         titleCode: params.coaInfo.titleCode,
-//         titleBranchNum: params.coaInfo.titleBranchNum,
-//         timeBegin: params.coaInfo.timeBegin,
-//         screenCode: params.coaInfo.screenCode,
-//         listSeat: params.object.acceptedOffer.map((offer) => {
-//             return {
-//                 seatSection: offer.seatSection,
-//                 seatNum: offer.seatNumber
-//             };
-//         })
-//     };
-// }
 /**
  * COA仮予約結果から注文アイテムを生成する
  */
@@ -202,6 +173,15 @@ function responseBody2acceptedOffers4result(params) {
         const reservation = Object.assign(Object.assign(Object.assign({ project: { typeOf: event.project.typeOf, id: event.project.id }, typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough: { typeOf: factory.product.ProductType.EventService }, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
             // numSeats: 1, // 廃止(2022-08-18~)
             reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
+        if (requestedOffer.priceSpecification === undefined) {
+            throw new factory.errors.NotFound('acceptedOffer.priceSpecification');
+        }
+        const priceSpecification = {
+            typeOf: requestedOffer.priceSpecification.typeOf,
+            priceCurrency: requestedOffer.priceSpecification.priceCurrency,
+            valueAddedTaxIncluded: requestedOffer.priceSpecification.valueAddedTaxIncluded,
+            priceComponent: requestedOffer.priceSpecification.priceComponent
+        };
         return {
             project: { typeOf: event.project.typeOf, id: event.project.id },
             typeOf: factory.offerType.Offer,
@@ -209,7 +189,7 @@ function responseBody2acceptedOffers4result(params) {
             name: requestedOffer.name,
             itemOffered: reservation,
             offeredThrough: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
-            priceSpecification: requestedOffer.priceSpecification,
+            priceSpecification,
             priceCurrency: factory.priceCurrency.JPY,
             seller: {
                 project: { typeOf: event.project.typeOf, id: event.project.id },

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

@@ -12,6 +12,8 @@ function createCompoundPriceSpec4event(params) {
     // 区分加算料金は決済カード適用でも価格要素に含まれるはず(2022-11-02~)
     const priceComponent = [
         unitPriceSpec,
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO strictコーディングで最適化
         ...params.videoFormatChargeSpecifications,
         ...params.soundFormatChargeSpecifications
     ];
@@ -40,6 +42,8 @@ function createCompoundPriceSpec4event(params) {
                 }
             }
         });
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO strictコーディングで最適化
         priceComponent.push(...mvtkSpecs);
     }
     else {

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -133,14 +133,16 @@ function createMoneyTransferAcceptedOffers(params) {
                 name: `${amountValue} ${currency}`
             };
             acceptedOffers.push({
-                project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
+                // 不要なので廃止(2022-11-05~)
+                // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
                 typeOf: factory.offerType.Offer,
                 itemOffered,
                 // ↓いったん廃止(2022-05-17~)
                 // price: authorizeMoneyTansferAction.result.price,
                 priceCurrency: authorizeMoneyTansferAction.result.priceCurrency,
                 seller: {
-                    project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
+                    // 不要なので廃止(2022-11-05~)
+                    // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
                     typeOf: params.seller.typeOf,
                     name: params.seller.name
                 }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.274.0-alpha.0",
-    "@cinerino/sdk": "3.130.0-alpha.1",
+    "@chevre/factory": "4.274.0-alpha.3",
+    "@cinerino/sdk": "3.130.0-alpha.5",
     "@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.0.0-alpha.2"
+  "version": "20.0.0-alpha.3"
 }