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

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -116,8 +116,7 @@ async function main() {
                                 options: {
                                     useCancelPayTransactionOnFailed: false,
                                     useCheckMovieTicketBeforePay: false,
-                                    useCheckByIdentifierIfNotYet: false,
-                                    useSearchTrade4accountId: false
+                                    useCheckByIdentifierIfNotYet: false
                                 }
                             })({
                                 accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),

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

@@ -94,7 +94,6 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
     useCheckMovieTicketBeforePay: boolean;
     useCheckByIdentifierIfNotYet: boolean;
-    searchTrade4accountId: boolean;
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**

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

@@ -41,7 +41,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false, processPublishPaymentUrl: true })(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { processPublishPaymentUrl: true })(repos);
                 let paymentUrl;
                 // 3DS拡張(2024-01-02~)
                 const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
@@ -147,7 +147,7 @@ function start(params, options) {
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 transaction =
-                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({}, (options.pendingPaymentAgencyTransaction !== undefined)
                         ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
                         : undefined))(repos);
                 break;
@@ -305,7 +305,7 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 }
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         return saveAuthorizeResult({

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

@@ -110,7 +110,6 @@ declare function authorize(params: {
         useCancelPayTransactionOnFailed: boolean;
         useCheckMovieTicketBeforePay: boolean;
         useCheckByIdentifierIfNotYet: boolean;
-        useSearchTrade4accountId: boolean;
     };
 }): IAuthorizeOperation<{
     /**

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

@@ -358,7 +358,7 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, searchTrade4accountId: params.options.useSearchTrade4accountId }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }
         catch (error) {
             try {

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

@@ -24,7 +24,6 @@ type IAuthorizeResult = IPaymentAgencyTransaction & {
  * クレジットカード決済承認
  */
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, options: {
-    searchTrade4accountId: boolean;
     pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
     /**
      * 決済URL発行処理かどうか

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

@@ -25,9 +25,8 @@ const debug = createDebug('chevre-domain:service:payment');
  * クレジットカード決済承認
  */
 function authorize(params, paymentServiceId, options) {
-    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
@@ -50,7 +49,7 @@ function authorize(params, paymentServiceId, options) {
         }
         // GMOオーソリ取得
         let authorizeResult;
-        let searchTradeResult;
+        // let searchTradeResult: GMO.factory.credit.ISearchTradeResult | undefined;
         try {
             const pendingPaymentAgencyTransaction = options.pendingPaymentAgencyTransaction;
             const redirectUrl = (_c = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _c === void 0 ? void 0 : _c.redirectUrl;
@@ -78,31 +77,13 @@ function authorize(params, paymentServiceId, options) {
         catch (error) {
             throw handleAuthorizeError(error);
         }
-        const searchTrade4accountId = (options === null || options === void 0 ? void 0 : options.searchTrade4accountId) === true;
-        if (searchTrade4accountId) {
-            try {
-                const creditCardService = new GMO.service.Credit({
-                    endpoint: String(availableChannel.serviceUrl),
-                    useFetch: credentials_1.credentials.gmo.useFetch
-                }, { 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: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                    sitePass: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.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 Object.assign({ accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
+        // クレジットカード詳細情報取得廃止(2024-03-19~)
+        // const searchTrade4accountId = options?.searchTrade4accountId === true;
+        // if (searchTrade4accountId) {
+        // }
+        return Object.assign({ 
+            // accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '',
+            accountId: '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
     });
 }
 exports.authorize = authorize;

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": "21.27.0-alpha.3"
+  "version": "21.27.0-alpha.4"
 }