@chevre/domain 22.5.0 → 22.6.0-alpha.1

package/example/src/chevre/searchIdsByReservationNumber.ts

@@ -0,0 +1,16 @@
+// 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, { autoIndex: false });
+    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
+    const ids = await reservationRepo.searchIdsByReservationNumber({ reservationNumber: { $in: ['283297254100608'] } });
+    console.log(ids);
+    console.log(ids.length, 'reservations found');
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/reservation.js

@@ -1120,23 +1120,16 @@ class ReservationRepo {
                 reservationNumber: {
                     $in: params.reservationNumber.$in
                 }
+            }, {
+                _id: 0,
+                id: { $toString: '$_id' }
             })
-                .select({ _id: 1 })
+                .lean()
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
-                .then((docs) => docs.map((doc) => doc._id.toString()));
+                .then((docs) => docs.map(({ id }) => id));
         });
     }
-    // public async deleteReservedTicketUnderName() {
-    //     const conditions = {
-    //         'reservedTicket.underName': { $exists: true }
-    //     };
-    //     const update = {
-    //         $unset: { 'reservedTicket.underName': 1 }
-    //     };
-    //     return this.reservationModel.updateMany(conditions, update)
-    //         .exec();
-    // }
     getCursor(conditions, projection) {
         return this.reservationModel.find(conditions, projection)
             .sort({ bookingTime: factory.sortType.Descending })

package/lib/chevre/service/reserve/checkInReservation.d.ts

@@ -1,7 +1,6 @@
 import { Settings } from '../../settings';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
-import type { EventRepo } from '../../repo/event';
 import type { ReservationRepo } from '../../repo/reservation';
 import type { TaskRepo } from '../../repo/task';
 interface ICheckInReservationParams {
@@ -34,7 +33,6 @@ interface ICheckInReservationParams {
 export declare function checkInReservation(params: ICheckInReservationParams): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    event: EventRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -44,20 +44,35 @@ function checkInReservation(params) {
                 }
             }
             yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
-            // 予約番号リストを予約IDリストに変換
-            checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
-                reservationNumber: { $in: params.object.reservationNumbers }
-            });
+            if (!settings.useExperimentalFeature) {
+                // 予約番号リストを予約IDリストに変換
+                checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
+                    reservationNumber: { $in: params.object.reservationNumbers }
+                });
+            }
+        }
+        if (Array.isArray(checkedInReservationIds)) {
+            yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({
+                project: params.project,
+                object: {
+                    ids: checkedInReservationIds
+                    // reservationFor: params.object.reservationFor
+                },
+                now,
+                purpose: params.purpose
+            })(repos, settings);
+        }
+        else if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
+            yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({
+                project: params.project,
+                object: {
+                    reservationNumbers: params.object.reservationNumbers
+                    // reservationFor: params.object.reservationFor
+                },
+                now,
+                purpose: params.purpose
+            })(repos, settings);
         }
-        yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({
-            project: params.project,
-            object: {
-                ids: checkedInReservationIds,
-                reservationFor: params.object.reservationFor
-            },
-            now,
-            purpose: params.purpose
-        })({ event: repos.event, task: repos.task }, settings);
     });
 }
 exports.checkInReservation = checkInReservation;

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.d.ts

@@ -1,4 +1,4 @@
-import type { EventRepo } from '../../../repo/event';
+import type { ReservationRepo } from '../../../repo/reservation';
 import type { TaskRepo } from '../../../repo/task';
 import { Settings } from '../../../settings';
 export declare function onReservationCheckedIn(params: {
@@ -14,12 +14,6 @@ export declare function onReservationCheckedIn(params: {
          * 予約番号で発券
          */
         reservationNumbers?: string[];
-        reservationFor?: {
-            /**
-             * 集計対象イベントID
-             */
-            ids?: string[];
-        };
     };
     now: Date;
     purpose: {
@@ -29,6 +23,6 @@ export declare function onReservationCheckedIn(params: {
         code: string;
     };
 }): (repos: {
-    event: EventRepo;
+    reservation: ReservationRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -31,10 +31,14 @@ function onReservationCheckedIn(params) {
             });
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            reservations4inform = params.object.reservationNumbers.map((reservationNumber, index) => {
-                return Object.assign({ typeOf: factory.reservationType.EventReservation, project,
-                    reservationNumber, checkedIn: true, modifiedTime: params.now }, (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
-            });
+            // ReservationPackageへ変更(2024-11-03~)
+            reservations4inform = yield Promise.all(params.object.reservationNumbers.map((reservationNumber, index) => __awaiter(this, void 0, void 0, function* () {
+                const subReservationIds = yield repos.reservation.searchIdsByReservationNumber({
+                    reservationNumber: { $in: [reservationNumber] }
+                });
+                return Object.assign({ typeOf: factory.reservationType.ReservationPackage, project,
+                    reservationNumber, checkedIn: true, modifiedTime: params.now, subReservation: subReservationIds.map((id) => ({ id })) }, (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
+            })));
         }
         if (reservations4inform.length > 0) {
             const informTaskRunsAt = params.now;

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

@@ -15,7 +15,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
-const event_1 = require("../../repo/event");
+// import { EventRepo } from '../../repo/event';
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
@@ -31,7 +31,7 @@ function call(data) {
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             code: new authorization_1.AuthorizationRepo(connection),
-            event: new event_1.EventRepo(connection),
+            // event: new EventRepo(connection),
             order: new order_1.OrderRepo(connection),
             ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
@@ -102,7 +102,7 @@ function onAuthorizationCreated(params) {
         })({
             action: repos.action,
             assetTransaction: repos.assetTransaction,
-            event: repos.event,
+            // event: repos.event,
             reservation: repos.reservation,
             task: repos.task
         }, settings);

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.388.0",
+    "@chevre/factory": "4.389.0-alpha.0",
     "@cinerino/sdk": "10.16.0-alpha.5",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0"
+  "version": "22.6.0-alpha.1"
 }