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

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/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">[]>;
+    }): 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/useReservation").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/reserve/useReservation.d.ts

@@ -1,6 +1,3 @@
-/**
- * 予約サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -11,6 +8,9 @@ import { IUseReservationAction } from './potentialActions/onReservationUsed';
  * 予約使用
  */
 export declare function useReservation(params: {
+    project: {
+        id: string;
+    };
     agent: factory.action.consume.use.reservation.IAgent;
     object: {
         /**
@@ -24,6 +24,7 @@ export declare function useReservation(params: {
     location?: {
         identifier?: string;
     };
+    verifyToken: boolean;
 }): (repos: {
     action: ActionRepo;
     order: OrderRepo;

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

@@ -10,51 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReservation = void 0;
-/**
- * 予約サービス
- */
 const factory = require("../../factory");
-const code_1 = require("../code");
-// import { maskUnderName } from './factory';
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
-function verifyToken4reservation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const payload = yield (0, code_1.verifyToken)({
-            project: params.project,
-            agent: params.agent,
-            token: params.token
-        })({});
-        switch (payload.typeOf) {
-            case factory.order.OrderType.Order:
-                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
-                const order = yield repos.order.findByOrderNumberAndReservationId({
-                    orderNumber: payload.orderNumber,
-                    reservationId: params.reservationId
-                });
-                // ステータス検証
-                switch (order.orderStatus) {
-                    case factory.orderStatus.OrderDelivered:
-                        break;
-                    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');
-                // }
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
-        }
-    });
-}
+const verifyToken4reservation_1 = require("./verifyToken4reservation");
 /**
  * 予約使用
  */
@@ -64,22 +22,24 @@ function useReservation(params) {
         var _a, _b;
         const now = new Date();
         const reservationId = params.object.id;
+        const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
+        if (params.verifyToken === true) {
+            // instrument?.tokenを検証
+            if (typeof token === 'string') {
+                yield (0, verifyToken4reservation_1.verifyToken4reservation)({
+                    project: { id: params.project.id },
+                    agent: params.agent,
+                    reservationId,
+                    token
+                })({ order: repos.order });
+            }
+        }
         // 予約検索
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
             id: reservationId,
             inclusion: ['_id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
-        // instrument?.tokenを検証
-        const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
-        if (typeof token === 'string') {
-            yield verifyToken4reservation({
-                project: { id: reservation.project.id },
-                agent: params.agent,
-                reservationId,
-                token
-            })({ order: repos.order });
-        }
         // UseActionを作成する
         const reservationAsObject = {
             id: reservation.id,
@@ -92,8 +52,6 @@ function useReservation(params) {
         const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), 
             // object最適化(2023-01-30~)
             // どの予約を
-            // mask
-            // object: [maskUnderName(reservation)],
             object: [reservationAsObject] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? {
                 location: {
@@ -111,14 +69,6 @@ function useReservation(params) {
         try {
             // 使用日時と同時更新(2023-01-30~)
             attendedReservation = (yield repos.reservation.attendIfNotAttended({ id: reservationId, now }));
-            // attendedReservation = <IEventReservation>await repos.reservation.attend({ id: reservationId, now });
-            // // 使用日時がなければ追加
-            // if (attendedReservation.reservedTicket?.dateUsed === undefined) {
-            //     attendedReservation = await repos.reservation.updatePartiallyById({
-            //         id: attendedReservation.id,
-            //         update: { 'reservedTicket.dateUsed': now }
-            //     });
-            // }
         }
         catch (error) {
             // actionにエラー結果を追加

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

@@ -0,0 +1,15 @@
+import * as factory from '../../factory';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+export declare function verifyToken4reservation(params: {
+    project: {
+        id: string;
+    };
+    agent: factory.action.check.token.IAgent;
+    reservationId: string;
+    token: string;
+}): (repos: {
+    order: OrderRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,56 @@
+"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.verifyToken4reservation = void 0;
+const factory = require("../../factory");
+const code_1 = require("../code");
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+function verifyToken4reservation(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const payload = yield (0, code_1.verifyToken)({
+            project: params.project,
+            agent: params.agent,
+            token: params.token
+        })({});
+        switch (payload.typeOf) {
+            case factory.order.OrderType.Order:
+                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
+                const order = yield repos.order.findByOrderNumberAndReservationId({
+                    orderNumber: payload.orderNumber,
+                    reservationId: params.reservationId
+                });
+                // ステータス検証
+                switch (order.orderStatus) {
+                    case factory.orderStatus.OrderDelivered:
+                        break;
+                    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');
+                // }
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
+        }
+    });
+}
+exports.verifyToken4reservation = verifyToken4reservation;

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

@@ -6,4 +6,5 @@ import { cancelPendingReservation, cancelReservation } from './reserve/cancelRes
 import { checkInRerservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { useReservation } from './reserve/useReservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInRerservation, confirmReservation, useReservation };
+import { verifyToken4reservation } from './reserve/verifyToken4reservation';
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInRerservation, confirmReservation, useReservation, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useReservation = exports.confirmReservation = exports.checkInRerservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.useReservation = exports.confirmReservation = exports.checkInRerservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -15,3 +15,5 @@ const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const useReservation_1 = require("./reserve/useReservation");
 Object.defineProperty(exports, "useReservation", { enumerable: true, get: function () { return useReservation_1.useReservation; } });
+const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");
+Object.defineProperty(exports, "verifyToken4reservation", { enumerable: true, get: function () { return verifyToken4reservation_1.verifyToken4reservation; } });

package/lib/chevre/service/task/useReservation.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.useReservation.IData): IOperation<void>;

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

@@ -0,0 +1,34 @@
+"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 action_1 = require("../../repo/action");
+const order_1 = require("../../repo/order");
+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* () {
+        var _a, _b;
+        yield (0, reserve_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object, 
+            // タスク作成前に検証済なので検証不要
+            verifyToken: false }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

package/package.json

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