@chevre/domain 20.12.0-alpha.1 → 20.12.0

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

@@ -13,6 +13,7 @@ import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
 import { MongoRepository as TaskRepo } from '../../repo/task';
+import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
@@ -89,7 +90,9 @@ export declare function invalidatePaymentUrl(params: factory.task.refund.IData):
 /**
  * 決済方法認証
  */
-export declare function check(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<factory.action.check.paymentMethod.movieTicket.IAction>;
+export declare function check(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<{
+    result: MovieTicketPayment.ICheckResult;
+}>;
 /**
  * 取引開始
  */

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

@@ -80,7 +80,9 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
 /**
  * 決済方法認証
  */
-function check(params) {
+function check(params
+// ): ICheckOperation<factory.action.check.paymentMethod.movieTicket.IAction> {
+) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         let action;

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -59,9 +59,9 @@ function processVoidTransaction4coa(params) {
         const action = params.action;
         // COAの場合、resultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
         if (action.result !== undefined) {
-            const updTmpReserveSeatArgs = action.result.requestBody;
-            const updTmpReserveSeatResult = action.result.responseBody;
-            if (updTmpReserveSeatArgs !== undefined && updTmpReserveSeatResult !== undefined) {
+            const coaRequestBody = action.result.requestBody;
+            const coaResponseBody = action.result.responseBody;
+            if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
                 // COAで仮予約取消
                 try {
                     const reserveService = new COA.service.Reserve({
@@ -69,12 +69,12 @@ function processVoidTransaction4coa(params) {
                         auth: coaAuthClient
                     }, { timeout: credentials_1.credentials.coa.timeout });
                     yield reserveService.delTmpReserve({
-                        theaterCode: updTmpReserveSeatArgs.theaterCode,
-                        dateJouei: updTmpReserveSeatArgs.dateJouei,
-                        titleCode: updTmpReserveSeatArgs.titleCode,
-                        titleBranchNum: updTmpReserveSeatArgs.titleBranchNum,
-                        timeBegin: updTmpReserveSeatArgs.timeBegin,
-                        tmpReserveNum: updTmpReserveSeatResult.tmpReserveNum
+                        theaterCode: coaRequestBody.theaterCode,
+                        dateJouei: coaRequestBody.dateJouei,
+                        titleCode: coaRequestBody.titleCode,
+                        titleBranchNum: coaRequestBody.titleBranchNum,
+                        timeBegin: coaRequestBody.timeBegin,
+                        tmpReserveNum: coaResponseBody.tmpReserveNum
                     });
                 }
                 catch (error) {
@@ -88,9 +88,6 @@ function processVoidTransaction4coa(params) {
                             if (error.message === '座席取消失敗') {
                                 deleted = true;
                             }
-                            // if (action.actionStatus === factory.actionStatusType.CanceledActionStatus) {
-                            //     deleted = true;
-                            // }
                         }
                     }
                     if (!deleted) {

package/lib/chevre/service/offer/eventServiceByCOA.js

@@ -53,8 +53,6 @@ function authorize(params) {
             seatingTypes,
             videoFormatTypes
         })(repos);
-        const updTmpReserveSeatArgs = params.result.requestBody;
-        const updTmpReserveSeatResult = params.result.responseBody;
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
             acceptedOffers,
@@ -78,7 +76,7 @@ function authorize(params) {
         // 座席仮予約からオファー情報を生成する
         const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
         const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
-            responseBody: updTmpReserveSeatResult,
+            responseBody: params.result.responseBody,
             object: action.object,
             event: screeningEvent,
             seller: transaction.seller,
@@ -86,7 +84,9 @@ function authorize(params) {
                 .toDate(),
             totalPrice: price
         });
-        const result = Object.assign({ price: price, priceCurrency: factory.priceCurrency.JPY, 
+        const result = {
+            price: price,
+            priceCurrency: factory.priceCurrency.JPY,
             // eligibleMonetaryAmountを使用(2023-03-08~)
             // amount: (requiredPoint > 0)
             //     ? [{
@@ -95,8 +95,13 @@ function authorize(params) {
             //         value: requiredPoint
             //     }]
             //     : [],
-            amount: eligibleMonetaryAmount, requestBody: updTmpReserveSeatArgs, responseBody: updTmpReserveSeatResult, acceptedOffers: acceptedOffers4result }, { updTmpReserveSeatArgs, updTmpReserveSeatResult } // 互換性維持のため
-        );
+            amount: eligibleMonetaryAmount,
+            requestBody: params.result.requestBody,
+            responseBody: params.result.responseBody,
+            acceptedOffers: acceptedOffers4result
+            // 不要なので廃止(2023-03-27~)
+            // ...{ updTmpReserveSeatArgs, updTmpReserveSeatResult } // 互換性維持のため
+        };
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }

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

@@ -34,11 +34,12 @@ interface IRefundOperationRepos {
     task: TaskRepo;
 }
 declare type IRefundOperation<T> = (repos: IRefundOperationRepos) => Promise<T>;
-declare type ICheckMovieTicketAction = factory.action.check.paymentMethod.movieTicket.IAction;
 /**
  * MovieTicket認証
  */
-declare function checkMovieTicket(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<ICheckMovieTicketAction>;
+declare function checkMovieTicket(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<{
+    result: ICheckResult;
+}>;
 interface IAuthorizeResult {
     accountId: string;
     checkResult?: ICheckResult;

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

@@ -23,6 +23,7 @@ const validation_1 = require("./movieTicket/validation");
 const errorHandler_1 = require("../../errorHandler");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
+// type ICheckMovieTicketAction = factory.action.check.paymentMethod.movieTicket.IAction;
 /**
  * MovieTicket認証
  */
@@ -84,8 +85,16 @@ function checkMovieTicket(params) {
             error = (0, errorHandler_1.handleMvtkReserveError)(error);
             throw error;
         }
-        const result = checkResult;
-        return repos.action.complete({ typeOf: actionAttributes.typeOf, id: action.id, result: result });
+        const result = {
+            purchaseNumberAuthIn: checkResult.purchaseNumberAuthIn,
+            purchaseNumberAuthResult: checkResult.purchaseNumberAuthResult,
+            // action.resultへの保管を廃止(2023-03-24~)
+            movieTickets: []
+        };
+        yield repos.action.complete({ typeOf: actionAttributes.typeOf, id: action.id, result });
+        return {
+            result: checkResult
+        };
     });
 }
 exports.checkMovieTicket = checkMovieTicket;

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.12.0-alpha.1"
+  "version": "20.12.0"
 }