@chevre/domain 21.33.0-alpha.21 → 21.33.0-alpha.22

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

@@ -56,7 +56,7 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
 /**
  * クレジットカード決済
  */
-declare function payCreditCard(params: factory.task.pay.IPayActionData): (repos: {
+declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (repos: {
     action: ActionRepo;
     actionRecipe: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;

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

@@ -9,7 +9,7 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
 declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
 }) => Promise<void>;
-declare function payFaceToFace(params: factory.task.pay.IPayActionData): (repos: {
+declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;

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

@@ -69,7 +69,7 @@ type IPayAction = factory.action.trade.pay.IAction;
 /**
  * MovieTicket着券
  */
-declare function payMovieTicket(params: factory.task.pay.IPayActionData): IPayOperation<IPayAction>;
+declare function payMovieTicket(params: factory.action.trade.pay.IAttributes): IPayOperation<IPayAction>;
 /**
  * MovieTicket着券取消
  */

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

@@ -16,7 +16,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     product: ProductRepo;
 }) => Promise<void>;
-declare function payPaymentCard(params: factory.task.pay.IPayActionData): (repos: {
+declare function payPaymentCard(params: factory.action.trade.pay.IAttributes): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;

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

@@ -19,7 +19,15 @@ import * as factory from '../factory';
 /**
  * 決済確定
  */
-export declare function pay(params: factory.task.pay.IData): (repos: {
+export declare function pay(params: factory.task.pay.IData & {
+    sameAs?: {
+        /**
+         * 実行元タスクID
+         */
+        id: string;
+        typeOf: 'Task';
+    };
+}): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     actionRecipe: ActionRecipeRepo;

package/lib/chevre/service/payment.js

@@ -19,6 +19,7 @@ const MovieTicketPaymentService = require("./payment/movieTicket");
 const PaymentCardPaymentService = require("./payment/paymentCard");
 function payTask2payActionAttributes(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let transaction;
         if (typeof params.object.paymentMethod.paymentMethodId === 'string') {
             transaction = yield repos.assetTransaction.findByTransactionNumber({
@@ -38,7 +39,7 @@ function payTask2payActionAttributes(params) {
             potentialActions: { pay: { purpose: params.purpose } },
             order
         });
-        return payActions[0];
+        return Object.assign(Object.assign({}, payActions[0]), (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: params.sameAs } : undefined);
     });
 }
 /**

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

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.pay.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.pay.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -27,9 +27,10 @@ const PaymentService = require("../payment");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield PaymentService.pay(data)({
+        yield PaymentService.pay(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
+         }))({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),

package/lib/chevre/service/task.js

@@ -107,6 +107,7 @@ function execute(task) {
                 case factory.taskName.AcceptCOAOffer:
                 case factory.taskName.AuthorizePayment:
                 case factory.taskName.CheckMovieTicket:
+                case factory.taskName.Pay:
                 case factory.taskName.PublishPaymentUrl:
                 case factory.taskName.Refund:
                 case factory.taskName.VoidReserveTransaction:

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.1",
+    "@chevre/factory": "4.374.0-alpha.2",
     "@cinerino/sdk": "7.0.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.21"
+  "version": "21.33.0-alpha.22"
 }