@chevre/domain 21.2.0-alpha.47 → 21.2.0-alpha.48

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

@@ -272,10 +272,16 @@ function processAuthorizeCreditCard(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, useCheckMovieTicketBeforePay)(repos);
+        const { accountId, payAction, accountsReceivablesByServiceType } = 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)
+            update: {
+                'object.accountId': accountId,
+                'object.paymentMethod.accountId': accountId,
+                'object.payAction': payAction,
+                // 認証レスポンスより計上金額を保管(2023-05-15~)
+                'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType
+            }
         })(repos);
     });
 }

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

@@ -6,10 +6,14 @@ import { MongoRepository as EventRepo } from '../../../repo/event';
 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, useCheckMovieTicketBeforePay: boolean): (repos: {
     event: EventRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
-}) => Promise<ICheckResult | undefined>;
+}) => Promise<{
+    accountsReceivablesByServiceType: {
+        serviceType: string;
+        accountsReceivable?: number;
+    }[];
+}>;

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

@@ -15,8 +15,8 @@ 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) {
+    // tslint:disable-next-line:max-func-body-length
     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;
@@ -54,7 +54,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         }
         // オプション追加(2023-03-06~)
         if (!useCheckMovieTicketBeforePay) {
-            return;
+            return { accountsReceivablesByServiceType: [] };
         }
         const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
             movieTickets: movieTickets,
@@ -62,24 +62,16 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             screeningEvent: screeningEvent,
             paymentServiceId
         })(repos);
-        // checkResult.movieTicketsへの依存排除(2023-03-24~)
-        // 要求に対して十分かどうか検証する
-        // 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 accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
         serviceTypes.forEach((serviceType) => {
-            var _a, _b, _c;
+            var _a, _b;
             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;
+            const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === serviceType);
+            const ykknKnshbtsmiNum = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.ykknKnshbtsmiNum;
             if (typeof ykknKnshbtsmiNum === 'string') {
                 availableMovieTicketsCountByServiceType = Number(ykknKnshbtsmiNum);
             }
@@ -87,18 +79,13 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
                 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`
-            //     );
-            // }
+            // checkResultから計上金額を取得
+            const accountsReceivableByResponse = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+            accountsReceivablesByServiceType.push(Object.assign({ serviceType }, (typeof accountsReceivableByResponse === 'string')
+                ? { accountsReceivable: Number(accountsReceivableByResponse) }
+                : undefined));
         });
-        // checkはするが保管は保留(2023-03-09~)
-        return;
-        // return checkResult;
+        return { accountsReceivablesByServiceType };
     });
 }
 exports.validateMovieTicket = validateMovieTicket;

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

@@ -42,7 +42,10 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 }>;
 interface IAuthorizeResult {
     accountId: string;
-    checkResult?: ICheckResult;
+    accountsReceivablesByServiceType: {
+        serviceType: string;
+        accountsReceivable?: number;
+    }[];
     payAction: factory.action.trade.pay.IAction;
 }
 /**

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

@@ -106,11 +106,12 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
-        let checkResult;
         let payAction;
+        let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             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;
@@ -141,7 +142,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
         catch (error) {
             throw (0, errorHandler_1.handleMvtkReserveError)(error);
         }
-        return { accountId, checkResult, payAction };
+        return { accountId, payAction, accountsReceivablesByServiceType };
     });
 }
 exports.authorize = authorize;

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.47"
+  "version": "21.2.0-alpha.48"
 }