@chevre/domain 22.10.0-alpha.9 → 22.10.0

package/lib/chevre/repo/transactionProcess.js

@@ -11,44 +11,65 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionProcessRepo = void 0;
 const createDebug = require("debug");
+const moment = require("moment");
 const factory = require("../factory");
+const concurrentLock_1 = require("./concurrentLock");
 const debug = createDebug('chevre-domain:repo:transactionProcess');
 const DEFAULT_LOCK_EXPIRES = 120;
 /**
  * 取引プロセスリポジトリ
  */
 class TransactionProcessRepo {
+    // private readonly redisClient: RedisClientType;
     constructor(redisClient, options) {
-        this.redisClient = redisClient;
+        this.concurrentLockRepo = new concurrentLock_1.ConcurrentLockRepo({ redisClient });
+        // this.redisClient = redisClient;
         this.options = options;
     }
     static CREATE_REDIS_KEY(params) {
-        // 最適化(2024-03-21~)
-        // return `chevre-api:${params.project.id}:transactionProcess:${params.typeOf}:${params.id}`;
         return `chvrapi:lockTxn:${params.id}`;
     }
     lock(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
-            // const ttl = TRANSACTION_RROCESS_LOCK_EXPIRES;
             const ttl = (typeof this.options.lockExpiresInSeconds === 'number') ? this.options.lockExpiresInSeconds : DEFAULT_LOCK_EXPIRES;
-            const results = yield this.redisClient.multi()
-                .setNX(key, '1')
-                .expire(key, ttl)
-                .exec();
-            debug('locked,', params.id, results);
-            if (Array.isArray(results) && (results[0] === 1 || results[0] === true)) {
-                return true;
+            const expires = moment()
+                .add(ttl, 'seconds')
+                .toDate();
+            // reimplement using concurrentLockRepo(2025-05-27~)
+            try {
+                yield this.concurrentLockRepo.lock({
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    about: { identifier: key, typeOf: 'Thing' },
+                    expires,
+                    audience: { identifier: '1', typeOf: 'Audience' }
+                });
+                debug('locked,', params.id);
             }
-            else {
+            catch (error) {
                 throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
             }
+            // const results = await this.redisClient.multi()
+            //     .setNX(key, '1')
+            //     .expire(key, ttl)
+            //     .exec();
+            // debug('locked,', params.id, results);
+            // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
+            //     return;
+            // } else {
+            //     throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
+            // }
         });
     }
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
-            yield this.redisClient.del([key]);
+            // reimplement using concurrentLockRepo(2025-05-27~)
+            yield this.concurrentLockRepo.unlock({
+                about: { identifier: key, typeOf: 'Thing' },
+                audience: { identifier: '1', typeOf: 'Audience' }
+            });
+            // await this.redisClient.del([key]);
         });
     }
 }

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -239,6 +239,7 @@ function isHoldByRateLimit(params) {
         const unitInSeconds = (_b = params.offer.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
+                project: { id: params.event.project.id },
                 reservedTicket: {
                     ticketType: {
                         validRateLimit: { scope: scope, unitInSeconds: unitInSeconds }

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -170,6 +170,7 @@ function addReservations(params) {
         let lockedOfferRateLimitKeys = [];
         try {
             lockedOfferRateLimitKeys = yield processLockOfferRateLimit({
+                project: { id: params.event.project.id },
                 reservations: objectSubReservations,
                 reservationFor,
                 reservationNumber
@@ -179,6 +180,7 @@ function addReservations(params) {
             if (lockedOfferRateLimitKeys.length > 0) {
                 yield Promise.all(objectSubReservations.map((reservation) => __awaiter(this, void 0, void 0, function* () {
                     yield (0, cancelReservation_1.processUnlockOfferRateLimit)({
+                        project: { id: params.event.project.id },
                         reservation: {
                             reservationNumber,
                             reservedTicket: reservation.reservedTicket
@@ -469,6 +471,7 @@ function processLockOfferRateLimit(params) {
             const unitInSeconds = (_b = reservation.reservedTicket.ticketType.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
             if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
                 const rateLimitKey = {
+                    project: { id: params.project.id },
                     reservedTicket: {
                         ticketType: {
                             validRateLimit: {
@@ -489,7 +492,12 @@ function processLockOfferRateLimit(params) {
                 rateLimitKeys.push(rateLimitKey);
             }
         });
-        yield repos.offerRateLimit.lock(rateLimitKeys);
+        if (rateLimitKeys.length > 0) {
+            if (rateLimitKeys.length > 1) {
+                throw new factory.errors.Argument('acceptedOffers', `Number of offers with rateLimit must be less than or equal to 1`);
+            }
+            yield repos.offerRateLimit.lock(rateLimitKeys[0]);
+        }
         return rateLimitKeys;
     });
 }

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -143,7 +143,7 @@ function validateEventOfferPeriod(params) {
                 throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier');
             }
             // トークン検証
-            const memberProgram = (yield repos.memberProgram.search({
+            const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.event.project.id } },

package/lib/chevre/service/code.js

@@ -41,7 +41,7 @@ function getToken(params) {
         const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
         const jti = id;
         // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
-        if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {
+        if (authorization.object.typeOf === factory.role.RoleType.OrganizationRole) {
             subject = authorization.object.member.id;
             typ = `${jwtSetting.payloadTypPrefix}:${authorization.object.member.typeOf}`;
         }

package/lib/chevre/service/offer/event/checkAvailability.d.ts

@@ -2,7 +2,7 @@ import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import * as factory from '../../../factory';
 declare function checkAvailability(params: {
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>, 'startDate'>;
+    event: Pick<IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>, 'startDate' | 'project'>;
     unitPriceOffer: factory.unitPriceOffer.IUnitPriceOffer;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;

package/lib/chevre/service/offer/event/checkAvailability.js

@@ -22,6 +22,7 @@ function checkAvailability(params) {
         const unitInSeconds = (_b = unitPriceOffer.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
+                project: { id: params.event.project.id },
                 reservedTicket: {
                     ticketType: {
                         validRateLimit: {

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

@@ -388,43 +388,3 @@ function createServiceOutputIdentifier(params) {
         })));
     });
 }
-// function processLockRegisterMembershipService(params: {
-//     agent: { id: string };
-//     product: factory.product.IProduct;
-//     purpose: factory.action.authorize.offer.product.IPurpose;
-// }) {
-//     return async (repos: {
-//         registerActionInProgress: RegisterServiceInProgressRepo;
-//     }) => {
-//         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
-//             await repos.registerActionInProgress.lock(
-//                 {
-//                     agent: { id: params.agent.id },
-//                     product: { id: String(params.product.id) }
-//                 },
-//                 params.purpose.id
-//             );
-//         }
-//     };
-// }
-// export function processUnlockRegisterMembershipService(params: {
-//     agent: { id: string };
-//     product: { id: string };
-//     purpose: factory.action.authorize.offer.product.IPurpose;
-// }) {
-//     return async (repos: {
-//         registerActionInProgress: RegisterServiceInProgressRepo;
-//     }) => {
-//         // 登録ロックIDが取引IDであればロック解除
-//         const holder = await repos.registerActionInProgress.getHolder({
-//             agent: { id: params.agent.id },
-//             product: { id: params.product.id }
-//         });
-//         if (holder === params.purpose.id) {
-//             await repos.registerActionInProgress.unlock({
-//                 agent: { id: params.agent.id },
-//                 product: { id: params.product.id }
-//             });
-//         }
-//     };
-// }

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

@@ -18,7 +18,6 @@ import type { TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
 import type { TransactionRepo } from '../../repo/transaction';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
-import type { TransactionProcessRepo } from '../../repo/transactionProcess';
 import * as PayTransactionService from '../assetTransaction/pay';
 import { onPaymentStatusChanged } from './any/onPaymentStatusChanged';
 import { person2username } from './any/person2username';
@@ -97,7 +96,6 @@ interface IAuthorizeRepos {
     ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
-    transactionProcess: TransactionProcessRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 interface IPublishPaymentUrlRepos {

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

@@ -20,6 +20,7 @@ exports.processVoidPayTransaction = processVoidPayTransaction;
 exports.publishPaymentUrl = publishPaymentUrl;
 const util = require("util");
 const factory = require("../../factory");
+// import type { TransactionProcessRepo } from '../../repo/transactionProcess';
 const PayTransactionService = require("../assetTransaction/pay");
 const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
 const factory_1 = require("./any/factory");

package/lib/chevre/service/reserve/cancelReservation.d.ts

@@ -31,6 +31,9 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 declare function processUnlockOfferRateLimit(params: {
+    project: {
+        id: string;
+    };
     reservation: {
         reservationNumber: string;
         reservedTicket: factory.reservation.ITicket;

package/lib/chevre/service/reserve/cancelReservation.js

@@ -104,6 +104,7 @@ function cancelPengindIfNotYet(params) {
                                             : reserveTransactionId
                                     })(repos);
                                     yield processUnlockOfferRateLimit({
+                                        project: { id: reserveTransaction.project.id },
                                         reservation: {
                                             reservationNumber: reserveTransaction.object.reservationNumber,
                                             reservedTicket: cancelingSubReservation.reservedTicket
@@ -204,6 +205,7 @@ function cancelReservation(actionAttributesList) {
                                         : reserveTransaction.id
                                 })(repos);
                                 yield processUnlockOfferRateLimit({
+                                    project: { id: reserveTransaction.project.id },
                                     reservation: {
                                         reservationNumber: reserveTransaction.object.reservationNumber,
                                         reservedTicket: cancelingSubReservation.reservedTicket
@@ -253,6 +255,7 @@ function cancelReservation(actionAttributesList) {
                             })(repos);
                         }
                         yield processUnlockOfferRateLimit({
+                            project: { id: reservation.project.id },
                             reservation: {
                                 reservationNumber: reservation.reservationNumber,
                                 reservedTicket: reservation.reservedTicket
@@ -401,6 +404,7 @@ function processUnlockOfferRateLimit(params) {
         const unitInSeconds = (_b = reservation.reservedTicket.ticketType.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
+                project: { id: params.project.id },
                 reservedTicket: {
                     ticketType: {
                         validRateLimit: {
@@ -420,7 +424,7 @@ function processUnlockOfferRateLimit(params) {
             };
             const holder = yield repos.offerRateLimit.getHolder(rateLimitKey);
             if (holder === rateLimitKey.reservationNumber) {
-                yield repos.offerRateLimit.unlock([rateLimitKey]);
+                yield repos.offerRateLimit.unlock(rateLimitKey);
             }
         }
     });

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

@@ -86,7 +86,7 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                     project: new project_1.ProjectRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,
@@ -104,7 +104,7 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                     project: new project_1.ProjectRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,

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

@@ -57,13 +57,13 @@ function call(params) {
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
-                confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo(redisClient),
+                confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({ redisClient, connection }),
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
                     scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
                 }),
                 event: new event_1.EventRepo(connection),
-                orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
@@ -73,8 +73,8 @@ function call(params) {
                 task: new task_1.TaskRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
-                transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient),
-                transactionProcess: transactionProcessRepo
+                transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection })
+                // transactionProcess: transactionProcessRepo
             }, settings);
         }
         catch (error) {

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

@@ -29,7 +29,7 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
         const projectRepo = new project_1.ProjectRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield DeliveryService.givePointAward(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,

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

@@ -25,7 +25,7 @@ function call(data) {
         }
         const actionRepo = new action_1.ActionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield MoneyTransferService.moneyTransfer(data)({
             action: actionRepo,
             product: productRepo,

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

@@ -43,14 +43,14 @@ function call(params) {
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
-                orderNumber: new orderNumber_1.OrderNumberRepo(redisClient),
+                orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
                 project: new project_1.ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
-                transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
+                transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection })
             }, settings);
         }
         catch (error) {

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

@@ -58,7 +58,7 @@ function call(params) {
             project: new project_1.ProjectRepo(connection),
             task: new task_1.TaskRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-            transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection })
         }, settings);
     });
 }

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

@@ -29,7 +29,7 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
         const projectRepo = new project_1.ProjectRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield (0, returnMoneyTransfer_1.returnMoneyTransfer)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,

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

@@ -39,7 +39,7 @@ function call(params) {
             product: new product_1.ProductRepo(connection),
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection),
-            transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection })
         });
     });
 }

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

@@ -29,7 +29,7 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
         const projectRepo = new project_1.ProjectRepo(connection);
-        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
+        const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo({ redisClient, connection });
         yield DeliveryService.returnPointAward(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,

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

@@ -55,7 +55,7 @@ function call(params) {
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             project: new project_1.ProjectRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
-            transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient),
+            transactionNumber: new transactionNumber_1.TransactionNumberRepo({ redisClient, connection }),
             reserveService
         });
     });

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

@@ -1,6 +1,5 @@
-import type { Connection } from 'mongoose';
-import type { RedisClientType } from 'redis';
 import { SendGridCredentials } from '../credentials/sendGrid';
+import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import * as factory from '../factory';
 import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
@@ -8,15 +7,7 @@ import { AggregationSettings } from '../settings/aggregation';
 interface ICredentialSettings {
     sendGrid: SendGridCredentials;
 }
-interface IExecuteSettings {
-    /**
-     * MongoDBコネクション
-     */
-    connection: Connection;
-    /**
-     * Redisクライアント
-     */
-    redisClient?: RedisClientType;
+interface IExecuteSettings extends IMinimumExecuteSettings {
     credentials: ICredentialSettings;
     settings: Settings;
     aggregationSettings?: AggregationSettings;
@@ -29,17 +20,17 @@ type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
 export type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
-declare function executeById(params: {
-    id: string;
-    status: factory.taskStatus.Ready | factory.taskStatus.Running;
+/**
+ * タスク変更イベントを受けて実行する
+ */
+declare function executeById(params: (IReadyTask | IRunningTask) & {
     executor: {
         /**
          * タスク実行者名称
          */
         name: string;
     };
-    expires?: Date;
-}): IOperation<void>;
+}, next?: INextFunction): IOperation<void>;
 /**
  * support no name(2025-03-04~)
  */
@@ -61,7 +52,7 @@ declare function executeOneIfExists(params: {
 /**
  * タスクを実行する
  */
-declare function execute(task: IExecutableTask<factory.taskName>): IOperationExecute<void>;
+declare function execute(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
 /**
  * add(2025-03-13~)
  */

package/lib/chevre/service/task.js

@@ -21,7 +21,10 @@ const moment = require("moment");
 const factory = require("../factory");
 const factory_1 = require("./notification/factory");
 const debug = createDebug('chevre-domain:service:task');
-function executeById(params) {
+/**
+ * タスク変更イベントを受けて実行する
+ */
+function executeById(params, next) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
         const { id, status, executor, expires } = params;
@@ -39,7 +42,7 @@ function executeById(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            yield execute(task)(settings, {
+            yield execute(task, (typeof next === 'function') ? next : undefined)(settings, {
                 executeById: true,
                 executeByName: false
             });
@@ -77,7 +80,7 @@ function executeOneIfExists(params) {
 /**
  * タスクを実行する
  */
-function execute(task) {
+function execute(task, next) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
     return (settings, options) => __awaiter(this, void 0, void 0, function* () {
@@ -129,7 +132,10 @@ function execute(task) {
                 error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
                     ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
             };
-            yield taskRepo.pushExecutionResultById(task.id, factory.taskStatus.Executed, result);
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: factory.taskStatus.Executed
+            }, result, (typeof next === 'function') ? next : undefined);
         }
         catch (error) {
             debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
@@ -143,7 +149,10 @@ function execute(task) {
                 error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            yield taskRepo.pushExecutionResultById(task.id, task.status, result);
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: task.status
+            }, result, (typeof next === 'function') ? next : undefined);
         }
     });
 }

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js

@@ -116,7 +116,7 @@ function validateStartRequest(params) {
             }
         })).shift();
         if (iamMember === undefined) {
-            throw new factory.errors.NotFound(factory.iam.RoleType.OrganizationRole);
+            throw new factory.errors.NotFound(factory.role.RoleType.OrganizationRole);
         }
         // メンバーシップトークン検証(2024-01-31~)
         let memeberOfPayload;
@@ -124,7 +124,7 @@ function validateStartRequest(params) {
         const validMemberProgramIdentifier = (_c = projectMakesOffer.validForMemberTier) === null || _c === void 0 ? void 0 : _c.isTierOf.identifier;
         if (typeof validMemberProgramIdentifier === 'string') {
             // メンバープログラムと発行者を参照(2025-01-16~)
-            const memberProgram = (yield repos.memberProgram.search({
+            const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },

package/lib/chevre/service/transaction/returnOrder/preStart/factory.d.ts

@@ -0,0 +1,20 @@
+import * as factory from '../../../../factory';
+/**
+ * 販売者に設定された利用可能な販売者返品ポリシー
+ */
+type IAvailableSellerReturnPolicy = Pick<factory.sellerReturnPolicy.ISellerReturnPolicy, 'applicablePaymentMethod' | 'identifier' | 'itemCondition' | 'merchantReturnDays' | 'restockingFee' | 'typeOf'>;
+/**
+ * プロジェクトのカスタム返品ポリシー
+ * リモートから取得
+ */
+type ICustomSellerReturnPolicy = Pick<factory.sellerReturnPolicy.ISellerReturnPolicy, 'identifier' | 'restockingFee' | 'typeOf'> & {
+    /**
+     * support itemCondition(2025-05-17~)
+     */
+    itemCondition?: factory.offerItemCondition.OfferItemCondition;
+    applicablePaymentMethod?: never;
+    merchantReturnDays?: never;
+};
+type IFixedAcceptedOffer = Pick<factory.order.IAcceptedOffer<factory.order.IItemOffered>, 'id' | 'priceSpecification' | 'itemOffered'>;
+type IFixedOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'dateReturned' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'paymentMethods' | 'price' | 'project' | 'seller' | 'typeOf'>;
+export { IAvailableSellerReturnPolicy, ICustomSellerReturnPolicy, IFixedAcceptedOffer, IFixedOrder };

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/chevre/service/transaction/returnOrder/preStart/findApplicableReturnPolicy.d.ts

@@ -0,0 +1,23 @@
+import * as factory from '../../../../factory';
+import { IAvailableSellerReturnPolicy, IFixedAcceptedOffer, IFixedOrder } from './factory';
+/**
+ * 採用可能な販売者の返品ポリシーをひとつ選択する
+ * restockingFeeが最低のポリシーを自動選択
+ */
+declare function findApplicableReturnPolicy(params: {
+    acceptedOffers: IFixedAcceptedOffer[];
+    events: {
+        id: string;
+        startDate: Date;
+    }[];
+    offerItemConditions: Pick<factory.offerItemCondition.IOfferItemCondition, 'id' | 'identifier' | 'itemOffered' | 'typeOf'>[];
+    orders: IFixedOrder[];
+    returningDate: Date;
+    reason: factory.transaction.returnOrder.Reason;
+    returnPolicies: IAvailableSellerReturnPolicy[];
+    returnPolicySettingsByProject?: factory.project.IHasMerchantReturnPolicy;
+    offers: factory.unitPriceOffer.IUnitPriceOffer[];
+    policiesByOffer: factory.unitPriceOffer.IOfferMerchantReturnPolicy[];
+    usedReservationExists: boolean;
+}): Promise<factory.action.transfer.returnAction.order.IReturnPolicy>;
+export { findApplicableReturnPolicy };