@chevre/domain 21.27.0-alpha.11 → 21.27.0-alpha.12

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

@@ -50,7 +50,6 @@ async function main() {
         project: { id: project.id },
         agent: { id: CLIENT_ID },
         object: {
-            typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             amount: AMOUNT,
             paymentMethod: paymentMethodType,
             issuedThrough: { id: paymentServiceId },
@@ -99,7 +98,6 @@ async function main() {
                                 project: { id: project.id },
                                 agent: { id: CLIENT_ID },
                                 object: {
-                                    typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
                                     amount: AMOUNT,
                                     paymentMethodId: publishPaymentUrlResult.paymentMethodId,
                                     paymentMethod: paymentMethodType,

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

@@ -84,11 +84,12 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
 /**
  * 決済承認
  */
@@ -99,7 +100,7 @@ declare function authorize(params: {
     agent: {
         id: string;
     };
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: IObjectWithoutDetail;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location?: factory.action.trade.pay.ILocation;

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

@@ -230,8 +230,9 @@ function publishPaymentUrl(params) {
         });
         let result;
         // URL発行
+        const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
         const startParams = (0, factory_1.creatPayTransactionStartParams)({
-            object: params.object,
+            object: authorizeObject,
             paymentServiceType,
             transaction: transaction,
             transactionNumber: transactionNumber,
@@ -318,7 +319,11 @@ function authorize(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
+        const { accountId } = yield fixAccountIdIfPossible({
+            object: params.object,
+            project: { id: transaction.project.id }
+        })({ action: repos.action });
+        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
         // 承認アクションを開始する
         const actionAttributes = {
             project: transaction.project,
@@ -346,10 +351,6 @@ function authorize(params) {
         const action = yield repos.action.start(actionAttributes);
         let payTransaction;
         try {
-            const { accountId } = yield validateFromLocation({
-                object: authorizeObject,
-                project: { id: transaction.project.id }
-            })({ action: repos.action });
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
                 accountId,
                 object: authorizeObject,
@@ -393,6 +394,9 @@ function authorize(params) {
     });
 }
 exports.authorize = authorize;
+/**
+ * 注文取引に保管された決済情報を承認しようとしている決済の整合性をを検証する
+ */
 function validatePaymentMethodByTransaction(params) {
     var _a, _b;
     const paymentServiceIdByObject = params.object.issuedThrough.id;
@@ -414,11 +418,16 @@ function validatePaymentMethodByTransaction(params) {
         throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
     }
 }
-function validateFromLocation(params) {
+/**
+ * 承認しようとしているobjectからaccountIdを決定する
+ */
+function fixAccountIdIfPossible(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let accountId = (_a = params.object) === null || _a === void 0 ? void 0 : _a.accountId;
-        const fromLocation = (_b = params.object) === null || _b === void 0 ? void 0 : _b.fromLocation;
+        // let accountId = params.object?.accountId;
+        let accountId = '';
+        const fromLocation = (_a = params.object) === null || _a === void 0 ? void 0 : _a.fromLocation;
+        const movieTickets = (_b = params.object) === null || _b === void 0 ? void 0 : _b.movieTickets;
         // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
         if (typeof fromLocation === 'string') {
             const paymentCardOwnershipInfo = yield (0, code_1.verifyToken)({
@@ -434,6 +443,10 @@ function validateFromLocation(params) {
             }
             accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
         }
+        // 購入番号管理番号をaccountIdにセット(2024-03-24~)
+        if (Array.isArray(movieTickets) && movieTickets.length > 0) {
+            accountId = movieTickets[0].identifier; // 決済カードidentifierは1つのみ許可の前提
+        }
         return { accountId };
     });
 }

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.364.0-alpha.0",
-    "@cinerino/sdk": "5.14.1",
+    "@chevre/factory": "4.364.0-alpha.1",
+    "@cinerino/sdk": "5.15.0-alpha.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.27.0-alpha.11"
+  "version": "21.27.0-alpha.12"
 }