@chevre/domain 20.4.0-alpha.31 → 20.4.0-alpha.33

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

@@ -9,6 +9,6 @@ export declare function createPrice(params: {
     };
     ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
-    acceptedAddOns: factory.offer.IAddOn[];
+    acceptedAddOns: factory.product.ITicketAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
 }): factory.reservation.IPriceSpecification<factory.reservationType.EventReservation>;

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

@@ -44,27 +44,20 @@ function createUnitPriceSpecsAppliedToAddOn(params) {
     if (Array.isArray(params.acceptedAddOns)) {
         unitPriceSpecsAppliedToAddOn = params.acceptedAddOns.map((acceptedAddOn) => {
             const acceptedAddOnPriceSpec = acceptedAddOn.priceSpecification;
-            if (acceptedAddOnPriceSpec === undefined || acceptedAddOnPriceSpec === null) {
-                throw new factory.errors.NotFound('AddOn PriceSpecification');
-            }
             // アドオンプロダクトを最適化
             const itemOffered4appliesToAddOn = {
                 id: acceptedAddOn.itemOffered.id,
                 name: acceptedAddOn.itemOffered.name,
                 productID: acceptedAddOn.itemOffered.productID,
-                // project: acceptedAddOn.itemOffered.project,
                 typeOf: acceptedAddOn.itemOffered.typeOf
             };
             const appliesToAddOn = {
-                // project: acceptedAddOn.project,
                 typeOf: acceptedAddOn.typeOf,
                 id: acceptedAddOn.id,
                 identifier: acceptedAddOn.identifier,
                 itemOffered: itemOffered4appliesToAddOn
-                // priceCurrency: acceptedAddOn.priceCurrency
             };
             return {
-                project: params.project,
                 typeOf: factory.priceSpecificationType.UnitPriceSpecification,
                 name: acceptedAddOnPriceSpec.name,
                 price: acceptedAddOnPriceSpec.price,

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

@@ -59,7 +59,7 @@ export declare function createReservation(params: {
     additionalTicketText?: string;
     ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
-    acceptedAddOns: factory.offer.IAddOn[];
+    acceptedAddOns: factory.product.ITicketAddOn[];
     subReservation?: factory.reservation.ISubReservation<factory.reservationType.EventReservation>[];
     programMembershipUsed?: factory.reservation.IProgramMembershipUsed<factory.reservationType.EventReservation>;
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;

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

@@ -119,7 +119,8 @@ function addReservations(params) {
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 onlyValid: true,
                 addSortIndex: false,
-                validateOfferRateLimit: true
+                validateOfferRateLimit: true,
+                searchAddOns: true
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
@@ -132,6 +133,7 @@ function addReservations(params) {
             availableOffers, now,
             event, availableSeatOffers,
             transaction,
+            availableAtOrFrom: params.availableAtOrFrom,
             validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
         })(repos);
         // 予約イベント最適化
@@ -306,8 +308,14 @@ function createReservations4transactionObject(params) {
             }
             // 指定されたアドオンがオファーに存在すれば、アドオンの単価仕様作成
             let acceptedAddOns = [];
+            let availableAddOns;
             const acceptedAddOnParams = acceptedOffer.addOn;
-            const availableAddOns = ticketOffer.addOn;
+            // availableAddOns = await searchAvailableAddOns({
+            //     project: { id: params.transaction.project.id },
+            //     ticketOffer,
+            //     availableAtOrFrom: params.availableAtOrFrom
+            // })(repos);
+            availableAddOns = ticketOffer.addOn;
             if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnParams)) {
                 acceptedAddOns = availableAddOns.filter((availableAddOn) => acceptedAddOnParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id));
             }
@@ -337,6 +345,63 @@ function createReservations4transactionObject(params) {
         return reservations;
     });
 }
+// function searchAvailableAddOns(params: {
+//     project: { id: string };
+//     ticketOffer: factory.product.ITicketOffer;
+//     availableAtOrFrom?: { id?: string };
+// }) {
+//     return async (repos: {
+//         offer: OfferRepo;
+//         product: ProductRepo;
+//     }) => {
+//         const availableAddOns: factory.product.ITicketAddOn[] = [];
+//         if (Array.isArray(params.ticketOffer.addOn)) {
+//             const addOnProductIds = [...new Set(params.ticketOffer.addOn.map((o) => String(o.itemOffered.id)))];
+//             for (const addOnProductId of addOnProductIds) {
+//                 const { offers, product } = await OfferService.product.search({
+//                     // ids?: string[];
+//                     project: { id: params.project.id },
+//                     itemOffered: { id: addOnProductId },
+//                     onlyValid: true,
+//                     addSortIndex: false,
+//                     ...(typeof params.availableAtOrFrom?.id === 'string')
+//                         ? { availableAt: { id: params.availableAtOrFrom.id } }
+//                         : undefined
+//                 })(repos);
+//                 availableAddOns.push(...offers.map<factory.product.ITicketAddOn>((o) => {
+//                     const itemOffered4addOn: factory.offer.IItemOffered4addOn = {
+//                         description: product.description,
+//                         id: product.id,
+//                         name: product.name,
+//                         productID: product.productID,
+//                         typeOf: product.typeOf
+//                     };
+//                     const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
+//                         return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
+//                     });
+//                     if (unitPriceSpec?.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
+//                         throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
+//                     }
+//                     return {
+//                         alternateName: o.alternateName,
+//                         availability: o.availability,
+//                         description: o.description,
+//                         id: String(o.id),
+//                         identifier: o.identifier,
+//                         itemOffered: itemOffered4addOn,
+//                         name: o.name,
+//                         priceCurrency: o.priceCurrency,
+//                         priceSpecification: unitPriceSpec,
+//                         typeOf: o.typeOf,
+//                         ...(o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined,
+//                         ...(o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined
+//                     };
+//                 }));
+//             }
+//         }
+//         return availableAddOns;
+//     };
+// }
 function getAcceptedSeatNumbersAndSeatSections(params) {
     const acceptedSeatNumbers = [];
     const acceptedSeatSections = [];

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

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

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

@@ -75,6 +75,7 @@ declare function searchEventTicketOffers(params: {
     page?: number;
     addSortIndex: boolean;
     validateOfferRateLimit: boolean;
+    searchAddOns: boolean;
 }): ISearchEventTicketOffersOperation<{
     ticketOffers: ITicketOfferWithSortIndex[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];

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

@@ -47,6 +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;
         const event = params.event;
@@ -90,20 +91,25 @@ function searchEventTicketOffersByEvent(params) {
                 availability = yield checkAvailability({ event, unitPriceOffer: availableOffer })(repos);
             }
             // アドオン設定があれば、プロダクトオファーを検索
-            const offerAddOn = [];
+            let offerAddOn = [];
             if (Array.isArray(availableOffer.addOn)) {
-                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);
+                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,
@@ -278,7 +284,8 @@ function searchEventTicketOffers(params) {
                     page: params.page,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
-                    onlyValid: params.onlyValid === true
+                    onlyValid: params.onlyValid === true,
+                    searchAddOns: params.searchAddOns
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;

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

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

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -17,6 +17,8 @@ export declare function searchProductOffers(params: {
     };
     onlyValid: boolean;
     addSortIndex: boolean;
+    limit?: number;
+    page?: number;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

package/lib/chevre/service/offer/product/searchProductOffers.js

@@ -27,6 +27,8 @@ function searchProductOffers(params) {
             ids: params.ids,
             offerCatalog: { id: offerCatalogId },
             excludeAppliesToMovieTicket: false,
+            limit: params.limit,
+            page: params.page,
             sort: false,
             onlyValid: params.onlyValid === true,
             availableAtOrFrom: params.availableAt

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

@@ -13,7 +13,6 @@ import { MongoRepository as ServiceOutputRepo } from '../../repo/serviceOutput';
 import { RedisRepository as ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
-import { searchProductOffers } from './product/searchProductOffers';
 export interface IAuthorizeOperationRepos {
     account: AccountRepo;
     action: ActionRepo;
@@ -32,7 +31,6 @@ export interface IAuthorizeOperationRepos {
 }
 export declare type IAuthorizeOperation<T> = (repos: IAuthorizeOperationRepos) => Promise<T>;
 export declare const ERROR_MESSAGE_ALREADY_REGISTERED = "Already registered";
-export { searchProductOffers };
 /**
  * プロダクトオファーを検索する
  */
@@ -54,11 +52,16 @@ export declare function search(params: {
         id: string;
     };
     onlyValid: boolean;
+    limit?: number;
+    page?: number;
     addSortIndex: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;
-}) => Promise<factory.product.ITicketOffer[]>;
+}) => Promise<{
+    offers: factory.product.ITicketOffer[];
+    product: factory.product.IProduct;
+}>;
 export declare type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**
  * サービス(Chevreプロダクト)オファー承認

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processUnlockRegisterMembershipService = exports.voidTransaction = exports.authorize = exports.search = exports.searchProductOffers = exports.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
+exports.processUnlockRegisterMembershipService = exports.voidTransaction = exports.authorize = exports.search = exports.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
@@ -18,8 +18,8 @@ const RegisterServiceTransaction = require("../assetTransaction/registerService"
 const placeOrderInProgress_1 = require("../transaction/placeOrderInProgress");
 const factory_1 = require("./product/factory");
 const searchProductOffers_1 = require("./product/searchProductOffers");
-Object.defineProperty(exports, "searchProductOffers", { enumerable: true, get: function () { return searchProductOffers_1.searchProductOffers; } });
 exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
+// export { searchProductOffers };
 /**
  * プロダクトオファーを検索する
  */
@@ -43,7 +43,7 @@ function search(params) {
             if (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
                 const productOffers = product.offers;
                 if (!Array.isArray(productOffers)) {
-                    return [];
+                    return { offers: [], product };
                 }
                 const hasValidOffer = productOffers.some((o) => {
                     var _a, _b;
@@ -56,18 +56,19 @@ function search(params) {
                             .isSameOrAfter(now);
                 });
                 if (!hasValidOffer) {
-                    return [];
+                    return { offers: [], product };
                 }
             }
         }
         // let offers: factory.product.ITicketOffer[] = [];
-        return (0, searchProductOffers_1.searchProductOffers)({
+        const offers = yield (0, searchProductOffers_1.searchProductOffers)({
             ids: params.ids,
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
             onlyValid: params.onlyValid,
             addSortIndex: params.addSortIndex
         })(repos);
+        return { offers, product };
         // Mongoへ移行(2023-03-01~)
         // 店舗条件によって対象を絞る
         // const storeId = params.availableAt?.id;
@@ -210,8 +211,8 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const availableOffers = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, addSortIndex: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
-        return { product, availableOffers };
+        const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, addSortIndex: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
+        return { product, availableOffers: offers };
     });
 }
 function voidTransaction(params) {

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -213,7 +213,7 @@ function processAuthorizeProductOffer(params) {
         };
         // オファーにポイント特典設定があるかどうか確認
         let pointAward;
-        const offers = yield OfferService.product.search({
+        const { offers } = yield OfferService.product.search({
             project: { id: params.project.id },
             itemOffered: { id: params.product.id },
             seller: { id: String(seller.id) },

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.292.0",
+    "@chevre/factory": "4.293.0-alpha.0",
     "@cinerino/sdk": "3.143.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.4.0-alpha.31"
+  "version": "20.4.0-alpha.33"
 }