@chevre/domain 21.13.0-alpha.4 → 21.13.0-alpha.6

package/example/src/retryConnectMongo.ts

@@ -0,0 +1,82 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+let connection: mongoose.Connection | undefined;
+let mongoLastConnected: Date | undefined;
+const MONGO_RETRY_INTERVAL_IN_MILLISECONDS = 1000;
+const MONGO_GIVE_UP_IN_SECONDS = 5;
+async function getConnection(): Promise<mongoose.Connection> {
+    if (mongoLastConnected instanceof Date) {
+        if (connection === undefined) {
+            if (moment()
+                .isAfter(moment(mongoLastConnected)
+                    .add(MONGO_GIVE_UP_IN_SECONDS, 'seconds'))
+            ) {
+                mongoLastConnected = void 0;
+            }
+
+            // 最終接続から一定期間経過していればリトライ
+            connection = await new Promise<mongoose.Connection>((resolve, reject) => {
+                setTimeout(
+                    async () => {
+                        console.log('retrying...', mongoLastConnected);
+                        try {
+                            resolve(await getConnection());
+                        } catch (error) {
+                            reject(error);
+                        }
+                    },
+                    MONGO_RETRY_INTERVAL_IN_MILLISECONDS
+                );
+            });
+        }
+    } else {
+        mongoLastConnected = new Date();
+        console.log('creating connection...', mongoLastConnected);
+        if (connection === undefined) {
+            connection = await new Promise<mongoose.Connection>((resolve) => {
+                setTimeout(
+                    async () => {
+                        resolve(await mongoose.createConnection(<string>process.env.MONGOLAB_URI, { autoIndex: false }));
+                    },
+                    // tslint:disable-next-line:no-magic-numbers
+                    2000
+                );
+            });
+            // throw new Error('failed in createConnection')
+        }
+    }
+
+    return connection;
+}
+
+getConnection()
+    .then(() => {
+        console.log('sucess!', mongoose.connections.length);
+    })
+    .catch((error) => {
+        console.error(error, mongoose.connections.length);
+    });
+getConnection()
+    .then(() => {
+        console.log('sucess!', mongoose.connections.length);
+    })
+    .catch((error) => {
+        console.error(error, mongoose.connections.length);
+    });
+getConnection()
+    .then(() => {
+        console.log('sucess!', mongoose.connections.length);
+    })
+    .catch((error) => {
+        console.error(error, mongoose.connections.length);
+    });
+// setInterval(
+//     () => {
+//         getConnection()
+//             .then(console.log)
+//             .catch(console.error);
+//     },
+//     1000
+// );

package/lib/chevre/index.js

@@ -10,7 +10,6 @@ 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;
-// import * as surfrock from '@surfrock/sdk';
 const credentials_1 = require("./credentials");
 Object.defineProperty(exports, "credentials", { enumerable: true, get: function () { return credentials_1.credentials; } });
 const errorHandler = require("./errorHandler");

package/lib/chevre/pecorinoapi.d.ts

@@ -1,6 +1,5 @@
 /**
  * Pecorino API Client
  */
-import { auth, pecorino } from '@cinerino/sdk';
-export import service = pecorino.service;
-export import auth = auth;
+import { auth, loadPecorino, pecorino } from '@cinerino/sdk';
+export { auth, loadPecorino, pecorino };

package/lib/chevre/pecorinoapi.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.auth = exports.service = void 0;
+exports.loadPecorino = exports.auth = void 0;
 /**
  * Pecorino API Client
  */
 const sdk_1 = require("@cinerino/sdk");
-exports.service = sdk_1.pecorino.service;
-exports.auth = sdk_1.auth;
+Object.defineProperty(exports, "auth", { enumerable: true, get: function () { return sdk_1.auth; } });
+Object.defineProperty(exports, "loadPecorino", { enumerable: true, get: function () { return sdk_1.loadPecorino; } });

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

@@ -139,13 +139,6 @@ export declare class MongoRepository {
     }): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
         acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered> | factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     }>;
-    /**
-     * 特典口座情報が未保管であれば保管する
-     */
-    saveAwardAccountsIfNotExist(parmas: {
-        orderNumber: string;
-        awardAccounts: factory.transaction.placeOrder.IAwardAccount[];
-    }): Promise<void>;
     /**
      * 注文に含まれる予約番号を検索する
      */

package/lib/chevre/repo/order.js

@@ -13,7 +13,6 @@ exports.MongoRepository = void 0;
 const factory = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const errorHandler_1 = require("../errorHandler");
-const order_2 = require("../factory/order");
 const settings_1 = require("../settings");
 /**
  * 注文リポジトリ
@@ -1022,21 +1021,25 @@ class MongoRepository {
                 .exec();
         });
     }
-    /**
-     * 特典口座情報が未保管であれば保管する
-     */
-    saveAwardAccountsIfNotExist(parmas) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (Array.isArray(parmas.awardAccounts)) {
-                const newIdentifier = { name: order_2.AWARD_ACCOUNTS_IDENTIFIER_NAME, value: JSON.stringify(parmas.awardAccounts) };
-                yield this.orderModel.findOneAndUpdate({
-                    orderNumber: { $eq: parmas.orderNumber },
-                    'identifier.name': { $ne: order_2.AWARD_ACCOUNTS_IDENTIFIER_NAME }
-                }, { $push: { identifier: newIdentifier } }, { new: true })
-                    .exec();
-            }
-        });
-    }
+    // 廃止(2023-10-15~)
+    // public async saveAwardAccountsIfNotExist(parmas: {
+    //     orderNumber: string;
+    //     awardAccounts: factory.transaction.placeOrder.IAwardAccount[];
+    // }) {
+    //     if (Array.isArray(parmas.awardAccounts)) {
+    //         const newIdentifier: factory.propertyValue.IPropertyValue<string>
+    //             = { name: AWARD_ACCOUNTS_IDENTIFIER_NAME, value: JSON.stringify(parmas.awardAccounts) };
+    //         await this.orderModel.findOneAndUpdate(
+    //             {
+    //                 orderNumber: { $eq: parmas.orderNumber },
+    //                 'identifier.name': { $ne: AWARD_ACCOUNTS_IDENTIFIER_NAME }
+    //             },
+    //             { $push: { identifier: newIdentifier } },
+    //             { new: true }
+    //         )
+    //             .exec();
+    //     }
+    // }
     /**
      * 注文に含まれる予約番号を検索する
      */

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

@@ -174,9 +174,9 @@ function fixFromLocation(params, product) {
             throw new factory.errors.ArgumentNull('amount.value');
         }
         const { permitServiceEndpoint, permitServiceAuthorizeServerDomain, permitServiceClientId, permitServiceClientSecret } = createPermitServiceCredentials({ product });
-        const permitService = new pecorinoapi.service.Permit({
+        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,
@@ -233,9 +233,9 @@ function fixToLocation(params, product) {
             throw new factory.errors.ArgumentNull('amount.value');
         }
         const { permitServiceEndpoint, permitServiceAuthorizeServerDomain, permitServiceClientId, permitServiceClientSecret } = createPermitServiceCredentials({ product });
-        const permitService = new pecorinoapi.service.Permit({
+        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,

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

@@ -141,9 +141,9 @@ function createPermitService(params) {
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
             throw new Error('product availableChannel invalid');
         }
-        return new pecorinoapi.service.Permit({
+        return new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,

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

@@ -648,9 +648,9 @@ function createPermitService(params) {
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
             throw new Error('product availableChannel invalid');
         }
-        return new pecorinoapi.service.Permit({
+        return new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,

package/lib/chevre/service/moneyTransfer.js

@@ -66,9 +66,9 @@ function processAccountTransaction(params) {
             .toDate();
         const issuedThroughId = getIssuedThroughId(params);
         const permitServiceCredentials = yield createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
-        const permitService = new pecorinoapi.service.Permit({
+        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceCredentials.permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: permitServiceCredentials.permitServiceClientId,
                 clientSecret: permitServiceCredentials.permitServiceClientSecret,
@@ -125,9 +125,9 @@ function processAccountTransaction(params) {
 function processDepositTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: params.permitServiceCredentials.permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: params.permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: params.permitServiceCredentials.permitServiceClientId,
                 clientSecret: params.permitServiceCredentials.permitServiceClientSecret,
@@ -155,9 +155,9 @@ function processDepositTransaction(params) {
 function processTransferTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: params.permitServiceCredentials.permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: params.permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: params.permitServiceCredentials.permitServiceClientId,
                 clientSecret: params.permitServiceCredentials.permitServiceClientSecret,
@@ -207,9 +207,9 @@ function processWithdrawTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         // 転送先口座が指定されていない場合は、出金取引
-        const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: params.permitServiceCredentials.permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: params.permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: params.permitServiceCredentials.permitServiceClientId,
                 clientSecret: params.permitServiceCredentials.permitServiceClientSecret,
@@ -362,9 +362,9 @@ function cancelMoneyTransfer(params) {
                     const issuedThroughId = getIssuedThroughIdByTransaction({ transaction });
                     const { permitServiceEndpoint, permitServiceAuthorizeServerDomain, permitServiceClientId, permitServiceClientSecret } = yield createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
                     // 汎用中止サービスを使用(2022-09-27~)
-                    const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+                    const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
                         endpoint: permitServiceEndpoint,
-                        auth: new pecorinoapi.auth.ClientCredentials({
+                        auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                             domain: permitServiceAuthorizeServerDomain,
                             clientId: permitServiceClientId,
                             clientSecret: permitServiceClientSecret,
@@ -399,9 +399,9 @@ function moneyTransfer(params) {
             const transactionNumber = yield fixAccountTransactionNumber(params)({ transactionNumber: repos.transactionNumber });
             const issuedThroughId = getIssuedThroughIdByAction({ action, pendingTransactionType: transactionType });
             const permitServiceCredentials = yield createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
-            const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+            const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
                 endpoint: permitServiceCredentials.permitServiceEndpoint,
-                auth: new pecorinoapi.auth.ClientCredentials({
+                auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                     domain: permitServiceCredentials.permitServiceAuthorizeServerDomain,
                     clientId: permitServiceCredentials.permitServiceClientId,
                     clientSecret: permitServiceCredentials.permitServiceClientSecret,
@@ -496,9 +496,9 @@ function processDepositFromNow(params, permitServiceCredentials, transactionNumb
         const description = (typeof params.description === 'string') ? params.description : params.purpose.typeOf;
         const permitIdentifier = String(params.toLocation.identifier);
         // Permitの存在確認
-        const permitService = new pecorinoapi.service.Permit({
+        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceCredentials.permitServiceEndpoint,
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: permitServiceCredentials.permitServiceClientId,
                 clientSecret: permitServiceCredentials.permitServiceClientSecret,

package/lib/chevre/service/payment/paymentCard.js

@@ -90,9 +90,9 @@ function validatePaymentMethod(params, paymentServiceId) {
             typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: paymentServiceId
         });
-        const permitService = new pecorinoapi.service.Permit({
+        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: String(availableChannel.serviceUrl),
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.authorizeServerDomain),
                 clientId: String((_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.clientId),
                 clientSecret: String((_h = availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.clientSecret),
@@ -146,9 +146,9 @@ function processAccountTransaction(params) {
             typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: params.paymentServiceId
         });
-        const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: String(availableChannel.serviceUrl),
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain),
                 clientId: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientId),
                 clientSecret: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.clientSecret),
@@ -198,9 +198,9 @@ function voidTransaction(params) {
             id: paymentServiceId
         });
         // 汎用中止サービスを使用(2022-09-27~)
-        const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: String(availableChannel.serviceUrl),
-            auth: new pecorinoapi.auth.ClientCredentials({
+            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: String((_a = availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.authorizeServerDomain),
                 clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
                 clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
@@ -234,9 +234,9 @@ function payPaymentCard(params) {
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
-            const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+            const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
                 endpoint: String(availableChannel.serviceUrl),
-                auth: new pecorinoapi.auth.ClientCredentials({
+                auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                     domain: String((_a = availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.authorizeServerDomain),
                     clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
                     clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
@@ -288,9 +288,9 @@ function refundPaymentCard(params) {
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
-            const accountTransactionService = new pecorinoapi.service.AccountTransaction({
+            const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
                 endpoint: String(availableChannel.serviceUrl),
-                auth: new pecorinoapi.auth.ClientCredentials({
+                auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
                     domain: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.authorizeServerDomain),
                     clientId: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.clientId),
                     clientSecret: String((_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.clientSecret),

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.334.0",
-    "@cinerino/sdk": "3.172.0",
+    "@cinerino/sdk": "4.0.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.13.0-alpha.4"
+  "version": "21.13.0-alpha.6"
 }