@chevre/domain 20.9.0-alpha.1 → 20.9.0

package/example/src/chevre/searchEventTicketOffers.ts

@@ -27,8 +27,7 @@ async function main() {
         validateOfferRateLimit: true,
         addSortIndex: true,
         limit: 100,
-        page: 1,
-        searchAddOns: true
+        page: 1
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({
         event: eventRepo,

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

@@ -2,6 +2,9 @@
  * 予約価格ファクトリー
  */
 import * as factory from '../../../../factory';
+export declare type IAcceptedAddOn = Pick<factory.offer.IAddOn, 'id' | 'identifier' | 'itemOffered' | 'priceCurrency' | 'typeOf' | 'validFrom' | 'validThrough'> & {
+    priceSpecification: factory.product.ITicketUnitPriceComponent;
+};
 export declare function createPrice(params: {
     project: {
         id: string;
@@ -9,6 +12,6 @@ export declare function createPrice(params: {
     };
     ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
-    acceptedAddOns: factory.product.ITicketAddOn[];
+    acceptedAddOns: IAcceptedAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
 }): factory.reservation.IPriceSpecification<factory.reservationType.EventReservation>;

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

@@ -1,5 +1,7 @@
 import * as factory from '../../../factory';
+import { IAcceptedAddOn } from './factory/price';
 declare type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
+export { IAcceptedAddOn };
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     reservationNumber: string;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
@@ -59,7 +61,7 @@ export declare function createReservation(params: {
     additionalTicketText?: string;
     ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
-    acceptedAddOns: factory.product.ITicketAddOn[];
+    acceptedAddOns: IAcceptedAddOn[];
     subReservation?: factory.reservation.ISubReservation<factory.reservationType.EventReservation>[];
     programMembershipUsed?: factory.reservation.IProgramMembershipUsed<factory.reservationType.EventReservation>;
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
@@ -73,4 +75,3 @@ export declare function createPotentialActions(params: factory.assetTransaction.
 export declare function createPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): factory.action.cancel.reservation.IAttributes[];
-export {};

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

@@ -119,8 +119,7 @@ function addReservations(params) {
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 onlyValid: true,
                 addSortIndex: false,
-                validateOfferRateLimit: true,
-                searchAddOns: false // false化(2023-03-02~)
+                validateOfferRateLimit: true
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;

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

@@ -226,8 +226,7 @@ function validateAcceptedOffers(params) {
             store: params.store,
             onlyValid: true,
             addSortIndex: false,
-            validateOfferRateLimit: true,
-            searchAddOns: false // false化(2023-03-02~)
+            validateOfferRateLimit: true
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))

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

@@ -12,7 +12,6 @@ interface ISearchEventTicketOffersRepos {
     product: ProductRepo;
 }
 declare type ISearchEventTicketOffersOperation<T> = (repos: ISearchEventTicketOffersRepos) => Promise<T>;
-declare type IAcceptedPaymentMethod = factory.paymentMethod.paymentCard.movieTicket.IMovieTicket;
 declare type ITicketOfferWithSortIndex = factory.product.ITicketOffer;
 /**
  * 興行オファー検索
@@ -41,41 +40,13 @@ declare function searchEventTicketOffers(params: {
     /**
      * どの決済方法に対して
      */
-    paymentMethod?: IAcceptedPaymentMethod;
     /**
      * COAムビチケ券種もほしい場合に指定
      */
-    movieTicket?: {
-        /**
-         * 電子券区分
-         */
-        kbnDenshiken: string;
-        /**
-         * 前売券区分
-         */
-        kbnMaeuriken: string;
-        /**
-         * 券種区分
-         */
-        kbnKensyu: string;
-        /**
-         * 販売単価
-         */
-        salesPrice: number;
-        /**
-         * 計上単価
-         */
-        appPrice: number;
-        /**
-         * 映写方式区分
-         */
-        kbnEisyahousiki: string;
-    };
     limit?: number;
     page?: number;
     addSortIndex: boolean;
     validateOfferRateLimit: boolean;
-    searchAddOns: boolean;
 }): ISearchEventTicketOffersOperation<{
     ticketOffers: ITicketOfferWithSortIndex[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];

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

@@ -47,7 +47,7 @@ function searchTicketOffersByItemOffered(params) {
 function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         const event = params.event;
         let soundFormatTypes = [];
         let videoFormatTypes = [];
@@ -91,27 +91,6 @@ function searchEventTicketOffersByEvent(params) {
                 // レート制限を確認
                 availability = yield checkAvailability({ event, unitPriceOffer: availableOffer })(repos);
             }
-            // アドオン設定があれば、プロダクトオファーを検索
-            let offerAddOn = [];
-            if (Array.isArray(availableOffer.addOn)) {
-                if (params.searchAddOns) {
-                    for (const addOn of availableOffer.addOn) {
-                        const productId = (_b = addOn.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
-                        if (typeof productId === 'string') {
-                            const productOffers = yield searchAddOns({
-                                product: { id: productId },
-                                store: params.store,
-                                addSortIndex: params.addSortIndex,
-                                onlyValid: params.onlyValid
-                            })(repos);
-                            offerAddOn.push(...productOffers);
-                        }
-                    }
-                }
-                else {
-                    offerAddOn = availableOffer.addOn;
-                }
-            }
             offers4event.push((0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
@@ -120,7 +99,7 @@ function searchEventTicketOffersByEvent(params) {
                 movieTicketTypeChargeSpecs,
                 videoFormatTypes,
                 availability,
-                addOn: offerAddOn,
+                addOn: (Array.isArray(availableOffer.addOn)) ? availableOffer.addOn : [],
                 sortIndex
             }));
         }
@@ -228,59 +207,11 @@ function checkAvailability(params) {
         return availability;
     });
 }
-/**
- * アドオンを検索する
- */
-function searchAddOns(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        let addOns = [];
-        const productId = (_a = params.product) === null || _a === void 0 ? void 0 : _a.id;
-        if (typeof productId === 'string') {
-            const productWithAddOns = yield repos.product.findById({ id: productId });
-            const offerCatalogId = (_b = productWithAddOns.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id;
-            if (typeof offerCatalogId === 'string') {
-                const { offers, sortedOfferIds } = yield repos.offer.findOffersByOfferCatalogId({
-                    offerCatalog: { id: offerCatalogId },
-                    availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
-                    excludeAppliesToMovieTicket: false,
-                    onlyValid: params.onlyValid === true,
-                    sort: true
-                });
-                const unitPriceOffers = offers;
-                addOns = unitPriceOffers.map((o) => {
-                    let sortIndex;
-                    if (params.addSortIndex) {
-                        sortIndex = sortedOfferIds.indexOf(String(o.id));
-                    }
-                    const itemOffered4addOn = {
-                        description: productWithAddOns.description,
-                        id: productWithAddOns.id,
-                        name: productWithAddOns.name,
-                        productID: productWithAddOns.productID,
-                        // project: productWithAddOns.project,
-                        typeOf: productWithAddOns.typeOf
-                    };
-                    return Object.assign(Object.assign(Object.assign({ 
-                        // additionalProperty: Array.isArray(o.additionalProperty) ? o.additionalProperty : [],
-                        alternateName: o.alternateName, availability: o.availability, 
-                        // availableAtOrFrom: o.availableAtOrFrom,
-                        // color: o.color,
-                        description: o.description, id: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: o.priceSpecification, 
-                        // project: o.project,
-                        typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined);
-                });
-            }
-        }
-        return addOns;
-    });
-}
 /**
  * 興行オファー検索
  */
 function searchEventTicketOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const now = moment();
         const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
         let offers;
         let unitPriceOffers;
@@ -303,47 +234,10 @@ function searchEventTicketOffers(params) {
                     page: params.page,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
-                    onlyValid: params.onlyValid === true,
-                    searchAddOns: params.searchAddOns
+                    onlyValid: params.onlyValid === true
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;
-            // mongo条件へ移行(2023-02-24~)
-            // 有効期間を適用
-            // if (params.onlyValid === true) {
-            //     offers = offers.filter((o) => {
-            //         let isvalid = true;
-            //         if (o.validFrom !== undefined && moment(o.validFrom)
-            //             .isAfter(now)) {
-            //             isvalid = false;
-            //         }
-            //         if (o.validThrough !== undefined && moment(o.validThrough)
-            //             .isBefore(now)) {
-            //             isvalid = false;
-            //         }
-            //         return isvalid;
-            //     });
-            // }
-            // mongo条件へ移行(2023-02-27~)
-            // for (const offer of offers) {
-            //     if (Array.isArray(offer.addOn)) {
-            //         // addOnsに対しても有効期間を適用
-            //         if (params.onlyValid === true) {
-            //             offer.addOn = offer.addOn.filter((offer4addOn) => {
-            //                 let isvalid = true;
-            //                 if (offer4addOn.validFrom !== undefined && moment(offer4addOn.validFrom)
-            //                     .isAfter(now)) {
-            //                     isvalid = false;
-            //                 }
-            //                 if (offer4addOn.validThrough !== undefined && moment(offer4addOn.validThrough)
-            //                     .isBefore(now)) {
-            //                     isvalid = false;
-            //                 }
-            //                 return isvalid;
-            //             });
-            //         }
-            //     }
-            // }
         }
         return { ticketOffers: offers, unitPriceOffers };
     });

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

@@ -29,7 +29,7 @@ function createAppliesToMovieTicket(params) {
         movieTicketTypeChargePriceSpec = {
             typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
             name: { ja: params.ticketInfo.ticketName, en: params.ticketInfo.ticketNameEng },
-            price: Number(params.ticketInfo.addPrice),
+            price: params.ticketInfo.addPrice,
             priceCurrency: factory.priceCurrency.JPY,
             valueAddedTaxIncluded: true,
             appliesToMovieTicket: {
@@ -98,7 +98,7 @@ function createPriceComponent(params) {
             eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
         }
     }
-    const accountsReceivable = (ticketInfo.mvtkSalesPrice > 0) ? ticketInfo.mvtkSalesPrice : ticketInfo.stdPrice;
+    const accountsReceivable = (ticketInfo.mvtkAppPrice > 0) ? ticketInfo.mvtkAppPrice : ticketInfo.stdPrice;
     const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price: Number(ticketInfo.stdPrice), priceCurrency: factory.priceCurrency.JPY, referenceQuantity: {
             typeOf: 'QuantitativeValue',
             unitCode: factory.unitCode.C62,
@@ -127,24 +127,27 @@ function createPriceComponent(params) {
     }
     // 区分加算料金
     const categoryCodeChargeSpecs = [];
-    if (ticketInfo.addPrice > 0) {
-        categoryCodeChargeSpecs.push({
-            name: {
-                en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                ja: '加算単価'
-            },
-            price: ticketInfo.addPrice,
-            priceCurrency: factory.priceCurrency.JPY,
-            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-            appliesToCategoryCode: [],
-            valueAddedTaxIncluded: true
-        });
+    // movieTicketTypeChargePriceSpecにaddPriceが含まれる場合は除く
+    if (movieTicketTypeChargePriceSpec === undefined) {
+        if (ticketInfo.addPrice > 0) {
+            categoryCodeChargeSpecs.push({
+                name: {
+                    en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                    ja: '加算単価'
+                },
+                price: ticketInfo.addPrice,
+                priceCurrency: factory.priceCurrency.JPY,
+                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                appliesToCategoryCode: [],
+                valueAddedTaxIncluded: true
+            });
+        }
     }
     if (ticketInfo.spseatAdd1 > 0) {
         categoryCodeChargeSpecs.push({
             name: {
                 en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                ja: '特別席加算額1'
+                ja: '特別席加算額'
             },
             price: ticketInfo.spseatAdd1,
             priceCurrency: factory.priceCurrency.JPY,
@@ -153,23 +156,35 @@ function createPriceComponent(params) {
             valueAddedTaxIncluded: true
         });
     }
+    // アドオン単価
+    const addOnUnitPriceSpecs = [];
     if (ticketInfo.spseatAdd2 > 0) {
-        categoryCodeChargeSpecs.push({
-            name: {
-                en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                ja: '特別席加算額2'
-            },
+        addOnUnitPriceSpecs.push({
+            typeOf: factory.priceSpecificationType.UnitPriceSpecification,
+            name: { ja: 'ミールクーポン', en: 'Meal Coupon' },
             price: ticketInfo.spseatAdd2,
             priceCurrency: factory.priceCurrency.JPY,
-            typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-            appliesToCategoryCode: [],
-            valueAddedTaxIncluded: true
+            referenceQuantity: {
+                typeOf: 'QuantitativeValue',
+                unitCode: factory.unitCode.C62,
+                value: 1
+            },
+            valueAddedTaxIncluded: true,
+            appliesToAddOn: [{
+                    typeOf: factory.offerType.Offer,
+                    // id?: string;
+                    // identifier?: string;
+                    itemOffered: {
+                        // id: '',
+                        name: { ja: 'ミールクーポン', en: 'Meal Coupon' },
+                        productID: '',
+                        typeOf: factory.product.ProductType.Product
+                    }
+                }]
         });
     }
-    // アドオン単価仕様
-    let addOnUnitPriceSpec;
     if (ticketInfo.addGlasses > 0) {
-        addOnUnitPriceSpec = {
+        addOnUnitPriceSpecs.push({
             typeOf: factory.priceSpecificationType.UnitPriceSpecification,
             name: { ja: 'メガネ', en: 'Glasses' },
             price: Number(ticketInfo.addGlasses),
@@ -186,19 +201,19 @@ function createPriceComponent(params) {
                     // identifier?: string;
                     itemOffered: {
                         // id: '',
-                        // name :'',
+                        name: { ja: 'メガネ', en: 'Glasses' },
                         productID: '',
                         typeOf: factory.product.ProductType.Product
                     }
                 }]
-        };
+        });
     }
     const priceComponent = [
         unitPriceSpec,
         ...(movieTicketTypeChargePriceSpec !== undefined) ? [movieTicketTypeChargePriceSpec] : [],
         ...(surfrockChargePriceSpec !== undefined) ? [surfrockChargePriceSpec] : [],
         ...categoryCodeChargeSpecs,
-        ...(addOnUnitPriceSpec !== undefined) ? [addOnUnitPriceSpec] : []
+        ...addOnUnitPriceSpecs
     ];
     return { priceComponent, eligibleMonetaryAmount };
 }

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

@@ -9,7 +9,7 @@ declare function createCompoundPriceSpec4event(params: {
     soundFormatChargeSpecs: ICategoryCodeChargeSpecification[];
     videoFormatTypes: string[];
     availability?: factory.itemAvailability;
-    addOn: factory.product.ITicketAddOn[] | factory.product.IMinimizedTicketAddOn[];
+    addOn: factory.product.IMinimizedTicketAddOn[];
     sortIndex?: number;
 }): factory.product.ITicketOffer & {
     sortIndex?: number;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.302.0",
+    "@chevre/factory": "4.303.0",
     "@cinerino/sdk": "3.150.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.9.0-alpha.1"
+  "version": "20.9.0"
 }