@chevre/domain 20.7.0-alpha.5 → 20.7.0-alpha.6

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

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

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

@@ -104,7 +104,7 @@ exports.check = check;
 /**
  * 取引開始
  */
-function start(params) {
+function start(params, useCheckMovieTicketBeforePay) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // 金額をfix
@@ -138,7 +138,8 @@ function start(params) {
                 transaction = yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                transaction = yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id))(repos);
+                transaction =
+                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), useCheckMovieTicketBeforePay)(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -267,9 +268,9 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
         })(repos);
     });
 }
-function processAuthorizeMovieTicket(params, transaction, paymentServiceId) {
+function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { accountId, checkResult, payAction } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId)(repos);
+        const { accountId, checkResult, payAction } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
             update: Object.assign({ 'object.accountId': accountId, 'object.paymentMethod.accountId': accountId, 'object.payAction': payAction }, (checkResult !== undefined) ? { 'object.checkResult': checkResult } : undefined)

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

@@ -112,5 +112,6 @@ declare function authorize(params: {
      * アクション失敗時に即時に決済取引を中止するかどうか
      */
     useCancelPayTransactionOnFailed: boolean;
+    useCheckMovieTicketBeforePay: boolean;
 }): IAuthorizeOperation<IAuthorizePaymentAction>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

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

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -7,7 +7,7 @@ import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { MongoRepository as SellerRepo } from '../../../repo/seller';
 import { ICheckResult } from './checkByIdentifier';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
     event: EventRepo;
     product: ProductRepo;
     project: ProjectRepo;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -15,8 +15,7 @@ exports.validateMovieTicket = void 0;
  */
 const factory = require("../../../factory");
 const checkByIdentifier_1 = require("./checkByIdentifier");
-const settings_1 = require("../../../settings");
-function validateMovieTicket(params, paymentServiceId) {
+function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const movieTickets = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.movieTickets;
@@ -53,7 +52,7 @@ function validateMovieTicket(params, paymentServiceId) {
             throw new factory.errors.Argument('recipient', 'payment not accepted');
         }
         // オプション追加(2023-03-06~)
-        if (!settings_1.settings.useCheckMovieTicketBeforePay) {
+        if (!useCheckMovieTicketBeforePay) {
             return;
         }
         const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({

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

@@ -48,7 +48,7 @@ interface IAuthorizeResult {
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;

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

@@ -93,7 +93,7 @@ exports.checkMovieTicket = checkMovieTicket;
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-function authorize(params, transaction, paymentServiceId) {
+function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
@@ -101,7 +101,7 @@ function authorize(params, transaction, paymentServiceId) {
         let payAction;
         try {
             // MovieTicket決済の場合、認証
-            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId)(repos);
+            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;

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

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

package/lib/chevre/settings.d.ts

@@ -24,7 +24,6 @@ export declare type ISettings = factory.project.ISettings & {
     useAggregateEntranceGateProjects: string[];
     useAggregateOfferProjects: string[];
     useOfferRateLimitProjects: string[];
-    useCheckMovieTicketBeforePay: boolean;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;

package/lib/chevre/settings.js

@@ -100,4 +100,4 @@ exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrder
         ? process.env.USE_AGGREGATE_OFFER_PROJECTS.split(',')
         : [], useOfferRateLimitProjects: (typeof process.env.USE_OFFER_RATE_LIMIT_PROJECTS === 'string')
         ? process.env.USE_OFFER_RATE_LIMIT_PROJECTS.split(',')
-        : [], useCheckMovieTicketBeforePay: process.env.USE_CHECK_MOVIE_TICKET_BEFORE_PAY === '1' });
+        : [] });

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.7.0-alpha.5"
+  "version": "20.7.0-alpha.6"
 }