diff --git a/dictation_server/src/constants/index.ts b/dictation_server/src/constants/index.ts index 4c63064..da502d7 100644 --- a/dictation_server/src/constants/index.ts +++ b/dictation_server/src/constants/index.ts @@ -301,10 +301,3 @@ export const USER_AUDIO_FORMAT = 'DS2(QP)'; * @const {string[]} */ export const NODE_ENV_TEST = 'test'; - -/** - * SQLのlockOptionの種類 - */ -export const DB_LOCK_MODE = { - PESSIMISTIC_WRITE: 'pessimistic_write', -}; diff --git a/dictation_server/src/repositories/licenses/licenses.repository.service.ts b/dictation_server/src/repositories/licenses/licenses.repository.service.ts index 2004be3..9f9cb85 100644 --- a/dictation_server/src/repositories/licenses/licenses.repository.service.ts +++ b/dictation_server/src/repositories/licenses/licenses.repository.service.ts @@ -9,7 +9,6 @@ import { } from './entity/license.entity'; import { CARD_LICENSE_LENGTH, - DB_LOCK_MODE, LICENSE_ALLOCATED_STATUS, LICENSE_ISSUE_STATUS, LICENSE_TYPE, @@ -417,20 +416,16 @@ export class LicensesRepositoryService { const licenseOrderRepo = entityManager.getRepository(LicenseOrder); const licenseRepo = entityManager.getRepository(License); - let lockOption = {}; - // テスト環境の場合は悲観的ロックを行わない - if (process.env.NODE_ENV !== NODE_ENV_TEST) { - lockOption = { mode: DB_LOCK_MODE.PESSIMISTIC_WRITE }; - } - const issuingOrder = await licenseOrderRepo.findOne({ where: { from_account_id: orderedAccountId, po_number: poNumber, }, comment: `${context.getTrackingId()}_${new Date().toUTCString()}`, - - ...lockOption, + // テスト環境の場合はロックを行わない(sqliteがlockに対応していないため) + ...(process.env.NODE_ENV !== NODE_ENV_TEST + ? { lock: { mode: 'pessimistic_write' } } + : {}), }); if (!issuingOrder) { // 注文が存在しない場合、エラー