@chevre/domain 24.0.0-alpha.40 → 24.0.0-alpha.42

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

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -16,7 +18,11 @@ function call(params) {
             sameAs: { id: params.id }
         })({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            // action: new ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+                refund: new refund_1.RefundActionRepo(connection),
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),

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

@@ -450,7 +450,7 @@ function createInformMovieTheaterTasks(params, setting) {
         // );
         // 入場ゲートを廃止(2026-01-17~)
         const movieTheaters4inform = movieTheaters.map((movieTheater) => {
-            const { hasEntranceGate, ...movieTheaterWithoutEntranceGates } = movieTheater;
+            const { hasEntranceGate, ...movieTheaterWithoutEntranceGates } = movieTheater; // eslint-disable-line @typescript-eslint/no-unused-vars
             return {
                 ...movieTheaterWithoutEntranceGates
                 // ...movieTheater

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

@@ -27,7 +27,9 @@ exports.call = call;
 const factory = __importStar(require("../../factory"));
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
 const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const credentials_1 = require("../../repo/credentials");
@@ -70,7 +72,11 @@ function call(params) {
         payActionAttributes)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            // action: new ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+                refund: new refund_1.RefundActionRepo(connection),
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             credentials: new credentials_1.CredentialsRepo(redisClient, {
                 scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,

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

@@ -1,7 +1,8 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
-import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -9,7 +10,11 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

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

@@ -1,6 +1,7 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
-import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../repo/credentials';
@@ -31,7 +32,11 @@ declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
 }): (repos: IPayTask2payActionAttributesRepos) => Promise<factory.action.trade.pay.IAttributes>;
 interface IPayByTaskRepos {
     acceptedOffer: AcceptedOfferRepo;
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
     credentials: CredentialsRepo;

package/lib/chevre/service/task/payment/payByTask.js

@@ -177,7 +177,7 @@ payActionAttributes) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 await CreditCardPaymentService.payCreditCard(payActionAttributes)(repos, settings);
                 break;
-            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+            case factory.service.paymentService.PaymentServiceType.MovieTicket: {
                 // check purpose(2025-02-12~)
                 const purpose = payActionAttributes.purpose;
                 if (purpose?.typeOf !== factory.order.OrderType.Order) {
@@ -188,6 +188,7 @@ payActionAttributes) {
                     purpose
                 }, { callOnPayActionCompleted: true })(repos, settings);
                 break;
+            }
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }

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

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
-import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -16,7 +17,11 @@ declare function refundByTask(params: factory.task.refund.IData & {
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

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

@@ -1,5 +1,7 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -12,6 +14,10 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 declare function voidPaymentByTask(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;

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

@@ -26,7 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
@@ -61,7 +63,11 @@ function call(params) {
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, refundByTask_1.refundByTask)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            // action: new ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+                refund: new refund_1.RefundActionRepo(connection),
+            },
             credentials: new credentials_1.CredentialsRepo(redisClient, {
                 scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                 expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0

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

@@ -30,13 +30,13 @@ exports.call = call;
 const moment_1 = __importDefault(require("moment"));
 const factory = __importStar(require("../../factory"));
 const action_1 = require("../../repo/action");
+const pay_1 = require("../../repo/action/pay");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const paymentService_1 = require("../../repo/paymentService");
 const potentialAction_1 = require("../../repo/potentialAction");
 const product_1 = require("../../repo/product");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const returnOrder_1 = require("../../repo/transaction/returnOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const RefundTransactionService = __importStar(require("../assetTransaction/refund"));
@@ -53,6 +53,9 @@ function call(params) {
             sameAs: { id: params.id }
         })({
             action: new action_1.ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
@@ -158,7 +161,7 @@ function returnPayTransaction(taskData) {
                 });
                 const refundPurpose = createRefundPurpose(refundActionAttributes, order);
                 await RefundTransactionService.start(startRefundTransactionParams)({
-                    action: repos.action,
+                    actions: repos.actions,
                     paymentService: repos.paymentService,
                     potentialAction: repos.potentialAction,
                     product: repos.product,

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

@@ -101,7 +101,7 @@ function returnReserve(params) {
         });
         try {
             switch (params.object.typeOf) {
-                case factory.assetTransactionType.COAReserveTransaction:
+                case factory.assetTransactionType.COAReserveTransaction: {
                     const processReturnCOAReserveResult = await CancelReservationCOAService.confirm({ object: params.object })({
                         reserveService: repos.reserveService
                     });
@@ -110,6 +110,7 @@ function returnReserve(params) {
                         project: { id: project.id }
                     });
                     break;
+                }
                 default:
                     await processCancelReservation4chevre(params, {
                         id: action.id,

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

@@ -27,6 +27,8 @@ exports.call = call;
 const factory = __importStar(require("../../factory"));
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
 const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
 const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
@@ -51,6 +53,10 @@ function call(data) {
         await (0, voidPaymentByTask_1.voidPaymentByTask)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+                refund: new refund_1.RefundActionRepo(connection),
+            },
             authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
             credentials: new credentials_1.CredentialsRepo(redisClient, {
                 scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -197,7 +197,7 @@ function deleteTransactionById(params) {
         try {
             const transactionTypeOf = transaction.typeOf;
             switch (transactionTypeOf) {
-                case factory.transactionType.PlaceOrder:
+                case factory.transactionType.PlaceOrder: {
                     // 取引に対する全ての承認アクションを検索
                     const authorizeActions = await repos.action.searchByPurpose({
                         typeOf: factory.actionType.AuthorizeAction,
@@ -210,7 +210,7 @@ function deleteTransactionById(params) {
                         case factory.transactionStatusType.Canceled:
                         case factory.transactionStatusType.Expired:
                             break;
-                        case factory.transactionStatusType.Confirmed:
+                        case factory.transactionStatusType.Confirmed: {
                             const deletingOrder = transaction.result?.order;
                             if (typeof deletingOrder?.orderNumber === 'string') {
                                 await (0, deleteOrder_1.deleteOrder)({
@@ -218,6 +218,7 @@ function deleteTransactionById(params) {
                                 })(repos);
                             }
                             break;
+                        }
                         default:
                             throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                     }
@@ -256,6 +257,7 @@ function deleteTransactionById(params) {
                     // 取引削除
                     await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
+                }
                 // implemented(2022-06-09~)
                 case factory.transactionType.ReturnOrder:
                     // 取引削除

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -166,7 +166,7 @@ function createTasks(params, setting
     };
     taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
     switch (transaction.status) {
-        case factory.transactionStatusType.Confirmed:
+        case factory.transactionStatusType.Confirmed: {
             taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             // const potentialActions = transaction.potentialActions;
             // if (potentialActions === undefined) {
@@ -201,6 +201,7 @@ function createTasks(params, setting
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;
+        }
         case factory.transactionStatusType.Canceled:
             taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             break;

package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js

@@ -92,7 +92,7 @@ function createTasks(params, setting
     };
     taskAttributes.push(deleteTransactionTask);
     switch (transaction.status) {
-        case factory.transactionStatusType.Confirmed:
+        case factory.transactionStatusType.Confirmed: {
             const returnOrderPotentialActions = transaction.potentialActions?.returnOrder;
             if (Array.isArray(returnOrderPotentialActions)) {
                 // 返品タスク
@@ -118,6 +118,7 @@ function createTasks(params, setting
                 taskAttributes.push(...returnOrderTask);
             }
             break;
+        }
         case factory.transactionStatusType.Expired:
             // 特にタスクなし
             break;

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -112,7 +112,7 @@ setting) {
                         : undefined
                 }, setting);
                 emailMessagesOnReturnInvoice.push(...emailMessagesOnReturnEachPaymentMethodId);
-                const { paymentStatus, ...referencedInvoiceAsObject } = referencedInvoice;
+                const { paymentStatus, ...referencedInvoiceAsObject } = referencedInvoice; // eslint-disable-line @typescript-eslint/no-unused-vars
                 const object = {
                     ...referencedInvoiceAsObject,
                     typeOf: 'Invoice'
@@ -190,7 +190,7 @@ setting) {
                 : undefined
         }, setting);
         emailMessagesOnReturnMovieTicket.push(...emailMessagesOnReturnEachPaymentMethodId);
-        const { paymentStatus, ...referencedInvoiceAsObject } = referencedInvoice;
+        const { paymentStatus, ...referencedInvoiceAsObject } = referencedInvoice; // eslint-disable-line @typescript-eslint/no-unused-vars
         const object = {
             ...referencedInvoiceAsObject,
             typeOf: 'Invoice'

package/lib/chevre/service/transaction/returnOrder/preStart/getReturnPolicyByProject.js

@@ -51,7 +51,8 @@ function createOrder4returnPolicy(params) {
                     priceSpecification: {
                         priceComponent: (Array.isArray(priceComponent))
                             ? priceComponent.map((component) => {
-                                const { accounting, name, priceCurrency, valueAddedTaxIncluded, ...postingComponent } = component;
+                                const { accounting, name, priceCurrency, valueAddedTaxIncluded, // eslint-disable-line @typescript-eslint/no-unused-vars
+                                ...postingComponent } = component;
                                 return postingComponent;
                             })
                             : []
@@ -89,7 +90,7 @@ async function getReturnPolicyByProject(params) {
         try {
             body = await res.json();
         }
-        catch (error) {
+        catch (_error) {
             // no op
         }
         let returnPolicy;
@@ -97,7 +98,7 @@ async function getReturnPolicyByProject(params) {
             case http_status_1.OK:
             case http_status_1.CREATED:
             case http_status_1.ACCEPTED:
-            case http_status_1.NO_CONTENT:
+            case http_status_1.NO_CONTENT: {
                 const restockingFeeValue = body?.restockingFee?.value;
                 if (typeof restockingFeeValue !== 'number') {
                     throw new factory.errors.Internal('invalid return policy');
@@ -121,6 +122,7 @@ async function getReturnPolicyByProject(params) {
                     };
                 }
                 break;
+            }
             case http_status_1.NOT_FOUND:
                 throw new factory.errors.Argument('', `custom return policy returned statusCode: ${res.status}`);
             // break;

package/lib/chevre/service/validation/validateOrder.js

@@ -165,7 +165,7 @@ function validateOrder(params) {
         let numOrderedItemExpected = 0;
         const itemOfferedTypeOf = itemOfferedTypeOfs[0];
         switch (itemOfferedTypeOf) {
-            case factory.reservationType.EventReservation:
+            case factory.reservationType.EventReservation: {
                 numOrderedItemExpected = reservationForIds.length;
                 const reservationAcceptedOffers = acceptedOffers;
                 const coaTicketInfoExists = reservationAcceptedOffers[0].itemOffered.reservedTicket.coaTicketInfo !== undefined;
@@ -197,13 +197,15 @@ function validateOrder(params) {
                     });
                 }
                 break;
-            case factory.permit.PermitType.Permit:
+            }
+            case factory.permit.PermitType.Permit: {
                 numOrderedItemExpected = acceptedOffers.length;
                 const permitAcceptedOffers = acceptedOffers;
                 priceExpected = (0, factory_2.acceptedOffers2amount)({
                     acceptedOffers: permitAcceptedOffers
                 });
                 break;
+            }
             // case factory.actionType.MoneyTransfer:
             //     break;
             default:

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": "6.0.0-alpha.3",
+    "@chevre/factory": "6.0.0-alpha.4",
     "@cinerino/sdk": "13.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.40"
+  "version": "24.0.0-alpha.42"
 }