@chevre/domain 21.2.0-alpha.136 → 21.2.0-alpha.137

package/example/src/chevre/searchPaymentServiceProviders.ts

@@ -6,7 +6,7 @@ import { chevre } from '../../../lib/index';
 const PROJECT_ID = process.env.PROJECT_ID;
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const productRepo = new chevre.repository.Product(mongoose.connection);
 

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

@@ -38,13 +38,7 @@ export declare class MongoRepository {
      * 施設を保管する
      */
     saveMovieTheater(params: factory.place.movieTheater.IPlaceWithoutScreeningRoom): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom>;
-    saveMovieTheaterByBranchCode4coa(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
-    findMovieTheaterByBranchCode(params: {
-        project: {
-            id: string;
-        };
-        branchCode: string;
-    }): Promise<factory.place.movieTheater.IPlace>;
+    saveMovieTheaterByBranchCode4coa(params: factory.place.movieTheater.IPlace): Promise<void>;
     /**
      * 施設検索
      */

package/lib/chevre/repo/place.js

@@ -239,41 +239,42 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    // void化(2023-06-23~)
     saveMovieTheaterByBranchCode4coa(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                branchCode: { $eq: params.branchCode }
-            }, params, { new: true })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory.errors.NotFound(`${factory.placeType.MovieTheater} ${params.branchCode}`);
-                }
-                return doc.toObject();
-            });
-        });
-    }
-    findMovieTheaterByBranchCode(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.findOne({
+            yield this.placeModel.updateOne({
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: params.project.id },
                 branchCode: { $eq: params.branchCode }
-            }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory.errors.NotFound(`${factory.placeType.MovieTheater} ${params.branchCode}`);
-                }
-                return doc.toObject();
-            });
+            }, params)
+                .exec();
         });
     }
+    // 廃止(2023-06-23~)
+    // public async findMovieTheaterByBranchCode(params: {
+    //     project: { id: string };
+    //     branchCode: string;
+    // }): Promise<factory.place.movieTheater.IPlace> {
+    //     return this.placeModel.findOne(
+    //         {
+    //             typeOf: { $eq: factory.placeType.MovieTheater },
+    //             'project.id': { $eq: params.project.id },
+    //             branchCode: { $eq: params.branchCode }
+    //         },
+    //         {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         }
+    //     )
+    //         .exec()
+    //         .then((doc) => {
+    //             if (doc === null) {
+    //                 throw new factory.errors.NotFound(`${factory.placeType.MovieTheater} ${params.branchCode}`);
+    //             }
+    //             return doc.toObject();
+    //         });
+    // }
     /**
      * 施設検索
      */
@@ -376,6 +377,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             // 施設存在確認
             let doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoom.project.id },
                 branchCode: screeningRoom.containedInPlace.branchCode
             }, {
@@ -387,6 +389,7 @@ class MongoRepository {
             }
             // ルームコードが存在しなければ追加する
             doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoom.project.id },
                 branchCode: screeningRoom.containedInPlace.branchCode,
                 'containsPlace.branchCode': { $ne: screeningRoom.branchCode }
@@ -419,6 +422,7 @@ class MongoRepository {
     updateScreeningRoom(screeningRoom, $unset) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoom.project.id },
                 branchCode: screeningRoom.containedInPlace.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode
@@ -451,6 +455,7 @@ class MongoRepository {
     deleteScreeningRoom(screeningRoom) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoom.project.id },
                 branchCode: screeningRoom.containedInPlace.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode
@@ -482,6 +487,7 @@ class MongoRepository {
             }
             // 施設存在確認
             let doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoomSection.project.id },
                 branchCode: movieTheater.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode
@@ -491,6 +497,7 @@ class MongoRepository {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
             doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoomSection.project.id },
                 branchCode: movieTheater.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode
@@ -531,6 +538,7 @@ class MongoRepository {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
             }
             const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoomSection.project.id },
                 branchCode: movieTheater.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode,
@@ -696,6 +704,7 @@ class MongoRepository {
     deleteScreeningRoomSection(screeningRoomSection) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoomSection.project.id },
                 branchCode: screeningRoomSection.containedInPlace.containedInPlace.branchCode,
                 'containsPlace.branchCode': screeningRoomSection.containedInPlace.branchCode,
@@ -832,7 +841,7 @@ class MongoRepository {
                             typeOf: '$typeOf',
                             branchCode: '$branchCode',
                             name: '$name'
-                        }, openSeatingAllowed: '$containsPlace.openSeatingAllowed', additionalProperty: '$containsPlace.additionalProperty' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.sectionCount) === 1)
+                        }, openSeatingAllowed: '$containsPlace.openSeatingAllowed', additionalProperty: '$containsPlace.additionalProperty', maximumAttendeeCapacity: '$containsPlace.maximumAttendeeCapacity' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.sectionCount) === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -930,6 +939,7 @@ class MongoRepository {
             }
             // 施設存在確認
             let doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: seat.project.id },
                 branchCode: movieTheater.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode,
@@ -942,6 +952,7 @@ class MongoRepository {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
             doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: seat.project.id },
                 branchCode: movieTheater.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode,
@@ -988,6 +999,7 @@ class MongoRepository {
                 throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.containedInPlace.branchCode');
             }
             const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: seat.project.id },
                 branchCode: movieTheater.branchCode,
                 'containsPlace.branchCode': screeningRoom.branchCode,
@@ -1212,6 +1224,7 @@ class MongoRepository {
     deleteSeat(seat) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: seat.project.id },
                 branchCode: seat.containedInPlace.containedInPlace.containedInPlace.branchCode,
                 'containsPlace.branchCode': seat.containedInPlace.containedInPlace.branchCode,

package/lib/chevre/repo/stockHolder.js

@@ -264,7 +264,7 @@ class StockHolderRepository {
                 const { id } = yield this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
                 const subReservation = StockHolderRepository.offer2subReservation(params.offer, params.hasTicketedSeat);
                 const reservationNumber = params.holder;
-                const updateResult = yield this.holdReservationModel.findOneAndUpdate({
+                const updateResult = yield this.holdReservationModel.updateOne({
                     _id: { $eq: id },
                     // 'reservationFor.id': { $eq: params.eventId },
                     'reservations.reservationNumber': {
@@ -279,17 +279,15 @@ class StockHolderRepository {
                     $inc: { reservationCount: -1 },
                     $pull: { 'reservations.$[reservationPackage].subReservation': { identifier: { $eq: subReservation.identifier } } }
                 }, {
-                    new: true,
                     arrayFilters: [
                         { 'reservationPackage.reservationNumber': reservationNumber }
                     ]
                 })
-                    .select({ _id: 1 })
                     .exec();
                 // docが存在しなくてもよい
                 debug('unlock processed. updateResult:', updateResult, 'reservationNumber:', reservationNumber, 'identifier:', subReservation.identifier);
                 // subReservationがemptyのreservationsをpull
-                const pullReservationPackageResult = yield this.holdReservationModel.findOneAndUpdate({
+                const pullReservationPackageResult = yield this.holdReservationModel.updateOne({
                     _id: { $eq: id },
                     // 'reservationFor.id': { $eq: params.eventId },
                     'reservations.reservationNumber': { $exists: true, $eq: reservationNumber }
@@ -300,8 +298,7 @@ class StockHolderRepository {
                             subReservation: { $size: 0 }
                         }
                     }
-                }, { new: true })
-                    .select({ _id: 1 })
+                })
                     .exec();
                 debug('unlock processed. pullReservationPackageResult:', pullReservationPackageResult, 'reservationNumber:', reservationNumber, 'identifier:', subReservation.identifier);
             }

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

@@ -17,6 +17,9 @@ export declare function importFromCOA(params: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
+    /**
+     * 施設コード
+     */
     locationBranchCode: string;
     importFrom: Date;
     importThrough: Date;

package/lib/chevre/service/event.js

@@ -22,7 +22,6 @@ const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
 const offer_1 = require("./offer");
-// const customsearch = google.customsearch('v1');
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
@@ -99,18 +98,29 @@ function importFromCOA(params) {
             if (typeof (seller === null || seller === void 0 ? void 0 : seller.id) !== 'string') {
                 throw new factory.errors.NotFound('Seller', `Seller with branchCod '${params.locationBranchCode}' not found`);
             }
-            // 施設取得
-            let movieTheater = createMovieTheaterFromCOA(project, { id: seller.id }, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
             // saveMovieTheater:trueの場合のみ、施設保管(2022-10-10~)
             if (params.saveMovieTheater === true) {
-                movieTheater = yield repos.place.saveMovieTheaterByBranchCode4coa(movieTheater);
+                const savingMovieTheater = createMovieTheaterFromCOA(project, { id: seller.id }, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
+                yield repos.place.saveMovieTheaterByBranchCode4coa(savingMovieTheater);
+                // } else {
+                //     movieTheater = await repos.place.findMovieTheaterByBranchCode({
+                //         project: { id: project.id },
+                //         branchCode: creatingMovieTheater.branchCode
+                //     });
             }
-            else {
-                movieTheater = yield repos.place.findMovieTheaterByBranchCode({
-                    project: { id: movieTheater.project.id },
-                    branchCode: movieTheater.branchCode
-                });
+            const movieTheaters = yield repos.place.searchMovieTheaters({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: project.id } },
+                branchCode: { $eq: params.locationBranchCode }
+            }, ['_id', 'typeOf', 'branchCode', 'name', 'kanaName'], []);
+            const movieTheater = movieTheaters.shift();
+            if (movieTheater === undefined) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
+            const screeningRooms = yield repos.place.searchScreeningRooms({
+                containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
+            });
             const targetImportFrom = moment(`${moment(params.importFrom)
                 .tz('Asia/Tokyo')
                 .format('YYYY-MM-DD')}T00:00:00+09:00`);
@@ -121,7 +131,7 @@ function importFromCOA(params) {
             debug('importing screening events...', targetImportFrom, targetImportThrough);
             const { screeningEventSerieses, savedEventsCount } = yield saveScreeningEventSeries({
                 locationBranchCode: params.locationBranchCode,
-                movieTheater: movieTheater,
+                movieTheater,
                 project: project,
                 saveScreeningEventSeries: params.saveScreeningEventSeries
             })(repos);
@@ -130,7 +140,8 @@ function importFromCOA(params) {
                 // イベント永続化
                 const screeningEvents = yield saveScreeningEvents({
                     locationBranchCode: params.locationBranchCode,
-                    movieTheater: movieTheater,
+                    // movieTheater: movieTheater,
+                    screeningRooms,
                     screeningEventSerieses: screeningEventSerieses,
                     project: project,
                     targetImportFrom: targetImportFrom.toDate(),
@@ -183,7 +194,6 @@ function importFromCOA(params) {
 exports.importFromCOA = importFromCOA;
 function saveScreeningEventSeries(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const movieTheater = params.movieTheater;
         const project = params.project;
         const masterService = new COA.service.Master({
             endpoint: credentials_1.credentials.coa.endpoint,
@@ -219,7 +229,7 @@ function saveScreeningEventSeries(params) {
             return createScreeningEventSeriesFromCOA({
                 project: project,
                 filmFromCOA: filmFromCOA,
-                movieTheater: movieTheater,
+                movieTheater: params.movieTheater,
                 eirinKubuns: eirinKubuns,
                 eizouKubuns: eizouKubuns,
                 joueihousikiKubuns: joueihousikiKubuns,
@@ -293,7 +303,7 @@ function saveScreeningEvents(params) {
 }
 function createScreeningEvents(params) {
     return () => __awaiter(this, void 0, void 0, function* () {
-        const movieTheater = params.movieTheater;
+        // const movieTheater = params.movieTheater;
         const screeningEventSerieses = params.screeningEventSerieses;
         const project = params.project;
         const masterService = new COA.service.Master({
@@ -329,8 +339,11 @@ function createScreeningEvents(params) {
                 titleCode: scheduleFromCOA.titleCode,
                 titleBranchNum: scheduleFromCOA.titleBranchNum
             });
-            // スクリーン存在チェック
-            const screenRoom = movieTheater.containsPlace.find((place) => place.branchCode === scheduleFromCOA.screenCode);
+            // ルーム存在チェック
+            const screenRoom = params.screeningRooms.find((place) => place.branchCode === scheduleFromCOA.screenCode);
+            // const screenRoom = <factory.place.screeningRoom.IPlace | undefined>movieTheater.containsPlace.find(
+            //     (place) => place.branchCode === scheduleFromCOA.screenCode
+            // );
             if (screenRoom === undefined) {
                 // tslint:disable-next-line:no-console
                 console.error('screenRoom not found.', scheduleFromCOA.screenCode);

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -20,19 +20,24 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         var _a, _b, _c, _d;
         const movieTickets = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.movieTickets;
         if (!Array.isArray(movieTickets)) {
-            throw new factory.errors.Argument('object.paymentMethod.movieTickets must be an array');
+            throw new factory.errors.Argument('movieTickets', 'object.paymentMethod.movieTickets must be an array');
         }
         // イベント1つのみ許可
-        const eventIds = [...new Set(movieTickets === null || movieTickets === void 0 ? void 0 : movieTickets.map((t) => t.serviceOutput.reservationFor.id))];
+        const eventIds = [...new Set(movieTickets.map((t) => t.serviceOutput.reservationFor.id))];
         if (eventIds.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
-        // ムビチケ購入管理番号は1つのみ許可
-        const movieTicketIdentifiers = [...new Set(movieTickets === null || movieTickets === void 0 ? void 0 : movieTickets.map((t) => t.identifier))];
+        // 決済カードidentifierは1つのみ許可
+        const movieTicketIdentifiers = [...new Set(movieTickets.map((t) => t.identifier))];
         if (movieTicketIdentifiers.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of movie ticket identifiers must be 1');
         }
         const movieTicketIdentifier = movieTicketIdentifiers[0];
+        // 決済カードaccessCodeは1つのみ許可(2023-06-23~)
+        const accessCodes = [...new Set(movieTickets.map((t) => t.accessCode))];
+        if (accessCodes.length !== 1) {
+            throw new factory.errors.Argument('movieTickets', 'Number of movie ticket accessCodes must be 1');
+        }
         // ムビチケ系統の決済方法タイプは動的
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
@@ -71,7 +76,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             var _a, _b;
             const requiredMovieTicketsCountByServiceType = movieTickets.filter((t) => t.serviceType === serviceType).length;
             let availableMovieTicketsCountByServiceType = 0;
-            const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifiers[0])) === null || _b === void 0 ? void 0 : _b.ykknInfo;
+            const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifier)) === null || _b === void 0 ? void 0 : _b.ykknInfo;
             const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType);
             const ykknKnshbtsmiNum = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.ykknKnshbtsmiNum;
             if (typeof ykknKnshbtsmiNum === 'string') {

package/package.json

@@ -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.136"
+  "version": "21.2.0-alpha.137"
 }