@chevre/domain 22.0.0-alpha.3 → 22.0.0-alpha.4

package/example/src/chevre/importCategoryCodesFromCOA.ts

@@ -1,28 +1,25 @@
 // tslint:disable:no-console
-import * as COA from '@motionpicture/coa-service';
-// import * as redis from 'redis';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: chevre.credentials.coa.endpoint,
-    refreshToken: chevre.credentials.coa.refreshToken,
-    useFetch: chevre.credentials.coa.useFetch
-});
-
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
-    const masterService = new COA.service.Master(
+    const coaAuthClient = new (await chevre.loadCOA()).auth.RefreshToken({
+        endpoint: '',
+        refreshToken: '',
+        useFetch: true
+    });
+    const masterService = new (await chevre.loadCOA()).service.Master(
         {
-            endpoint: chevre.credentials.coa.endpoint,
+            endpoint: '',
             auth: coaAuthClient
         },
-        { timeout: chevre.credentials.coa.timeout }
+        { timeout: 20000 }
     );
 
     await (await chevre.service.offer.createService()).event.importCategoryCodesFromCOA({

package/example/src/chevre/importEventsFromCOA.ts

@@ -18,6 +18,19 @@ async function main() {
     const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
     const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
+    const coaAuthClient = new (await chevre.loadCOA()).auth.RefreshToken({
+        endpoint: '',
+        refreshToken: '',
+        useFetch: true
+    });
+    const masterService = new (await chevre.loadCOA()).service.Master(
+        {
+            endpoint: '',
+            auth: coaAuthClient
+        },
+        { timeout: 20000 }
+    );
+
     await (await chevre.service.event.createService()).importFromCOA({
         project: {
             id: project.id,
@@ -39,7 +52,8 @@ async function main() {
         event: eventRepo,
         movieTheater: movieTheaterRepo,
         screeningRoom: screeningRoomRepo,
-        seller: sellerRepo
+        seller: sellerRepo,
+        masterService
     });
     console.log('imported');
 }

package/example/src/chevre/migrateCognitoUser.ts

@@ -1,4 +1,7 @@
 // tslint:disable:no-console
+import { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
+import { fromEnv } from '@aws-sdk/credential-providers';
+
 import { chevre } from '../../../lib/index';
 
 export const USERPOOL_ID_OLD = String(process.env.USERPOOL_ID_OLD);
@@ -9,11 +12,21 @@ const NEW_USERPOOL_PROVIDER_NAME = 'SSKTS';
 export async function migrateUser(params: {
     id: string;
 }): Promise<void> {
+    const awsCredentials = fromEnv();
+    const cognitoIdentityServiceProvider = new CognitoIdentityProvider({
+        apiVersion: 'latest',
+        region: 'ap-northeast-1',
+        credentials: awsCredentials
+    });
+
     // 旧会員を取得
     let oldPerson: chevre.factory.person.IPerson | undefined;
 
     try {
-        const oldPersonRepo = await chevre.repository.Person.createInstance({ userPoolId: USERPOOL_ID_OLD });
+        const oldPersonRepo = await chevre.repository.Person.createInstance({
+            userPoolId: USERPOOL_ID_OLD,
+            cognitoIdentityServiceProvider
+        });
         oldPerson = await oldPersonRepo.findById({ userId: params.id });
         console.log('oldPerson found', oldPerson.id, oldPerson.givenName, oldPerson.familyName);
     } catch (error) {
@@ -33,7 +46,10 @@ export async function migrateUser(params: {
     }
 
     // create user
-    const newPersonRepo = await chevre.repository.Person.createInstance({ userPoolId: USERPOOL_ID_NEW });
+    const newPersonRepo = await chevre.repository.Person.createInstance({
+        userPoolId: USERPOOL_ID_NEW,
+        cognitoIdentityServiceProvider
+    });
     const newUsername = `${NEW_USERPOOL_PROVIDER_NAME}_${oldPerson.id}`;
     const newUserId = await new Promise<string>((resolve, reject) => {
         newPersonRepo.cognitoIdentityServiceProvider.adminCreateUser(

package/example/src/chevre/person/updateProfile.ts

@@ -1,9 +1,18 @@
+import { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
+import { fromEnv } from '@aws-sdk/credential-providers';
+
 // tslint:disable:no-console no-magic-numbers
 import { chevre } from '../../../../lib/index';
 
 async function main() {
+    const awsCredentials = fromEnv();
     const personRepo = await chevre.repository.Person.createInstance({
-        userPoolId: <string>process.env.COGNITO_USER_POOL_ID
+        userPoolId: <string>process.env.COGNITO_USER_POOL_ID,
+        cognitoIdentityServiceProvider: new CognitoIdentityProvider({
+            apiVersion: 'latest',
+            region: 'ap-northeast-1',
+            credentials: awsCredentials
+        })
     });
 
     const username = 'xxx';

package/example/src/chevre/searchReservationsByOrder.ts

@@ -8,19 +8,31 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
+    const coaAuthClient = new (await chevre.loadCOA()).auth.RefreshToken({
+        endpoint: '',
+        refreshToken: '',
+        useFetch: true
+    });
+
     const { reservations } = await (await chevre.service.reserve.createService()).searchByOrder({
         limit: 10,
         page: 1,
         project: { id: project.id },
         orderNumber: 'CIN3-0760465-8981560',
-        // orderNumber: 'SSK1-3743647-5975553',
-        // orderNumber: 'SSK9-4864565-8689164',
         typeOf: chevre.factory.reservationType.EventReservation
     })({
         acceptedOffer: await chevre.repository.AcceptedOffer.createInstance(mongoose.connection),
         order: await chevre.repository.Order.createInstance(mongoose.connection),
-        reservation: await chevre.repository.Reservation.createInstance(mongoose.connection)
+        reservation: await chevre.repository.Reservation.createInstance(mongoose.connection),
+        reserveService: new (await chevre.loadCOA()).service.Reserve(
+            {
+                endpoint: '',
+                auth: coaAuthClient
+            },
+            { timeout: 20000 }
+        )
     });
+
     console.log(reservations);
     console.log(reservations.length, 'reservations found');
 }

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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,17 @@
+"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;

package/lib/chevre/credentials.d.ts

@@ -1,19 +1,9 @@
+import type { COACredentials } from './credentials/coa';
 import type { JWTCredentials } from './credentials/jwt';
 /**
  * 外部サービスを使用するための認証情報
  */
 export declare namespace credentials {
-    const aws: {
-        accessKeyId: string;
-        secretAccessKey: string;
-        tokenIssuerEndpoint: string;
-    };
-    const coa: {
-        endpoint: string;
-        refreshToken: string;
-        timeout: number;
-        useFetch: boolean;
-    };
     const customSearch: {
         engineId: string;
         apiKey: string;
@@ -42,6 +32,10 @@ export declare namespace credentials {
     const sendGrid: {
         apiKey: string | undefined;
     };
+    type COA = COACredentials;
+    namespace COA {
+        function createInstance(...params: ConstructorParameters<typeof COACredentials>): Promise<COACredentials>;
+    }
     type JWT = JWTCredentials;
     namespace JWT {
         function createInstance(...params: ConstructorParameters<typeof JWTCredentials>): Promise<JWTCredentials>;

package/lib/chevre/credentials.js

@@ -33,24 +33,24 @@ exports.credentials = void 0;
  */
 var credentials;
 (function (credentials) {
-    credentials.aws = {
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        tokenIssuerEndpoint: process.env.TOKEN_ISSUER_ENDPOINT
-    };
+    // export const aws = {
+    //     accessKeyId: <string>process.env.AWS_ACCESS_KEY_ID,
+    //     secretAccessKey: <string>process.env.AWS_SECRET_ACCESS_KEY,
+    //     tokenIssuerEndpoint: <string>process.env.TOKEN_ISSUER_ENDPOINT
+    // };
     // export const chevre = {
     //     authorizeServerDomain: <string>process.env.CHEVRE_AUTHORIZE_SERVER_DOMAIN,
     //     clientId: <string>process.env.CHEVRE_CLIENT_ID,
     //     clientSecret: <string>process.env.CHEVRE_CLIENT_SECRET,
     //     endpoint: <string>process.env.CHEVRE_ENDPOINT
     // };
-    credentials.coa = {
-        endpoint: process.env.COA_ENDPOINT,
-        refreshToken: process.env.COA_REFRESH_TOKEN,
-        // tslint:disable-next-line:no-magic-numbers
-        timeout: (typeof process.env.COA_TIMEOUT === 'string') ? Number(process.env.COA_TIMEOUT) : 20000,
-        useFetch: process.env.COA_USE_FETCH === '1'
-    };
+    // export const coa = {
+    //     endpoint: <string>process.env.COA_ENDPOINT,
+    //     refreshToken: <string>process.env.COA_REFRESH_TOKEN,
+    //     // tslint:disable-next-line:no-magic-numbers
+    //     timeout: (typeof process.env.COA_TIMEOUT === 'string') ? Number(process.env.COA_TIMEOUT) : 20000,
+    //     useFetch: process.env.COA_USE_FETCH === '1'
+    // };
     credentials.customSearch = {
         engineId: process.env.CUSTOM_SEARCH_ENGINE_ID,
         apiKey: process.env.GOOGLE_API_KEY
@@ -84,6 +84,19 @@ var credentials;
     credentials.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 JWT;
     (function (JWT) {
         let cred;

package/lib/chevre/index.d.ts

@@ -1,6 +1,7 @@
 /**
  * index module
  */
+import type * as COAService from '@motionpicture/coa-service';
 import type * as GMOService from '@motionpicture/gmo-service';
 import type * as Pecorinoapi from './pecorinoapi';
 import { credentials } from './credentials';
@@ -12,4 +13,5 @@ import * as service from './service';
 import * as settings from './settings';
 export { credentials, errorHandler, eventEmitter, factory, repository, service, settings };
 export declare function loadPecorinoapi(): Promise<typeof Pecorinoapi>;
+export declare function loadCOA(): Promise<typeof COAService>;
 export declare function loadGMO(): Promise<typeof GMOService>;

package/lib/chevre/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadGMO = exports.loadPecorinoapi = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
+exports.loadGMO = exports.loadCOA = exports.loadPecorinoapi = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
 const credentials_1 = require("./credentials");
 Object.defineProperty(exports, "credentials", { enumerable: true, get: function () { return credentials_1.credentials; } });
 const errorHandler = require("./errorHandler");
@@ -34,6 +34,16 @@ function loadPecorinoapi() {
     });
 }
 exports.loadPecorinoapi = loadPecorinoapi;
+let COA;
+function loadCOA() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (COA === undefined) {
+            COA = yield Promise.resolve().then(() => require('@motionpicture/coa-service'));
+        }
+        return COA;
+    });
+}
+exports.loadCOA = loadCOA;
 let GMO;
 function loadGMO() {
     return __awaiter(this, void 0, void 0, function* () {

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

@@ -1,4 +1,4 @@
-import { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
+import type { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
 import type { AttributeType } from '@aws-sdk/client-cognito-identity-provider/dist-types/models/models_0';
 import * as factory from '../factory';
 export type IPerson = factory.person.IPerson;
@@ -8,7 +8,8 @@ export type IPerson = factory.person.IPerson;
 export declare class PersonRepo {
     readonly cognitoIdentityServiceProvider: CognitoIdentityProvider;
     private readonly userPoolId;
-    constructor(params: {
+    constructor(options: {
+        cognitoIdentityServiceProvider: CognitoIdentityProvider;
         userPoolId: string;
     });
     static ATTRIBUTE2PROFILE(params: {

package/lib/chevre/repo/person.js

@@ -10,22 +10,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PersonRepo = void 0;
-const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
-const credential_providers_1 = require("@aws-sdk/credential-providers");
+// import { fromEnv } from '@aws-sdk/credential-providers';
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory = require("../factory");
-const awsCredentials = (0, credential_providers_1.fromEnv)();
+// const awsCredentials = fromEnv();
 /**
  * 会員リポジトリ
  */
 class PersonRepo {
-    constructor(params) {
-        this.userPoolId = params.userPoolId;
-        this.cognitoIdentityServiceProvider = new client_cognito_identity_provider_1.CognitoIdentityProvider({
-            apiVersion: 'latest',
-            region: 'ap-northeast-1',
-            credentials: awsCredentials
-        });
+    constructor(options) {
+        const { cognitoIdentityServiceProvider, userPoolId } = options;
+        this.userPoolId = userPoolId;
+        this.cognitoIdentityServiceProvider = cognitoIdentityServiceProvider;
+        // this.cognitoIdentityServiceProvider = new CognitoIdentityProvider({
+        //     apiVersion: 'latest',
+        //     region: 'ap-northeast-1',
+        //     credentials: awsCredentials
+        // });
     }
     static ATTRIBUTE2PROFILE(params) {
         let additionalProperty = [];

package/lib/chevre/service/aggregation/event/importFromCOA.d.ts

@@ -1,3 +1,7 @@
+/**
+ * COAイベント集計サービス
+ */
+import type * as COA from '@motionpicture/coa-service';
 import type { EventRepo } from '../../../repo/event';
 import * as factory from '../../../factory';
 /**
@@ -13,4 +17,5 @@ export declare function importFromCOA(params: {
     importThrough: Date;
 }): (repos: {
     event: EventRepo;
+    reserveService: COA.service.Reserve;
 }) => Promise<void>;

package/lib/chevre/service/aggregation/event/importFromCOA.js

@@ -10,32 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importFromCOA = void 0;
-/**
- * COAイベント集計サービス
- */
-const COA = require("@motionpicture/coa-service");
 const createDebug = require("debug");
 const moment = require("moment-timezone");
-const credentials_1 = require("../../../credentials");
 const event_1 = require("../../event");
 const debug = createDebug('chevre-domain:service');
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken,
-    useFetch: credentials_1.credentials.coa.useFetch
-});
 /**
  * イベント席数を更新する
  */
 function importFromCOA(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const reserveService = new COA.service.Reserve({
-            endpoint: credentials_1.credentials.coa.endpoint,
-            auth: coaAuthClient
-        }, { timeout: credentials_1.credentials.coa.timeout });
         try {
             // COAから空席状況取得
-            const countFreeSeatResult = yield reserveService.countFreeSeat({
+            const countFreeSeatResult = yield repos.reserveService.countFreeSeat({
                 theaterCode: params.locationBranchCode,
                 begin: moment(params.importFrom)
                     .tz('Asia/Tokyo')

package/lib/chevre/service/assetTransaction/cancelReservationCOA.d.ts

@@ -1,9 +1,11 @@
 /**
  * COA予約取消取引サービス
  */
-import * as COA from '@motionpicture/coa-service';
+import type * as COA from '@motionpicture/coa-service';
 import { IProcessReturnCOAReserveResult } from './cancelReservationCOA/factory';
-type IConfirmOperation<T> = () => Promise<T>;
+type IConfirmOperation<T> = (repos: {
+    reserveService: COA.service.Reserve;
+}) => Promise<T>;
 declare function confirm(params: {
     object: COA.factory.reserve.IStateReserveArgs;
 }): IConfirmOperation<IProcessReturnCOAReserveResult>;

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

@@ -10,27 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirm = void 0;
-/**
- * COA予約取消取引サービス
- */
-const COA = require("@motionpicture/coa-service");
-const credentials_1 = require("../../credentials");
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken,
-    useFetch: credentials_1.credentials.coa.useFetch
-});
 function confirm(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         let stateReserveArgs;
         let stateReserveResult;
         let delReserveArgs;
-        const reserveService = new COA.service.Reserve({
-            endpoint: credentials_1.credentials.coa.endpoint,
-            auth: coaAuthClient
-        }, { timeout: credentials_1.credentials.coa.timeout });
         stateReserveArgs = params.object;
-        stateReserveResult = yield reserveService.stateReserve(stateReserveArgs);
+        stateReserveResult = yield repos.reserveService.stateReserve(stateReserveArgs);
         if (stateReserveResult !== null) {
             delReserveArgs = {
                 theaterCode: stateReserveArgs.theaterCode,
@@ -42,7 +28,7 @@ function confirm(params) {
                 timeBegin: stateReserveResult.timeBegin,
                 listSeat: stateReserveResult.listTicket
             };
-            yield reserveService.delReserve(delReserveArgs);
+            yield repos.reserveService.delReserve(delReserveArgs);
         }
         return {
             stateReserveArgs,

package/lib/chevre/service/assetTransaction/reserveCOA.d.ts

@@ -1,6 +1,11 @@
+/**
+ * COA予約取引サービス
+ */
+import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../factory';
 import { IProcessConfirmCOAReserveResult } from './reserveCOA/factory';
 interface IConfirmRepo {
+    reserveService: COA.service.Reserve;
 }
 type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
 /**

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

@@ -10,21 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirm = void 0;
-/**
- * COA予約取引サービス
- */
-const COA = require("@motionpicture/coa-service");
-const credentials_1 = require("../../credentials");
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken,
-    useFetch: credentials_1.credentials.coa.useFetch
-});
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         let stateReserveArgs;
         let stateReserveResult;
         let updReserveArgs;
@@ -32,19 +22,15 @@ function confirm(params) {
         // 未本予約であれば実行(COA本予約は一度成功すると成功できない)
         // リトライ可能な前提でつくる必要があるので、要注意
         // すでに本予約済みかどうか確認
-        const reserveService = new COA.service.Reserve({
-            endpoint: credentials_1.credentials.coa.endpoint,
-            auth: coaAuthClient
-        }, { timeout: credentials_1.credentials.coa.timeout });
         stateReserveArgs = {
             theaterCode: params.object.theaterCode,
             reserveNum: params.object.tmpReserveNum,
             telNum: params.object.telNum
         };
-        stateReserveResult = yield reserveService.stateReserve(stateReserveArgs);
+        stateReserveResult = yield repos.reserveService.stateReserve(stateReserveArgs);
         if (stateReserveResult === null) {
             updReserveArgs = params.object;
-            updReserveResult = yield reserveService.updReserve(updReserveArgs);
+            updReserveResult = yield repos.reserveService.updReserve(updReserveArgs);
         }
         return {
             stateReserveArgs,

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

@@ -1,3 +1,7 @@
+/**
+ * マスターデータ同期サービス
+ */
+import type * as COA from '@motionpicture/coa-service';
 import type { ActionRepo } from '../repo/action';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
@@ -41,6 +45,7 @@ export declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
+    masterService: COA.service.Master;
 }) => Promise<void>;
 /**
  * COA情報からイベントIDを作成する