@chevre/domain 21.8.0-alpha.43 → 21.8.0-alpha.45

package/example/src/chevre/searchEventTicketOffers.ts

@@ -30,7 +30,8 @@ async function main() {
         validateOfferRateLimit: true,
         addSortIndex: true,
         limit: 100,
-        page: 1
+        page: 1,
+        useOffersAsPrimaryForcible: false
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({
         event: eventRepo,
@@ -39,6 +40,7 @@ async function main() {
         priceSpecification: priceSpecificationRepo,
         product: productRepo
     });
+    console.log(ticketOffers);
     console.log(ticketOffers.map((o) => o.sortIndex));
     console.log(ticketOffers.length);
 }

package/example/src/chevre/searchOffersByCatalog.ts

@@ -18,9 +18,10 @@ async function main() {
             id: '0001'
             // id: 'xxx'
         },
-        excludeAppliesToMovieTicket: false
-        // useOffersAsPrimary: true
+        excludeAppliesToMovieTicket: false,
+        useOffersAsPrimaryForcible: false
     });
+    console.log(offers);
     console.log(offers.map((offer) => {
         return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id} ${(<any>offer).offerIndex}`;
     }));

package/lib/chevre/repo/offer.d.ts

@@ -32,6 +32,9 @@ type IProjection = {
 };
 export type IUnitPriceOfferFromAggregateOffer = factory.unitPriceOffer.IUnitPriceOffer & {
     offerIndex?: number;
+    parentOffer?: {
+        id: string;
+    };
 };
 /**
  * オファーリポジトリ
@@ -71,7 +74,7 @@ export declare class MongoRepository {
         /**
          * 強制的にoffersコレクションを使用する
          */
-        useOffersAsPrimary?: boolean;
+        useOffersAsPrimaryForcible: boolean;
     }): Promise<{
         offers: IUnitPriceOfferFromAggregateOffer[];
         sortedOfferIds: string[];

package/lib/chevre/repo/offer.js

@@ -731,6 +731,9 @@ class MongoRepository {
         let projectStage = {
             _id: 0,
             offerIndex: `$${OFFERS_ARRAY_INDEX_NAME}`,
+            parentOffer: {
+                id: '$_id'
+            },
             typeOf: '$offers.typeOf',
             project: '$project',
             id: '$offers.id',
@@ -769,7 +772,10 @@ class MongoRepository {
         if (positiveProjectionFields.length > 0) {
             projectStage = {
                 _id: 0,
-                offerIndex: `$${OFFERS_ARRAY_INDEX_NAME}`
+                offerIndex: `$${OFFERS_ARRAY_INDEX_NAME}`,
+                parentOffer: {
+                    id: '$_id'
+                }
             };
             positiveProjectionFields.forEach((field) => {
                 projectStage[field] = `$offers.${field}`;
@@ -833,10 +839,7 @@ class MongoRepository {
                     // 明示的なソート指定を調整(決して重複しない属性が相応)(2023-09-07~)
                     ? { sort: { identifier: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);
-                // USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG対応(2023-09-06~)
-                const useOffersAsPrimary = (params.useOffersAsPrimary === true)
-                    ? true
-                    : !settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG;
+                const useOffersAsPrimary = (params.useOffersAsPrimaryForcible === true);
                 offers = yield this.search(searchOffersConditions, params.projection, useOffersAsPrimary);
                 // 完全廃止(基本的にsortedOfferIdsと合わせて利用する想定)(2023-09-04~)
                 // if (params.sort) {

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -179,7 +179,8 @@ function findOffers(params) {
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false
+                        excludeAppliesToMovieTicket: false,
+                        useOffersAsPrimaryForcible: false
                         // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
                     });
                     availableOffers = findOffersByOfferCatalogIdResult.offers;

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -104,7 +104,8 @@ function findOffers(params) {
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false
+                        excludeAppliesToMovieTicket: false,
+                        useOffersAsPrimaryForcible: false
                         // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
                     });
                     availableOffers = findOffersByOfferCatalogIdResult.offers;

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

@@ -94,7 +94,8 @@ function createTransactionObject(params) {
             ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
             onlyValid: true,
-            addSortIndex: false
+            addSortIndex: false,
+            useOffersAsPrimaryForcible: false
         })(repos);
         const transactionObject = [];
         for (const acceptedOffer of params.acceptedOffers) {

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

@@ -120,7 +120,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,
+                useOffersAsPrimaryForcible: false
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
@@ -476,7 +477,7 @@ function searchAvailableAddOns(params) {
         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 } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, useOffersAsPrimaryForcible: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAt: { id: params.availableAtOrFrom.id } }
                     : undefined))(repos);
                 availableAddOns.push(...offers.map((o) => {

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

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

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

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

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

@@ -35,7 +35,8 @@ function searchTicketOffersByItemOffered(params) {
             onlyValid: params.onlyValid === true,
             // Mongoのpagingを利用するオプション(2023-02-21~)
             limit: params.limit,
-            page: params.page
+            page: params.page,
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
             // sort: false // 完全廃止(2023-09-04~)
         });
         return { availableOffers: offers, sortedOfferIds };
@@ -84,7 +85,8 @@ function searchEventTicketOffersByEvent(params) {
             page: params.page,
             onlyValid: params.onlyValid,
             unacceptedPaymentMethod,
-            excludeAppliesToMovieTicket
+            excludeAppliesToMovieTicket,
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
         })(repos);
         // 冗長な検索について最適化(2023-03-03~)
         const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({
@@ -248,7 +250,8 @@ function searchEventTicketOffers(params) {
                     page: params.page,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
-                    onlyValid: params.onlyValid === true
+                    onlyValid: params.onlyValid === true,
+                    useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;

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

@@ -1,10 +1,19 @@
 import * as factory from '../../factory';
 type IMovieTicketTypeChargeSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.MovieTicketTypeChargeSpecification>;
 type ICategoryCodeChargeSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>;
+type ITicketOffer = factory.product.ITicketOffer & {
+    offerIndex?: number;
+    parentOffer?: {
+        id: string;
+    };
+};
 declare function createCompoundPriceSpec4event(params: {
     eligibleQuantity: factory.quantitativeValue.IQuantitativeValue<factory.unitCode.C62>;
     offer: factory.unitPriceOffer.IUnitPriceOffer & {
         offerIndex?: number;
+        parentOffer?: {
+            id: string;
+        };
     };
     movieTicketTypeChargeSpecs: IMovieTicketTypeChargeSpecification[];
     videoFormatChargeSpecs: ICategoryCodeChargeSpecification[];
@@ -13,8 +22,5 @@ declare function createCompoundPriceSpec4event(params: {
     availability?: factory.itemAvailability;
     addOn: factory.product.IMinimizedTicketAddOn[];
     sortIndex?: number;
-}): factory.product.ITicketOffer & {
-    sortIndex?: number;
-    offerIndex?: number;
-};
+}): ITicketOffer;
 export { createCompoundPriceSpec4event };

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

@@ -75,12 +75,12 @@ function createCompoundPriceSpec4event(params) {
         priceComponent
     };
     // 必要な属性のみに限定(2023-02-24~)
-    const { name, description, alternateName, color, typeOf, id, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex } = params.offer;
-    return Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
+    const { name, description, alternateName, color, typeOf, id, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
+    return Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
         availableAtOrFrom, category,
         eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
         priceCurrency,
         validFrom, validThrough, validRateLimit, additionalProperty,
-        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined);
+        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

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

@@ -1,6 +1,12 @@
 import * as factory from '../../../factory';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
+type ITicketOffer = factory.product.ITicketOffer & {
+    offerIndex?: number;
+    parentOffer?: {
+        id: string;
+    };
+};
 /**
  * プロダクトオファーを検索する
  */
@@ -19,7 +25,9 @@ export declare function searchProductOffers(params: {
     addSortIndex: boolean;
     limit?: number;
     page?: number;
+    useOffersAsPrimaryForcible: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;
-}) => Promise<factory.product.ITicketOffer[]>;
+}) => Promise<ITicketOffer[]>;
+export {};

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

@@ -31,9 +31,11 @@ function searchProductOffers(params) {
             page: params.page,
             // sort: false, // 完全廃止(2023-09-04~)
             onlyValid: params.onlyValid === true,
-            availableAtOrFrom: params.availableAt
+            availableAtOrFrom: params.availableAt,
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
         });
         return offers.map((o) => {
+            var _a;
             let sortIndex;
             if (params.addSortIndex) {
                 sortIndex = sortedOfferIds.indexOf(String(o.id));
@@ -47,7 +49,7 @@ function searchProductOffers(params) {
                     ...(unitSpec !== undefined) ? [unitSpec] : []
                 ]
             };
-            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: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined);
+            return Object.assign(Object.assign(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: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined), (typeof o.offerIndex === 'number') ? { offerIndex: o.offerIndex } : undefined), (typeof ((_a = o.parentOffer) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { parentOffer: { id: o.parentOffer.id } } : undefined);
         });
     });
 }

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

@@ -55,6 +55,7 @@ export declare function search(params: {
     limit?: number;
     page?: number;
     addSortIndex: boolean;
+    useOffersAsPrimaryForcible: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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

@@ -66,7 +66,8 @@ function search(params) {
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
             onlyValid: params.onlyValid,
-            addSortIndex: params.addSortIndex
+            addSortIndex: params.addSortIndex,
+            useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
         })(repos);
         return { offers, product };
         // Mongoへ移行(2023-03-01~)
@@ -211,7 +212,7 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        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);
+        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, useOffersAsPrimaryForcible: 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 };
     });
 }

package/lib/chevre/settings.d.ts

@@ -43,7 +43,6 @@ export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const USE_ORDER_PAYMENT_DUE_ON_PLACED: boolean;
 export declare const USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY: boolean;
 export declare const USE_AGGREGATE_OFFERS_AS_PRIMARY: boolean;
-export declare const USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 /**
  * グローバル設定

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -75,7 +75,6 @@ exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1
 exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = process.env.USE_ORDER_PAYMENT_DUE_ON_PLACED === '1';
 exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = process.env.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY === '1';
 exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY === '1';
-exports.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG = process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.43"
+  "version": "21.8.0-alpha.45"
 }