@chevre/domain 21.2.0-alpha.7 → 21.2.0-alpha.71

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onReservationCanceled = exports.onReservationCanceledByAction = void 0;
+exports.onReservationCanceled = void 0;
 /**
  * 予約取消時アクション
  */
@@ -19,26 +19,26 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約取消後のアクション
  */
-function onReservationCanceledByAction(actionAttributes) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const potentialActions = actionAttributes.potentialActions;
-        const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (potentialActions !== undefined) {
-            // no op
-        }
-        // タスク保管
-        if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
-        }
-    });
-}
-exports.onReservationCanceledByAction = onReservationCanceledByAction;
+// export function onReservationCanceledByAction(
+//     actionAttributes: factory.action.cancel.reservation.IAttributes
+// ) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }) => {
+//         const potentialActions = actionAttributes.potentialActions;
+//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
+//         if (potentialActions !== undefined) {
+//             // no op
+//         }
+//         // タスク保管
+//         if (taskAttributes.length > 0) {
+//             await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+//         }
+//     };
+// }
 function onReservationCanceled(canceledReservations, useInformReservation) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
@@ -50,7 +50,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
                 if (Array.isArray(informReservations)) {
                     // やや遅延させる(確定通知が未達の可能性を考慮して)
                     const informTaskRunsAt = moment(now)
-                        .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                        .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                         .toDate();
                     const reservations4inform = canceledReservations.map((r) => {
                         return {
@@ -91,7 +91,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({

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

@@ -19,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 INFORM_TASK_DELAY_IN_SECONDS = 30;
 // tslint:disable-next-line:max-func-body-length
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
@@ -31,7 +30,7 @@ function onReservationCheckedIn(params) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(params.now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             informReservations.forEach((informReservation) => {
                 var _a;
@@ -107,7 +106,7 @@ function onReservationCheckedIn(params) {
             });
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         const reservationForIds = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.ids;

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

@@ -57,38 +57,9 @@ function onReservationConfirmedByAction(actionAttributes
                 }));
             }
         }
-        // inform galobally
-        // if (Array.isArray(informReservations)) {
-        //     const reservation4inform: IReservation4informConfirmed = maskUnderName(confirmedReservation);
-        //     taskAttributes.push(...informReservations.map<ITriggerWebhookTaskAttributes>((informReservation) => {
-        //         const informUrl: string = String(informReservation.recipient?.url);
-        //         const informReservationAttributes: InformReservationActionattributes = {
-        //             agent: confirmedReservation.project,
-        //             object: [reservation4inform],
-        //             project: confirmedReservation.project,
-        //             recipient: {
-        //                 id: '',
-        //                 name: informUrl,
-        //                 typeOf: factory.creativeWorkType.WebApplication,
-        //                 url: informUrl
-        //             },
-        //             typeOf: factory.actionType.InformAction
-        //         };
-        //         return {
-        //             project: actionAttributes.project,
-        //             name: factory.taskName.TriggerWebhook,
-        //             status: factory.taskStatus.Ready,
-        //             runsAt: now,
-        //             remainingNumberOfTries: NUM_TRY_INFORM_RESERVATION,
-        //             numberOfTried: 0,
-        //             executionResults: [],
-        //             data: informReservationAttributes
-        //         };
-        //     }));
-        // }
         // タスク保管
         if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
+            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
     });
 }
@@ -142,7 +113,7 @@ function onReservationConfirmed(confirmedReservations) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
         }
     });

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

@@ -19,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 INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約使用
  */
@@ -32,7 +31,7 @@ function onReservationUsed(action, attendedReservation) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             const reservation4inform = {
                 typeOf: attendedReservation.typeOf,
@@ -97,7 +96,7 @@ function onReservationUsed(action, attendedReservation) {
             }
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({

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

@@ -31,13 +31,6 @@ function verifyToken4reservation(params) {
                     orderNumber: payload.orderNumber,
                     reservationId: params.reservationId
                 });
-                // 注文検索
-                // const order: Pick<factory.order.IOrder, 'orderStatus' | 'acceptedOffers'> =
-                //     await repos.order.findByOrderNumber({
-                //         orderNumber: payload.orderNumber,
-                //         inclusion: ['orderStatus', 'acceptedOffers'],
-                //         exclusion: []
-                //     });
                 // ステータス検証
                 switch (order.orderStatus) {
                     case factory.orderStatus.OrderDelivered:
@@ -75,7 +68,7 @@ function useReservation(params) {
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
             id: reservationId,
-            inclusion: ['id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            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;

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

@@ -95,7 +95,7 @@ function onRegistered(actionAttributes) {
             taskAttributes.push(...orderProgramMembershipTasks);
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRegistered = onRegistered;

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

@@ -10,8 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const order_1 = require("../../repo/order");
+const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
 const transaction_1 = require("../../repo/transaction");
 const TransactionService = require("../transaction");
@@ -20,15 +23,14 @@ const TransactionService = require("../transaction");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield TransactionService.deleteTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo,
-            reservation: reservationRepo,
-            transaction: transactionRepo
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_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),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -35,6 +35,10 @@ function call(data) {
             offer: offerRepo,
             masterService
         });
+        yield OfferService.event.importCategoryCodesFromCOA(data)({
+            categoryCode: categoryCodeRepo,
+            masterService
+        });
     });
 }
 exports.call = call;

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

@@ -134,13 +134,7 @@ function refundTransactionAlreadyExists(params) {
             typeOf: factory.assetTransactionType.Refund,
             statuses: [factory.transactionStatusType.Confirmed],
             object: { paymentMethodId: { $eq: params.object.paymentMethodId } }
-        }, {
-            agent: 0,
-            object: 0,
-            potentialActions: 0,
-            recipient: 0,
-            result: 0
-        });
+        }, ['_id'], []);
         return refundTransactions.length > 0;
     });
 }
@@ -219,10 +213,6 @@ function onRefund(refundActionAttributes) {
             });
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -17,6 +17,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
 const EventOfferService = require("../offer/event");
 /**
  * タスク実行関数
@@ -38,7 +39,8 @@ function call(data) {
             stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
-            task: taskRepo
+            task: taskRepo,
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -16,11 +16,20 @@ export type TaskOperation<T> = (repos: {
     task: TaskRepo;
 }) => Promise<T>;
 export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+export declare function executeById(params: {
+    id: string;
+    executor?: {
+        name: string;
+    };
+}): IOperation<void>;
 /**
  * タスク名でタスクをひとつ実行する
  */
 export declare function executeByName<T extends factory.taskName>(params: {
     name: T;
+    executor?: {
+        name: string;
+    };
 }): IOperation<void>;
 /**
  * タスクを実行する

package/lib/chevre/service/task.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = void 0;
+exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = exports.executeById = void 0;
 /**
  * タスクサービス
  */
@@ -18,19 +18,54 @@ const factory = require("../factory");
 const task_1 = require("../repo/task");
 const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
+const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
+const DEFAULT_EXECUTOR_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
+function executeById(params) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const taskRepo = new task_1.MongoRepository(settings.connection);
+        // 未実行のタスクを取得
+        // tslint:disable-next-line:no-null-keyword
+        let task = null;
+        try {
+            task = yield taskRepo.executeById({
+                id: params.id,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
+        }
+        catch (error) {
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore next */
+            debug('service.task.executeById error:', error);
+        }
+        // タスクがなければ終了
+        if (task !== null) {
+            yield execute(task)(settings);
+        }
+    });
+}
+exports.executeById = executeById;
 /**
  * タスク名でタスクをひとつ実行する
  */
 function executeByName(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const taskRepo = new task_1.MongoRepository(settings.connection);
         // 未実行のタスクを取得
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeOneByName(params);
+            task = yield taskRepo.executeOneByName({
+                name: params.name,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -106,7 +141,9 @@ function abort(params) {
             }
             // 開発者へ報告
             const message = (0, factory_1.task2lineNotify)({ task: abortedTask });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }
@@ -123,7 +160,9 @@ function notifyAbortedTasks(params) {
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -0,0 +1,21 @@
+import * as factory from '../../factory';
+import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
+import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+/**
+ * 取引に関わるリソースを削除する
+ * 冪等性を確保すること
+ */
+export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
+    accountingReport: AccountingReportRepo;
+    action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+    ownershipInfo: OwnershipInfoRepo;
+    reservation: ReservationRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;