@chevre/domain 20.4.0-alpha.26 → 20.4.0-alpha.28

package/example/src/chevre/reIndex.ts

@@ -0,0 +1,25 @@
+// 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);
+
+    const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
+    const result = await priceSpecificationRepo.reIndex();
+    console.log(result);
+}
+
+main()
+    .then()
+    .catch(console.error);
+// setInterval(
+//     () => {
+//         main()
+//             .then()
+//             .catch(console.error);
+//     },
+//     // tslint:disable-next-line:no-magic-numbers
+//     60000
+// );

package/example/src/chevre/searchOfferCatalogs.ts

@@ -0,0 +1,29 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = process.env.PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const catalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+
+    console.log('searching...');
+    const catalogs = await catalogRepo.search(
+        {
+            project: { id: { $eq: PROJECT_ID } },
+            identifier: { $eq: '0001' },
+            sort: { identifier: chevre.factory.sortType.Descending },
+            limit: 2,
+            page: 1
+        }
+    );
+    console.log('catalogs found', catalogs.map((catalog) => `${catalog.identifier} ${catalog.numberOfItems}`));
+    console.log(catalogs.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -32,7 +32,9 @@ export declare class MongoRepository {
         id: string;
     }): Promise<factory.offerCatalog.IOfferCatalog>;
     count(params: factory.offerCatalog.ISearchConditions): Promise<number>;
-    search(params: factory.offerCatalog.ISearchConditions): Promise<factory.offerCatalog.IOfferCatalog[]>;
+    search(params: factory.offerCatalog.ISearchConditions): Promise<(Omit<factory.offerCatalog.IOfferCatalog, 'itemListElement'> & {
+        numberOfItems?: number;
+    })[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offerCatalog.js

@@ -205,24 +205,62 @@ class MongoRepository {
     search(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.offerCatalogModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
+            const matchStages = conditions.map((condition) => {
+                return { $match: condition };
             });
+            // numberOfItems集計(2023-02-28~)
+            const aggregate = this.offerCatalogModel.aggregate([
+                ...(params.sort !== undefined) ? [{ $sort: params.sort }] : [],
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        name: '$name',
+                        description: '$description',
+                        project: '$project',
+                        typeOf: '$typeOf',
+                        id: '$_id',
+                        identifier: '$identifier',
+                        // itemListElement: '$itemListElement',
+                        itemOffered: '$itemOffered',
+                        additionalProperty: '$additionalProperty',
+                        numberOfItems: {
+                            $cond: {
+                                if: { $isArray: '$itemListElement' },
+                                then: { $size: '$itemListElement' },
+                                else: 0
+                            }
+                        }
+                    }
+                }
+            ]);
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
-                query.limit(params.limit)
+                aggregate.limit(params.limit * page)
                     .skip(params.limit * (page - 1));
             }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
-            }
-            return query.setOptions({ maxTimeMS: 10000 })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return aggregate.exec();
+            // const query = this.offerCatalogModel.find(
+            //     (conditions.length > 0) ? { $and: conditions } : {},
+            //     {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     }
+            // );
+            // if (typeof params.limit === 'number') {
+            //     const page: number = (typeof params.page === 'number') ? params.page : 1;
+            //     query.limit(params.limit)
+            //         .skip(params.limit * (page - 1));
+            // }
+            // // tslint:disable-next-line:no-single-line-block-comment
+            // /* istanbul ignore else */
+            // if (params.sort !== undefined) {
+            //     query.sort(params.sort);
+            // }
+            // return query.setOptions({ maxTimeMS: 10000 })
+            //     .exec()
+            //     .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
     deleteById(params) {

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

@@ -41,4 +41,5 @@ export declare class MongoRepository {
         deletedCount?: number | undefined;
     }>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+    reIndex(): Promise<any>;
 }

package/lib/chevre/repo/priceSpecification.js

@@ -32,7 +32,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const andConditions = [];
         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') {
@@ -146,6 +146,10 @@ class MongoRepository {
                 }
             });
         }
+        const priceEq = (_g = params.price) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof priceEq === 'number') {
+            andConditions.push({ price: { $eq: priceEq } });
+        }
         return andConditions;
     }
     count(params) {
@@ -248,5 +252,13 @@ class MongoRepository {
             .sort({ price: factory.sortType.Ascending })
             .cursor();
     }
+    reIndex() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // return this.priceSpecificationModel.collection.name;
+            return this.priceSpecificationModel.db.db.command({
+                reIndex: this.priceSpecificationModel.collection.name
+            });
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -118,27 +118,12 @@ function addReservations(params) {
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 onlyValid: true,
-                sort: false,
                 addSortIndex: false,
                 validateOfferRateLimit: true
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
         }
-        // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
-        // let availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = [];
-        // // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-        // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>event.offers;
-        // if (typeof eventOffers?.itemOffered?.id === 'string') {
-        //     const eventService = <factory.product.IProduct>await repos.product.findById({ id: eventOffers.itemOffered.id });
-        //     if (typeof eventService.hasOfferCatalog?.id === 'string') {
-        //         availableOffers = await repos.offer.findOffersByOfferCatalogId({
-        //             offerCatalog: { id: eventService.hasOfferCatalog.id }
-        //         });
-        //     }
-        // } else {
-        //     throw new factory.errors.NotFound('event.offers.itemOffered.id');
-        // }
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event: { id: event.id } })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({

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

@@ -225,7 +225,6 @@ function validateAcceptedOffers(params) {
             event: { id: params.event.id },
             store: params.store,
             onlyValid: true,
-            sort: false,
             addSortIndex: false,
             validateOfferRateLimit: true
         })(repos);

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

@@ -73,7 +73,6 @@ declare function searchEventTicketOffers(params: {
     };
     limit?: number;
     page?: number;
-    sort: boolean;
     addSortIndex: boolean;
     validateOfferRateLimit: boolean;
 }): ISearchEventTicketOffersOperation<{

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

@@ -26,12 +26,18 @@ function searchTicketOffersByItemOffered(params) {
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
-        const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: catalogId }, availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id }, unacceptedPaymentMethod: params.unacceptedPaymentMethod, excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
-            ? {
-                limit: params.limit,
-                page: params.page
-            }
-            : undefined));
+        const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
+            ids: params.ids,
+            offerCatalog: { id: catalogId },
+            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+            unacceptedPaymentMethod: params.unacceptedPaymentMethod,
+            excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
+            onlyValid: params.onlyValid === true,
+            // Mongoのpagingを利用するオプション(2023-02-21~)
+            limit: params.limit,
+            page: params.page,
+            sort: false
+        });
         const availableOffers = findOffersByOfferCatalogIdResult.offers;
         const sortedOfferIds = findOffersByOfferCatalogIdResult.sortedOfferIds;
         return { availableOffers, sortedOfferIds };
@@ -63,7 +69,6 @@ function searchEventTicketOffersByEvent(params) {
             store: params.store,
             limit: params.limit,
             page: params.page,
-            sort: params.sort,
             onlyValid: params.onlyValid,
             unacceptedPaymentMethod,
             excludeAppliesToMovieTicket
@@ -271,7 +276,6 @@ function searchEventTicketOffers(params) {
                     store: params.store,
                     limit: params.limit,
                     page: params.page,
-                    sort: params.sort,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
                     onlyValid: params.onlyValid === true

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.291.0",
-    "@cinerino/sdk": "3.140.0-alpha.19",
+    "@cinerino/sdk": "3.141.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.26"
+  "version": "20.4.0-alpha.28"
 }