@chevre/domain 22.11.0-alpha.38 → 22.11.0-alpha.39

package/lib/chevre/service/order/confirmPayTransaction.d.ts

@@ -8,7 +8,12 @@ import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
-declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>, options: {}): (repos: {
+declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction> & {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+}, options: {}): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js

@@ -60,14 +60,14 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
         }
         yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
             const data = {
-                project: order.project,
+                // project: order.project, // discontinue(2025-08-20~)
                 typeOf: factory.actionType.ConfirmAction,
                 object: confirmObject,
-                agent: order.project,
+                // agent: order.project, // discontinue(2025-08-20~)
                 purpose: simpleOrder
                 // instrument廃止(2024-03-13~)
             };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', order.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
                 alternateName: taskIdentifier,
                 identifier: taskIdentifier,

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

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

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

@@ -23,9 +23,10 @@ const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
+    // export function call(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): IOperationExecute<void> {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data, {})({
+        yield (0, confirmPayTransaction_1.confirmPayTransaction)(Object.assign(Object.assign({}, params.data), { project: params.project }), {})({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

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

@@ -17,10 +17,14 @@ export declare function call(params: Pick<factory.task.ITask<factory.taskName.Co
 /**
  * 予約を確定する
  */
-export declare function confirmReserveTransaction(params: factory.task.IData<factory.taskName.ConfirmReserveTransaction> & {
+export declare function confirmReserveTransaction(params: Omit<factory.task.IData<factory.taskName.ConfirmReserveTransaction>, 'agent' | 'project'> & {
     sameAs?: {
         id: string;
     };
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
 }, options: {
     sendOrder: boolean;
     useOnOrderStatusChanged: boolean;

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

@@ -52,7 +52,7 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: settings.coa.timeout });
-        yield confirmReserveTransaction(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }), {
+        yield confirmReserveTransaction(Object.assign(Object.assign({}, params.data), { project: params.project, sameAs: { id: params.id } }), {
             sendOrder: true,
             useOnOrderStatusChanged: true
         })({
@@ -179,8 +179,8 @@ function confirmReserveTransaction(params, options) {
             default:
                 confirmActionObject = params.object;
         }
-        const { agent, project, purpose, typeOf, sameAs } = params;
-        const confirmActionAttributes = Object.assign({ agent, project, purpose, typeOf, object: confirmActionObject }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined // link sameAs(2024-06-10~)
+        const { project, purpose, typeOf, sameAs } = params;
+        const confirmActionAttributes = Object.assign({ agent: project, project, purpose, typeOf, object: confirmActionObject }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined // link sameAs(2024-06-10~)
         );
         const action = yield repos.action.start(confirmActionAttributes, Object.assign({}, (recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
         ));

package/lib/chevre/service/taskHandler.js

@@ -62,6 +62,7 @@ function executeTask(task, next) {
                 case factory.taskName.Refund:
                 case factory.taskName.VoidPayTransaction:
                 case factory.taskName.VoidReserveTransaction:
+                case factory.taskName.ConfirmPayTransaction:
                 case factory.taskName.ConfirmReserveTransaction:
                 case factory.taskName.ReturnPayTransaction:
                 case factory.taskName.ReturnReserveTransaction:

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.396.0-alpha.8",
+    "@chevre/factory": "4.396.0-alpha.9",
     "@cinerino/sdk": "11.2.0-alpha.2",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.38"
+  "version": "22.11.0-alpha.39"
 }