@chevre/domain 21.8.0-alpha.44 → 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

@@ -21,6 +21,7 @@ async function main() {
         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;
+    };
 };
 /**
  * オファーリポジトリ

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}`;

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;
+    };
+};
 /**
  * プロダクトオファーを検索する
  */
@@ -23,4 +29,5 @@ export declare function searchProductOffers(params: {
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;
-}) => Promise<factory.product.ITicketOffer[]>;
+}) => Promise<ITicketOffer[]>;
+export {};

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

@@ -35,6 +35,7 @@ function searchProductOffers(params) {
             useOffersAsPrimaryForcible: params.useOffersAsPrimaryForcible
         });
         return offers.map((o) => {
+            var _a;
             let sortIndex;
             if (params.addSortIndex) {
                 sortIndex = sortedOfferIds.indexOf(String(o.id));
@@ -48,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/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.44"
+  "version": "21.8.0-alpha.45"
 }