@chevre/domain 21.20.0-alpha.8 → 21.20.0

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

@@ -15,23 +15,23 @@ exports.onPaid = void 0;
  */
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
-function onPaid(params) {
+function onPaid(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         switch (params.purpose.typeOf) {
             // 返品手数料決済であれば
             case factory.actionType.ReturnAction:
-                yield onReturnFeePaid(params)(repos);
+                yield onReturnFeePaid(params, project)(repos);
                 break;
             // 注文決済であれば
             case factory.order.OrderType.Order:
-                yield onOrderPaid(params)(repos);
+                yield onOrderPaid(params, project)(repos);
                 break;
             default:
         }
     });
 }
 exports.onPaid = onPaid;
-function onReturnFeePaid(params) {
+function onReturnFeePaid(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
@@ -47,11 +47,14 @@ function onReturnFeePaid(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            project: { id: project.id },
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }
-function onOrderPaid(params) {
+function onOrderPaid(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
@@ -67,7 +70,10 @@ function onOrderPaid(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            project: { id: project.id },
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onRefunded.d.ts

@@ -1,6 +1,8 @@
 import type { MongoRepository as AccountingReportRepo } from '../../../../repo/accountingReport';
 import * as factory from '../../../../factory';
 export type IOptimizedRefundAction = factory.report.accountingReport.IOptimizedRefundAction;
-export declare function onRefunded(params: IOptimizedRefundAction): (repos: {
+export declare function onRefunded(params: IOptimizedRefundAction, project: {
+    id: string;
+}): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;

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

@@ -15,19 +15,19 @@ exports.onRefunded = void 0;
  */
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
-function onRefunded(params) {
+function onRefunded(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         switch (params.purpose.typeOf) {
             // 返品手数料決済であれば
             case factory.actionType.ReturnAction:
-                yield onOrderRefunded(params)(repos);
+                yield onOrderRefunded(params, project)(repos);
                 break;
             default:
         }
     });
 }
 exports.onRefunded = onRefunded;
-function onOrderRefunded(params) {
+function onOrderRefunded(params, project) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
@@ -43,7 +43,10 @@ function onOrderRefunded(params) {
             }
             : undefined);
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.accountingReportModel.findOneAndUpdate({ 'mainEntity.orderNumber': orderNumber }, { $addToSet: { hasPart: childReport } })
-            .exec();
+        yield repos.accountingReport.addChildReport({
+            project: { id: project.id },
+            mainEntity: { orderNumber },
+            hasPart: childReport
+        });
     });
 }

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

@@ -24,10 +24,10 @@ function onPaymentStatusChanged(params) {
         const optimizedAction = optimizeAction4report(action);
         switch (optimizedAction.typeOf) {
             case factory.actionType.PayAction:
-                yield (0, onPaid_1.onPaid)(optimizedAction)(repos);
+                yield (0, onPaid_1.onPaid)(optimizedAction, { id: action.project.id })(repos);
                 break;
             case factory.actionType.RefundAction:
-                yield (0, onRefunded_1.onRefunded)(optimizedAction)(repos);
+                yield (0, onRefunded_1.onRefunded)(optimizedAction, { id: action.project.id })(repos);
                 break;
             default:
             // no op

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

@@ -88,7 +88,7 @@ function onRefund(refundAction) {
                     name: factory.taskName.TriggerWebhook,
                     status: factory.taskStatus.Ready,
                     runsAt: now,
-                    remainingNumberOfTries: 10,
+                    remainingNumberOfTries: 30,
                     numberOfTried: 0,
                     executionResults: [],
                     data: Object.assign(Object.assign({}, a), { object: aciton4inform })

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

@@ -10,7 +10,6 @@ import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentSe
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
@@ -18,7 +17,6 @@ import type { RedisRepository as TransactionNumberRepo } from '../../repo/transa
 import * as PayTransactionService from '../assetTransaction/pay';
 import { onPaymentStatusChanged } from './any/onPaymentStatusChanged';
 import { person2username } from './any/person2username';
-type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -64,7 +62,6 @@ interface IAuthorizeRepos {
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
@@ -76,7 +73,6 @@ interface IPublishPaymentUrlRepos {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
-    project: ProjectRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -119,5 +115,10 @@ declare function authorize(params: {
         useCheckByIdentifierIfNotYet: boolean;
         useSearchTrade4accountId: boolean;
     };
-}): IAuthorizeOperation<IAuthorizePaymentAction>;
+}): IAuthorizeOperation<{
+    /**
+     * 承認アクションID
+     */
+    id: string;
+}>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -197,7 +197,7 @@ function processVoidPayTransaction(params) {
                         }
                     }
                 }
-                yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+                yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             }
             catch (error) {
                 errors.push(error);
@@ -378,7 +378,8 @@ function authorize(params) {
         }
         // アクションを完了
         const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
-        return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        return { id: action.id };
     });
 }
 exports.authorize = authorize;

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

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

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

@@ -87,7 +87,10 @@ function authorize(params, paymentServiceId, options) {
         const searchTrade4accountId = (options === null || options === void 0 ? void 0 : options.searchTrade4accountId) === true;
         if (searchTrade4accountId) {
             try {
-                const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+                const creditCardService = new GMO.service.Credit({
+                    endpoint: String(availableChannel.serviceUrl),
+                    useFetch: credentials_1.credentials.gmo.useFetch
+                }, { timeout: credentials_1.credentials.gmo.timeout });
                 // ベストエフォートでクレジットカード詳細情報を取得
                 const startSearchTradeDate = Date.now();
                 debug('searchTrade processing...orderId:', orderId, startSearchTradeDate);
@@ -110,7 +113,7 @@ function authorize(params, paymentServiceId, options) {
 }
 exports.authorize = authorize;
 function processAuthorizeCreditCard(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return () => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         // GMOオーソリ取得
@@ -118,24 +121,17 @@ function processAuthorizeCreditCard(params) {
         let entryTranResult;
         let execTranArgs;
         let execTranResult;
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         const creditCard = params.object.creditCard;
-        const memberId = creditCard.memberId;
-        const cardSeq = creditCard.cardSeq;
+        const { cardSeq, memberId } = creditCard;
         if (typeof memberId === 'string' && memberId.length > 0 && typeof cardSeq === 'number') {
             // 決済承認時のuseUsernameAsGMOMemberId判定を廃止(2024-01-04~)
-            // 特殊なプロジェクトのみユーザーネームに自動変換(新旧会員互換性維持対応)
-            // memberIdはPersonIDが指定されてくる想定
-            // const useUsernameAsGMOMemberId = params.projectSettings?.useUsernameAsGMOMemberId === true;
-            // if (useUsernameAsGMOMemberId) {
-            //     try {
-            //         const customer = await repos.person.findById({ userId: memberId });
-            //         memberId = await person2username(customer);
-            //     } catch (error) {
-            //         throw error;
-            //     }
-            // }
         }
+        const { cardNo, cardPass, expire } = creditCard;
+        const { token } = creditCard;
         const retUrl = creditCard === null || creditCard === void 0 ? void 0 : creditCard.retUrl;
         // 3DS拡張(2024-01-02~)
         if (params.processPublishPaymentUrl === true && typeof retUrl === 'string' && retUrl.length > 0) {
@@ -165,23 +161,7 @@ function processAuthorizeCreditCard(params) {
                 tds2Type: GMO.utils.util.Tds2Type.Error
             };
             entryTranResult = yield creditCardService.entryTran(entryTranArgs);
-            execTranArgs = {
-                accessId: entryTranResult.accessId,
-                accessPass: entryTranResult.accessPass,
-                orderId: params.orderId,
-                method: params.object.method,
-                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
-                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass,
-                cardNo: creditCard.cardNo,
-                cardPass: creditCard.cardPass,
-                expire: creditCard.expire,
-                token: creditCard.token,
-                memberId: memberId,
-                cardSeq: cardSeq,
-                seqMode: GMO.utils.util.SeqMode.Physics,
-                retUrl,
-                callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.util.CallbackType.Post
-            };
+            execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId: params.orderId, method: params.object.method, siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId, sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass, seqMode: GMO.utils.util.SeqMode.Physics, retUrl, callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.util.CallbackType.Post }, (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);
             execTranResult = yield creditCardService.execTran3ds(execTranArgs);
         }
         else {
@@ -197,21 +177,7 @@ function processAuthorizeCreditCard(params) {
                 sitePass: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
             };
             entryTranResult = yield creditCardService.entryTran(entryTranArgs);
-            execTranArgs = {
-                accessId: entryTranResult.accessId,
-                accessPass: entryTranResult.accessPass,
-                orderId: params.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,
-                cardNo: creditCard.cardNo,
-                cardPass: creditCard.cardPass,
-                expire: creditCard.expire,
-                token: creditCard.token,
-                memberId: memberId,
-                cardSeq: cardSeq,
-                seqMode: GMO.utils.util.SeqMode.Physics
-            };
+            execTranArgs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ accessId: entryTranResult.accessId, accessPass: entryTranResult.accessPass, orderId: params.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);
             execTranResult = yield creditCardService.execTran(execTranArgs);
         }
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
@@ -219,7 +185,10 @@ function processAuthorizeCreditCard(params) {
 }
 function processAuthorizeCreditCard3ds(params) {
     return () => __awaiter(this, void 0, void 0, function* () {
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = params.pendingPaymentAgencyTransaction;
         const { accessId, accessPass } = entryTranResult;
         const secureTran2Result = yield creditCardService.secureTran2({ accessId, accessPass });
@@ -291,23 +260,39 @@ function voidTransaction(params) {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
         const { shopId, shopPass } = yield getGMOInfoFromSeller({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
-        const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
-        // オーソリ取消
-        // 現時点では、ここで失敗したらオーソリ取消をあきらめる
-        // GMO混雑エラーはここでも発生する(取消処理でも混雑エラーが発生することは確認済)
-        // try {
-        // } catch (error) {
-        //     // no op
-        // }
-        const searchTradeResult = yield creditCardService.searchTrade({
-            shopId: shopId,
-            shopPass: shopPass,
-            orderId: paymentMethodId,
-            siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-            sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
-        });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
+        let searchTradeResult;
+        try {
+            searchTradeResult = yield creditCardService.searchTrade({
+                shopId: shopId,
+                shopPass: shopPass,
+                orderId: paymentMethodId,
+                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+            });
+        }
+        catch (error) {
+            // searchTradeでのエラーをハンドリング(2024-01-27~)
+            let throwsError = true;
+            if (error.name === 'GMOServiceBadRequestError') {
+                if (Array.isArray(error.errors) && error.errors.length > 0) {
+                    const gmoErrors = error.errors;
+                    // 指定されたIDとパスワードの取引が存在しません。
+                    const notFoundErrorExists = gmoErrors.some(({ info }) => info === 'E01110002');
+                    if (notFoundErrorExists) {
+                        throwsError = false;
+                    }
+                }
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
         // 仮売上であれば取消
-        if (searchTradeResult.status === GMO.utils.util.JobCd.Auth) {
+        if ((searchTradeResult === null || searchTradeResult === void 0 ? void 0 : searchTradeResult.status) === GMO.utils.util.JobCd.Auth) {
             yield creditCardService.alterTran({
                 shopId: shopId,
                 shopPass: shopPass,
@@ -348,7 +333,10 @@ function payCreditCard(params) {
         let action = yield repos.action.start(params);
         const alterTranResults = [];
         try {
-            const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+            const creditCardService = new GMO.service.Credit({
+                endpoint: String(availableChannel.serviceUrl),
+                useFetch: credentials_1.credentials.gmo.useFetch
+            }, { timeout: credentials_1.credentials.gmo.timeout });
             yield Promise.all(payObject.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
                 alterTranResults.push(...yield processAlterTran({ shopId, shopPass, availableChannel, paymentMethod })({ creditCardService }));
             })));
@@ -500,7 +488,10 @@ function processChangeTransaction(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     return __awaiter(this, void 0, void 0, function* () {
         const alterTranResult = [];
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         // 取引状態参照
         const searchTradeResult = yield creditCardService.searchTrade({
             shopId: params.shopId,
@@ -604,7 +595,10 @@ exports.getGMOInfoFromSeller = getGMOInfoFromSeller;
 function searchGMOTrade(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const creditCardService = new GMO.service.Credit({
+            endpoint: String(params.availableChannel.serviceUrl),
+            useFetch: credentials_1.credentials.gmo.useFetch
+        }, { timeout: credentials_1.credentials.gmo.timeout });
         // 取引状態参照
         debug('searching trade...', params.paymentMethodId);
         const searchTradeResult = yield creditCardService.searchTrade({

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

@@ -5,24 +5,20 @@ import * as factory from '../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
-    project: ProjectRepo;
 }) => Promise<void>;
-declare function payFaceToFace(params: factory.task.pay.IData): (repos: {
+declare function payFaceToFace(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
 export { payFaceToFace, refundFaceToFace, voidTransaction };

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

@@ -1,7 +1,6 @@
 import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
-import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import * as factory from '../../../factory';
 interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
@@ -19,6 +18,5 @@ interface ICheckByIdentifierParams {
 declare function checkByIdentifier(params: ICheckByIdentifierParams): (repos: {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<ICheckResult>;
 export { ICheckByIdentifierParams, ICheckResult, checkByIdentifier };

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkByIdentifier = void 0;
 const surfrock = require("@surfrock/sdk");
 const moment = require("moment-timezone");
+// import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
 const getCredentials_1 = require("./getCredentials");

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

@@ -3,7 +3,6 @@ import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
-import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
     action: ActionRepo;
@@ -11,7 +10,6 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

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

@@ -3,7 +3,6 @@ import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
@@ -14,7 +13,6 @@ interface ICheckOperationRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }
 type ICheckOperation<T> = (repos: ICheckOperationRepos) => Promise<T>;
 interface IPayOperationRepos {
@@ -24,7 +22,6 @@ interface IPayOperationRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }
 type IPayOperation<T> = (repos: IPayOperationRepos) => Promise<T>;
@@ -32,7 +29,6 @@ interface IRefundOperationRepos {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentService: PaymentServiceRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }
 type IRefundOperation<T> = (repos: IRefundOperationRepos) => Promise<T>;
@@ -58,21 +54,19 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<IAuthorizeResult>;
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentService: PaymentServiceRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<void>;
 type IPayAction = factory.action.trade.pay.IAction;
 /**
  * MovieTicket着券
  */
-declare function payMovieTicket(params: factory.task.pay.IData): IPayOperation<IPayAction>;
+declare function payMovieTicket(params: factory.task.pay.IPayActionData): IPayOperation<IPayAction>;
 /**
  * MovieTicket着券取消
  */

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

@@ -85,7 +85,7 @@ function checkMovieTicket(params) {
             // action.resultへの保管を廃止(2023-03-24~)
             // movieTickets: []
         };
-        yield repos.action.complete({ typeOf: actionAttributes.typeOf, id: action.id, result });
+        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result });
         return {
             result: checkResult
         };

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

@@ -3,13 +3,11 @@ import type { MongoRepository as AccountingReportRepo } from '../../repo/account
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
 type IPendingTransaction = Pick<factory.account.transaction.withdraw.ITransaction, 'id' | 'transactionNumber' | 'typeOf'>;
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
     product: ProductRepo;
-    project: ProjectRepo;
 }) => Promise<{
     pendingTransaction: IPendingTransaction;
     currency: string;
@@ -18,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.IData): (repos: {
+declare function payPaymentCard(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;

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

@@ -22,12 +22,12 @@ const onRefund_1 = require("./any/onRefund");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 function authorize(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // const project = <Pick<factory.project.IProject, 'id' | 'typeOf'>>await repos.project.findById({
+        //     id: params.project.id,
+        //     inclusion: ['_id', 'typeOf'],
+        //     exclusion: []
+        // });
         var _a;
-        const project = yield repos.project.findById({
-            id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
-            exclusion: []
-        });
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string') {
             throw new factory.errors.ArgumentNull('transactionNumber');
@@ -46,7 +46,7 @@ function authorize(params, paymentServiceId) {
                 .toDate();
             pendingTransaction = yield processAccountTransaction({
                 transactionNumber,
-                project: project,
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
                 paymentMethod: params.object.paymentMethod,
                 agent: params.agent,
                 recipient: params.recipient,

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

@@ -1,10 +1,12 @@
 /**
  * 決済サービス
  */
+import type { MongoRepository as AcceptedOfferRepo } from '../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../repo/event';
+import type { MongoRepository as OrderRepo } from '../repo/order';
 import type { MongoRepository as PaymentServiceRepo } from '../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../repo/product';
@@ -17,9 +19,12 @@ import * as factory from '../factory';
  * 決済確定
  */
 export declare function pay(params: factory.task.pay.IData): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    assetTransaction: AssetTransactionRepo;
     event: EventRepo;
+    order: OrderRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;