@chevre/domain 21.2.0-alpha.74 → 21.2.0-alpha.76

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

@@ -63,7 +63,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

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

@@ -135,12 +135,20 @@ function addReservations(params) {
         })(repos);
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
-        const minimizedObjectSubReservations = objectSubReservations.map((r) => {
-            var _a;
-            return Object.assign({ id: r.id, typeOf: r.typeOf, reservedTicket: Object.assign({ ticketType: r.reservedTicket.ticketType }, (typeof ((_a = r.reservedTicket.ticketedSeat) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                    ? { ticketedSeat: r.reservedTicket.ticketedSeat }
-                    : undefined) }, (Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined);
-        });
+        // const minimizedObjectSubReservations: factory.assetTransaction.reserve.IMinimizedObjectSubReservation[] =
+        //     objectSubReservations.map((r) => {
+        //         return {
+        //             id: r.id,
+        //             typeOf: r.typeOf,
+        //             reservedTicket: {
+        //                 ticketType: r.reservedTicket.ticketType,
+        //                 ...(typeof r.reservedTicket.ticketedSeat?.typeOf === 'string')
+        //                     ? { ticketedSeat: r.reservedTicket.ticketedSeat }
+        //                     : undefined
+        //             },
+        //             ...(Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined
+        //         };
+        //     });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -152,9 +160,7 @@ function addReservations(params) {
                     acceptedOffer: acceptedOffers4transactionObject,
                     reservationFor,
                     // subReservationにreservationForを保管しない(2021-10-19～)
-                    subReservation: (transaction.object.disablePendingReservations === true)
-                        ? objectSubReservations
-                        : minimizedObjectSubReservations
+                    subReservation: objectSubReservations
                     // subReservation: minimizedObjectSubReservations
                 }
             });
@@ -177,9 +183,9 @@ function addReservations(params) {
         if (transaction.object.disablePendingReservations !== true) {
             // 予約作成(insertManyで実装)
             yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
-            // 予約作成後処理
-            yield onReservationsCreated({ event })(repos);
         }
+        // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
+        yield onReservationsCreated({ event })(repos);
         return { transaction, objectSubReservations };
     });
 }

package/lib/chevre/service/task/onAuthorizationCreated.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.onAuthorizationCreated.IData): IOperation<void>;

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

@@ -0,0 +1,101 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const factory = require("../../factory");
+const code_1 = require("../../repo/code");
+const order_1 = require("../../repo/order");
+const ownershipInfo_1 = require("../../repo/ownershipInfo");
+const reservation_1 = require("../../repo/reservation");
+const task_1 = require("../../repo/task");
+const reserve_1 = require("../reserve");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        yield onAuthorizationCreated(data)({
+            code: new code_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;
+function onAuthorizationCreated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 発券対象予約ID
+        let reservationIds = [];
+        // 発券対象予約番号
+        let reservationNumbers = [];
+        // 発券対象イベントID
+        let reservationForIds = [];
+        const authorizationObject = yield repos.code.findOne({
+            code: params.code,
+            project: { id: params.project.id, typeOf: factory.organizationType.Project }
+        });
+        switch (authorizationObject.typeOf) {
+            case factory.order.OrderType.Order:
+                // 注文検索
+                const orderNumber = authorizationObject.orderNumber;
+                if (typeof orderNumber === 'string' && orderNumber.length > 0) {
+                    // 最適化(2023-01-28~)
+                    const order = yield repos.order.findByOrderNumber({
+                        orderNumber,
+                        inclusion: ['acceptedOffers'],
+                        exclusion: []
+                    });
+                    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                    reservationNumbers = acceptedOffers
+                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                        .map((o) => o.itemOffered.reservationNumber);
+                    reservationNumbers = [...new Set(reservationNumbers)];
+                    reservationForIds = acceptedOffers
+                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                        .map((o) => String(o.itemOffered.reservationFor.id));
+                    reservationForIds = [...new Set(reservationForIds)];
+                }
+                break;
+            case 'OwnershipInfo':
+                // 所有権検索
+                const ownershipInfoId = authorizationObject.id;
+                if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
+                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
+                    // 座席予約に対する所有権であれば発券
+                    if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
+                        || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
+                        const reservationId = String(ownershipInfo.typeOfGood.id);
+                        reservationIds = [reservationId];
+                        const reservation = yield repos.reservation.findById({ id: reservationId });
+                        reservationForIds = [String(reservation.reservationFor.id)];
+                    }
+                }
+                break;
+            default:
+            // no op
+        }
+        yield (0, reserve_1.checkInRerservation)({
+            project: { id: params.project.id },
+            object: {
+                ids: reservationIds,
+                reservationNumbers: reservationNumbers,
+                reservationFor: { ids: reservationForIds }
+            }
+        })({
+            reservation: repos.reservation,
+            task: repos.task
+        });
+    });
+}

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.14",
+    "@chevre/factory": "4.313.0-alpha.15",
     "@cinerino/sdk": "3.157.0-alpha.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -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.74"
+  "version": "21.2.0-alpha.76"
 }