@chevre/domain 20.12.0-alpha.0 → 20.12.0-alpha.2

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/payment/movieTicket/validation.js

@@ -15,6 +15,7 @@ exports.validateMovieTicket = void 0;
  */
 const factory = require("../../../factory");
 const checkByIdentifier_1 = require("./checkByIdentifier");
+// tslint:disable-next-line:max-func-body-length
 function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
@@ -61,21 +62,39 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             screeningEvent: screeningEvent,
             paymentServiceId
         })(repos);
+        // checkResult.movieTicketsへの依存排除(2023-03-24~)
         // 要求に対して十分かどうか検証する
-        const availableMovieTickets = checkResult.movieTickets.filter((t) => { var _a; return ((_a = t.amount) === null || _a === void 0 ? void 0 : _a.validThrough) === undefined; });
-        // 総数が足りているか
-        if (availableMovieTickets.length < movieTickets.length) {
-            throw new factory.errors.Argument('movieTickets', `${movieTickets.length - availableMovieTickets.length} movie tickets short`);
-        }
+        // const availableMovieTickets = checkResult.movieTickets.filter((t) => t.amount?.validThrough === undefined);
+        // 総数が足りているか(券種ごとに枚数検証を実行するので不要)
+        // if (availableMovieTickets.length < movieTickets.length) {
+        //     throw new factory.errors.Argument(
+        //         'movieTickets',
+        //         `${movieTickets.length - availableMovieTickets.length} movie tickets short`
+        //     );
+        // }
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
         serviceTypes.forEach((serviceType) => {
-            const availableMovieTicketsByServiceType = availableMovieTickets.filter((t) => t.serviceType === serviceType);
-            const requiredMovieTicketsByServiceType = movieTickets.filter((t) => t.serviceType === serviceType);
-            if (availableMovieTicketsByServiceType.length < requiredMovieTicketsByServiceType.length) {
-                const shortNumber = requiredMovieTicketsByServiceType.length - availableMovieTicketsByServiceType.length;
+            var _a, _b, _c;
+            const requiredMovieTicketsCountByServiceType = movieTickets.filter((t) => t.serviceType === serviceType).length;
+            let availableMovieTicketsCountByServiceType = 0;
+            const ykknInfos = (_b = (_a = checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicketIdentifiers[0])) === null || _b === void 0 ? void 0 : _b.ykknInfo;
+            const ykknKnshbtsmiNum = (_c = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType)) === null || _c === void 0 ? void 0 : _c.ykknKnshbtsmiNum;
+            if (typeof ykknKnshbtsmiNum === 'string') {
+                availableMovieTicketsCountByServiceType = Number(ykknKnshbtsmiNum);
+            }
+            if (availableMovieTicketsCountByServiceType < requiredMovieTicketsCountByServiceType) {
+                const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsCountByServiceType;
                 throw new factory.errors.Argument('movieTickets', `${shortNumber} movie tickets by service type ${serviceType} short`);
             }
+            // const availableMovieTicketsByServiceType = availableMovieTickets.filter((t) => t.serviceType === serviceType);
+            // if (availableMovieTicketsByServiceType.length < requiredMovieTicketsCountByServiceType) {
+            //     const shortNumber = requiredMovieTicketsCountByServiceType - availableMovieTicketsByServiceType.length;
+            //     throw new factory.errors.Argument(
+            //         'movieTickets',
+            //         `${shortNumber} movie tickets by service type ${serviceType} short`
+            //     );
+            // }
         });
         // checkはするが保管は保留(2023-03-09~)
         return;

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