@chevre/domain 21.2.0-alpha.130 → 21.2.0-alpha.132

package/example/src/chevre/searchHoldReservations.ts

@@ -19,18 +19,18 @@ async function main() {
     const stockHolderRepo = new chevre.repository.StockHolder(client, mongoose.connection);
 
     const holdReservations = await stockHolderRepo.search({
-        limit: 100,
-        page: 1
+        limit: 2,
+        page: 2,
+        sort: { 'reservationFor.startDate': chevre.factory.sortType.Ascending }
     });
-    console.log(holdReservations[0]?.reservationFor.aggregateReservation, holdReservations[0]?.objectSize);
+    console.log(holdReservations);
     console.log(holdReservations.length);
 
-    const aggregations = await stockHolderRepo.aggregateByReservationFor({
-        // reservationFor: { id: { $eq: 'xxx' } },
-        limit: 100,
-        page: 1
-    });
-    console.log(aggregations);
+    // const aggregations = await stockHolderRepo.aggregateByReservationFor({
+    //     limit: 100,
+    //     page: 1
+    // });
+    // console.log(aggregations);
 }
 
 main()

package/example/src/chevre/searchPaymentServiceProviders.ts

@@ -0,0 +1,38 @@
+// 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 productRepo = new chevre.repository.Product(mongoose.connection);
+
+    const providers = await productRepo.searchProviders({
+        project: { id: { $eq: PROJECT_ID } },
+        id: 'xxx'
+    });
+    console.log(providers);
+    console.log(providers[0]?.credentials);
+    console.log(providers.length);
+
+    const paymentServices = await productRepo.searchPaymentServicesByProvider(
+        {
+            limit: 10,
+            page: 1,
+            sort: { productID: chevre.factory.sortType.Descending },
+            project: { id: { $eq: PROJECT_ID } },
+            typeOf: { $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard },
+            provider: { id: { $eq: 'xxx' } }
+        }
+    );
+    console.log(paymentServices);
+    console.log(paymentServices[0]?.provider?.credentials);
+    console.log(paymentServices.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -60,3 +60,33 @@ schema.index({ 'reservationFor.startDate': -1 }, { name: 'searchByReservationFor
 schema.index({ 'reservationFor.id': 1 }, { name: 'uniqueReservationForId', unique: true });
 schema.index({ 'reservationFor.id': 1, 'reservationFor.startDate': -1 }, { name: 'searchByReservationForId' });
 schema.index({ 'project.id': 1, 'reservationFor.startDate': -1 }, { name: 'searchByProjectId' });
+schema.index({ 'reservations.reservationNumber': 1, 'reservationFor.startDate': -1 }, {
+    name: 'searchByReservationNumber',
+    partialFilterExpression: {
+        'reservations.reservationNumber': { $exists: true }
+    }
+});
+schema.index({ 'reservations.subReservation.id': 1, 'reservationFor.startDate': -1 }, {
+    name: 'searchBySubReservationId',
+    partialFilterExpression: {
+        'reservations.subReservation.id': { $exists: true }
+    }
+});
+schema.index({ 'reservations.subReservation.identifier': 1, 'reservationFor.startDate': -1 }, {
+    name: 'searchBySubReservationIdentifier',
+    partialFilterExpression: {
+        'reservations.subReservation.identifier': { $exists: true }
+    }
+});
+schema.index({ 'reservations.subReservation.reservedTicket.ticketedSeat.seatNumber': 1, 'reservationFor.startDate': -1 }, {
+    name: 'searchBySubReservationSeatNumber',
+    partialFilterExpression: {
+        'reservations.subReservation.reservedTicket.ticketedSeat.seatNumber': { $exists: true }
+    }
+});
+schema.index({ 'reservations.subReservation.reservedTicket.ticketedSeat.seatSection': 1, 'reservationFor.startDate': -1 }, {
+    name: 'searchBySubReservationSeatSection',
+    partialFilterExpression: {
+        'reservations.subReservation.reservedTicket.ticketedSeat.seatSection': { $exists: true }
+    }
+});

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

@@ -100,3 +100,9 @@ schema.index({ 'name.en': 1, productID: 1 }, {
         'name.en': { $exists: true }
     }
 });
+schema.index({ 'provider.id': 1, productID: 1 }, {
+    name: 'searchByProviderId',
+    partialFilterExpression: {
+        'provider.id': { $exists: true }
+    }
+});

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

@@ -25,6 +25,9 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type IProduct = factory.product.IProduct | factory.service.paymentService.IService;
+export type IPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'additionalProperty'> & {
+    provider?: Pick<factory.service.paymentService.IProvider, 'credentials'>;
+};
 /**
  * プロダクトリポジトリ
  */
@@ -51,6 +54,20 @@ export declare class MongoRepository {
         typeOf: factory.service.paymentService.PaymentServiceType;
         id: string;
     }): Promise<factory.product.IAvailableChannel>;
+    searchPaymentServicesByProvider(params: Pick<factory.product.ISearchConditions, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPaymentServiceByProvider[]>;
+    /**
+     * 決済サービスのプロバイダー検索
+     */
+    searchProviders(params: {
+        limit?: number;
+        page?: number;
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        id: string;
+    }): Promise<factory.service.paymentService.IProvider[]>;
     /**
      * プロダクトを保管する
      * 作成 or 更新

package/lib/chevre/repo/product.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
 const settings_1 = require("../settings");
@@ -33,7 +34,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -144,6 +145,11 @@ class MongoRepository {
                 ]
             });
         }
+        // プロバイダー条件を追加(2023-06-21~)
+        const providerIdEq = (_x = (_w = params.provider) === null || _w === void 0 ? void 0 : _w.id) === null || _x === void 0 ? void 0 : _x.$eq;
+        if (typeof providerIdEq === 'string') {
+            andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
+        }
         return andConditions;
     }
     findById(conditions, projection) {
@@ -225,6 +231,113 @@ class MongoRepository {
             return availableChannel;
         });
     }
+    searchPaymentServicesByProvider(params) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            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 typeOfEq = (_c = params.typeOf) === null || _c === void 0 ? void 0 : _c.$eq;
+            if (typeof typeOfEq === 'string') {
+                matchStages.push({ $match: { typeOf: { $eq: typeOfEq } } });
+            }
+            const providerIdEq = (_e = (_d = params.provider) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof providerIdEq === 'string') {
+                matchStages.push({ $match: { 'provider.id': { $exists: true, $eq: providerIdEq } } });
+            }
+            const aggregate = this.productModel.aggregate([
+                ...(typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.productID) === 'number')
+                    ? [{ $sort: { productID: params.sort.productID } }]
+                    : [],
+                {
+                    $unwind: {
+                        path: '$provider'
+                    }
+                },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        typeOf: '$typeOf',
+                        productID: '$productID',
+                        description: '$description',
+                        name: '$name',
+                        // provider: [ [Object] ],
+                        additionalProperty: '$additionalProperty',
+                        serviceType: '$serviceType',
+                        id: { $toString: '$_id' },
+                        // ↓セキュアな情報を隠蔽するように
+                        provider: {
+                            credentials: {
+                                shopId: '$provider.credentials.shopId',
+                                tokenizationCode: '$provider.credentials.tokenizationCode',
+                                paymentUrl: {
+                                    expiresInSeconds: '$provider.credentials.paymentUrl.expiresInSeconds',
+                                    useCallback: '$provider.credentials.paymentUrl.useCallback',
+                                    useWebhook: '$provider.credentials.paymentUrl.useWebhook'
+                                }
+                            }
+                        }
+                    }
+                }
+            ]);
+            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.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * 決済サービスのプロバイダー検索
+     */
+    searchProviders(params) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            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 } } });
+            }
+            matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.id) } } });
+            const aggregate = this.productModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$provider'
+                    }
+                },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        // ↓セキュアな情報を隠蔽するように
+                        credentials: {
+                            shopId: '$provider.credentials.shopId',
+                            tokenizationCode: '$provider.credentials.tokenizationCode',
+                            paymentUrl: {
+                                expiresInSeconds: '$provider.credentials.paymentUrl.expiresInSeconds',
+                                useCallback: '$provider.credentials.paymentUrl.useCallback',
+                                useWebhook: '$provider.credentials.paymentUrl.useWebhook'
+                            }
+                        },
+                        id: '$provider.id',
+                        name: '$provider.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.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     /**
      * プロダクトを保管する
      * 作成 or 更新

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

@@ -43,7 +43,6 @@ export interface ISubReservation {
     };
 }
 export interface IReservationPackage {
-    typeOf: factory.reservationType.ReservationPackage;
     reservationNumber: string;
     subReservation: ISubReservation[];
 }
@@ -148,6 +147,9 @@ export declare class StockHolderRepository {
     search(params: {
         limit?: number;
         page?: number;
+        sort?: {
+            'reservationFor.startDate': factory.sortType;
+        };
         project?: {
             id?: {
                 $eq?: string;

package/lib/chevre/repo/stockHolder.js

@@ -123,7 +123,7 @@ class StockHolderRepository {
                 const reservationCountLte = maximum - addedReservationCount;
                 const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer, lockKey.hasTicketedSeat));
                 const reservationPackage = {
-                    typeOf: factory.reservationType.ReservationPackage,
+                    // typeOf: factory.reservationType.ReservationPackage,
                     reservationNumber: lockKey.holder,
                     subReservation: subReservations
                 };
@@ -181,7 +181,7 @@ class StockHolderRepository {
                 const addedReservationCount = lockKey.offers.length;
                 const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer, lockKey.hasTicketedSeat));
                 const reservationPackage = {
-                    typeOf: factory.reservationType.ReservationPackage,
+                    // typeOf: factory.reservationType.ReservationPackage,
                     reservationNumber: lockKey.holder,
                     subReservation: subReservations
                 };
@@ -264,8 +264,14 @@ class StockHolderRepository {
                 const reservationNumber = params.holder;
                 const updateResult = yield this.holdReservationModel.findOneAndUpdate({
                     'reservationFor.id': { $eq: params.eventId },
-                    'reservations.reservationNumber': { $eq: reservationNumber },
-                    'reservations.subReservation.identifier': { $eq: subReservation.identifier }
+                    'reservations.reservationNumber': {
+                        $exists: true,
+                        $eq: reservationNumber
+                    },
+                    'reservations.subReservation.identifier': {
+                        $exists: true,
+                        $eq: subReservation.identifier
+                    }
                 }, {
                     $inc: { reservationCount: -1 },
                     $pull: { 'reservations.$[reservationPackage].subReservation': { identifier: { $eq: subReservation.identifier } } }
@@ -277,8 +283,23 @@ class StockHolderRepository {
                 })
                     .select({ _id: 1 })
                     .exec();
-                debug('unlock processed. updateResult:', updateResult, 'reservationNumber:', reservationNumber, 'identifier:', subReservation.identifier);
                 // docが存在しなくてもよい
+                debug('unlock processed. updateResult:', updateResult, 'reservationNumber:', reservationNumber, 'identifier:', subReservation.identifier);
+                // subReservationがemptyのreservationsをpull
+                const pullReservationPackageResult = yield this.holdReservationModel.findOneAndUpdate({
+                    'reservationFor.id': { $eq: params.eventId },
+                    'reservations.reservationNumber': { $exists: true, $eq: reservationNumber }
+                }, {
+                    $pull: {
+                        reservations: {
+                            reservationNumber: { $eq: reservationNumber },
+                            subReservation: { $size: 0 }
+                        }
+                    }
+                }, { new: true })
+                    .select({ _id: 1 })
+                    .exec();
+                debug('unlock processed. pullReservationPackageResult:', pullReservationPackageResult, 'reservationNumber:', reservationNumber, 'identifier:', subReservation.identifier);
             }
             else {
                 const field = StockHolderRepository.offer2field(params.offer, params.hasTicketedSeat);
@@ -359,7 +380,12 @@ class StockHolderRepository {
                         $match: { 'reservationFor.id': { $eq: params.eventId } }
                     },
                     {
-                        $match: { 'reservations.subReservation.identifier': { $eq: subReservation.identifier } }
+                        $match: {
+                            'reservations.subReservation.identifier': {
+                                $exists: true,
+                                $eq: subReservation.identifier
+                            }
+                        }
                     }
                 ];
                 const aggregate = this.holdReservationModel.aggregate([
@@ -436,7 +462,12 @@ class StockHolderRepository {
                         $match: { 'reservationFor.id': { $eq: params.eventId } }
                     },
                     {
-                        $match: { 'reservations.subReservation.identifier': { $in: subReservations.map((r) => r.identifier) } }
+                        $match: {
+                            'reservations.subReservation.identifier': {
+                                $exists: true,
+                                $in: subReservations.map((r) => r.identifier)
+                            }
+                        }
                     }
                 ];
                 const aggregate = this.holdReservationModel.aggregate([
@@ -502,8 +533,9 @@ class StockHolderRepository {
     /**
      * 汎用的な検索(mongooseのみ対応)
      */
+    // tslint:disable-next-line:max-func-body-length
     search(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [];
             const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -516,21 +548,16 @@ class StockHolderRepository {
             }
             const reservationNumberEq = (_e = params.reservationNumber) === null || _e === void 0 ? void 0 : _e.$eq;
             if (typeof reservationNumberEq === 'string') {
-                matchStages.push({ $match: { 'reservations.reservationNumber': { $eq: reservationNumberEq } } });
+                matchStages.push({ $match: { 'reservations.reservationNumber': { $exists: true, $eq: reservationNumberEq } } });
             }
             const identifierEq = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof identifierEq === 'string') {
-                matchStages.push({ $match: { 'reservations.subReservation.identifier': { $eq: identifierEq } } });
+                matchStages.push({ $match: { 'reservations.subReservation.identifier': { $exists: true, $eq: identifierEq } } });
             }
             const idEq = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof idEq === 'string') {
                 matchStages.push({
-                    $match: {
-                        'reservations.subReservation.id': {
-                            $exists: true,
-                            $eq: idEq
-                        }
-                    }
+                    $match: { 'reservations.subReservation.id': { $exists: true, $eq: idEq } }
                 });
             }
             const seatNumberEq = (_k = (_j = (_h = params.reservedTicket) === null || _h === void 0 ? void 0 : _h.ticketedSeat) === null || _j === void 0 ? void 0 : _j.seatNumber) === null || _k === void 0 ? void 0 : _k.$eq;
@@ -556,8 +583,21 @@ class StockHolderRepository {
                 });
             }
             const aggregate = this.holdReservationModel.aggregate([
-                { $unwind: '$reservations' },
-                { $unwind: '$reservations.subReservation' },
+                ...(typeof ((_p = params.sort) === null || _p === void 0 ? void 0 : _p['reservationFor.startDate']) === 'number')
+                    ? [{ $sort: { 'reservationFor.startDate': params.sort['reservationFor.startDate'] } }]
+                    : [],
+                {
+                    $unwind: {
+                        path: '$reservations',
+                        includeArrayIndex: 'reservationPackageIndex'
+                    }
+                },
+                {
+                    $unwind: {
+                        path: '$reservations.subReservation',
+                        includeArrayIndex: 'subReservationIndex'
+                    }
+                },
                 ...matchStages,
                 {
                     $project: {
@@ -573,7 +613,9 @@ class StockHolderRepository {
                         },
                         reservationNumber: '$reservations.reservationNumber',
                         reservedTicket: '$reservations.subReservation.reservedTicket',
-                        objectSize: { $bsonSize: '$$ROOT' }
+                        objectSize: { $bsonSize: '$$ROOT' },
+                        reservationPackageIndex: '$reservationPackageIndex',
+                        subReservationIndex: '$subReservationIndex'
                     }
                 }
             ]);

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.39",
+    "@chevre/factory": "4.313.0-alpha.40",
     "@cinerino/sdk": "3.157.0-alpha.16",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.130"
+  "version": "21.2.0-alpha.132"
 }