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

package/example/src/chevre/searchActionsBySameAs.ts

@@ -14,7 +14,8 @@ async function main() {
 
     const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
     const actions = await actionRepo.searchBySameAs({
-        sameAs: { id: { $eq: '662456a40e9f9ad3b50f1481' } }
+        sameAs: { id: { $eq: '662456a40e9f9ad3b50f1481' } },
+        typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
     });
     console.log('actions:', actions);
 }

package/lib/chevre/repo/action.d.ts

@@ -185,6 +185,12 @@ export declare class MongoRepository {
                 $eq: string;
             };
         };
+        /**
+         * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
+         */
+        typeOf: {
+            $eq: factory.actionType;
+        };
     }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
     deleteByProject(params: {
         project: {

package/lib/chevre/repo/action.js

@@ -709,7 +709,7 @@ class MongoRepository {
     searchBySameAs(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const query = this.actionModel.find(Object.assign({ 'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq } }, (typeof ((_a = params.purpose) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
+            const query = this.actionModel.find(Object.assign({ typeOf: { $eq: params.typeOf.$eq }, 'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq } }, (typeof ((_a = params.purpose) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
                 ? { 'purpose.id': { $exists: true, $eq: params.purpose.id.$eq } }
                 : undefined))
                 .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })

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

@@ -189,7 +189,7 @@ exports.check = check;
  */
 function start(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         // 金額をfix
         const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
         if (typeof amount !== 'number') {
@@ -225,7 +225,9 @@ function start(params, options) {
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
-                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckMovieTicketBeforePay, options.useCheckByIdentifierIfNotYet)(repos);
+                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckMovieTicketBeforePay, options.useCheckByIdentifierIfNotYet, {
+                        executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {}
+                    })(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -389,9 +391,9 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, optio
         })(repos);
     });
 }
-function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
+function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
+        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet, options)(repos);
         const payActionInObject = {
             actionStatus: payAction.actionStatus,
             id: payAction.id,

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.js

@@ -43,7 +43,8 @@ function findAcceptAction(params) {
             default:
                 // タスクがReadyでなければアクション検索
                 const acceptAction = (yield repos.action.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } }
+                    sameAs: { id: { $eq: task.id } },
+                    typeOf: { $eq: factory.actionType.AcceptAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (acceptAction !== undefined) {

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

@@ -476,7 +476,8 @@ function findAuthorizeAction(params) {
             default:
                 // タスクがReadyでなければアクション検索
                 const authorizeAction = (yield repos.action.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } }
+                    sameAs: { id: { $eq: task.id } },
+                    typeOf: { $eq: factory.actionType.AuthorizeAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (authorizeAction !== undefined) {
@@ -529,7 +530,8 @@ function findCheckAction(params) {
             default:
                 // タスクがReadyでなければアクション検索
                 const authorizeAction = (yield repos.action.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } }
+                    sameAs: { id: { $eq: task.id } },
+                    typeOf: { $eq: factory.actionType.CheckAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (authorizeAction !== undefined) {
@@ -604,7 +606,8 @@ function findAcceptAction(params) {
             default:
                 // タスクがReadyでなければアクション検索
                 const acceptAction = (yield repos.action.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } }
+                    sameAs: { id: { $eq: task.id } },
+                    typeOf: { $eq: factory.actionType.AcceptAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (acceptAction !== undefined) {

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

@@ -36,7 +36,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     executor?: {
         /**
          * task ID
-         * taskによって実行されている場合値が存在する
+         * taskによって実行されている場合値が存在する(taskName: authorizePayment)
          */
         id?: string;
     };
@@ -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

@@ -49,7 +49,18 @@ interface IAuthorizeResult {
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean, options: {
+    /**
+     * 実行者
+     */
+    executor?: {
+        /**
+         * task ID
+         * taskによって実行されている場合値が存在する(taskName: authorizePayment)
+         */
+        id?: string;
+    };
+}): (repos: {
     action: ActionRepo;
     actionRecipe: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;
@@ -69,7 +80,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/movieTicket.js

@@ -127,9 +127,9 @@ exports.checkMovieTicket = checkMovieTicket;
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
+function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         let accountId;
         let payAction;
         let accountsReceivablesByServiceType = [];
@@ -156,9 +156,11 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };
-            const payActionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: transaction.project, recipient: transaction.recipient }, (params.purpose !== undefined)
+            const payActionAttributes = Object.assign(Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: transaction.project, recipient: transaction.recipient }, (params.purpose !== undefined)
                 ? { purpose: params.purpose }
-                : { purpose: { typeOf: transaction.typeOf, transactionNumber: transaction.transactionNumber, id: transaction.id } });
+                : { purpose: { typeOf: transaction.typeOf, transactionNumber: transaction.transactionNumber, id: transaction.id } }), (typeof ((_b = options.executor) === null || _b === void 0 ? void 0 : _b.id) === 'string')
+                ? { sameAs: { id: options.executor.id, typeOf: 'Task' } } // link sameAs(2024-06-04~)
+                : undefined);
             // 着券させざるをえないが、informPaymentはしない(注文がまだ存在しないため)
             payAction = yield payMovieTicket(payActionAttributes)(repos);
         }

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/acceptCOAOffer.js

@@ -84,7 +84,8 @@ function call(params) {
             // アクションが存在すればタスクを実行済扱いにする
             const action = (yield actionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
-                purpose: { id: { $eq: params.data.purpose.id } }
+                purpose: { id: { $eq: params.data.purpose.id } },
+                typeOf: { $eq: factory.actionType.AcceptAction }
             })).shift();
             if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
                 throwsError = false;

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

@@ -69,7 +69,8 @@ function call(params) {
             // アクションが存在すればタスクを実行済扱いにする
             const action = (yield actionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
-                purpose: { id: { $eq: params.data.purpose.id } }
+                purpose: { id: { $eq: params.data.purpose.id } },
+                typeOf: { $eq: factory.actionType.AuthorizeAction }
             })).shift();
             if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
                 throwsError = false;

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

@@ -45,7 +45,7 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (yield actionRepo.searchBySameAs(Object.assign({ sameAs: { id: { $eq: params.id } } }, (typeof ((_a = params.data.purpose) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            const action = (yield actionRepo.searchBySameAs(Object.assign({ sameAs: { id: { $eq: params.id } }, typeOf: { $eq: factory.actionType.CheckAction } }, (typeof ((_a = params.data.purpose) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { purpose: { id: { $eq: params.data.purpose.id } } }
                 : undefined))).shift();
             if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {

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/publishPaymentUrl.js

@@ -52,7 +52,8 @@ function call(params) {
             // アクションが存在すればタスクを実行済扱いにする
             const action = (yield actionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
-                purpose: { id: { $eq: params.data.purpose.id } }
+                purpose: { id: { $eq: params.data.purpose.id } },
+                typeOf: { $eq: factory.actionType.AcceptAction }
             })).shift();
             if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
                 throwsError = false;

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.23"
 }