@chevre/domain 22.0.0-alpha.10 → 22.0.0-alpha.11

package/example/src/chevre/aggregateAllEvents2.ts

@@ -69,6 +69,7 @@ export async function aggregateScreeningEvent() {
                         deliverOrderLimit: 1,
                         transaction: { informUrls: [], confirmedStoragePeriodInDays: 365, canceledStoragePeriodInDays: 365 },
                         abortedTasksWithoutReport: [],
+                        coa: { timeout: 1000 },
                         gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },
                         movieticketReserve: { timeout: 1000, timeoutCheck: 1000 },
                         numTryConfirmReserveTransaction: 10,

package/lib/chevre/credentials.d.ts

@@ -1,4 +1,3 @@
-import type { COACredentials } from './credentials/coa';
 import type { CustomSearchCredentials } from './credentials/customSearch';
 import type { JWTCredentials } from './credentials/jwt';
 import type { LINENotifyCredentials } from './credentials/lineNotify';
@@ -7,10 +6,6 @@ import type { SendGridCredentials } from './credentials/sendGrid';
  * 外部サービス認証情報
  */
 export declare namespace credentials {
-    type COA = COACredentials;
-    namespace COA {
-        function createInstance(...params: ConstructorParameters<typeof COACredentials>): Promise<COACredentials>;
-    }
     type CustomSearch = CustomSearchCredentials;
     namespace CustomSearch {
         function createInstance(...params: ConstructorParameters<typeof CustomSearchCredentials>): Promise<CustomSearchCredentials>;

package/lib/chevre/credentials.js

@@ -28,19 +28,6 @@ var credentials;
     // export const sendGrid = {
     //     apiKey: process.env.SENDGRID_API_KEY
     // };
-    let COA;
-    (function (COA) {
-        let cred;
-        function createInstance(...params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (cred === undefined) {
-                    cred = (yield Promise.resolve().then(() => require('./credentials/coa'))).COACredentials;
-                }
-                return new cred(...params);
-            });
-        }
-        COA.createInstance = createInstance;
-    })(COA = credentials.COA || (credentials.COA = {}));
     let CustomSearch;
     (function (CustomSearch) {
         let cred;

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

@@ -17,15 +17,13 @@ const event_1 = require("../../repo/event");
 const transaction_1 = require("../../repo/transaction");
 const transactionProcess_1 = require("../../repo/transactionProcess");
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
-let coaAuthClient;
 /**
  * タスク実行関数
  */
 function call(params) {
-    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
-        const { connection, credentials, redisClient } = settings;
-        if (credentials.coa === undefined) {
-            throw new factory.errors.Argument('settings', 'coaCredentials required');
+    return ({ connection, redisClient, settings, coaAuthClient }, options) => __awaiter(this, void 0, void 0, function* () {
+        if (coaAuthClient === undefined) {
+            throw new factory.errors.Argument('settings', 'coaAuthClient required');
         }
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
@@ -34,24 +32,17 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
-        if (coaAuthClient === undefined) {
-            coaAuthClient = new COA.auth.RefreshToken({
-                endpoint: credentials.coa.endpoint,
-                refreshToken: credentials.coa.refreshToken,
-                useFetch: credentials.coa.useFetch
-            });
-        }
-        const actionRepo = new action_1.ActionRepo(settings.connection);
+        const actionRepo = new action_1.ActionRepo(connection);
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const reserveService = new COA.service.Reserve({
-                endpoint: credentials.coa.endpoint,
+                endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
-            }, { timeout: credentials.coa.timeout });
+            }, { timeout: settings.coa.timeout });
             const masterService = new COA.service.Master({
-                endpoint: credentials.coa.endpoint,
+                endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
-            }, { timeout: credentials.coa.timeout });
+            }, { timeout: settings.coa.timeout });
             const { object, potentialActions, purpose } = params.data;
             if (typeof potentialActions.id === 'string') {
                 yield (0, acceptOffer_1.reAcceptOffer)({

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

@@ -23,26 +23,18 @@ const task_1 = require("../../repo/task");
 const ReserveTransactionService = require("../assetTransaction/reserve");
 const COAReserveService = require("../assetTransaction/reserveCOA");
 const factory_1 = require("../assetTransaction/reserveCOA/factory");
-let coaAuthClient;
 /**
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, credentials, settings }) => __awaiter(this, void 0, void 0, function* () {
-        if (credentials.coa === undefined) {
-            throw new factory.errors.Argument('settings', 'coaCredentials required');
-        }
+    return ({ connection, settings, coaAuthClient }) => __awaiter(this, void 0, void 0, function* () {
         if (coaAuthClient === undefined) {
-            coaAuthClient = new COA.auth.RefreshToken({
-                endpoint: credentials.coa.endpoint,
-                refreshToken: credentials.coa.refreshToken,
-                useFetch: credentials.coa.useFetch
-            });
+            throw new factory.errors.Argument('settings', 'coaAuthClient required');
         }
         const reserveService = new COA.service.Reserve({
-            endpoint: credentials.coa.endpoint,
+            endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient
-        }, { timeout: credentials.coa.timeout });
+        }, { timeout: settings.coa.timeout });
         yield confirmReserveTransaction(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }), {
             sendOrder: true,
             useOnOrderStatusChanged: true

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

@@ -14,26 +14,18 @@ const COA = require("@motionpicture/coa-service");
 const factory = require("../../factory");
 const event_1 = require("../../repo/event");
 const EventAggregationService = require("../aggregation/event");
-let coaAuthClient;
 /**
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, credentials }) => __awaiter(this, void 0, void 0, function* () {
-        if (credentials.coa === undefined) {
-            throw new factory.errors.Argument('settings', 'coaCredentials required');
-        }
+    return ({ connection, settings, coaAuthClient }) => __awaiter(this, void 0, void 0, function* () {
         if (coaAuthClient === undefined) {
-            coaAuthClient = new COA.auth.RefreshToken({
-                endpoint: credentials.coa.endpoint,
-                refreshToken: credentials.coa.refreshToken,
-                useFetch: credentials.coa.useFetch
-            });
+            throw new factory.errors.Argument('settings', 'coaAuthClient required');
         }
         const reserveService = new COA.service.Reserve({
-            endpoint: credentials.coa.endpoint,
+            endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient
-        }, { timeout: credentials.coa.timeout });
+        }, { timeout: settings.coa.timeout });
         yield EventAggregationService.importFromCOA(data)({
             event: new event_1.EventRepo(connection),
             reserveService

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

@@ -20,26 +20,18 @@ const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const seller_1 = require("../../repo/seller");
 const EventService = require("../event");
-let coaAuthClient;
 /**
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, credentials }) => __awaiter(this, void 0, void 0, function* () {
-        if (credentials.coa === undefined) {
-            throw new factory.errors.Argument('settings', 'coaCredentials required');
-        }
+    return ({ connection, settings, coaAuthClient }) => __awaiter(this, void 0, void 0, function* () {
         if (coaAuthClient === undefined) {
-            coaAuthClient = new COA.auth.RefreshToken({
-                endpoint: credentials.coa.endpoint,
-                refreshToken: credentials.coa.refreshToken,
-                useFetch: credentials.coa.useFetch
-            });
+            throw new factory.errors.Argument('settings', 'coaAuthClient required');
         }
         const masterService = new COA.service.Master({
-            endpoint: credentials.coa.endpoint,
+            endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient
-        }, { timeout: credentials.coa.timeout });
+        }, { timeout: settings.coa.timeout });
         yield EventService.importFromCOA(data)({
             action: new action_1.ActionRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),

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

@@ -16,29 +16,21 @@ const categoryCode_1 = require("../../repo/categoryCode");
 const offer_1 = require("../../repo/offer");
 const task_1 = require("../../repo/task");
 const OfferService = require("../offer");
-let coaAuthClient;
 /**
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, credentials }) => __awaiter(this, void 0, void 0, function* () {
-        if (credentials.coa === undefined) {
-            throw new factory.errors.Argument('settings', 'coaCredentials required');
+    return ({ connection, settings, coaAuthClient }) => __awaiter(this, void 0, void 0, function* () {
+        if (coaAuthClient === undefined) {
+            throw new factory.errors.Argument('settings', 'coaAuthClient required');
         }
         const categoryCodeRepo = new categoryCode_1.CategoryCodeRepo(connection);
         const offerRepo = new offer_1.OfferRepo(connection);
         const taskRepo = new task_1.TaskRepo(connection);
-        if (coaAuthClient === undefined) {
-            coaAuthClient = new COA.auth.RefreshToken({
-                endpoint: credentials.coa.endpoint,
-                refreshToken: credentials.coa.refreshToken,
-                useFetch: credentials.coa.useFetch
-            });
-        }
         const masterService = new COA.service.Master({
-            endpoint: credentials.coa.endpoint,
+            endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient
-        }, { timeout: credentials.coa.timeout });
+        }, { timeout: settings.coa.timeout });
         yield OfferService.event.importFromCOA(data)({
             categoryCode: categoryCodeRepo,
             offer: offerRepo,

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

@@ -21,29 +21,21 @@ const transactionNumber_1 = require("../../repo/transactionNumber");
 const CancelReservationTransactionService = require("../assetTransaction/cancelReservation");
 const CancelReservationCOAService = require("../assetTransaction/cancelReservationCOA");
 const factory_1 = require("../assetTransaction/cancelReservationCOA/factory");
-let coaAuthClient;
 /**
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, credentials, redisClient }) => __awaiter(this, void 0, void 0, function* () {
-        if (credentials.coa === undefined) {
-            throw new factory.errors.Argument('settings', 'coaCredentials required');
+    return ({ connection, redisClient, settings, coaAuthClient }) => __awaiter(this, void 0, void 0, function* () {
+        if (coaAuthClient === undefined) {
+            throw new factory.errors.Argument('settings', 'coaAuthClient required');
         }
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        if (coaAuthClient === undefined) {
-            coaAuthClient = new COA.auth.RefreshToken({
-                endpoint: credentials.coa.endpoint,
-                refreshToken: credentials.coa.refreshToken,
-                useFetch: credentials.coa.useFetch
-            });
-        }
         const reserveService = new COA.service.Reserve({
-            endpoint: credentials.coa.endpoint,
+            endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient
-        }, { timeout: credentials.coa.timeout });
+        }, { timeout: settings.coa.timeout });
         yield returnReserve(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

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

@@ -22,15 +22,14 @@ const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const transactionProcess_1 = require("../../repo/transactionProcess");
 const event_1 = require("../offer/event");
-let coaAuthClient;
 /**
  * タスク実行関数
  */
 function call(params) {
     // export function call(data: factory.task.IData<factory.taskName.VoidReserveTransaction>): IOperationExecute<void> {
-    return ({ connection, credentials, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
-        if (credentials.coa === undefined) {
-            throw new factory.errors.Argument('settings', 'coaCredentials required');
+    return ({ connection, redisClient, settings, coaAuthClient }, options) => __awaiter(this, void 0, void 0, function* () {
+        if (coaAuthClient === undefined) {
+            throw new factory.errors.Argument('settings', 'coaAuthClient required');
         }
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
@@ -42,17 +41,10 @@ function call(params) {
                 return;
             }
         }
-        if (coaAuthClient === undefined) {
-            coaAuthClient = new COA.auth.RefreshToken({
-                endpoint: credentials.coa.endpoint,
-                refreshToken: credentials.coa.refreshToken,
-                useFetch: credentials.coa.useFetch
-            });
-        }
         const reserveService = new COA.service.Reserve({
-            endpoint: credentials.coa.endpoint,
+            endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient
-        }, { timeout: credentials.coa.timeout });
+        }, { timeout: settings.coa.timeout });
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             yield (0, event_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({

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

@@ -1,6 +1,9 @@
+/**
+ * タスクサービス
+ */
+import type * as COA from '@motionpicture/coa-service';
 import type { Connection } from 'mongoose';
 import type { RedisClientType } from 'redis';
-import { COACredentials } from '../credentials/coa';
 import { JWTCredentials } from '../credentials/jwt';
 import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
@@ -8,7 +11,6 @@ import * as factory from '../factory';
 import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
 interface ICredentialSettings {
-    coa?: COACredentials;
     jwt?: JWTCredentials;
     sendGrid: SendGridCredentials;
 }
@@ -23,6 +25,7 @@ interface IExecuteSettings {
     redisClient?: RedisClientType;
     credentials: ICredentialSettings;
     settings: Settings;
+    coaAuthClient?: COA.auth.RefreshToken;
 }
 interface IExecuteOptions {
     executeById: boolean;

package/lib/chevre/service/task.js

@@ -10,9 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyAbortedTasks = exports.abort = exports.execute = exports.executeByName = exports.executeById = void 0;
-/**
- * タスクサービス
- */
 const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../factory");

package/lib/chevre/settings.d.ts

@@ -35,6 +35,9 @@ interface IOptions {
     };
     defaultSenderEmail: string;
     deliverOrderLimit: number;
+    coa: {
+        timeout: number;
+    };
     gmo: {
         timeout: number;
         timeoutBackground: number;
@@ -99,6 +102,9 @@ declare class Settings {
     };
     readonly defaultSenderEmail: string;
     readonly deliverOrderLimit: number;
+    readonly coa: {
+        timeout: number;
+    };
     readonly gmo: {
         timeout: number;
         timeoutBackground: number;

package/lib/chevre/settings.js

@@ -14,7 +14,7 @@ exports.MONGO_AUTO_INDEX = process.env.MONGO_AUTO_INDEX === '1';
  */
 class Settings {
     constructor(options) {
-        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, useAggregateEntranceGateProjects, useAggregateOfferProjects, useOfferRateLimitProjects, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, notification } = options;
+        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, useAggregateEntranceGateProjects, useAggregateOfferProjects, useOfferRateLimitProjects, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, notification } = options;
         this.onEventChanged = onEventChanged;
         this.onOrderStatusChanged = onOrderStatusChanged;
         this.onResourceUpdated = onResourceUpdated;
@@ -29,6 +29,7 @@ class Settings {
         this.transaction = transaction;
         this.defaultSenderEmail = defaultSenderEmail;
         this.deliverOrderLimit = deliverOrderLimit;
+        this.coa = coa;
         this.gmo = gmo;
         this.movieticketReserve = movieticketReserve;
         this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.0.0-alpha.10"
+  "version": "22.0.0-alpha.11"
 }

package/lib/chevre/credentials/coa.d.ts

@@ -1,17 +0,0 @@
-interface IOptions {
-    endpoint: string;
-    refreshToken: string;
-    timeout: number;
-    useFetch: boolean;
-}
-/**
- * COA認証情報
- */
-declare class COACredentials {
-    readonly endpoint: string;
-    readonly refreshToken: string;
-    readonly timeout: number;
-    readonly useFetch: boolean;
-    constructor(options: IOptions);
-}
-export { COACredentials };

package/lib/chevre/credentials/coa.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.COACredentials = void 0;
-/**
- * COA認証情報
- */
-class COACredentials {
-    constructor(options) {
-        this.timeout = 20000;
-        const { endpoint, refreshToken, timeout, useFetch } = options;
-        this.endpoint = endpoint;
-        this.refreshToken = refreshToken;
-        this.timeout = timeout;
-        this.useFetch = useFetch;
-    }
-}
-exports.COACredentials = COACredentials;