@chevre/domain 22.2.0-alpha.26 → 22.2.0-alpha.28

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

@@ -25,9 +25,12 @@
 import { factory as surfrockFactory } from '@surfrock/sdk';
 import { Connection, Document, FilterQuery, QueryOptions, UpdateQuery } from 'mongoose';
 import * as factory from '../factory';
-export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> & {
+export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier> | factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.paymentMethod.any.IAction) & {
     cancelAction?: any;
-} : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> & {
+} : never;
+export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> & {
+    cancelAction?: any;
+} : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.token.IAction) : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> & {
     targetCollection?: any;
 } : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 export type IPayAction = factory.action.trade.pay.IAction;
@@ -93,7 +96,7 @@ export declare class ActionRepo {
      */
     start<T extends factory.actionType>(attributes: factory.action.IAttributes<T, any, any>, options?: {
         recipe?: IRecipeAsActionAttributes;
-    }): Promise<IAction<T>>;
+    }): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
     /**
      * アクション完了
      * @deprecated use completeWithVoid
@@ -193,7 +196,7 @@ export declare class ActionRepo {
             $nin?: string[];
         };
         sort?: factory.action.ISortOrder;
-    }): Promise<IAction<T>[]>;
+    }): Promise<IAction4transaction<T>[]>;
     /**
      * 注文番号から、注文に対するアクションを検索する
      */
@@ -201,7 +204,7 @@ export declare class ActionRepo {
         orderNumber: string;
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<factory.actionType>[]>;
-    searchBySameAs(params: {
+    searchBySameAs<T extends factory.actionType>(params: {
         sameAs: {
             id: {
                 $eq: string;
@@ -216,9 +219,9 @@ export declare class ActionRepo {
          * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
          */
         typeOf: {
-            $eq: factory.actionType;
+            $eq: T;
         };
-    }): Promise<Pick<IAction<factory.actionType>, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
+    }): Promise<Pick<IAction<T>, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/action.js

@@ -506,7 +506,8 @@ class ActionRepo {
      */
     start(attributes, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const startedAction = yield this.actionModel.create(Object.assign(Object.assign({}, attributes), { actionStatus: factory.actionStatusType.ActiveActionStatus, startDate: new Date() }))
+            const startDate = new Date();
+            const startedAction = yield this.actionModel.create(Object.assign(Object.assign({}, attributes), { actionStatus: factory.actionStatusType.ActiveActionStatus, startDate }))
                 .then((doc) => doc.toObject());
             // add recipe(2024-06-09~)
             const savingRecipe = options === null || options === void 0 ? void 0 : options.recipe;

package/lib/chevre/service/code.js

@@ -160,7 +160,7 @@ function verifyToken(params) {
                     typeOf: factory.action.check.token.ObjectType.Ticket
                 }
             };
-            action = (yield repos.action.start(actionAttributes));
+            action = yield repos.action.start(actionAttributes);
         }
         try {
             // payload = await new Promise<IPayloadWithNoVersion | IPayload>((resolve, reject) => {

package/lib/chevre/service/moneyTransfer.js

@@ -408,7 +408,7 @@ function moneyTransfer(params) {
                 transactionType = pendingTransaction.typeOf;
             }
             const transactionNumber = yield fixAccountTransactionNumber(params)({ transactionNumber: repos.transactionNumber });
-            const issuedThroughId = getIssuedThroughIdByAction({ action, pendingTransactionType: transactionType });
+            const issuedThroughId = getIssuedThroughIdByAction({ action: params, pendingTransactionType: transactionType });
             const permitServiceCredentials = yield createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
             const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
                 endpoint: permitServiceCredentials.permitServiceEndpoint,

package/lib/chevre/service/notification.js

@@ -53,7 +53,7 @@ function sendEmailMessage(params) {
                 // メッセージリポジトリに対応(2024-04-29~)
                 emailMessage = yield repos.message.findByIdentifier({
                     identifier: params.object.identifier,
-                    project: { id: action.project.id }
+                    project: { id: project.id }
                 });
             }
             const emailMessageFrom = {

package/lib/chevre/service/offer/product.js

@@ -146,8 +146,10 @@ function authorize(params) {
             });
             requestBody = startParams;
             responseBody = yield RegisterServiceTransaction.start(startParams)(repos);
-            const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({ project: action.project, responseBody, acceptedOffer });
-            result = (0, factory_1.createResult)({ project: action.project, requestBody, responseBody, acceptedOffer });
+            const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({
+                project: actionAttributes.project, responseBody, acceptedOffer
+            });
+            result = (0, factory_1.createResult)({ project: actionAttributes.project, requestBody, responseBody, acceptedOffer });
             yield (0, any_1.acceptOffer)({
                 project: transaction.project,
                 purpose: { id: transaction.id },

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -43,7 +43,7 @@ function createPlacingOrderFromExistingTransaction(params) {
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = yield repos.action.search({
+                authorizePaymentActions = (yield repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
                         typeOf: { $in: [factory.transactionType.PlaceOrder] },
@@ -51,7 +51,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                     },
                     object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['result'], []);
+                }, ['result'], []));
                 authorizeOfferActionsWithInstrument = (yield repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {

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

@@ -415,9 +415,9 @@ function authorize(params) {
                 const rawError = Array.isArray(error) ? error[1] : undefined;
                 if (rawError !== undefined && rawError.name !== 'AbortError') {
                     yield processVoidPayTransaction({
-                        project: action.project,
+                        project: actionAttributes.project,
                         id: action.id,
-                        purpose: action.purpose
+                        purpose: actionAttributes.purpose
                     })(repos);
                 }
             }

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js

@@ -85,7 +85,7 @@ function processAuthorizeCreditCard(params) {
                 sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
             };
             // add action(2024-06-12~)
-            action = (yield repos.action.start(actionAttributes, { recipe }));
+            action = yield repos.action.start(actionAttributes, { recipe });
             try {
                 entryTranResult = yield repos.creditCardService.entryTran(entryTranArgs);
                 execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId, method: params.object.method, siteId: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId, sitePass: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass, seqMode: GMO.utils.util.SeqMode.Physics }, (typeof cardNo === 'string') ? { cardNo } : undefined), (typeof cardPass === 'string') ? { cardPass } : undefined), (typeof expire === 'string') ? { expire } : undefined), (typeof token === 'string') ? { token } : undefined), (typeof memberId === 'string') ? { memberId } : undefined), (typeof cardSeq === 'number') ? { cardSeq } : undefined);

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.js

@@ -34,7 +34,7 @@ function processAuthorizeCreditCard3ds(params) {
             sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
         };
         // add action(2024-06-12~)
-        action = (yield repos.action.start(actionAttributes, { recipe }));
+        action = yield repos.action.start(actionAttributes, { recipe });
         try {
             secureTran2Result = yield repos.creditCardService.secureTran2(secureTran2Args);
         }

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

@@ -6,7 +6,6 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-type IPayAction = factory.action.trade.pay.IAction;
 /**
  * クレジットカード決済
  */
@@ -17,5 +16,5 @@ declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (r
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<IPayAction>;
+}, settings: Settings) => Promise<void>;
 export { payCreditCard };

package/lib/chevre/service/payment/creditCard/payCreditCard.js

@@ -83,13 +83,13 @@ function payCreditCard(params) {
         yield (0, onPaid_1.onPaid)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
             typeOf: action.typeOf
         })(repos);
-        return action;
+        // return action;
     });
 }
 exports.payCreditCard = payCreditCard;

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -103,10 +103,10 @@ function refundCreditCard(params, options) {
         yield (0, onRefund_1.onRefund)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: startingActionParams.object,
+            potentialActions: startingActionParams.potentialActions,
+            project: startingActionParams.project,
+            purpose: startingActionParams.purpose,
             typeOf: action.typeOf
         })(repos);
         // return action;

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

@@ -14,11 +14,11 @@ declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (r
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
+}) => Promise<void>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
+}) => Promise<void>;
 export { payFaceToFace, refundFaceToFace, voidTransaction };

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

@@ -42,13 +42,13 @@ function payFaceToFace(params) {
         yield (0, onPaid_1.onPaid)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
             typeOf: action.typeOf
         })(repos);
-        return action;
+        // return action;
     });
 }
 exports.payFaceToFace = payFaceToFace;
@@ -72,13 +72,13 @@ function refundFaceToFace(params) {
         yield (0, onRefund_1.onRefund)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
             typeOf: action.typeOf
         })(repos);
-        return action;
+        // return action;
     });
 }
 exports.refundFaceToFace = refundFaceToFace;

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

@@ -10,7 +10,6 @@ import { Settings } from '../../../settings';
 interface IAuthorizeResult {
     accountId: string;
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
-    payAction: factory.action.trade.pay.IAction;
 }
 /**
  * 決済カード承認

package/lib/chevre/service/payment/movieTicket/authorize.js

@@ -22,7 +22,7 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
-        let payAction;
+        // let payAction: factory.action.trade.pay.IAction;
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
@@ -64,7 +64,8 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
                 ? { sameAs: { id: options.executor.id, typeOf: 'Task' } } // link sameAs(2024-06-04~)
                 : undefined);
             // 着券させざるをえないが、informPaymentはしない(注文がまだ存在しないため)
-            payAction = yield (0, payMovieTicket_1.payMovieTicket)(payActionAttributes)(repos, settings);
+            // payAction = await payMovieTicket(payActionAttributes)(repos, settings);
+            yield (0, payMovieTicket_1.payMovieTicket)(payActionAttributes)(repos, settings);
         }
         catch (error) {
             // アクション保管用のエラーと両方throw(2024-05-22~)
@@ -76,7 +77,11 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
             }
             // throw handleMvtkReserveError(error);
         }
-        return { accountId, payAction, accountsReceivablesByServiceType };
+        return {
+            accountId,
+            // payAction, // discontinue(2024-08-28~)
+            accountsReceivablesByServiceType
+        };
     });
 }
 exports.authorize = authorize;

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

@@ -17,9 +17,8 @@ interface IPayOperationRepos {
     task: TaskRepo;
 }
 type IPayOperation<T> = (repos: IPayOperationRepos, settings: Settings) => Promise<T>;
-type IPayAction = factory.action.trade.pay.IAction;
 /**
  * 決済カード決済
  */
-declare function payMovieTicket(params: factory.action.trade.pay.IAttributes): IPayOperation<IPayAction>;
+declare function payMovieTicket(params: factory.action.trade.pay.IAttributes): IPayOperation<void>;
 export { payMovieTicket };

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -95,13 +95,13 @@ function payMovieTicket(params) {
         yield (0, onPaid_1.onPaid)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: startingAction.object,
+            potentialActions: startingAction.potentialActions,
+            project: startingAction.project,
+            purpose: startingAction.purpose,
             typeOf: action.typeOf
         })(repos);
-        return action;
+        // return action;
     });
 }
 exports.payMovieTicket = payMovieTicket;

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -115,10 +115,10 @@ function refundMovieTicket(params) {
         yield (0, onRefund_1.onRefund)({
             actionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: refundActionAttributes.object,
+            potentialActions: refundActionAttributes.potentialActions,
+            project: refundActionAttributes.project,
+            purpose: refundActionAttributes.purpose,
             typeOf: action.typeOf
         })(repos);
     });

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

@@ -21,7 +21,7 @@ declare function payPaymentCard(params: factory.action.trade.pay.IAttributes): (
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
+}) => Promise<void>;
 declare function refundPaymentCard(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
@@ -29,5 +29,5 @@ declare function refundPaymentCard(params: factory.task.refund.IData): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
     transactionNumber: TransactionNumberRepo;
-}) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
+}) => Promise<void>;
 export { authorize, payPaymentCard, refundPaymentCard, voidTransaction };

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

@@ -237,7 +237,7 @@ function payPaymentCard(params) {
         try {
             const transactionNumber = payObject[0].paymentMethod.paymentMethodId;
             const availableChannel = yield repos.product.findAvailableChannel({
-                project: { id: action.project.id },
+                project: { id: params.project.id },
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
@@ -268,13 +268,13 @@ function payPaymentCard(params) {
         yield (0, onPaid_1.onPaid)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
             typeOf: action.typeOf
         })(repos);
-        return action;
+        // return action;
     });
 }
 exports.payPaymentCard = payPaymentCard;
@@ -298,7 +298,7 @@ function refundPaymentCard(params) {
         let accountTransactionNumber4refund;
         try {
             const availableChannel = yield repos.product.findAvailableChannel({
-                project: { id: action.project.id },
+                project: { id: params.project.id },
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
@@ -314,7 +314,7 @@ function refundPaymentCard(params) {
             });
             // 返金のユニークネスを保証するため識別子を指定する
             const accountTransactionIdentifier = (0, accountTransactionIdentifier_1.createRefundIdentifier)({
-                project: { id: action.project.id },
+                project: { id: params.project.id },
                 paymentMethodId
             });
             // すでに返金済かどうか確認
@@ -323,7 +323,7 @@ function refundPaymentCard(params) {
                 // 口座取引で確認する(2022-10-27~)
                 const searchAccountTransactionsResult = yield accountTransactionService.search({
                     limit: 100,
-                    project: { id: { $eq: action.project.id } },
+                    project: { id: { $eq: params.project.id } },
                     identifier: { $eq: accountTransactionIdentifier }
                 });
                 const existingAccountTransactions = searchAccountTransactionsResult.data;
@@ -390,13 +390,13 @@ function refundPaymentCard(params) {
         yield (0, onRefund_1.onRefund)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
-            object: action.object,
-            potentialActions: action.potentialActions,
-            project: action.project,
-            purpose: action.purpose,
+            object: params.object,
+            potentialActions: params.potentialActions,
+            project: params.project,
+            purpose: params.purpose,
             typeOf: action.typeOf
         })(repos);
-        return action;
+        // return action;
     });
 }
 exports.refundPaymentCard = refundPaymentCard;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.382.0-alpha.1",
+    "@chevre/factory": "4.382.0-alpha.3",
     "@cinerino/sdk": "10.8.0-alpha.1",
     "@motionpicture/coa-service": "9.5.0-alpha.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": "22.2.0-alpha.26"
+  "version": "22.2.0-alpha.28"
 }