@chevre/domain 21.2.0-alpha.131 → 21.2.0-alpha.133

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/place.d.ts

@@ -73,6 +73,8 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
     parentOrganization?: any;
+    openSeatingAllowed?: any;
+    amenityFeature?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
@@ -95,6 +97,8 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
     parentOrganization?: any;
+    openSeatingAllowed?: any;
+    amenityFeature?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
@@ -117,6 +121,8 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
     parentOrganization?: any;
+    openSeatingAllowed?: any;
+    amenityFeature?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

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

@@ -32,7 +32,10 @@ const schema = new mongoose_1.Schema({
     kanaName: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    parentOrganization: mongoose_1.SchemaTypes.Mixed
+    parentOrganization: mongoose_1.SchemaTypes.Mixed,
+    // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
+    openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
+    amenityFeature: mongoose_1.SchemaTypes.Mixed
 }, {
     collection: 'places',
     id: true,
@@ -132,3 +135,15 @@ schema.index({ 'containsPlace.containsPlace.containsPlace.additionalProperty': 1
         'containsPlace.containsPlace.containsPlace.additionalProperty': { $exists: true }
     }
 });
+schema.index({ 'containedInPlace.id': 1, branchCode: 1 }, {
+    name: 'searchByContainedInPlaceId',
+    partialFilterExpression: {
+        'containedInPlace.id': { $exists: true }
+    }
+});
+schema.index({ 'containedInPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainedInPlaceBranchCode',
+    partialFilterExpression: {
+        'containedInPlace.branchCode': { $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/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -56,16 +56,25 @@ function findEntranceGates(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let movieTheater;
         try {
-            movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id }, 
-            // 不要な属性を取得しない
-            ['hasEntranceGate'], []
-            // {
-            //     containsPlace: 0,
-            //     hasPOS: 0,
-            //     offers: 0,
-            //     parentOrganization: 0
-            // }
-            );
+            const searchMovieTheatersResult = yield repos.place.searchMovieTheaters({
+                limit: 1,
+                page: 1,
+                id: { $eq: params.event.superEvent.location.id },
+                $projection: {
+                    containsPlace: 0,
+                    hasPOS: 0,
+                    offers: 0,
+                    parentOrganization: 0,
+                    name: 0
+                }
+            });
+            movieTheater = searchMovieTheatersResult.shift();
+            // movieTheater = await repos.place.findById(
+            //     { id: params.event.superEvent.location.id },
+            //     // 不要な属性を取得しない
+            //     ['hasEntranceGate'],
+            //     []
+            // );
         }
         catch (error) {
             let throwsError = true;

package/lib/chevre/service/task/onResourceUpdated.js

@@ -66,6 +66,13 @@ function onResourceUpdated(params) {
                         ids: params.id,
                         typeOf: params.typeOf
                     })(repos);
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO ルーム同期タスクを作成
+                    yield syncScreeningRooms({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf
+                    })(repos);
                     break;
                 case 'AccountTitle':
                     yield createInformAccountTitleTasks({
@@ -235,17 +242,29 @@ function createInformMovieTheaterTasks(params) {
             'project',
             'telephone',
             'url',
-            'typeOf',
-            'containsPlace.branchCode',
-            'containsPlace.name',
-            'containsPlace.typeOf',
-            'containsPlace.additionalProperty',
-            'containsPlace.address'
+            'typeOf'
+            // 'containsPlace.branchCode',
+            // 'containsPlace.name',
+            // 'containsPlace.typeOf',
+            // 'containsPlace.additionalProperty',
+            // 'containsPlace.address'
         ], []);
         if (movieTheater.project.id !== params.project.id) {
             throw new factory.errors.Argument('project.id', 'project.id not matched');
         }
-        const movieTheaters4inform = [movieTheater];
+        // ルームを検索
+        const screeningRooms = yield repos.place.searchScreeningRooms({
+            containedInPlace: { id: { $eq: movieTheater.id } }
+        });
+        const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
+                    return {
+                        branchCode: room.branchCode,
+                        name: room.name,
+                        typeOf: room.typeOf,
+                        additionalProperty: room.additionalProperty,
+                        address: room.address
+                    };
+                }) })];
         if (movieTheaters4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -350,3 +369,35 @@ function createInformAccountTitleTasks(params) {
         }
     });
 }
+function syncScreeningRooms(__) {
+    return (__2) => __awaiter(this, void 0, void 0, function* () {
+        // if (params.ids.length !== 1) {
+        //     throw new factory.errors.Argument('id', 'id.length must be 1');
+        // }
+        // const movieTheater = await repos.place.findById(
+        //     { id: params.ids[0] },
+        //     [
+        //         'additionalProperty',
+        //         'branchCode',
+        //         'hasEntranceGate',
+        //         'hasPOS',
+        //         'kanaName',
+        //         'name',
+        //         'parentOrganization',
+        //         'project',
+        //         'telephone',
+        //         'url',
+        //         'typeOf',
+        //         'containsPlace.branchCode',
+        //         'containsPlace.name',
+        //         'containsPlace.typeOf',
+        //         'containsPlace.additionalProperty',
+        //         'containsPlace.address'
+        //     ],
+        //     []
+        // );
+        // if (movieTheater.project.id !== params.project.id) {
+        //     throw new factory.errors.Argument('project.id', 'project.id not matched');
+        // }
+    });
+}

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.131"
+  "version": "21.2.0-alpha.133"
 }