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

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

@@ -42,6 +42,12 @@ export declare class MongoRepository {
         ok?: number;
         deletedCount?: number;
     } | null>;
+    /**
+     * 有効期限を一定期間過ぎた承認を削除する
+     */
+    deleteValidUntilPassedCertainPeriod(params: {
+        $lt: Date;
+    }): Promise<void>;
     /**
      * コードを保管する
      */

package/lib/chevre/repo/code.js

@@ -221,6 +221,20 @@ class MongoRepository {
             });
         });
     }
+    /**
+     * 有効期限を一定期間過ぎた承認を削除する
+     */
+    deleteValidUntilPassedCertainPeriod(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.authorizationModel.deleteMany({
+                validUntil: {
+                    $exists: true,
+                    $lt: params.$lt
+                }
+            })
+                .exec();
+        });
+    }
     /**
      * コードを保管する
      */

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/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/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.43"
+  "version": "20.2.0-alpha.45"
 }