@chevre/domain 20.2.0-alpha.39 → 20.2.0-alpha.40

package/example/src/chevre/findScreeningRoomsByBranchCode.ts

@@ -0,0 +1,27 @@
+// 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 placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const event = await placeRepo.findScreeningRoomsByBranchCode({
+        branchCode: {
+            $eq: '20'
+        },
+        containedInPlace: {
+            id: {
+                $eq: '5bfb841d5a78d7948369979a'
+            }
+        }
+    });
+    console.log('room found', event);
+
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/processReserve.ts

@@ -63,6 +63,8 @@ async function main() {
             ],
             reservationFor: { id: 'ckuz8uj0c' }
         },
+        validateEvent: false,
+        validateEventOfferPeriod: false,
         validateAppliesToMovieTicket: true
     })({
         eventAvailability: itemAvailabilityRepo,

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

@@ -41,7 +41,9 @@ export declare class MongoRepository {
      */
     findByOrderNumber(params: {
         orderNumber: string;
-    }, projection?: any): Promise<factory.order.IOrder>;
+        inclusion: string[];
+        exclusion: string[];
+    }): Promise<factory.order.IOrder>;
     /**
      * 注文番号で削除する
      */

package/lib/chevre/repo/order.js

@@ -693,7 +693,11 @@ class MongoRepository {
                 .exec();
             // NotFoundであれば状態確認
             if (doc === null) {
-                const order = yield this.findByOrderNumber(params);
+                const order = yield this.findByOrderNumber({
+                    orderNumber: params.orderNumber,
+                    inclusion: [],
+                    exclusion: []
+                });
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */
                 if (order.orderStatus === params.orderStatus) {
@@ -732,7 +736,11 @@ class MongoRepository {
                 .exec();
             // NotFoundであれば状態確認
             if (doc === null) {
-                const order = yield this.findByOrderNumber(params);
+                const order = yield this.findByOrderNumber({
+                    orderNumber: params.orderNumber,
+                    inclusion: [],
+                    exclusion: []
+                });
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */
                 if (order.orderStatus === factory.orderStatus.OrderReturned) {
@@ -769,9 +777,27 @@ class MongoRepository {
     /**
      * 注文番号から注文を取得する
      */
-    findByOrderNumber(params, projection) {
+    findByOrderNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.orderModel.findOne({ orderNumber: params.orderNumber }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.orderModel.findOne({ orderNumber: params.orderNumber }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);

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

@@ -1,6 +1,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 declare type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
+export declare type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace'>;
 /**
  * 施設リポジトリ
  */
@@ -79,6 +80,16 @@ export declare class MongoRepository {
         };
     }): Promise<void>;
     searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>[]>;
+    findScreeningRoomsByBranchCode(params: {
+        branchCode: {
+            $eq: string;
+        };
+        containedInPlace: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<IScreeningRoomFoundByBranchCode>;
     createSeat(seat: factory.place.seat.IPlace): Promise<void>;
     updateSeat(seat: factory.place.seat.IPlace, $unset: any): Promise<void>;
     searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;

package/lib/chevre/repo/place.js

@@ -250,6 +250,10 @@ class MongoRepository {
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: params.project.id },
                 branchCode: { $eq: params.branchCode }
+            }, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0
             })
                 .exec()
                 .then((doc) => {
@@ -260,12 +264,6 @@ class MongoRepository {
             });
         });
     }
-    // public async countMovieTheaters(params: factory.place.movieTheater.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
-    //     return this.placeModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
     /**
      * 施設検索
      */
@@ -533,7 +531,7 @@ class MongoRepository {
                     }
                 });
             }
-            // スクリーンコード
+            // ルームコード
             const containedInPlaceBranchCodeEq = (_g = (_f = searchConditions.containedInPlace) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
@@ -698,7 +696,7 @@ class MongoRepository {
                     }
                 }
             }
-            // スクリーンコード
+            // ルームコード
             if (searchConditions.branchCode !== undefined) {
                 if (typeof searchConditions.branchCode.$eq === 'string') {
                     matchStages.push({
@@ -814,6 +812,47 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
+    findScreeningRoomsByBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [
+                { $match: { typeOf: { $eq: factory.placeType.MovieTheater } } },
+                {
+                    $match: { _id: { $eq: mongoose_1.Types.ObjectId(params.containedInPlace.id.$eq) } }
+                },
+                {
+                    $match: { 'containsPlace.branchCode': { $exists: true, $eq: params.branchCode.$eq } }
+                }
+            ];
+            const aggregate = this.placeModel.aggregate([
+                { $unwind: '$containsPlace' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        typeOf: '$containsPlace.typeOf',
+                        branchCode: '$containsPlace.branchCode',
+                        name: '$containsPlace.name',
+                        // address: '$containsPlace.address',
+                        // containedInPlace: {
+                        //     id: '$_id',
+                        //     typeOf: '$typeOf',
+                        //     branchCode: '$branchCode',
+                        //     name: '$name'
+                        // },
+                        // openSeatingAllowed: '$containsPlace.openSeatingAllowed',
+                        // additionalProperty: '$containsPlace.additionalProperty',
+                        containsPlace: '$containsPlace.containsPlace'
+                    }
+                }
+            ]);
+            const docs = yield aggregate.limit(1)
+                .exec();
+            if (docs.length < 1) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+            }
+            return docs[0];
+        });
+    }
     createSeat(seat) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -63,22 +63,36 @@ function aggregateScreeningEvent(params) {
 exports.aggregateScreeningEvent = aggregateScreeningEvent;
 function aggregateByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const now = new Date();
         // 集計対象イベント検索
         let event = params.event;
-        // 施設取得
-        const movieTheater = yield findLocation(params)(repos);
-        // 万が一施設が存在しなければ処理終了
-        if (movieTheater === undefined) {
-            return;
+        // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
+        let movieTheaterId;
+        if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+            movieTheaterId = params.event.superEvent.location.id;
         }
-        const screeningRoom = movieTheater.containsPlace.find((p) => p.branchCode === event.location.branchCode);
-        if (screeningRoom === undefined) {
-            // 基本的にありえないはずだが、万が一スクリーンが見つからなければcapacityは0のまま
-            // tslint:disable-next-line:no-console
-            console.error(new Error(`Screening room not found. branchCode: ${event.location.branchCode}`));
-            return;
+        else {
+            movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
         }
+        const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
+            branchCode: { $eq: event.location.branchCode },
+            containedInPlace: { id: { $eq: movieTheaterId } }
+        });
+        // 施設取得
+        // const movieTheater = await findLocation(params)(repos);
+        // // 万が一施設が存在しなければ処理終了
+        // if (movieTheater === undefined) {
+        //     return;
+        // }
+        // const screeningRoom = <factory.place.screeningRoom.IPlace | undefined>
+        //     movieTheater.containsPlace.find((p) => p.branchCode === event.location.branchCode);
+        // if (screeningRoom === undefined) {
+        //     // 基本的にありえないはずだが、万が一スクリーンが見つからなければcapacityは0のまま
+        //     // tslint:disable-next-line:no-console
+        //     console.error(new Error(`Screening room not found. branchCode: ${event.location.branchCode}`));
+        //     return;
+        // }
         // 予約集計
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({
             aggregateDate: now,
@@ -115,31 +129,33 @@ exports.aggregateByEvent = aggregateByEvent;
  * イベントロケーション取得
  * NotFoundエラーをハンドリングする
  */
-function findLocation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let movieTheater;
-        try {
-            if (params.event.typeOf === factory.eventType.ScreeningEvent) {
-                movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id });
-            }
-            else {
-                const movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
-                movieTheater = yield repos.place.findById({ id: movieTheaterId });
-            }
-        }
-        catch (error) {
-            let throwsError = true;
-            if (error instanceof factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return movieTheater;
-    });
-}
+// function findLocation(params: {
+//     event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+// }) {
+//     return async (repos: {
+//         place: PlaceRepo;
+//     }): Promise<factory.place.movieTheater.IPlace | undefined> => {
+//         let movieTheater: factory.place.movieTheater.IPlace | undefined;
+//         try {
+//             if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+//                 movieTheater = await repos.place.findById({ id: params.event.superEvent.location.id });
+//             } else {
+//                 const movieTheaterId: string =
+//                     String(params.event.offers?.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+//                 movieTheater = await repos.place.findById({ id: movieTheaterId });
+//             }
+//         } catch (error) {
+//             let throwsError = true;
+//             if (error instanceof factory.errors.NotFound) {
+//                 throwsError = false;
+//             }
+//             if (throwsError) {
+//                 throw error;
+//             }
+//         }
+//         return movieTheater;
+//     };
+// }
 /**
  * 集計後アクション
  */

package/lib/chevre/service/delivery/factory.d.ts

@@ -4,5 +4,5 @@ export declare type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factor
  * 注文から所有権を作成する
  */
 export declare function createOwnershipInfosFromOrder(params: {
-    order: factory.order.IOrder;
+    order: Pick<factory.order.IOrder, 'acceptedOffers' | 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'>;
 }): IOwnershipInfo[];

package/lib/chevre/service/order/returnOrder.js

@@ -21,7 +21,7 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        let order = yield repos.order.findByOrderNumber({ orderNumber });
+        let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
         // プロジェクト条件検証
         if (order.project.id !== params.project.id) {
             throw new factory.errors.NotFound('Order');

package/lib/chevre/service/order/sendOrder.js

@@ -31,7 +31,7 @@ function sendOrder(params) {
                 orderNumber
             })({ transaction: repos.transaction });
             // 注文取得
-            let order = yield repos.order.findByOrderNumber({ orderNumber });
+            let order = yield repos.order.findByOrderNumber({ orderNumber, inclusion: [], exclusion: [] });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {
                 throw new factory.errors.NotFound('Order');
@@ -100,7 +100,9 @@ function sendOrder(params) {
             let throwsError = true;
             // すでにOrderReturnedだった場合、OrderDelivered->OrderReturnedの処理自体は成功しているので、後処理を続行する
             const currentOrder = yield repos.order.findByOrderNumber({
-                orderNumber: params.object.orderNumber
+                orderNumber: params.object.orderNumber,
+                inclusion: ['orderStatus'],
+                exclusion: []
             });
             if ((currentOrder === null || currentOrder === void 0 ? void 0 : currentOrder.orderStatus) === factory.orderStatus.OrderReturned) {
                 throwsError = false;

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

@@ -27,7 +27,11 @@ function verifyToken4reservation(params) {
         switch (payload.typeOf) {
             case factory.order.OrderType.Order:
                 // 注文検索
-                const order = yield repos.order.findByOrderNumber({ orderNumber: payload.orderNumber });
+                const order = yield repos.order.findByOrderNumber({
+                    orderNumber: payload.orderNumber,
+                    inclusion: ['orderStatus', 'acceptedOffers'],
+                    exclusion: []
+                });
                 // ステータス検証
                 switch (order.orderStatus) {
                     case factory.orderStatus.OrderDelivered:

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

@@ -64,7 +64,11 @@ function returnPayTransaction(params) {
         if (typeof paymentServiceType !== 'string' || paymentServiceType.length === 0) {
             throw new factory.errors.ArgumentNull('object.issuedThrough.typeOf');
         }
-        const order = yield repos.order.findByOrderNumber({ orderNumber });
+        const order = yield repos.order.findByOrderNumber({
+            orderNumber,
+            inclusion: ['seller', 'project', 'dateReturned'],
+            exclusion: []
+        });
         const action = yield repos.action.start(refundActionAttributes);
         let refundTransaction;
         try {

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.39"
+  "version": "20.2.0-alpha.40"
 }