@chevre/domain 21.17.0-alpha.17 → 21.17.0-alpha.19

package/example/src/chevre/searchAggregateOffers.ts

@@ -3,8 +3,17 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const indexes = await mongoose.connection.db.collection('aggregateOffers')
+        .indexes();
+    console.log(indexes);
+    console.log(indexes.length);
 
     const aggregateOfferRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
 
@@ -15,6 +24,7 @@ async function main() {
             project: { id: { $eq: String(process.env.PROJECT_ID) } },
             availability: { $eq: chevre.factory.itemAvailability.InStock },
             itemOffered: { typeOf: { $eq: chevre.factory.product.ProductType.EventService } },
+            acceptedPaymentMethod: { identifier: { $in: ['xxx'] } },
             // identifier: { $eq: '901' },
             sort: {
                 'priceSpecification.price': 1,
@@ -34,13 +44,6 @@ async function main() {
         return `${offer.project.id} ${(<any>offer).offerCount} ${offer.offers[0].identifier} ${offer.offers[0].name.ja} ${offer.offers[0].priceSpecification.price}`;
     }));
     console.log(offers.length);
-
-    const aggregateOfferCount = await aggregateOfferRepo.count({
-        project: { id: { $eq: String(process.env.PROJECT_ID) } },
-        availability: { $eq: chevre.factory.itemAvailability.InStock },
-        itemOffered: { typeOf: { $eq: chevre.factory.product.ProductType.EventService } }
-    });
-    console.log('aggregateOfferCount:', aggregateOfferCount);
 }
 
 main()

package/example/src/chevre/searchOffers.ts

@@ -10,13 +10,10 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    // const indexes = await mongoose.connection.db.collection('aggregateOffers')
-    //     .indexes();
-    // console.log(indexes);
-    // console.log(indexes.length);
-    // await mongoose.connection.db.collection('aggregateOffers')
-    //     .dropIndexes();
-    // console.log('indexes droped');
+    const indexes = await mongoose.connection.db.collection('aggregateOffers')
+        .indexes();
+    console.log(indexes);
+    console.log(indexes.length);
 
     const offerRepo = await chevre.repository.Offer.createInstance(mongoose.connection);
 
@@ -25,6 +22,7 @@ async function main() {
         // page: 1,
         project: { id: { $eq: String(process.env.PROJECT_ID) } },
         availability: { $eq: chevre.factory.itemAvailability.InStock },
+        acceptedPaymentMethod: { identifier: { $in: ['xxx'] } },
         parentOffer: {
         },
         priceSpecification: {

package/example/src/chevre/searchOrderAcceptedOffers.ts

@@ -0,0 +1,38 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+
+    const searchConditions: chevre.factory.order.ISearchConditions = {
+        // tslint:disable-next-line:no-magic-numbers
+        limit: 10,
+        page: 1,
+        project: { id: { $eq: project.id } },
+        confirmationNumbers: ['36684'],
+        orderNumbers: ['CIN1-3743286-2441943'],
+        acceptedOffers: { itemOffered: { typeOf: { $in: [chevre.factory.reservationType.EventReservation] } } }
+        // ...(typeof req.seller?.id === 'string') ? { seller: { id: { $eq: req.seller.id } } } : undefined // req.seller.idを考慮
+    };
+    const acceptedOffers = await orderRepo.searchAcceptedOffers(searchConditions, ['itemOffered', 'id']);
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(acceptedOffers, { depth: 1 });
+    const reservationIds = acceptedOffers.map((acceptedOffer) => {
+        if (acceptedOffer.itemOffered.typeOf === chevre.factory.reservationType.EventReservation) {
+            return acceptedOffer.itemOffered.id;
+        } else {
+            return '';
+        }
+    });
+    console.log('reservationIds:', reservationIds);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/aggregateOffer.js

@@ -22,7 +22,7 @@ class MongoRepository {
     }
     // 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;
+        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;
         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') {
@@ -361,7 +361,18 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_39 = params.additionalProperty) === null || _39 === void 0 ? void 0 : _39.$all;
+        const acceptedPaymentMethodIdentifierIn = (_40 = (_39 = params.acceptedPaymentMethod) === null || _39 === void 0 ? void 0 : _39.identifier) === null || _40 === void 0 ? void 0 : _40.$in;
+        if (Array.isArray(acceptedPaymentMethodIdentifierIn)) {
+            matchStages.push({
+                $match: {
+                    'offers.acceptedPaymentMethod.identifier': {
+                        $exists: true,
+                        $in: acceptedPaymentMethodIdentifierIn
+                    }
+                }
+            });
+        }
+        const additionalPropertyAll = (_41 = params.additionalProperty) === null || _41 === void 0 ? void 0 : _41.$all;
         if (Array.isArray(additionalPropertyAll)) {
             matchStages.push({
                 $match: {
@@ -372,7 +383,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_40 = params.additionalProperty) === null || _40 === void 0 ? void 0 : _40.$elemMatch;
+        const additionalPropertyElemMatch = (_42 = params.additionalProperty) === null || _42 === void 0 ? void 0 : _42.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             matchStages.push({
                 $match: {

package/lib/chevre/repo/mongoose/schemas/aggregateOffer.d.ts

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "AggregateOffer";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

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

@@ -39,17 +39,6 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * 集計オファースキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
     [
         { createdAt: 1 },
@@ -288,6 +277,31 @@ const indexes = [
                 'offers.validThrough': { $exists: true }
             }
         }
+    ],
+    [
+        { 'offers.acceptedPaymentMethod.identifier': 1 },
+        {
+            name: 'searchByOffersAcceptedPaymentMethodIdentifier',
+            partialFilterExpression: {
+                'offers.acceptedPaymentMethod.identifier': { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;
+/**
+ * 集計オファースキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

package/lib/chevre/repo/offer.js

@@ -40,7 +40,7 @@ class MongoRepository {
     }
     // 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;
+        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;
         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') {
@@ -359,7 +359,18 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_43 = params.additionalProperty) === null || _43 === void 0 ? void 0 : _43.$all;
+        const acceptedPaymentMethodIdentifierIn = (_44 = (_43 = params.acceptedPaymentMethod) === null || _43 === void 0 ? void 0 : _43.identifier) === null || _44 === void 0 ? void 0 : _44.$in;
+        if (Array.isArray(acceptedPaymentMethodIdentifierIn)) {
+            matchStages.push({
+                $match: {
+                    'offers.acceptedPaymentMethod.identifier': {
+                        $exists: true,
+                        $in: acceptedPaymentMethodIdentifierIn
+                    }
+                }
+            });
+        }
+        const additionalPropertyAll = (_45 = params.additionalProperty) === null || _45 === void 0 ? void 0 : _45.$all;
         if (Array.isArray(additionalPropertyAll)) {
             matchStages.push({
                 $match: {
@@ -370,7 +381,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_44 = params.additionalProperty) === null || _44 === void 0 ? void 0 : _44.$elemMatch;
+        const additionalPropertyElemMatch = (_46 = params.additionalProperty) === null || _46 === void 0 ? void 0 : _46.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             matchStages.push({
                 $match: {

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

@@ -25,11 +25,10 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IKeyOfProjection = keyof factory.order.IOrder | '_id';
-type IProjection4searchWithUnwoundAcceptedOffer = {
+type IProjection4searchWithUnwoundAcceptedOffers = {
     [key in keyof Omit<factory.order.IOrder, 'acceptedOffers'>]?: 1;
 } & {
     _id?: 0 | 1;
-    acceptedOffers?: ['$acceptedOffers'];
 };
 /**
  * 注文リポジトリ
@@ -37,7 +36,7 @@ type IProjection4searchWithUnwoundAcceptedOffer = {
 export declare class MongoRepository {
     private readonly orderModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.order.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.order.ISearchConditions): FilterQuery<factory.order.IOrder>[];
     /**
      * なければ作成する
      */
@@ -141,9 +140,11 @@ export declare class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffer): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered> | factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }>;
+    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
+    /**
+     * オファーのみ展開して検索する
+     */
+    searchAcceptedOffers(params: factory.order.ISearchConditions, inclusion?: (keyof factory.order.IAcceptedOffer<factory.order.IItemOffered>)[]): Promise<factory.order.IAcceptedOffer<factory.order.IItemOffered>[]>;
     /**
      * 注文に含まれる予約番号を検索する
      */

package/lib/chevre/repo/order.js

@@ -989,7 +989,7 @@ class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params, projection) {
+    searchWithUnwoundAcceptedOffers(params, projection) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
@@ -1005,43 +1005,67 @@ class MongoRepository {
             conditions.forEach((c) => {
                 aggregate.match(c);
             });
-            aggregate.project((projection !== undefined && projection !== null)
-                ? projection
-                : {
-                    // _id: 0,
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
+            aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate
+                // .allowDiskUse(true) // false化(2023-11-30~)
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * オファーのみ展開して検索する
+     */
+    searchAcceptedOffers(params, inclusion) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const aggregate = this.orderModel.aggregate();
+            // pipelineの順序に注意
+            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
+                aggregate.sort({ orderDate: params.sort.orderDate });
+            }
+            aggregate.unwind('$acceptedOffers');
+            conditions.forEach((c) => {
+                aggregate.match(c);
+            });
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                const specifiedProjection = {
+                    _id: 0
+                };
+                inclusion.forEach((key) => {
+                    specifiedProjection[key] = `$acceptedOffers.${key}`;
                 });
+                aggregate.project(specifiedProjection);
+            }
+            else {
+                aggregate.project({
+                    _id: 0,
+                    itemOffered: '$acceptedOffers.itemOffered',
+                    priceSpecification: '$acceptedOffers.priceSpecification',
+                    typeOf: '$acceptedOffers.typeOf',
+                    id: '$acceptedOffers.id',
+                    offeredThrough: '$acceptedOffers.offeredThrough',
+                    name: '$acceptedOffers.name'
+                });
+            }
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 aggregate.limit(params.limit * page)
                     .skip(params.limit * (page - 1));
             }
-            return aggregate.allowDiskUse(true)
+            return aggregate
                 .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
-    // 廃止(2023-10-15~)
-    // public async saveAwardAccountsIfNotExist(parmas: {
-    //     orderNumber: string;
-    //     awardAccounts: factory.transaction.placeOrder.IAwardAccount[];
-    // }) {
-    //     if (Array.isArray(parmas.awardAccounts)) {
-    //         const newIdentifier: factory.propertyValue.IPropertyValue<string>
-    //             = { name: AWARD_ACCOUNTS_IDENTIFIER_NAME, value: JSON.stringify(parmas.awardAccounts) };
-    //         await this.orderModel.findOneAndUpdate(
-    //             {
-    //                 orderNumber: { $eq: parmas.orderNumber },
-    //                 'identifier.name': { $ne: AWARD_ACCOUNTS_IDENTIFIER_NAME }
-    //             },
-    //             { $push: { identifier: newIdentifier } },
-    //             { new: true }
-    //         )
-    //             .exec();
-    //     }
-    // }
     /**
      * 注文に含まれる予約番号を検索する
      */

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.343.0-alpha.5",
-    "@cinerino/sdk": "5.2.0-alpha.4",
+    "@chevre/factory": "4.343.0",
+    "@cinerino/sdk": "5.2.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.17.0-alpha.17"
+  "version": "21.17.0-alpha.19"
 }