npm - @chevre/domain - Versions diffs - 22.9.0-alpha.96 → 22.9.0-alpha.98 - Mend

@chevre/domain 22.9.0-alpha.96 → 22.9.0-alpha.98

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/example/src/chevre/playAroundAdvanceBookingRequirement.ts +1 -0
package/example/src/chevre/reIndex.ts +1 -1
package/example/src/moment.ts +19 -18
package/lib/chevre/repo/aggregateOffer.d.ts +2 -14
package/lib/chevre/repo/aggregateOffer.js +94 -124
package/lib/chevre/repo/mongoose/schemas/aggregateOffer.js +9 -3
package/lib/chevre/repo/offer.d.ts +1 -3
package/lib/chevre/repo/offer.js +6 -392
package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js +14 -3
package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js +0 -2
package/package.json +1 -1
package/example/src/chevre/optimizeOffers.ts +0 -16

package/example/src/chevre/playAroundAdvanceBookingRequirement.ts CHANGED Viewed

@@ -33,6 +33,7 @@ async function main() {
             identifier: 'sampleRequirement',
             project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
             typeOf: 'QuantitativeValue',
+            unitCode: chevre.factory.unitCode.Day,
             // maxValue: 3,
             $unset: { maxValue: 1 }
         }

package/example/src/chevre/reIndex.ts CHANGED Viewed

@@ -11,7 +11,7 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-    await chevre.repository.Task.createInstance(mongoose.connection);
+    await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
     console.log('success!');
 }

package/example/src/moment.ts CHANGED Viewed

@@ -1,21 +1,22 @@
 // tslint:disable:no-console
-import * as moment from 'moment-timezone';
+import * as moment from 'moment';
-const importFrom = '2024-04-23T22:45:00.414Z';
-const importThrough = '2024-04-25T22:45:00.414Z';
-const targetImportFrom = moment(importFrom)
-    .tz('Asia/Tokyo')
-    .startOf('day');
-const targetImportThrough = moment(importThrough)
-    .tz('Asia/Tokyo')
-    .endOf('day');
-console.log(targetImportFrom.toDate(), targetImportThrough.toDate());
+const eventStartDate = '2025-04-10T01:00:00Z';
+// const timeFormat = 'HH:mm:ssZ';
+const time = '00:00:00+09:00';
+// const time = '00:00:00Z';
-const targetImportFrom2 = moment(`${moment(importFrom)
-    .tz('Asia/Tokyo')
-    .format('YYYY-MM-DD')}T00:00:00+09:00`);
-const targetImportThrough2 = moment(`${moment(importThrough)
-    .tz('Asia/Tokyo')
-    .format('YYYY-MM-DD')}T00:00:00+09:00`)
-    .add(1, 'day');
-console.log(targetImportFrom2.toDate(), targetImportThrough2.toDate());
+// tslint:disable-next-line:no-magic-numbers
+const offset = time.slice(8);
+console.log('offset:', offset);
+// const opensMoment = moment(time, timeFormat, true);
+// const utcOffset = opensMoment.utcOffset();
+// const eventStartDateMoment = moment.utc(eventStartDate);
+const eventStartDateMoment = moment(eventStartDate, true);
+console.log(eventStartDateMoment);
+console.log(eventStartDateMoment.utcOffset(offset));
+const usageDate = moment(`${eventStartDateMoment.format('YYYY-MM-DD')}T${time}`, true);
+console.log(usageDate);

package/lib/chevre/repo/aggregateOffer.d.ts CHANGED Viewed

@@ -5,25 +5,17 @@ type KeyOfUnitPriceOffer = keyof factory.unitPriceOffer.IUnitPriceOffer;
 type IProjection = {
     [key in KeyOfUnitPriceOffer]?: 0 | 1;
 };
-export type IUnitPriceOfferFromAggregateOffer = factory.unitPriceOffer.IUnitPriceOffer & {
-    offerIndex?: number;
-    parentOffer?: {
-        id: string;
-    };
-};
-type ISearchConditions = factory.unitPriceOffer.ISearchConditions;
 /**
  * 集計オファーリポジトリ
  */
 export declare class AggregateOfferRepo {
     private readonly aggregateOfferModel;
     constructor(connection: Connection);
-    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: ISearchConditions): IMatchStage[];
+    static CREATE_MATCH_STAGE(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): IMatchStage[];
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
         [field: string]: AnyExpression;
     };
-    count(params: Omit<ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
-    search(params: ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
+    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
     pushIncludedInDataCatalog(params: {
         project: {
             id: string;
@@ -65,10 +57,6 @@ export declare class AggregateOfferRepo {
         };
         id: string;
     }): Promise<void>;
-    /**
-     * 単価オファー最適化作業における一時的な処理
-     */
-    optimizeOffers(): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.aggregateOffer.IAggregateOffer>;
         $unset: any;

package/lib/chevre/repo/aggregateOffer.js CHANGED Viewed

@@ -21,125 +21,91 @@ class AggregateOfferRepo {
         this.aggregateOfferModel = connection.model(aggregateOffer_1.modelName, (0, aggregateOffer_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44;
+    static CREATE_MATCH_STAGE(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50;
         const matchStages = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
             matchStages.push({
-                $match: {
-                    'project.id': { $eq: projectIdEq }
-                }
+                $match: { 'project.id': { $eq: projectIdEq } }
             });
         }
-        const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        const parentOfferIdIn = (_d = (_c = params.parentOffer) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(parentOfferIdIn)) {
+            matchStages.push({ $match: { _id: { $in: parentOfferIdIn } } });
+        }
+        // aggregateOffer.includedInDataCatalogで検索する(2023-09-21~)
+        const includedInDataCatalogIdIn = (_f = (_e = params.includedInDataCatalog) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+        if (Array.isArray(includedInDataCatalogIdIn)) {
+            matchStages.push({ $match: { 'includedInDataCatalog.id': { $exists: true, $in: includedInDataCatalogIdIn } } });
+        }
+        const idEq = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof idEq === 'string') {
             matchStages.push({
-                $match: {
-                    // 'offers.id': { $eq: idEq }
-                    _id: { $eq: idEq } // _idに変更(2023-12-22~)
-                }
+                $match: { _id: { $eq: idEq } } // _idに変更(2023-12-22~)
             });
         }
-        const idIn = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$in;
+        const idIn = (_h = params.id) === null || _h === void 0 ? void 0 : _h.$in;
         if (Array.isArray(idIn)) {
             matchStages.push({
-                $match: {
-                    // 'offers.id': { $in: idIn }
-                    _id: { $in: idIn } // _idに変更(2023-12-22~)
-                }
+                $match: { _id: { $in: idIn } } // _idに変更(2023-12-22~)
             });
         }
-        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        const identifierEq = (_j = params.identifier) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof identifierEq === 'string') {
             matchStages.push({
                 $match: {
-                    'offers.identifier': {
-                        $exists: true,
-                        $eq: identifierEq
-                    }
+                    'offers.identifier': { $exists: true, $eq: identifierEq }
                 }
             });
         }
-        const identifierIn = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$in;
+        const identifierIn = (_k = params.identifier) === null || _k === void 0 ? void 0 : _k.$in;
         if (Array.isArray(identifierIn)) {
             matchStages.push({
                 $match: {
-                    'offers.identifier': {
-                        $exists: true,
-                        $in: identifierIn
-                    }
+                    'offers.identifier': { $exists: true, $in: identifierIn }
                 }
             });
         }
-        const identifierRegex = (_g = params.identifier) === null || _g === void 0 ? void 0 : _g.$regex;
+        const identifierRegex = (_l = params.identifier) === null || _l === void 0 ? void 0 : _l.$regex;
         if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
             matchStages.push({
                 $match: {
-                    'offers.identifier': {
-                        $exists: true,
-                        $regex: new RegExp(identifierRegex)
-                    }
+                    'offers.identifier': { $exists: true, $regex: new RegExp(identifierRegex) }
                 }
             });
         }
-        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
+        const nameRegex = (_m = params.name) === null || _m === void 0 ? void 0 : _m.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             const nameRegexExp = new RegExp(nameRegex);
             matchStages.push({
                 $match: {
                     $or: [
-                        {
-                            'offers.name.ja': {
-                                $exists: true,
-                                $regex: nameRegexExp
-                            }
-                        },
-                        {
-                            'offers.name.en': {
-                                $exists: true,
-                                $regex: nameRegexExp
-                            }
-                        },
-                        {
-                            'offers.alternateName.ja': {
-                                $exists: true,
-                                $regex: nameRegexExp
-                            }
-                        },
-                        {
-                            'offers.alternateName.en': {
-                                $exists: true,
-                                $regex: nameRegexExp
-                            }
-                        }
+                        { 'offers.name.ja': { $exists: true, $regex: nameRegexExp } },
+                        { 'offers.name.en': { $exists: true, $regex: nameRegexExp } },
+                        { 'offers.alternateName.ja': { $exists: true, $regex: nameRegexExp } },
+                        { 'offers.alternateName.en': { $exists: true, $regex: nameRegexExp } }
                     ]
                 }
             });
         }
-        const itemOfferedTypeOfEq = (_k = (_j = params.itemOffered) === null || _j === void 0 ? void 0 : _j.typeOf) === null || _k === void 0 ? void 0 : _k.$eq;
+        const itemOfferedTypeOfEq = (_p = (_o = params.itemOffered) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$eq;
         if (typeof itemOfferedTypeOfEq === 'string') {
             matchStages.push({
                 $match: {
-                    'offers.itemOffered.typeOf': {
-                        $exists: true,
-                        $eq: itemOfferedTypeOfEq
-                    }
+                    'offers.itemOffered.typeOf': { $exists: true, $eq: itemOfferedTypeOfEq }
                 }
             });
         }
-        const categoryCodeValueIn = (_m = (_l = params.category) === null || _l === void 0 ? void 0 : _l.codeValue) === null || _m === void 0 ? void 0 : _m.$in;
+        const categoryCodeValueIn = (_r = (_q = params.category) === null || _q === void 0 ? void 0 : _q.codeValue) === null || _r === void 0 ? void 0 : _r.$in;
         if (Array.isArray(categoryCodeValueIn)) {
             matchStages.push({
                 $match: {
-                    'offers.category.codeValue': {
-                        $exists: true,
-                        $in: categoryCodeValueIn
-                    }
+                    'offers.category.codeValue': { $exists: true, $in: categoryCodeValueIn }
                 }
             });
         }
-        const eligibleMembershipTypeCodeValueEq = (_p = (_o = params.eligibleMembershipType) === null || _o === void 0 ? void 0 : _o.codeValue) === null || _p === void 0 ? void 0 : _p.$eq;
+        const eligibleMembershipTypeCodeValueEq = (_t = (_s = params.eligibleMembershipType) === null || _s === void 0 ? void 0 : _s.codeValue) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof eligibleMembershipTypeCodeValueEq === 'string') {
             matchStages.push({
                 $match: {
@@ -150,7 +116,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const eligibleMonetaryAmountCurrencyEq = (_r = (_q = params.eligibleMonetaryAmount) === null || _q === void 0 ? void 0 : _q.currency) === null || _r === void 0 ? void 0 : _r.$eq;
+        const eligibleMonetaryAmountCurrencyEq = (_v = (_u = params.eligibleMonetaryAmount) === null || _u === void 0 ? void 0 : _u.currency) === null || _v === void 0 ? void 0 : _v.$eq;
         if (typeof eligibleMonetaryAmountCurrencyEq === 'string') {
             matchStages.push({
                 $match: {
@@ -161,7 +127,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const eligibleSeatingTypeCodeValueEq = (_t = (_s = params.eligibleSeatingType) === null || _s === void 0 ? void 0 : _s.codeValue) === null || _t === void 0 ? void 0 : _t.$eq;
+        const eligibleSeatingTypeCodeValueEq = (_x = (_w = params.eligibleSeatingType) === null || _w === void 0 ? void 0 : _w.codeValue) === null || _x === void 0 ? void 0 : _x.$eq;
         if (typeof eligibleSeatingTypeCodeValueEq === 'string') {
             matchStages.push({
                 $match: {
@@ -172,13 +138,13 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const appliesToMovieTicketSize = (_v = (_u = params.priceSpecification) === null || _u === void 0 ? void 0 : _u.appliesToMovieTicket) === null || _v === void 0 ? void 0 : _v.$size;
+        const appliesToMovieTicketSize = (_z = (_y = params.priceSpecification) === null || _y === void 0 ? void 0 : _y.appliesToMovieTicket) === null || _z === void 0 ? void 0 : _z.$size;
         if (typeof appliesToMovieTicketSize === 'number') {
             matchStages.push({
                 $match: { 'offers.priceSpecification.appliesToMovieTicket': { $exists: true, $size: appliesToMovieTicketSize } }
             });
         }
-        const appliesToMovieTicketServiceTypeExist = (_y = (_x = (_w = params.priceSpecification) === null || _w === void 0 ? void 0 : _w.appliesToMovieTicket) === null || _x === void 0 ? void 0 : _x.serviceType) === null || _y === void 0 ? void 0 : _y.$exists;
+        const appliesToMovieTicketServiceTypeExist = (_2 = (_1 = (_0 = params.priceSpecification) === null || _0 === void 0 ? void 0 : _0.appliesToMovieTicket) === null || _1 === void 0 ? void 0 : _1.serviceType) === null || _2 === void 0 ? void 0 : _2.$exists;
         if (typeof appliesToMovieTicketServiceTypeExist === 'boolean') {
             matchStages.push({
                 $match: {
@@ -188,7 +154,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const appliesToMovieTicketServiceTypeEq = (_1 = (_0 = (_z = params.priceSpecification) === null || _z === void 0 ? void 0 : _z.appliesToMovieTicket) === null || _0 === void 0 ? void 0 : _0.serviceType) === null || _1 === void 0 ? void 0 : _1.$eq;
+        const appliesToMovieTicketServiceTypeEq = (_5 = (_4 = (_3 = params.priceSpecification) === null || _3 === void 0 ? void 0 : _3.appliesToMovieTicket) === null || _4 === void 0 ? void 0 : _4.serviceType) === null || _5 === void 0 ? void 0 : _5.$eq;
         if (typeof appliesToMovieTicketServiceTypeEq === 'string') {
             matchStages.push({
                 $match: {
@@ -199,7 +165,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const appliesToMovieTicketServiceOutputTypeOfEq = (_5 = (_4 = (_3 = (_2 = params.priceSpecification) === null || _2 === void 0 ? void 0 : _2.appliesToMovieTicket) === null || _3 === void 0 ? void 0 : _3.serviceOutput) === null || _4 === void 0 ? void 0 : _4.typeOf) === null || _5 === void 0 ? void 0 : _5.$eq;
+        const appliesToMovieTicketServiceOutputTypeOfEq = (_9 = (_8 = (_7 = (_6 = params.priceSpecification) === null || _6 === void 0 ? void 0 : _6.appliesToMovieTicket) === null || _7 === void 0 ? void 0 : _7.serviceOutput) === null || _8 === void 0 ? void 0 : _8.typeOf) === null || _9 === void 0 ? void 0 : _9.$eq;
         if (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string') {
             matchStages.push({
                 $match: {
@@ -210,7 +176,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const appliesToMovieTicketServiceOutputTypeOfAll = (_9 = (_8 = (_7 = (_6 = params.priceSpecification) === null || _6 === void 0 ? void 0 : _6.appliesToMovieTicket) === null || _7 === void 0 ? void 0 : _7.serviceOutput) === null || _8 === void 0 ? void 0 : _8.typeOf) === null || _9 === void 0 ? void 0 : _9.$all;
+        const appliesToMovieTicketServiceOutputTypeOfAll = (_13 = (_12 = (_11 = (_10 = params.priceSpecification) === null || _10 === void 0 ? void 0 : _10.appliesToMovieTicket) === null || _11 === void 0 ? void 0 : _11.serviceOutput) === null || _12 === void 0 ? void 0 : _12.typeOf) === null || _13 === void 0 ? void 0 : _13.$all;
         if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfAll)) {
             matchStages.push({
                 $match: {
@@ -221,7 +187,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const appliesToMovieTicketServiceOutputTypeOfNin = (_13 = (_12 = (_11 = (_10 = params.priceSpecification) === null || _10 === void 0 ? void 0 : _10.appliesToMovieTicket) === null || _11 === void 0 ? void 0 : _11.serviceOutput) === null || _12 === void 0 ? void 0 : _12.typeOf) === null || _13 === void 0 ? void 0 : _13.$nin;
+        const appliesToMovieTicketServiceOutputTypeOfNin = (_17 = (_16 = (_15 = (_14 = params.priceSpecification) === null || _14 === void 0 ? void 0 : _14.appliesToMovieTicket) === null || _15 === void 0 ? void 0 : _15.serviceOutput) === null || _16 === void 0 ? void 0 : _16.typeOf) === null || _17 === void 0 ? void 0 : _17.$nin;
         if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfNin)) {
             matchStages.push({
                 $match: {
@@ -232,7 +198,7 @@ class AggregateOfferRepo {
             });
         }
         if (params.priceSpecification !== undefined && params.priceSpecification !== null) {
-            const priceSpecificationPriceGte = (_14 = params.priceSpecification.price) === null || _14 === void 0 ? void 0 : _14.$gte;
+            const priceSpecificationPriceGte = (_18 = params.priceSpecification.price) === null || _18 === void 0 ? void 0 : _18.$gte;
             if (typeof priceSpecificationPriceGte === 'number') {
                 matchStages.push({
                     $match: {
@@ -243,7 +209,7 @@ class AggregateOfferRepo {
                     }
                 });
             }
-            const priceSpecificationPriceLte = (_15 = params.priceSpecification.price) === null || _15 === void 0 ? void 0 : _15.$lte;
+            const priceSpecificationPriceLte = (_19 = params.priceSpecification.price) === null || _19 === void 0 ? void 0 : _19.$lte;
             if (typeof priceSpecificationPriceLte === 'number') {
                 matchStages.push({
                     $match: {
@@ -254,7 +220,7 @@ class AggregateOfferRepo {
                     }
                 });
             }
-            const accountsReceivableGte = (_17 = (_16 = params.priceSpecification.accounting) === null || _16 === void 0 ? void 0 : _16.accountsReceivable) === null || _17 === void 0 ? void 0 : _17.$gte;
+            const accountsReceivableGte = (_21 = (_20 = params.priceSpecification.accounting) === null || _20 === void 0 ? void 0 : _20.accountsReceivable) === null || _21 === void 0 ? void 0 : _21.$gte;
             if (typeof accountsReceivableGte === 'number') {
                 matchStages.push({
                     $match: {
@@ -265,7 +231,7 @@ class AggregateOfferRepo {
                     }
                 });
             }
-            const accountsReceivableLte = (_19 = (_18 = params.priceSpecification.accounting) === null || _18 === void 0 ? void 0 : _18.accountsReceivable) === null || _19 === void 0 ? void 0 : _19.$lte;
+            const accountsReceivableLte = (_23 = (_22 = params.priceSpecification.accounting) === null || _22 === void 0 ? void 0 : _22.accountsReceivable) === null || _23 === void 0 ? void 0 : _23.$lte;
             if (typeof accountsReceivableLte === 'number') {
                 matchStages.push({
                     $match: {
@@ -276,7 +242,7 @@ class AggregateOfferRepo {
                     }
                 });
             }
-            const accountingCodeValueEq = (_22 = (_21 = (_20 = params.priceSpecification.accounting) === null || _20 === void 0 ? void 0 : _20.operatingRevenue) === null || _21 === void 0 ? void 0 : _21.codeValue) === null || _22 === void 0 ? void 0 : _22.$eq;
+            const accountingCodeValueEq = (_26 = (_25 = (_24 = params.priceSpecification.accounting) === null || _24 === void 0 ? void 0 : _24.operatingRevenue) === null || _25 === void 0 ? void 0 : _25.codeValue) === null || _26 === void 0 ? void 0 : _26.$eq;
             if (typeof accountingCodeValueEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -287,7 +253,7 @@ class AggregateOfferRepo {
                     }
                 });
             }
-            const accountingCodeValueIn = (_25 = (_24 = (_23 = params.priceSpecification.accounting) === null || _23 === void 0 ? void 0 : _23.operatingRevenue) === null || _24 === void 0 ? void 0 : _24.codeValue) === null || _25 === void 0 ? void 0 : _25.$in;
+            const accountingCodeValueIn = (_29 = (_28 = (_27 = params.priceSpecification.accounting) === null || _27 === void 0 ? void 0 : _27.operatingRevenue) === null || _28 === void 0 ? void 0 : _28.codeValue) === null || _29 === void 0 ? void 0 : _29.$in;
             if (Array.isArray(accountingCodeValueIn)) {
                 matchStages.push({
                     $match: {
@@ -298,7 +264,7 @@ class AggregateOfferRepo {
                     }
                 });
             }
-            const referenceQuantityValueEq = (_27 = (_26 = params.priceSpecification.referenceQuantity) === null || _26 === void 0 ? void 0 : _26.value) === null || _27 === void 0 ? void 0 : _27.$eq;
+            const referenceQuantityValueEq = (_31 = (_30 = params.priceSpecification.referenceQuantity) === null || _30 === void 0 ? void 0 : _30.value) === null || _31 === void 0 ? void 0 : _31.$eq;
             if (typeof referenceQuantityValueEq === 'number') {
                 matchStages.push({
                     $match: {
@@ -310,7 +276,7 @@ class AggregateOfferRepo {
                 });
             }
         }
-        const availabilityEq = (_28 = params.availability) === null || _28 === void 0 ? void 0 : _28.$eq;
+        const availabilityEq = (_32 = params.availability) === null || _32 === void 0 ? void 0 : _32.$eq;
         if (typeof availabilityEq === 'string') {
             matchStages.push({
                 $match: {
@@ -318,7 +284,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const availableAtOrFromIdEq = (_30 = (_29 = params.availableAtOrFrom) === null || _29 === void 0 ? void 0 : _29.id) === null || _30 === void 0 ? void 0 : _30.$eq;
+        const availableAtOrFromIdEq = (_34 = (_33 = params.availableAtOrFrom) === null || _33 === void 0 ? void 0 : _33.id) === null || _34 === void 0 ? void 0 : _34.$eq;
         if (typeof availableAtOrFromIdEq === 'string') {
             matchStages.push({
                 $match: {
@@ -329,7 +295,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const availableAtOrFromIdIn = (_32 = (_31 = params.availableAtOrFrom) === null || _31 === void 0 ? void 0 : _31.id) === null || _32 === void 0 ? void 0 : _32.$in;
+        const availableAtOrFromIdIn = (_36 = (_35 = params.availableAtOrFrom) === null || _35 === void 0 ? void 0 : _35.id) === null || _36 === void 0 ? void 0 : _36.$in;
         if (Array.isArray(availableAtOrFromIdIn)) {
             matchStages.push({
                 $match: {
@@ -340,7 +306,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const addOnItemOfferedIdEq = (_35 = (_34 = (_33 = params.addOn) === null || _33 === void 0 ? void 0 : _33.itemOffered) === null || _34 === void 0 ? void 0 : _34.id) === null || _35 === void 0 ? void 0 : _35.$eq;
+        const addOnItemOfferedIdEq = (_39 = (_38 = (_37 = params.addOn) === null || _37 === void 0 ? void 0 : _37.itemOffered) === null || _38 === void 0 ? void 0 : _38.id) === null || _39 === void 0 ? void 0 : _39.$eq;
         if (typeof addOnItemOfferedIdEq === 'string') {
             matchStages.push({
                 $match: {
@@ -348,7 +314,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const addOnItemOfferedIdIn = (_38 = (_37 = (_36 = params.addOn) === null || _36 === void 0 ? void 0 : _36.itemOffered) === null || _37 === void 0 ? void 0 : _37.id) === null || _38 === void 0 ? void 0 : _38.$in;
+        const addOnItemOfferedIdIn = (_42 = (_41 = (_40 = params.addOn) === null || _40 === void 0 ? void 0 : _40.itemOffered) === null || _41 === void 0 ? void 0 : _41.id) === null || _42 === void 0 ? void 0 : _42.$in;
         if (Array.isArray(addOnItemOfferedIdIn)) {
             matchStages.push({
                 $match: {
@@ -356,7 +322,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_40 = (_39 = params.hasMerchantReturnPolicy) === null || _39 === void 0 ? void 0 : _39.id) === null || _40 === void 0 ? void 0 : _40.$eq;
+        const hasMerchantReturnPolicyIdEq = (_44 = (_43 = params.hasMerchantReturnPolicy) === null || _43 === void 0 ? void 0 : _43.id) === null || _44 === void 0 ? void 0 : _44.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             matchStages.push({
                 $match: {
@@ -367,7 +333,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const acceptedPaymentMethodIdentifierIn = (_42 = (_41 = params.acceptedPaymentMethod) === null || _41 === void 0 ? void 0 : _41.identifier) === null || _42 === void 0 ? void 0 : _42.$in;
+        const acceptedPaymentMethodIdentifierIn = (_46 = (_45 = params.acceptedPaymentMethod) === null || _45 === void 0 ? void 0 : _45.identifier) === null || _46 === void 0 ? void 0 : _46.$in;
         if (Array.isArray(acceptedPaymentMethodIdentifierIn)) {
             matchStages.push({
                 $match: {
@@ -378,7 +344,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const additionalPropertyAll = (_43 = params.additionalProperty) === null || _43 === void 0 ? void 0 : _43.$all;
+        const additionalPropertyAll = (_47 = params.additionalProperty) === null || _47 === void 0 ? void 0 : _47.$all;
         if (Array.isArray(additionalPropertyAll)) {
             matchStages.push({
                 $match: {
@@ -389,7 +355,7 @@ class AggregateOfferRepo {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_44 = params.additionalProperty) === null || _44 === void 0 ? void 0 : _44.$elemMatch;
+        const additionalPropertyElemMatch = (_48 = params.additionalProperty) === null || _48 === void 0 ? void 0 : _48.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             matchStages.push({
                 $match: {
@@ -418,6 +384,11 @@ class AggregateOfferRepo {
                 }
             });
         }
+        // add advanceBookingRequirement.id.$eq(2025-04-08~)
+        const advanceBookingRequirementIdEq = (_50 = (_49 = params.advanceBookingRequirement) === null || _49 === void 0 ? void 0 : _49.id) === null || _50 === void 0 ? void 0 : _50.$eq;
+        if (typeof advanceBookingRequirementIdEq === 'string') {
+            matchStages.push({ $match: { 'offers.advanceBookingRequirement.id': { $exists: true, $eq: advanceBookingRequirementIdEq } } });
+        }
         return matchStages;
     }
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params) {
@@ -462,23 +433,23 @@ class AggregateOfferRepo {
         }
         return projectStage;
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = AggregateOfferRepo.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
-            const result = yield this.aggregateOfferModel.aggregate([
-                ...matchStages,
-                {
-                    $count: 'offerCount'
-                }
-            ])
-                .exec();
-            return (result.length > 0) ? result[0].offerCount : 0;
-        });
-    }
+    // public async count(
+    //     params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>
+    // ): Promise<number> {
+    //     const matchStages = AggregateOfferRepo.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
+    //     const result = await this.aggregateOfferModel.aggregate<{ offerCount: number }>([
+    //         ...matchStages,
+    //         {
+    //             $count: 'offerCount'
+    //         }
+    //     ])
+    //         .exec();
+    //     return (result.length > 0) ? result[0].offerCount : 0;
+    // }
     search(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const matchStages = AggregateOfferRepo.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
+            const matchStages = AggregateOfferRepo.CREATE_MATCH_STAGE(params);
             const projectStage = AggregateOfferRepo.CREATE_AGGREGATE_OFFERS_PROJECTION(Object.assign({}, projection));
             const sortByPrice = (_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price'];
             const sortByIdentifier = (_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier;
@@ -568,26 +539,25 @@ class AggregateOfferRepo {
                 .exec();
         });
     }
-    /**
-     * 単価オファー最適化作業における一時的な処理
-     */
-    optimizeOffers() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.aggregateOfferModel.updateMany({
-                $or: [
-                    { 'offers.id': { $exists: true } },
-                    { 'offers.project': { $exists: true } }
-                ]
-            }, {
-                $set: {},
-                $unset: {
-                    'offers.0.id': 1,
-                    'offers.0.project': 1
-                }
-            })
-                .exec();
-        });
-    }
+    // 単価オファー最適化作業における一時的な処理
+    // public async optimizeOffers() {
+    //     return this.aggregateOfferModel.updateMany(
+    //         {
+    //             $or: [
+    //                 { 'offers.id': { $exists: true } },
+    //                 { 'offers.project': { $exists: true } }
+    //             ]
+    //         },
+    //         {
+    //             $set: {},
+    //             $unset: {
+    //                 'offers.0.id': 1,
+    //                 'offers.0.project': 1
+    //             }
+    //         }
+    //     )
+    //         .exec();
+    // }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.aggregateOfferModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })

package/lib/chevre/repo/mongoose/schemas/aggregateOffer.js CHANGED Viewed

@@ -13,9 +13,6 @@ const schemaDefinition = {
     typeOf: String,
     offers: [mongoose_1.SchemaTypes.Mixed],
     includedInDataCatalog: [mongoose_1.SchemaTypes.Mixed]
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -272,6 +269,15 @@ const indexes = [
                 'offers.acceptedPaymentMethod.identifier': { $exists: true }
             }
         }
+    ],
+    [
+        { 'offers.advanceBookingRequirement.id': 1 },
+        {
+            name: 'advanceBookingRequirementId',
+            partialFilterExpression: {
+                'offers.advanceBookingRequirement.id': { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;

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

@@ -1,8 +1,7 @@
 import type { BulkWriteResult } from 'mongodb';
-import { AnyExpression, Connection, Document, PipelineStage } from 'mongoose';
+import { AnyExpression, Connection, Document } from 'mongoose';
 import * as factory from '../factory';
 import { IDocType as IAggregateOfferDocType } from './mongoose/schemas/aggregateOffer';
-type IMatchStage = PipelineStage.Match;
 type KeyOfUnitPriceOffer = keyof Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
 type IProjection = {
     [key in KeyOfUnitPriceOffer]?: 0 | 1;
@@ -42,7 +41,6 @@ export declare class OfferRepo {
     private readonly offerCatalogModel;
     private readonly offerCatalogItemModel;
     constructor(connection: Connection);
-    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): IMatchStage[];
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
         [field: string]: AnyExpression;
     };

package/lib/chevre/repo/offer.js CHANGED Viewed

@@ -23,7 +23,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfferRepo = void 0;
 const mongoose_1 = require("mongoose");
 const factory = require("../factory");
-const aggregateOffer_1 = require("./mongoose/schemas/aggregateOffer");
+const aggregateOffer_1 = require("./aggregateOffer");
+const aggregateOffer_2 = require("./mongoose/schemas/aggregateOffer");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
 const offerCatalogItem_1 = require("./mongoose/schemas/offerCatalogItem");
 const OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
@@ -32,397 +33,10 @@ const OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
  */
 class OfferRepo {
     constructor(connection) {
-        this.aggregateOfferModel = connection.model(aggregateOffer_1.modelName, (0, aggregateOffer_1.createSchema)());
+        this.aggregateOfferModel = connection.model(aggregateOffer_2.modelName, (0, aggregateOffer_2.createSchema)());
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName, (0, offerCatalog_1.createSchema)());
         this.offerCatalogItemModel = connection.model(offerCatalogItem_1.modelName, (0, offerCatalogItem_1.createSchema)());
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50;
-        const matchStages = [];
-        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-        if (typeof projectIdEq === 'string') {
-            matchStages.push({
-                $match: { 'project.id': { $eq: projectIdEq } }
-            });
-        }
-        const parentOfferIdIn = (_d = (_c = params.parentOffer) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$in;
-        if (Array.isArray(parentOfferIdIn)) {
-            matchStages.push({ $match: { _id: { $in: parentOfferIdIn } } });
-        }
-        // aggregateOffer.includedInDataCatalogで検索する(2023-09-21~)
-        const includedInDataCatalogIdIn = (_f = (_e = params.includedInDataCatalog) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
-        // if (Array.isArray(includedInDataCatalogIdIn)) {
-        //     matchStages.push({ $match: { 'offers.includedInDataCatalog.id': { $exists: true, $in: includedInDataCatalogIdIn } } });
-        // }
-        if (Array.isArray(includedInDataCatalogIdIn)) {
-            matchStages.push({ $match: { 'includedInDataCatalog.id': { $exists: true, $in: includedInDataCatalogIdIn } } });
-        }
-        // const includedInOfferCatalogItemIncludedInDataCatalogIdIn = params.includedInOfferCatalogItem?.includedInDataCatalog?.id?.$in;
-        // if (Array.isArray(includedInOfferCatalogItemIncludedInDataCatalogIdIn)) {
-        //     matchStages.push({
-        //         $match: {
-        //             'offers.includedInOfferCatalogItem.includedInDataCatalog.id': {
-        //                 $exists: true,
-        //                 $in: includedInOfferCatalogItemIncludedInDataCatalogIdIn
-        //             }
-        //         }
-        //     });
-        // }
-        const idEq = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$eq;
-        if (typeof idEq === 'string') {
-            matchStages.push({
-                // $match: { 'offers.id': { $eq: idEq } }
-                $match: { _id: { $eq: idEq } } // _idに変更(2023-12-22~)
-            });
-        }
-        const idIn = (_h = params.id) === null || _h === void 0 ? void 0 : _h.$in;
-        if (Array.isArray(idIn)) {
-            matchStages.push({
-                // $match: { 'offers.id': { $in: idIn } }
-                $match: { _id: { $in: idIn } } // _idに変更(2023-12-22~)
-            });
-        }
-        const identifierEq = (_j = params.identifier) === null || _j === void 0 ? void 0 : _j.$eq;
-        if (typeof identifierEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.identifier': { $exists: true, $eq: identifierEq }
-                }
-            });
-        }
-        const identifierIn = (_k = params.identifier) === null || _k === void 0 ? void 0 : _k.$in;
-        if (Array.isArray(identifierIn)) {
-            matchStages.push({
-                $match: {
-                    'offers.identifier': { $exists: true, $in: identifierIn }
-                }
-            });
-        }
-        const identifierRegex = (_l = params.identifier) === null || _l === void 0 ? void 0 : _l.$regex;
-        if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
-            matchStages.push({
-                $match: {
-                    'offers.identifier': { $exists: true, $regex: new RegExp(identifierRegex) }
-                }
-            });
-        }
-        const nameRegex = (_m = params.name) === null || _m === void 0 ? void 0 : _m.$regex;
-        if (typeof nameRegex === 'string' && nameRegex.length > 0) {
-            const nameRegexExp = new RegExp(nameRegex);
-            matchStages.push({
-                $match: {
-                    $or: [
-                        { 'offers.name.ja': { $exists: true, $regex: nameRegexExp } },
-                        { 'offers.name.en': { $exists: true, $regex: nameRegexExp } },
-                        { 'offers.alternateName.ja': { $exists: true, $regex: nameRegexExp } },
-                        { 'offers.alternateName.en': { $exists: true, $regex: nameRegexExp } }
-                    ]
-                }
-            });
-        }
-        const itemOfferedTypeOfEq = (_p = (_o = params.itemOffered) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$eq;
-        if (typeof itemOfferedTypeOfEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.itemOffered.typeOf': { $exists: true, $eq: itemOfferedTypeOfEq }
-                }
-            });
-        }
-        const categoryCodeValueIn = (_r = (_q = params.category) === null || _q === void 0 ? void 0 : _q.codeValue) === null || _r === void 0 ? void 0 : _r.$in;
-        if (Array.isArray(categoryCodeValueIn)) {
-            matchStages.push({
-                $match: {
-                    'offers.category.codeValue': { $exists: true, $in: categoryCodeValueIn }
-                }
-            });
-        }
-        const eligibleMembershipTypeCodeValueEq = (_t = (_s = params.eligibleMembershipType) === null || _s === void 0 ? void 0 : _s.codeValue) === null || _t === void 0 ? void 0 : _t.$eq;
-        if (typeof eligibleMembershipTypeCodeValueEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.eligibleMembershipType.codeValue': {
-                        $exists: true,
-                        $eq: eligibleMembershipTypeCodeValueEq
-                    }
-                }
-            });
-        }
-        const eligibleMonetaryAmountCurrencyEq = (_v = (_u = params.eligibleMonetaryAmount) === null || _u === void 0 ? void 0 : _u.currency) === null || _v === void 0 ? void 0 : _v.$eq;
-        if (typeof eligibleMonetaryAmountCurrencyEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.eligibleMonetaryAmount.currency': {
-                        $exists: true,
-                        $eq: eligibleMonetaryAmountCurrencyEq
-                    }
-                }
-            });
-        }
-        const eligibleSeatingTypeCodeValueEq = (_x = (_w = params.eligibleSeatingType) === null || _w === void 0 ? void 0 : _w.codeValue) === null || _x === void 0 ? void 0 : _x.$eq;
-        if (typeof eligibleSeatingTypeCodeValueEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.eligibleSeatingType.codeValue': {
-                        $exists: true,
-                        $eq: eligibleSeatingTypeCodeValueEq
-                    }
-                }
-            });
-        }
-        const appliesToMovieTicketSize = (_z = (_y = params.priceSpecification) === null || _y === void 0 ? void 0 : _y.appliesToMovieTicket) === null || _z === void 0 ? void 0 : _z.$size;
-        if (typeof appliesToMovieTicketSize === 'number') {
-            matchStages.push({
-                $match: { 'offers.priceSpecification.appliesToMovieTicket': { $exists: true, $size: appliesToMovieTicketSize } }
-            });
-        }
-        const appliesToMovieTicketServiceTypeExist = (_2 = (_1 = (_0 = params.priceSpecification) === null || _0 === void 0 ? void 0 : _0.appliesToMovieTicket) === null || _1 === void 0 ? void 0 : _1.serviceType) === null || _2 === void 0 ? void 0 : _2.$exists;
-        if (typeof appliesToMovieTicketServiceTypeExist === 'boolean') {
-            matchStages.push({
-                $match: {
-                    'offers.priceSpecification.appliesToMovieTicket.serviceType': {
-                        $exists: appliesToMovieTicketServiceTypeExist
-                    }
-                }
-            });
-        }
-        const appliesToMovieTicketServiceTypeEq = (_5 = (_4 = (_3 = params.priceSpecification) === null || _3 === void 0 ? void 0 : _3.appliesToMovieTicket) === null || _4 === void 0 ? void 0 : _4.serviceType) === null || _5 === void 0 ? void 0 : _5.$eq;
-        if (typeof appliesToMovieTicketServiceTypeEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.priceSpecification.appliesToMovieTicket.serviceType': {
-                        $exists: true,
-                        $eq: appliesToMovieTicketServiceTypeEq
-                    }
-                }
-            });
-        }
-        const appliesToMovieTicketServiceOutputTypeOfEq = (_9 = (_8 = (_7 = (_6 = params.priceSpecification) === null || _6 === void 0 ? void 0 : _6.appliesToMovieTicket) === null || _7 === void 0 ? void 0 : _7.serviceOutput) === null || _8 === void 0 ? void 0 : _8.typeOf) === null || _9 === void 0 ? void 0 : _9.$eq;
-        if (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
-                        $exists: true,
-                        $eq: appliesToMovieTicketServiceOutputTypeOfEq
-                    }
-                }
-            });
-        }
-        const appliesToMovieTicketServiceOutputTypeOfAll = (_13 = (_12 = (_11 = (_10 = params.priceSpecification) === null || _10 === void 0 ? void 0 : _10.appliesToMovieTicket) === null || _11 === void 0 ? void 0 : _11.serviceOutput) === null || _12 === void 0 ? void 0 : _12.typeOf) === null || _13 === void 0 ? void 0 : _13.$all;
-        if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfAll)) {
-            matchStages.push({
-                $match: {
-                    'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
-                        $exists: true,
-                        $all: appliesToMovieTicketServiceOutputTypeOfAll
-                    }
-                }
-            });
-        }
-        const appliesToMovieTicketServiceOutputTypeOfNin = (_17 = (_16 = (_15 = (_14 = params.priceSpecification) === null || _14 === void 0 ? void 0 : _14.appliesToMovieTicket) === null || _15 === void 0 ? void 0 : _15.serviceOutput) === null || _16 === void 0 ? void 0 : _16.typeOf) === null || _17 === void 0 ? void 0 : _17.$nin;
-        if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfNin)) {
-            matchStages.push({
-                $match: {
-                    'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
-                        $nin: appliesToMovieTicketServiceOutputTypeOfNin
-                    }
-                }
-            });
-        }
-        if (params.priceSpecification !== undefined && params.priceSpecification !== null) {
-            const priceSpecificationPriceGte = (_18 = params.priceSpecification.price) === null || _18 === void 0 ? void 0 : _18.$gte;
-            if (typeof priceSpecificationPriceGte === 'number') {
-                matchStages.push({
-                    $match: {
-                        'offers.priceSpecification.price': {
-                            $exists: true,
-                            $gte: priceSpecificationPriceGte
-                        }
-                    }
-                });
-            }
-            const priceSpecificationPriceLte = (_19 = params.priceSpecification.price) === null || _19 === void 0 ? void 0 : _19.$lte;
-            if (typeof priceSpecificationPriceLte === 'number') {
-                matchStages.push({
-                    $match: {
-                        'offers.priceSpecification.price': {
-                            $exists: true,
-                            $lte: priceSpecificationPriceLte
-                        }
-                    }
-                });
-            }
-            const accountsReceivableGte = (_21 = (_20 = params.priceSpecification.accounting) === null || _20 === void 0 ? void 0 : _20.accountsReceivable) === null || _21 === void 0 ? void 0 : _21.$gte;
-            if (typeof accountsReceivableGte === 'number') {
-                matchStages.push({
-                    $match: {
-                        'offers.priceSpecification.accounting.accountsReceivable': {
-                            $exists: true,
-                            $gte: accountsReceivableGte
-                        }
-                    }
-                });
-            }
-            const accountsReceivableLte = (_23 = (_22 = params.priceSpecification.accounting) === null || _22 === void 0 ? void 0 : _22.accountsReceivable) === null || _23 === void 0 ? void 0 : _23.$lte;
-            if (typeof accountsReceivableLte === 'number') {
-                matchStages.push({
-                    $match: {
-                        'offers.priceSpecification.accounting.accountsReceivable': {
-                            $exists: true,
-                            $lte: accountsReceivableLte
-                        }
-                    }
-                });
-            }
-            const accountingCodeValueEq = (_26 = (_25 = (_24 = params.priceSpecification.accounting) === null || _24 === void 0 ? void 0 : _24.operatingRevenue) === null || _25 === void 0 ? void 0 : _25.codeValue) === null || _26 === void 0 ? void 0 : _26.$eq;
-            if (typeof accountingCodeValueEq === 'string') {
-                matchStages.push({
-                    $match: {
-                        'offers.priceSpecification.accounting.operatingRevenue.codeValue': {
-                            $exists: true,
-                            $eq: accountingCodeValueEq
-                        }
-                    }
-                });
-            }
-            const accountingCodeValueIn = (_29 = (_28 = (_27 = params.priceSpecification.accounting) === null || _27 === void 0 ? void 0 : _27.operatingRevenue) === null || _28 === void 0 ? void 0 : _28.codeValue) === null || _29 === void 0 ? void 0 : _29.$in;
-            if (Array.isArray(accountingCodeValueIn)) {
-                matchStages.push({
-                    $match: {
-                        'offers.priceSpecification.accounting.operatingRevenue.codeValue': {
-                            $exists: true,
-                            $in: accountingCodeValueIn
-                        }
-                    }
-                });
-            }
-            const referenceQuantityValueEq = (_31 = (_30 = params.priceSpecification.referenceQuantity) === null || _30 === void 0 ? void 0 : _30.value) === null || _31 === void 0 ? void 0 : _31.$eq;
-            if (typeof referenceQuantityValueEq === 'number') {
-                matchStages.push({
-                    $match: {
-                        'offers.priceSpecification.referenceQuantity.value': {
-                            $exists: true,
-                            $eq: referenceQuantityValueEq
-                        }
-                    }
-                });
-            }
-        }
-        const availabilityEq = (_32 = params.availability) === null || _32 === void 0 ? void 0 : _32.$eq;
-        if (typeof availabilityEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.availability': { $eq: availabilityEq }
-                }
-            });
-        }
-        const availableAtOrFromIdEq = (_34 = (_33 = params.availableAtOrFrom) === null || _33 === void 0 ? void 0 : _33.id) === null || _34 === void 0 ? void 0 : _34.$eq;
-        if (typeof availableAtOrFromIdEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.availableAtOrFrom.id': {
-                        $exists: true,
-                        $eq: availableAtOrFromIdEq
-                    }
-                }
-            });
-        }
-        const availableAtOrFromIdIn = (_36 = (_35 = params.availableAtOrFrom) === null || _35 === void 0 ? void 0 : _35.id) === null || _36 === void 0 ? void 0 : _36.$in;
-        if (Array.isArray(availableAtOrFromIdIn)) {
-            matchStages.push({
-                $match: {
-                    'offers.availableAtOrFrom.id': {
-                        $exists: true,
-                        $in: availableAtOrFromIdIn
-                    }
-                }
-            });
-        }
-        const addOnItemOfferedIdEq = (_39 = (_38 = (_37 = params.addOn) === null || _37 === void 0 ? void 0 : _37.itemOffered) === null || _38 === void 0 ? void 0 : _38.id) === null || _39 === void 0 ? void 0 : _39.$eq;
-        if (typeof addOnItemOfferedIdEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.addOn.itemOffered.id': { $exists: true, $eq: addOnItemOfferedIdEq }
-                }
-            });
-        }
-        const addOnItemOfferedIdIn = (_42 = (_41 = (_40 = params.addOn) === null || _40 === void 0 ? void 0 : _40.itemOffered) === null || _41 === void 0 ? void 0 : _41.id) === null || _42 === void 0 ? void 0 : _42.$in;
-        if (Array.isArray(addOnItemOfferedIdIn)) {
-            matchStages.push({
-                $match: {
-                    'offers.addOn.itemOffered.id': { $exists: true, $in: addOnItemOfferedIdIn }
-                }
-            });
-        }
-        const hasMerchantReturnPolicyIdEq = (_44 = (_43 = params.hasMerchantReturnPolicy) === null || _43 === void 0 ? void 0 : _43.id) === null || _44 === void 0 ? void 0 : _44.$eq;
-        if (typeof hasMerchantReturnPolicyIdEq === 'string') {
-            matchStages.push({
-                $match: {
-                    'offers.hasMerchantReturnPolicy.id': {
-                        $exists: true,
-                        $eq: hasMerchantReturnPolicyIdEq
-                    }
-                }
-            });
-        }
-        const acceptedPaymentMethodIdentifierIn = (_46 = (_45 = params.acceptedPaymentMethod) === null || _45 === void 0 ? void 0 : _45.identifier) === null || _46 === void 0 ? void 0 : _46.$in;
-        if (Array.isArray(acceptedPaymentMethodIdentifierIn)) {
-            matchStages.push({
-                $match: {
-                    'offers.acceptedPaymentMethod.identifier': {
-                        $exists: true,
-                        $in: acceptedPaymentMethodIdentifierIn
-                    }
-                }
-            });
-        }
-        const additionalPropertyAll = (_47 = params.additionalProperty) === null || _47 === void 0 ? void 0 : _47.$all;
-        if (Array.isArray(additionalPropertyAll)) {
-            matchStages.push({
-                $match: {
-                    'offers.additionalProperty': {
-                        $exists: true,
-                        $all: additionalPropertyAll
-                    }
-                }
-            });
-        }
-        const additionalPropertyElemMatch = (_48 = params.additionalProperty) === null || _48 === void 0 ? void 0 : _48.$elemMatch;
-        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-            matchStages.push({
-                $match: {
-                    'offers.additionalProperty': {
-                        $exists: true,
-                        $elemMatch: additionalPropertyElemMatch
-                    }
-                }
-            });
-        }
-        if (params.onlyValid === true) {
-            const now = new Date();
-            matchStages.push({
-                $match: {
-                    $or: [
-                        { 'offers.validFrom': { $exists: false } },
-                        { 'offers.validFrom': { $exists: true, $lte: now } }
-                    ]
-                }
-            }, {
-                $match: {
-                    $or: [
-                        { 'offers.validThrough': { $exists: false } },
-                        { 'offers.validThrough': { $exists: true, $gte: now } }
-                    ]
-                }
-            });
-        }
-        // add advanceBookingRequirement.id.$eq(2025-04-08~)
-        const advanceBookingRequirementIdEq = (_50 = (_49 = params.advanceBookingRequirement) === null || _49 === void 0 ? void 0 : _49.id) === null || _50 === void 0 ? void 0 : _50.$eq;
-        if (typeof advanceBookingRequirementIdEq === 'string') {
-            matchStages.push({ $match: { 'offers.advanceBookingRequirement.id': { $exists: true, $eq: advanceBookingRequirementIdEq } } });
-        }
-        return matchStages;
-    }
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params) {
         let projectStage = {
             _id: 0,
@@ -645,7 +259,7 @@ class OfferRepo {
                         ? { serviceOutput: { typeOf: { $nin: params.unacceptedPaymentMethod } } }
                         : undefined)
                 }, onlyValid: params.onlyValid === true });
-            const matchStages = OfferRepo.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(searchOffersConditions);
+            const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(searchOffersConditions);
             const aggregate = this.aggregateOfferModel.aggregate([
                 { $unwind: { path: '$offers' } },
                 { $unwind: { path: '$offers.priceSpecification.appliesToMovieTicket' } },
@@ -707,7 +321,7 @@ class OfferRepo {
     }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = OfferRepo.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
+            const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
             const result = yield this.aggregateOfferModel.aggregate([
                 {
                     $unwind: { path: '$offers' }
@@ -724,7 +338,7 @@ class OfferRepo {
     search(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const matchStages = OfferRepo.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
+            const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
             const projectStage = OfferRepo.CREATE_AGGREGATE_OFFERS_PROJECTION(Object.assign({}, projection));
             const sortByPrice = (_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price'];
             const sortByIdentifier = (_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier;

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js CHANGED Viewed

@@ -259,7 +259,7 @@ function validateQuantityRequirement(params) {
  * 事前予約要件を検証する
  */
 function validateAdvanceBookingRequirement(params) {
-    var _a;
+    var _a, _b;
     let requirementSatisfied = true;
     // reimplement using advanceBookingRequirementRepo(2025-04-08~)
     const advanceBookingRequirementId = (_a = params.unitPriceOffer.advanceBookingRequirement) === null || _a === void 0 ? void 0 : _a.id;
@@ -271,7 +271,18 @@ function validateAdvanceBookingRequirement(params) {
         const advanceBookingRequirementMaxValue = advanceBookingRequirement.maxValue;
         const advanceBookingRequirementMinValue = advanceBookingRequirement.minValue;
         const advanceBookingRequirementUnitCode = advanceBookingRequirement.unitCode;
-        const usageDate = moment(params.reservationFor.startDate);
+        const valueReferenceOpens = (_b = advanceBookingRequirement.valueReference) === null || _b === void 0 ? void 0 : _b.opens;
+        let usageDate = moment(params.reservationFor.startDate, true);
+        if (typeof valueReferenceOpens === 'string') {
+            // support valueReference(2025-04-10~)
+            // tslint:disable-next-line:no-magic-numbers
+            const opensOffset = valueReferenceOpens.slice(8); // format: HH:mm:ssZ
+            // tslint:disable-next-line:no-console
+            debug('opensOffset:', opensOffset);
+            usageDate = usageDate.utcOffset(opensOffset);
+            usageDate = moment(`${usageDate.format('YYYY-MM-DD')}T${valueReferenceOpens}`, true);
+        }
+        debug('usageDate:', usageDate);
         if (typeof advanceBookingRequirementMaxValue === 'number' && typeof advanceBookingRequirementUnitCode === 'string') {
             if (advanceBookingRequirementMaxValue < 0) {
                 throw new factory.errors.NotImplemented('negative value as advanceBookingRequirement.maxValue not implemented');
@@ -280,7 +291,7 @@ function validateAdvanceBookingRequirement(params) {
                 throw new factory.errors.NotImplemented(`only ${factory.unitCode.Day} implemented`);
             }
             const usageDateMustBeBefore = moment(params.now)
-                .add(advanceBookingRequirementMinValue, 'days');
+                .add(advanceBookingRequirementMaxValue, 'days');
             if (!usageDate.isSameOrBefore(usageDateMustBeBefore)) {
                 requirementSatisfied = false;
             }

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js CHANGED Viewed

@@ -31,8 +31,6 @@ function wait4payActionDelayIfNeeded(params) {
             }
         }
         if (waitingNecessary) {
-            // tslint:disable-next-line:no-console
-            console.log('wait4payActionDelayIfNeeded: waiting... minIntervalBetweenPayAndRefund:', minIntervalBetweenPayAndRefund);
             yield new Promise((resolve) => {
                 setTimeout(() => {
                     resolve();

package/package.json CHANGED Viewed

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.96"
+  "version": "22.9.0-alpha.98"
 }

package/example/src/chevre/optimizeOffers.ts DELETED Viewed

@@ -1,16 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-import { chevre } from '../../../lib/index';
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-    const aggregateOfferRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
-    const result = await aggregateOfferRepo.optimizeOffers();
-    console.log('result:', result);
-}
-main()
-    .then(console.log)
-    .catch(console.error);