@chevre/domain 22.10.0-alpha.8 → 22.10.0

package/lib/chevre/repo/transactionNumberCounter.js

@@ -0,0 +1,128 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionNumberCounterRepo = void 0;
+const errorHandler_1 = require("../errorHandler");
+const factory = require("../factory");
+const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+const MAX_RETRY_INCREMENT = 1;
+/**
+ * 取引番号カウンターリポジトリ
+ */
+class TransactionNumberCounterRepo {
+    constructor(params) {
+        const { redisClient, connection } = params;
+        this.redisClient = redisClient;
+        this.transactionNumberModel = connection.model(transactionNumber_1.modelName, (0, transactionNumber_1.createSchema)());
+    }
+    incrementByRedis(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // const now = moment();
+            const { expires } = params;
+            const key = `${params.includedInDataCatalog.identifier}:${params.identifier}`;
+            // const TTL = moment(expires)
+            //     .diff(now, 'seconds');
+            const [incrReply, expireAtReply] = yield this.redisClient.multi()
+                .incr(key)
+                // .expire(key, TTL)
+                .expireAt(key, expires)
+                .exec();
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else: please write tests */
+            if (typeof incrReply !== 'number') {
+                // 基本的にありえないフロー
+                throw new factory.errors.Internal('transaction number not incremented unexpectedly');
+            }
+            // expireAtReplyの検証も追加する(2023-04-19~)
+            const expiredSet = expireAtReply === 1 || expireAtReply === true;
+            if (!expiredSet) {
+                // 基本的にありえないフロー
+                throw new factory.errors.Internal('transaction number expiration not set unexpectedly');
+            }
+            return incrReply;
+        });
+    }
+    incrementByMongo(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const now = new Date();
+            const dataFeedExpires = params.expires;
+            const dataFeedIdentifier = params.identifier;
+            const dataFeed = {
+                typeOf: 'DataFeed',
+                includedInDataCatalog: {
+                    identifier: params.includedInDataCatalog.identifier,
+                    typeOf: 'DataCatalog'
+                },
+                dateCreated: now,
+                expires: dataFeedExpires,
+                identifier: dataFeedIdentifier,
+                interactionStatistic: {
+                    typeOf: 'InteractionCounter',
+                    userInteractionCount: 0
+                },
+                project: { id: '*', typeOf: factory.organizationType.Project }
+            };
+            const { typeOf, includedInDataCatalog, dateCreated, expires, identifier, project, interactionStatistic } = dataFeed;
+            let doc;
+            let retryCount = 0;
+            while (retryCount <= MAX_RETRY_INCREMENT) {
+                try {
+                    doc = yield this.transactionNumberModel.findOneAndUpdate({
+                        'project.id': { $eq: dataFeed.project.id },
+                        'includedInDataCatalog.identifier': { $eq: dataFeed.includedInDataCatalog.identifier },
+                        identifier: { $eq: dataFeed.identifier }
+                    }, {
+                        $set: {
+                            dateModified: now
+                        },
+                        $setOnInsert: {
+                            typeOf, includedInDataCatalog, dateCreated, expires, identifier, project,
+                            'interactionStatistic.typeOf': interactionStatistic.typeOf
+                        },
+                        $inc: {
+                            'interactionStatistic.userInteractionCount': 1
+                        }
+                    }, {
+                        upsert: true,
+                        new: true,
+                        projection: { _id: 0, interactionStatistic: 1 }
+                    })
+                        .lean()
+                        .exec();
+                    break;
+                }
+                catch (error) {
+                    if (yield (0, errorHandler_1.isMongoError)(error)) {
+                        if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                            // すでに存在するので、リトライすればincrementに成功するはず
+                            retryCount += 1;
+                            continue;
+                        }
+                    }
+                    throw error;
+                }
+            }
+            if (doc === undefined) {
+                throw new factory.errors.NotFound('DataFeed');
+            }
+            const incrReply = (_a = doc.interactionStatistic) === null || _a === void 0 ? void 0 : _a.userInteractionCount;
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore if */
+            if (typeof incrReply !== 'number') {
+                // 基本的にありえないフロー
+                throw new factory.errors.Internal('confirmation number not incremented unexpectedly');
+            }
+            return incrReply;
+        });
+    }
+}
+exports.TransactionNumberCounterRepo = TransactionNumberCounterRepo;

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

@@ -6,6 +6,9 @@ interface IProcessKey {
      * 取引ID
      */
     id: string;
+    project: {
+        id: string;
+    };
 }
 interface IOptions {
     lockExpiresInSeconds: number;
@@ -14,11 +17,11 @@ interface IOptions {
  * 取引プロセスリポジトリ
  */
 export declare class TransactionProcessRepo {
+    private readonly concurrentLockRepo;
     private readonly options;
-    private readonly redisClient;
     constructor(redisClient: RedisClientType, options: IOptions);
-    static CREATE_REDIS_KEY(params: IProcessKey): string;
-    lock(params: IProcessKey): Promise<boolean>;
-    unlock(params: IProcessKey): Promise<void>;
+    static CREATE_REDIS_KEY(params: Pick<IProcessKey, 'id' | 'typeOf'>): string;
+    lock(params: IProcessKey): Promise<void>;
+    unlock(params: Pick<IProcessKey, 'id' | 'typeOf'>): Promise<void>;
 }
 export {};

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/repository.d.ts

@@ -68,6 +68,7 @@ import type { ScheduleRepo } from './repo/schedule';
 import type { SellerRepo } from './repo/seller';
 import type { SellerPaymentAcceptedRepo } from './repo/sellerPaymentAccepted';
 import type { SellerReturnPolicyRepo } from './repo/sellerReturnPolicy';
+import type { ServiceAvailableHourRepo } from './repo/service/availableHour';
 import type { ServiceOutputRepo } from './repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from './repo/serviceOutputIdentifier';
 import type { SettingRepo } from './repo/setting';
@@ -390,6 +391,10 @@ export type SellerReturnPolicy = SellerReturnPolicyRepo;
 export declare namespace SellerReturnPolicy {
     function createInstance(...params: ConstructorParameters<typeof SellerReturnPolicyRepo>): Promise<SellerReturnPolicyRepo>;
 }
+export type ServiceAvailableHour = ServiceAvailableHourRepo;
+export declare namespace ServiceAvailableHour {
+    function createInstance(...params: ConstructorParameters<typeof ServiceAvailableHourRepo>): Promise<ServiceAvailableHourRepo>;
+}
 export type ServiceOutput = ServiceOutputRepo;
 export declare namespace ServiceOutput {
     function createInstance(...params: ConstructorParameters<typeof ServiceOutputRepo>): Promise<ServiceOutputRepo>;

package/lib/chevre/repository.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -945,6 +945,19 @@ var SellerReturnPolicy;
     }
     SellerReturnPolicy.createInstance = createInstance;
 })(SellerReturnPolicy || (exports.SellerReturnPolicy = SellerReturnPolicy = {}));
+var ServiceAvailableHour;
+(function (ServiceAvailableHour) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/service/availableHour'))).ServiceAvailableHourRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    ServiceAvailableHour.createInstance = createInstance;
+})(ServiceAvailableHour || (exports.ServiceAvailableHour = ServiceAvailableHour = {}));
 var ServiceOutput;
 (function (ServiceOutput) {
     let repo;

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
         });
     });