@chevre/domain 20.2.0-alpha.40 → 20.2.0-alpha.41

package/example/src/chevre/attendIfNotAttended.ts

@@ -0,0 +1,22 @@
+// 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 reservationRepo = new chevre.repository.Reservation(mongoose.connection);
+
+    const reservation = await reservationRepo.attendIfNotAttended(
+        {
+            id: '864318975593476-0',
+            now: new Date()
+        }
+    );
+    console.log('event found', reservation);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -26,6 +26,8 @@ export declare class MongoRepository {
     search<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, projection?: any): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
     findById<T extends factory.reservationType>(params: {
         id: string;
+        inclusion?: string[];
+        exclusion?: string[];
     }): Promise<factory.reservation.IReservation<T>>;
     /**
      * 予約確定
@@ -69,7 +71,7 @@ export declare class MongoRepository {
     /**
      * 入場する
      */
-    attend(params: {
+    attendIfNotAttended(params: {
         id: string;
         /**
          * modifiedTime

package/lib/chevre/repo/reservation.js

@@ -900,11 +900,25 @@ class MongoRepository {
     // }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.reservationModel.findById(params.id, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.reservationModel.findById(params.id, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.reservationModel.modelName);
@@ -1052,16 +1066,21 @@ class MongoRepository {
     /**
      * 入場する
      */
-    attend(params) {
+    attendIfNotAttended(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.reservationModel.findByIdAndUpdate(String(params.id), {
+            const doc = yield this.reservationModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                attended: { $eq: false }
+            }, {
                 attended: true,
-                modifiedTime: params.now
+                modifiedTime: params.now,
+                'reservedTicket.dateUsed': params.now
             }, { new: true })
                 .select({ __v: 0, createdAt: 0, updatedAt: 0 })
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.reservationModel.modelName);
+                return this.findById({ id: params.id });
+                // throw new factory.errors.NotFound(this.reservationModel.modelName);
             }
             return doc.toObject();
         });

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

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationUsed = void 0;
 /**
@@ -20,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const informUseReservations = (_a = settings_1.settings.onReservationUsed) === null || _a === void 0 ? void 0 : _a.informAction;
 const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約使用
@@ -28,41 +26,39 @@ const INFORM_TASK_DELAY_IN_SECONDS = 30;
 function onReservationUsed(action, attendedReservation) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const reservation = action.object[0];
         const tasks = [];
         const now = new Date();
+        // INFORM_USE_RESERVATION_URL廃止(2023-01-30~)
         // アクション通知タスク作成
-        if (Array.isArray(informUseReservations)) {
-            informUseReservations.filter((informUseReservation) => {
-                var _a;
-                return typeof ((_a = informUseReservation.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string'
-                    && informUseReservation.recipient.url.length > 0;
-            })
-                .forEach((informUseReservation) => {
-                var _a, _b;
-                const triggerWebhookTask = {
-                    project: action.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 3,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: {
-                        project: action.project,
-                        typeOf: factory.actionType.InformAction,
-                        agent: action.project,
-                        recipient: {
-                            typeOf: factory.personType.Person,
-                            id: String((_a = informUseReservation.recipient) === null || _a === void 0 ? void 0 : _a.url),
-                            url: String((_b = informUseReservation.recipient) === null || _b === void 0 ? void 0 : _b.url)
-                        },
-                        object: action
-                    }
-                };
-                tasks.push(triggerWebhookTask);
-            });
-        }
+        // if (Array.isArray(informUseReservations)) {
+        //     informUseReservations.filter((informUseReservation) => {
+        //         return typeof informUseReservation.recipient?.url === 'string'
+        //             && informUseReservation.recipient.url.length > 0;
+        //     })
+        //         .forEach((informUseReservation) => {
+        //             const triggerWebhookTask: factory.task.triggerWebhook.IAttributes = {
+        //                 project: action.project,
+        //                 name: factory.taskName.TriggerWebhook,
+        //                 status: factory.taskStatus.Ready,
+        //                 runsAt: now,
+        //                 remainingNumberOfTries: 3,
+        //                 numberOfTried: 0,
+        //                 executionResults: [],
+        //                 data: {
+        //                     project: action.project,
+        //                     typeOf: factory.actionType.InformAction,
+        //                     agent: action.project,
+        //                     recipient: {
+        //                         typeOf: factory.personType.Person,
+        //                         id: String(informUseReservation.recipient?.url),
+        //                         url: String(informUseReservation.recipient?.url)
+        //                     },
+        //                     object: action
+        //                 }
+        //             };
+        //             tasks.push(triggerWebhookTask);
+        //         });
+        // }
         // inform galobally
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)

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

@@ -11,9 +11,6 @@ import { IUseReservationAction } from './potentialActions/onReservationUsed';
  * 予約使用
  */
 export declare function useReservation(params: {
-    project: {
-        id: string;
-    };
     agent: factory.action.consume.use.reservation.IAgent;
     object: {
         /**

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

@@ -15,7 +15,7 @@ exports.useReservation = void 0;
  */
 const factory = require("../../factory");
 const code_1 = require("../code");
-const factory_1 = require("./factory");
+// import { maskUnderName } from './factory';
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
 function verifyToken4reservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -57,54 +57,67 @@ function verifyToken4reservation(params) {
 /**
  * 予約使用
  */
-// export function useReservation(actionAttributes: factory.action.consume.use.reservation.IAttributes) {
+// tslint:disable-next-line:max-func-body-length
 function useReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         const now = new Date();
+        const reservationId = params.object.id;
         // 予約検索
-        let reservation = yield repos.reservation.findById({ id: params.object.id });
+        // 取得属性最適化(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: params.project.id },
+                project: { id: reservation.project.id },
                 agent: params.agent,
-                reservationId: params.object.id,
+                reservationId,
                 token
             })({ order: repos.order });
         }
         // UseActionを作成する
-        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
-            }), 
+        const reservationAsObject = {
+            id: reservation.id,
+            issuedThrough: reservation.issuedThrough,
+            reservationFor: reservation.reservationFor,
+            reservationNumber: reservation.reservationNumber,
+            reservedTicket: reservation.reservedTicket,
+            typeOf: reservation.typeOf
+        };
+        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: [(0, factory_1.maskUnderName)(reservation)] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+            // object: [maskUnderName(reservation)],
+            object: [reservationAsObject] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? {
                 location: {
                     typeOf: factory.placeType.Place,
                     identifier: params.location.identifier
                 }
             }
-            : undefined
-        // purpose: params.purpose
-        );
+            : undefined);
         let action = yield repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory.errors.Argument('object', 'number of using reservations must be 1');
         }
-        reservation = actionAttributes.object[0];
+        let attendedReservation;
         try {
-            reservation = (yield repos.reservation.attend({ id: reservation.id, now }));
-            // 使用日時がなければ追加
-            if (((_c = reservation.reservedTicket) === null || _c === void 0 ? void 0 : _c.dateUsed) === undefined) {
-                reservation = yield repos.reservation.updatePartiallyById({
-                    id: reservation.id,
-                    update: { 'reservedTicket.dateUsed': now }
-                });
-            }
+            // 使用日時と同時更新(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にエラー結果を追加
@@ -119,7 +132,7 @@ function useReservation(params) {
         }
         // アクション完了
         action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} }));
-        yield (0, onReservationUsed_1.onReservationUsed)(action, reservation)({ task: repos.task });
+        yield (0, onReservationUsed_1.onReservationUsed)(action, attendedReservation)({ task: repos.task });
         return action;
     });
 }

package/lib/chevre/settings.js

@@ -14,9 +14,9 @@ const informOrderUrls = (typeof process.env.INFORM_ORDER_URL === 'string')
 const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'string')
     ? process.env.INFORM_RESERVATION_URL.split(',')
     : [];
-const informUseReservationUrls = (typeof process.env.INFORM_USE_RESERVATION_URL === 'string')
-    ? process.env.INFORM_USE_RESERVATION_URL.split(',')
-    : [];
+// const informUseReservationUrls = (typeof process.env.INFORM_USE_RESERVATION_URL === 'string')
+//     ? process.env.INFORM_USE_RESERVATION_URL.split(',')
+//     : [];
 // tslint:disable-next-line:no-magic-numbers
 const triggerWebhookTimeout = (process.env.TRIGGER_WEBHOOK_TIMEOUT !== undefined) ? Number(process.env.TRIGGER_WEBHOOK_TIMEOUT) : 15000;
 const MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = (typeof process.env.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS === 'string')
@@ -81,13 +81,16 @@ exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged:
             .map((url) => {
             return { recipient: { url } };
         })
-    }, onReservationUsed: {
-        informAction: informUseReservationUrls
-            .filter((url) => url.length > 0)
-            .map((url) => {
-            return { recipient: { url } };
-        })
-    }, webhook: {
+    }, 
+    // 廃止(2023-01-30~)
+    // onReservationUsed: {
+    //     informAction: informUseReservationUrls
+    //         .filter((url) => url.length > 0)
+    //         .map((url) => {
+    //             return { recipient: { url } };
+    //         })
+    // },
+    webhook: {
         timeout: triggerWebhookTimeout
     }, maximumReservationGracePeriodInDays: MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS, userPoolIdOld: String(process.env.USERPOOL_ID_OLD), userPoolIdNew: String(process.env.USERPOOL_ID_NEW) }, (typeof MAX_NUM_CREDIT_CARD_PAYMENT_METHOD === 'number')
     ? { maxNumCreditCardPaymentMethod: MAX_NUM_CREDIT_CARD_PAYMENT_METHOD }

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.284.0-alpha.0",
+    "@chevre/factory": "4.284.0-alpha.1",
     "@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.40"
+  "version": "20.2.0-alpha.41"
 }