@chevre/domain 21.2.0-alpha.92 → 21.2.0-alpha.93

package/example/src/chevre/processPay.ts

@@ -63,7 +63,8 @@ async function main() {
                 name: 'xx'
             }
         },
-        true
+        true,
+        false
     )({
         accountingReport: accountingReportRepo,
         action: actionRepo,

package/example/src/chevre/searchActions.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  mongoose from 'mongoose';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+
+    const actionRepo = new chevre.repository.Action(mongoose.connection);
+    const actions = await actionRepo.search(
+        {
+            object: { reservationNumber: { $eq: 'xxx' } }
+        },
+        ['_id'],
+        []
+    );
+    console.log('actions:', actions);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -96,7 +96,7 @@ export declare function check(params: factory.action.check.paymentMethod.movieTi
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, useCheckMovieTicketBeforePay: boolean): IStartOperation<factory.assetTransaction.pay.ITransaction>;
+export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, useCheckMovieTicketBeforePay: boolean, searchTrade4accountId: boolean): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定
  */

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

@@ -42,7 +42,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId)(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, false)(repos);
                 const acsUrl = authorizeResult.execTranResult.acsUrl;
                 if (typeof acsUrl !== 'string' || acsUrl.length === 0) {
                     throw new factory.errors.ServiceUnavailable('Payment URL unable to publish');
@@ -106,7 +106,7 @@ exports.check = check;
 /**
  * 取引開始
  */
-function start(params, useCheckMovieTicketBeforePay) {
+function start(params, useCheckMovieTicketBeforePay, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // 金額をfix
@@ -137,7 +137,8 @@ function start(params, useCheckMovieTicketBeforePay) {
                 transaction = yield processAuthorizeAccount(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                transaction = yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
+                transaction =
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), searchTrade4accountId)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
@@ -253,9 +254,9 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
         })(repos);
     });
 }
-function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
+function processAuthorizeCreditCard(params, transaction, paymentServiceId, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId)(repos);
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, searchTrade4accountId)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
             update: {

package/lib/chevre/service/payment/any.d.ts

@@ -113,5 +113,6 @@ declare function authorize(params: {
      */
     useCancelPayTransactionOnFailed: boolean;
     useCheckMovieTicketBeforePay: boolean;
+    useSearchTrade4accountId: boolean;
 }): IAuthorizeOperation<IAuthorizePaymentAction>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -314,7 +314,7 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, params.useCheckMovieTicketBeforePay)(repos);
+            payTransaction = yield PayTransactionService.start(startParams, params.useCheckMovieTicketBeforePay, params.useSearchTrade4accountId)(repos);
         }
         catch (error) {
             try {

package/lib/chevre/service/payment/creditCard.d.ts

@@ -13,7 +13,7 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * クレジットカード決済承認
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, searchTrade4accountId: boolean): (repos: {
     person: PersonRepo;
     product: ProductRepo;
     project: ProjectRepo;

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

@@ -21,11 +21,11 @@ const factory = require("../../factory");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
 const person2username_1 = require("./any/person2username");
-const debug = createDebug('chevre-domain:service');
+const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
  */
-function authorize(params, paymentServiceId) {
+function authorize(params, paymentServiceId, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const project = yield repos.project.findById({ id: params.project.id });
@@ -65,19 +65,25 @@ function authorize(params, paymentServiceId) {
         catch (error) {
             throw handleAuthorizeError(error);
         }
-        try {
-            const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
-            // ベストエフォートでクレジットカード詳細情報を取得
-            searchTradeResult = yield creditCardService.searchTrade({
-                shopId: shopId,
-                shopPass: shopPass,
-                orderId: orderId,
-                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
-            });
-        }
-        catch (error) {
-            // no op
+        if (searchTrade4accountId) {
+            try {
+                const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+                // ベストエフォートでクレジットカード詳細情報を取得
+                const startSearchTradeDate = Date.now();
+                debug('searchTrade processing...orderId:', orderId, startSearchTradeDate);
+                searchTradeResult = yield creditCardService.searchTrade({
+                    shopId: shopId,
+                    shopPass: shopPass,
+                    orderId: orderId,
+                    siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                    sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                });
+                debug('searchTrade processed. orderId:', orderId, 'execution time:', (Date.now() - startSearchTradeDate), 'ms');
+            }
+            catch (error) {
+                // no op
+                debug('searchTrade throwed an error. orderId:', orderId, error);
+            }
         }
         return {
             accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '',

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -339,7 +339,8 @@ function processAuthorizeCreditCard(params) {
             purpose: params.purpose,
             paymentServiceType: factory.service.paymentService.PaymentServiceType.CreditCard,
             useCancelPayTransactionOnFailed: false,
-            useCheckMovieTicketBeforePay: false
+            useCheckMovieTicketBeforePay: false,
+            useSearchTrade4accountId: false
         })(repos);
     });
 }

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.92"
+  "version": "21.2.0-alpha.93"
 }

package/example/src/chevre/searchSellers.ts

@@ -1,33 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
-    const sellers = await sellerRepo.search({
-        hasMerchantReturnPolicy: { itemCondition: { id: { $eq: '646dc7848b3c1437d43dbfeb' } } }
-    });
-    console.log('sellers:', sellers);
-
-    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
-    const reserveTransactions = await assetTransactionRepo.search({
-        limit: 1,
-        typeOf: chevre.factory.assetTransactionType.Reserve,
-        object: {
-            reservationNumber: { $eq: 'xxx' }
-            // reservationFor: { id: { $eq: 'xxx' } }
-        }
-    });
-    console.log('reserveTransactions:', reserveTransactions);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);