@chevre/domain 20.2.0-alpha.42 → 20.2.0-alpha.45

package/example/src/chevre/findByOrderNumberAndReservationId.ts

@@ -0,0 +1,20 @@
+// 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 orderRepo = new chevre.repository.Order(mongoose.connection);
+
+    const order = await orderRepo.findByOrderNumberAndReservationId({
+        orderNumber: 'CIN9-4783801-1618274',
+        reservationId: '139787058570943-0'
+    });
+    console.log('order found', order);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -1,7 +1,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 import { modelName } from './mongoose/model/authorization';
-export declare type IData = any;
+export declare type IObject = factory.authorization.IObject;
 export declare type ICode = string;
 export { modelName };
 /**
@@ -19,7 +19,7 @@ export declare class MongoRepository {
             id: string;
             typeOf: factory.organizationType.Project;
         };
-        data: IData;
+        object: IObject;
         validFrom: Date;
         expiresInSeconds: number;
     }[]): Promise<factory.authorization.IAuthorization[]>;
@@ -32,22 +32,9 @@ export declare class MongoRepository {
             typeOf: factory.organizationType.Project;
         };
         code: ICode;
-    }): Promise<IData>;
+    }): Promise<IObject>;
     count(params: factory.authorization.ISearchConditions): Promise<number>;
     search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
-    /**
-     * コードを保管する
-     */
-    save(params: {
-        project: {
-            id: string;
-            typeOf: factory.organizationType.Project;
-        };
-        code: ICode;
-        data: IData;
-        validFrom: Date;
-        expiresInSeconds: number;
-    }[]): Promise<factory.authorization.IAuthorization[]>;
     deleteByCode(params: {
         code: string;
     }): Promise<{
@@ -55,4 +42,14 @@ export declare class MongoRepository {
         ok?: number;
         deletedCount?: number;
     } | null>;
+    /**
+     * 有効期限を一定期間過ぎた承認を削除する
+     */
+    deleteValidUntilPassedCertainPeriod(params: {
+        $lt: Date;
+    }): Promise<void>;
+    /**
+     * コードを保管する
+     */
+    private save;
 }

package/lib/chevre/repo/code.js

@@ -134,7 +134,7 @@ class MongoRepository {
                 return {
                     project: p.project,
                     code: code,
-                    data: p.data,
+                    object: p.object,
                     validFrom: p.validFrom,
                     expiresInSeconds: p.expiresInSeconds
                 };
@@ -204,6 +204,37 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    deleteByCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.authorizationModel.deleteOne({
+                code: { $exists: true, $eq: params.code }
+            })
+                .exec()
+                .then((result) => {
+                return {
+                    n: result === null || result === void 0 ? void 0 : result.n,
+                    // opTime: result.opTime,
+                    ok: result === null || result === void 0 ? void 0 : result.ok,
+                    // operationTime,
+                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
+                };
+            });
+        });
+    }
+    /**
+     * 有効期限を一定期間過ぎた承認を削除する
+     */
+    deleteValidUntilPassedCertainPeriod(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.authorizationModel.deleteMany({
+                validUntil: {
+                    $exists: true,
+                    $lt: params.$lt
+                }
+            })
+                .exec();
+        });
+    }
     /**
      * コードを保管する
      */
@@ -218,7 +249,7 @@ class MongoRepository {
                         project: p.project,
                         typeOf: 'Authorization',
                         code: p.code,
-                        object: p.data,
+                        object: p.object,
                         validFrom: p.validFrom,
                         validUntil: validUntil
                     };
@@ -234,22 +265,5 @@ class MongoRepository {
             }
         });
     }
-    deleteByCode(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.authorizationModel.deleteOne({
-                code: { $exists: true, $eq: params.code }
-            })
-                .exec()
-                .then((result) => {
-                return {
-                    n: result === null || result === void 0 ? void 0 : result.n,
-                    // opTime: result.opTime,
-                    ok: result === null || result === void 0 ? void 0 : result.ok,
-                    // operationTime,
-                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
-                };
-            });
-        });
-    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -44,6 +44,10 @@ export declare class MongoRepository {
         inclusion: string[];
         exclusion: string[];
     }): Promise<factory.order.IOrder>;
+    findByOrderNumberAndReservationId(params: {
+        orderNumber: string;
+        reservationId: string;
+    }): Promise<Pick<factory.order.IOrder, 'orderNumber' | 'orderStatus' | 'typeOf'>>;
     /**
      * 注文番号で削除する
      */

package/lib/chevre/repo/order.js

@@ -805,6 +805,30 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    findByOrderNumberAndReservationId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                orderStatus: 1,
+                typeOf: 1,
+                orderNumber: 1,
+                _id: 0
+            };
+            const doc = yield this.orderModel.findOne({
+                orderNumber: { $eq: params.orderNumber },
+                acceptedOffers: {
+                    $elemMatch: {
+                        'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                        'itemOffered.id': { $eq: params.reservationId }
+                    }
+                }
+            }, projection)
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.orderModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
     /**
      * 注文番号で削除する
      */

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

@@ -56,7 +56,7 @@ export declare class MongoRepository {
     /**
      * 発券する
      */
-    checkIn(params: {
+    checkInIfNot(params: {
         id?: string | {
             $in?: string[];
         };
@@ -68,6 +68,9 @@ export declare class MongoRepository {
          */
         now: Date;
     }): Promise<void>;
+    /**
+     * 発券する
+     */
     /**
      * 入場する
      */

package/lib/chevre/repo/reservation.js

@@ -1027,7 +1027,7 @@ class MongoRepository {
     /**
      * 発券する
      */
-    checkIn(params) {
+    checkInIfNot(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = [];
@@ -1055,6 +1055,8 @@ class MongoRepository {
             }
             // 無条件で実行されないように
             if (conditions.length > 0) {
+                // false->trueのみ(2023-01-31~)
+                conditions.push({ checkedIn: { $eq: false } });
                 yield this.reservationModel.updateMany({ $and: conditions }, {
                     checkedIn: true,
                     modifiedTime: params.now
@@ -1063,6 +1065,50 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * 発券する
+     */
+    // public async checkIn(params: {
+    //     id?: string | { $in?: string[] };
+    //     reservationNumber?: string | { $in?: string[] };
+    //     /**
+    //      * modifiedTime
+    //      */
+    //     now: Date;
+    // }): Promise<void> {
+    //     const conditions: any[] = [];
+    //     if (typeof params.id === 'string') {
+    //         if (params.id.length > 0) {
+    //             conditions.push({ _id: { $eq: params.id } });
+    //         }
+    //     } else {
+    //         const idIn = params.id?.$in;
+    //         if (Array.isArray(idIn)) {
+    //             conditions.push({ _id: { $in: idIn } });
+    //         }
+    //     }
+    //     if (typeof params.reservationNumber === 'string') {
+    //         if (params.reservationNumber.length > 0) {
+    //             conditions.push({ reservationNumber: { $eq: params.reservationNumber } });
+    //         }
+    //     } else {
+    //         const reservationNumberIn = params.reservationNumber?.$in;
+    //         if (Array.isArray(reservationNumberIn)) {
+    //             conditions.push({ reservationNumber: { $in: reservationNumberIn } });
+    //         }
+    //     }
+    //     // 無条件で実行されないように
+    //     if (conditions.length > 0) {
+    //         await this.reservationModel.updateMany(
+    //             { $and: conditions },
+    //             {
+    //                 checkedIn: true,
+    //                 modifiedTime: params.now
+    //             }
+    //         )
+    //             .exec();
+    //     }
+    // }
     /**
      * 入場する
      */

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

@@ -117,7 +117,8 @@ function addReservations(params) {
                 event: { id: event.id },
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
-                sort: false // ソート不要(2023-01-27~)
+                sort: false,
+                validateOfferRateLimit: true
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;

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

@@ -2,7 +2,6 @@ import { MongoRepository as ActionRepo } from '../repo/action';
 import { MongoRepository as AuthorizationRepo } from '../repo/code';
 import * as factory from '../factory';
 export declare type IToken = string;
-export declare type IData = any;
 export declare type ICode = string;
 /**
  * 承認を削除する
@@ -24,7 +23,7 @@ export declare function getToken(params: {
 }): (repos: {
     authorization: AuthorizationRepo;
 }) => Promise<IToken>;
-export declare function verifyToken<T>(params: {
+export declare function verifyToken<T = factory.authorization.IObject>(params: {
     project: {
         id: string;
     };

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

@@ -219,7 +219,8 @@ function validateAcceptedOffers(params) {
             event: { id: params.event.id },
             // seller: params.seller,
             store: params.store,
-            sort: false // ソート不要(2023-01-27~)
+            sort: false,
+            validateOfferRateLimit: true
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))

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

@@ -75,6 +75,7 @@ declare function searchEventTicketOffers(params: {
         kbnEisyahousiki: string;
     };
     sort: boolean;
+    validateOfferRateLimit: boolean;
 }): ISearchEventTicketOffersOperation<{
     ticketOffers: factory.product.ITicketOffer[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];

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

@@ -101,10 +101,12 @@ function searchTransportationEventTicketOffers(params) {
                 videoFormatTypes
             });
         });
-        // レート制限を確認
-        offers4event = yield Promise.all(offers4event.map((offer) => __awaiter(this, void 0, void 0, function* () {
-            return checkAvailability({ event: screeningEvent, offer })(repos);
-        })));
+        if (params.validateOfferRateLimit) {
+            // レート制限を確認
+            offers4event = yield Promise.all(offers4event.map((offer) => __awaiter(this, void 0, void 0, function* () {
+                return checkAvailability({ event: screeningEvent, offer })(repos);
+            })));
+        }
         // アドオン設定があれば、プロダクトオファーを検索
         for (const offer of offers4event) {
             const offerAddOn = [];
@@ -220,10 +222,12 @@ function searchScreeningEventTicketOffers(params) {
                 videoFormatTypes
             });
         });
-        // レート制限を確認
-        offers4event = yield Promise.all(offers4event.map((offer) => __awaiter(this, void 0, void 0, function* () {
-            return checkAvailability({ event: screeningEvent, offer })(repos);
-        })));
+        if (params.validateOfferRateLimit) {
+            // レート制限を確認
+            offers4event = yield Promise.all(offers4event.map((offer) => __awaiter(this, void 0, void 0, function* () {
+                return checkAvailability({ event: screeningEvent, offer })(repos);
+            })));
+        }
         // アドオン設定があれば、プロダクトオファーを検索
         for (const offer of offers4event) {
             const offerAddOn = [];
@@ -390,7 +394,8 @@ function searchEventTicketOffers(params) {
                         ids: params.ids,
                         event,
                         store: params.store,
-                        sort: params.sort
+                        sort: params.sort,
+                        validateOfferRateLimit: params.validateOfferRateLimit
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
@@ -400,7 +405,8 @@ function searchEventTicketOffers(params) {
                         ids: params.ids,
                         event,
                         store: params.store,
-                        sort: params.sort
+                        sort: params.sort,
+                        validateOfferRateLimit: params.validateOfferRateLimit
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;

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

@@ -17,11 +17,11 @@ function checkInRerservation(params) {
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            yield repos.reservation.checkIn({ id: { $in: params.object.ids }, now });
+            yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            yield repos.reservation.checkIn({ reservationNumber: { $in: params.object.reservationNumbers }, now });
+            yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
             // 予約番号リストを予約IDリストに変換
             checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
                 reservationNumber: { $in: params.object.reservationNumbers }

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

@@ -26,12 +26,18 @@ function verifyToken4reservation(params) {
         })({});
         switch (payload.typeOf) {
             case factory.order.OrderType.Order:
-                // 注文検索
-                const order = yield repos.order.findByOrderNumber({
+                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
+                const order = yield repos.order.findByOrderNumberAndReservationId({
                     orderNumber: payload.orderNumber,
-                    inclusion: ['orderStatus', 'acceptedOffers'],
-                    exclusion: []
+                    reservationId: params.reservationId
                 });
+                // 注文検索
+                // const order: Pick<factory.order.IOrder, 'orderStatus' | 'acceptedOffers'> =
+                //     await repos.order.findByOrderNumber({
+                //         orderNumber: payload.orderNumber,
+                //         inclusion: ['orderStatus', 'acceptedOffers'],
+                //         exclusion: []
+                //     });
                 // ステータス検証
                 switch (order.orderStatus) {
                     case factory.orderStatus.OrderDelivered:
@@ -39,15 +45,17 @@ function verifyToken4reservation(params) {
                     default:
                         throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
                 }
-                const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                    return (offer.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || offer.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        && offer.itemOffered.id === params.reservationId;
-                });
-                if (!reservationExistsInOrder) {
-                    throw new factory.errors.NotFound('AcceptedOffer');
-                }
+                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
+                //     return (
+                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
+                //     )
+                //         && offer.itemOffered.id === params.reservationId;
+                // });
+                // if (!reservationExistsInOrder) {
+                //     throw new factory.errors.NotFound('AcceptedOffer');
+                // }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.284.0-alpha.1",
+    "@chevre/factory": "4.284.0-alpha.2",
     "@cinerino/sdk": "3.136.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -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.42"
+  "version": "20.2.0-alpha.45"
 }