@chevre/domain 22.7.0-alpha.7 → 22.7.0-alpha.9

package/lib/chevre/repo/passport.js

@@ -96,12 +96,20 @@ class PassportRepo {
                     });
                 }
                 catch (error) {
-                    throw new factory.errors.Argument('Passport Token', `Invalid token: ${error.message}`);
+                    let message = `Invalid token: ${error.message}`;
+                    if (error instanceof jwt.JsonWebTokenError) {
+                        // remove -> 'jwt issuer invalid. expected: [OPTIONS ISSUER]'
+                        const indexOfExpected = message.indexOf('expected:');
+                        if (indexOfExpected >= 0) {
+                            message = message.substring(0, indexOfExpected);
+                        }
+                    }
+                    throw new factory.errors.Argument('passport.token', message);
                 }
                 // 許可証バリデーション
                 if (typeof this.options.passportValidator === 'function') {
                     if (!this.options.passportValidator({ passport })) {
-                        throw new factory.errors.Argument('Passport Token', 'passportValidator requirement not satisfied');
+                        throw new factory.errors.Argument('passport.token', 'passportValidator requirement not satisfied');
                     }
                 }
                 // カスタマータイプ決定(2023-11-20~)

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

@@ -8,4 +8,8 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
     amount: number;
     paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'>;
     location?: factory.action.trade.pay.ILocation;
+}, options: {
+    checkedAction: {
+        id: string;
+    };
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Pay>;

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

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-function createStartParams(params) {
+function createStartParams(params, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
@@ -106,15 +106,9 @@ function createStartParams(params) {
         : undefined), (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard)
         ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
         : undefined);
-    const object = {
-        // パラメータから必要なもののみ取り込む
-        accountId: (typeof accountId === 'string') ? accountId : '',
-        paymentMethodId: params.transactionNumber,
-        typeOf: params.paymentServiceType,
-        id: paymentServiceId,
-        onPaymentStatusChanged: { informPayment: informPaymentParams },
-        paymentMethod
-    };
+    const object = Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, onPaymentStatusChanged: { informPayment: informPaymentParams }, paymentMethod }, (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
+        ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
+        : undefined);
     return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
         ? { location: params.location }
         : undefined);

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

@@ -205,7 +205,8 @@ function start(params, options) {
         const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { transactionNumber,
             paymentServiceType,
             amount,
-            paymentService }));
+            paymentService }), { checkedAction: options.checkedAction } // 連携(2024-12-13~)
+        );
         transaction = yield repos.assetTransaction.start(startParams);
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:

package/lib/chevre/service/payment/factory/createPayObjectServiceOutput.d.ts

@@ -8,6 +8,9 @@ declare function createPayObjectServiceOutput(params: {
     order: {
         acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
     };
+    checkResult?: {
+        purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
+    };
 }): factory.invoice.IPaymentServiceOutput | undefined;
 type IAcceptedOfferMovieTicketUsed = Pick<factory.order.IAcceptedOffer<factory.order.IReservation>, 'itemOffered' | 'priceSpecification'>;
 export { createPayObjectServiceOutput, IAcceptedOfferMovieTicketUsed };

package/lib/chevre/service/payment/factory/createPayObjectServiceOutput.js

@@ -36,12 +36,24 @@ function createPayObjectServiceOutput(params) {
     return paymentServiceOutput;
 }
 exports.createPayObjectServiceOutput = createPayObjectServiceOutput;
-function movieTicket2amount(transaction, movieTicket) {
-    var _a;
+function movieTicket2amount(transaction, movieTicket, checkResult) {
+    var _a, _b, _c;
     let amount;
+    // accountsReceivablesByServiceTypeへの依存をactionRecipeへ移行可能か？(2024-12-13~)
+    const ykknInfos = (_b = (_a = checkResult === null || checkResult === void 0 ? void 0 : checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find((knyknrNoInfoOut) => knyknrNoInfoOut.knyknrNo === movieTicket.identifier)) === null || _b === void 0 ? void 0 : _b.ykknInfo;
+    const ykknInfoOfServiceType = ykknInfos === null || ykknInfos === void 0 ? void 0 : ykknInfos.find((ykknInfo) => ykknInfo.ykknshTyp === movieTicket.serviceType);
+    const accountsReceivableByResponse = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+    // tslint:disable-next-line:no-console
+    console.log('movieTicket2amount:', transaction.object.paymentMethodId, movieTicket.identifier, movieTicket.serviceOutput, 'accountsReceivableByResponse:', accountsReceivableByResponse);
+    if (typeof accountsReceivableByResponse === 'string') {
+        // amount = {
+        //     typeOf: 'MonetaryAmount',
+        //     value: Number(accountsReceivableByResponse)
+        // };
+    }
     const accountsReceivables = transaction.object.accountsReceivablesByServiceType;
     if (Array.isArray(accountsReceivables)) {
-        const accountsReceivable = (_a = accountsReceivables.find((a) => a.serviceType === movieTicket.serviceType)) === null || _a === void 0 ? void 0 : _a.accountsReceivable;
+        const accountsReceivable = (_c = accountsReceivables.find((a) => a.serviceType === movieTicket.serviceType)) === null || _c === void 0 ? void 0 : _c.accountsReceivable;
         if (typeof accountsReceivable === 'number') {
             amount = {
                 typeOf: 'MonetaryAmount',

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

@@ -9,5 +9,8 @@ declare function createPayOrderAction(params: {
     order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
         acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
     };
+    checkResult?: {
+        purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
+    };
 }): Pick<factory.action.trade.pay.IAttributes, 'agent' | 'instrument' | 'location' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'recipient' | 'typeOf'>;
 export { createPayOrderAction, IAcceptedOfferMovieTicketUsed };

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

@@ -1,6 +1,3 @@
-/**
- * 決済サービス
- */
 import type { AcceptedOfferRepo } from '../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../repo/accountingReport';
 import type { ActionRepo } from '../repo/action';
@@ -42,6 +39,7 @@ export declare function payTask2payActionAttributes(params: factory.task.pay.IDa
         typeOf: 'Task';
     };
 }): (repos: {
+    action: ActionRepo;
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;

package/lib/chevre/service/payment.js

@@ -10,12 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refund = exports.voidPayment = exports.pay = exports.payTask2payActionAttributes = exports.fixOrderAsPurpose = void 0;
+/**
+ * 決済サービス
+ */
+const createDebug = require("debug");
 const factory = require("../factory");
 const CreditCardPaymentService = require("./payment/creditCard");
 const FaceToFacePaymentService = require("./payment/faceToFace");
 const factory_1 = require("./payment/factory");
 const MovieTicketPaymentService = require("./payment/movieTicket");
 const PaymentCardPaymentService = require("./payment/paymentCard");
+const debug = createDebug('chevre-domain:service:payment');
 function fixOrderAsPurpose(params, transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -57,7 +62,7 @@ function fixOrderAsPurpose(params, transaction) {
 exports.fixOrderAsPurpose = fixOrderAsPurpose;
 function payTask2payActionAttributes(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const { object, potentialActions, purpose, typeOf } = params;
         if (typeOf === factory.actionType.PayAction) {
             // 返金手数料決済の場合
@@ -87,12 +92,30 @@ function payTask2payActionAttributes(params) {
                 throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
             }
             const order = yield fixOrderAsPurpose({ potentialActions: { pay: { purpose: params.purpose } } }, transaction)(repos);
+            // 認証アクションのactionRecipeを検索(2024-12-13~)
+            let checkResult;
+            const checkedActionId = (_b = transaction.object.checkedAction) === null || _b === void 0 ? void 0 : _b.id;
+            if (typeof checkedActionId === 'string' && checkedActionId !== '') {
+                const recipe = yield repos.action.findRecipeByAction({
+                    project: { id: transaction.project.id },
+                    recipeFor: { id: checkedActionId }
+                });
+                const directionPurchaseNumberAuth = (_d = (_c = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _c === void 0 ? void 0 : _c.itemListElement[0]) === null || _d === void 0 ? void 0 : _d.itemListElement[0];
+                if (directionPurchaseNumberAuth !== undefined) {
+                    const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
+                    if (beforeMedia !== undefined && afterMedia !== undefined) {
+                        checkResult = { purchaseNumberAuthIn: beforeMedia, purchaseNumberAuthResult: afterMedia };
+                    }
+                }
+                debug('payTask2payActionAttributes: checkResult found.', checkResult);
+            }
             const payOrderAction = (0, factory_1.createPayOrderAction)({
                 transaction: transaction,
                 potentialActions: { pay: { purpose: params.purpose } },
-                order
+                order,
+                checkResult
             });
-            return Object.assign(Object.assign({}, payOrderAction), (typeof ((_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? { sameAs: params.sameAs } : undefined);
+            return Object.assign(Object.assign({}, payOrderAction), (typeof ((_e = params.sameAs) === null || _e === void 0 ? void 0 : _e.id) === 'string') ? { sameAs: params.sameAs } : undefined);
         }
     });
 }

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

@@ -37,6 +37,7 @@ function call(params) {
         let payActionAttributes;
         payActionAttributes = yield (0, payment_1.payTask2payActionAttributes)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
          }))({
+            action: new action_1.ActionRepo(connection),
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection)

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.390.0",
+    "@chevre/factory": "4.391.0-alpha.0",
     "@cinerino/sdk": "10.19.0-alpha.0",
     "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.7"
+  "version": "22.7.0-alpha.9"
 }