@chevre/domain 21.34.0-alpha.12 → 21.34.0-alpha.14

package/example/src/chevre/migrateCheckMovieTicketRecipes.ts

@@ -15,12 +15,12 @@ async function main() {
             typeOf: { $eq: chevre.factory.actionType.CheckAction },
             actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
             startDate: {
-                // $lte: moment()
-                //     // tslint:disable-next-line:no-magic-numbers
-                //     .add(-29, 'days'),
+                $lte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-28, 'days'),
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-30, 'days')
+                    .add(-180, 'days')
             },
             'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
         },

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

@@ -114,7 +114,6 @@ async function main() {
                                 },
                                 options: {
                                     useCancelPayTransactionOnFailed: false,
-                                    useCheckMovieTicketBeforePay: false,
                                     useCheckByIdentifierIfNotYet: false,
                                     useUnlockTransactionProcess: false
                                 }

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

@@ -111,7 +111,6 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
  * 取引開始
  */
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
-    useCheckMovieTicketBeforePay: boolean;
     useCheckByIdentifierIfNotYet: boolean;
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
     /**

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

@@ -223,7 +223,7 @@ function start(params, options) {
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
-                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckMovieTicketBeforePay, options.useCheckByIdentifierIfNotYet, {
+                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckByIdentifierIfNotYet, {
                         executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {}
                     })(repos);
                 break;
@@ -389,9 +389,9 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, optio
         })(repos);
     });
 }
-function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet, options) {
+function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet, options)(repos);
+        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options)(repos);
         const payActionInObject = {
             actionStatus: payAction.actionStatus,
             id: payAction.id,

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

@@ -132,7 +132,6 @@ declare function authorize(params: {
          * アクション失敗時に即時に決済取引を中止するかどうか
          */
         useCancelPayTransactionOnFailed: boolean;
-        useCheckMovieTicketBeforePay: boolean;
         useCheckByIdentifierIfNotYet: boolean;
         useUnlockTransactionProcess: boolean;
     };

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

@@ -381,7 +381,7 @@ function authorize(params) {
                 location: params.location,
                 order: Object.assign({}, (typeof confirmationNumber === 'string') ? { confirmationNumber } : undefined)
             });
-            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {} }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {} }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }
         catch (error) {
             try {

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

@@ -15,7 +15,7 @@ interface IAuthorizeResult {
  * 決済カード承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean, options: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean, options: {
     /**
      * 実行者
      */

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

@@ -18,7 +18,7 @@ const validation_1 = require("./validation");
  * 決済カード承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet, options) {
+function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
@@ -26,7 +26,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckByIdentifierIfNotYet)(repos);
             accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);

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

@@ -4,7 +4,7 @@ import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean): (repos: {
     action: ActionRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;

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

@@ -14,7 +14,7 @@ const createDebug = require("debug");
 const factory = require("../../../factory");
 const processPurchaseNumberAuth_1 = require("./processPurchaseNumberAuth");
 const debug = createDebug('chevre-domain:service:payment');
-function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
+function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNotYet) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -73,10 +73,6 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
         }
-        // オプション追加(2023-03-06~)
-        if (!useCheckMovieTicketBeforePay) {
-            return { accountsReceivablesByServiceType: [] };
-        }
         const checkResult = yield checkByIdentifierIfNotYet({
             movieTicketIdentifier,
             movieTickets: movieTickets,

package/package.json

@@ -10,12 +10,12 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.20",
+    "@chevre/factory": "4.374.0-alpha.22",
     "@cinerino/sdk": "7.1.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.3.0-alpha.2",
+    "@surfrock/sdk": "1.3.0",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.34.0-alpha.12"
+  "version": "21.34.0-alpha.14"
 }