diff --git a/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/upload/route.ts b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/upload/route.ts index 4d403f0f..c63fb893 100644 --- a/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/upload/route.ts +++ b/furniture-3d-system/src/app/api/supply-chain/supplier-recommended-products/upload/route.ts @@ -4,7 +4,7 @@ import { ErrorCode } from '@/server/core/errors' import { handleRequest, jsonError, jsonSuccess } from '@/server/core/response' import { uploadBufferToObjectStorage } from '@/lib/storage' -export const SUPPLIER_RECOMMENDED_IMAGE_STORAGE_PREFIX = 'supplier-recommended-images' +const SUPPLIER_RECOMMENDED_IMAGE_STORAGE_PREFIX = 'supplier-recommended-images' const SUPPLIER_RECOMMENDED_IMAGE_MAX_BYTES = 25 * 1024 * 1024 diff --git a/furniture-3d-system/src/server/services/employee-hours-record.service.test.ts b/furniture-3d-system/src/server/services/employee-hours-record.service.test.ts index 40352a24..944ba413 100644 --- a/furniture-3d-system/src/server/services/employee-hours-record.service.test.ts +++ b/furniture-3d-system/src/server/services/employee-hours-record.service.test.ts @@ -22,10 +22,11 @@ jest.mock('@/server/repositories/employee-hours-config.repository', () => ({ }, })) -jest.mock('@/lib/storage', () => ({ - normalizeObjectStorageUrlForPersistence: jest.fn((url: string) => - url.replace('https://cp.jiansun.vip', ''), - ), +jest.mock('@/server/repositories/work-record.repository', () => ({ + workRecordRepository: { + findScoreRuleById: jest.fn(), + findScoreRules: jest.fn(), + }, })) jest.mock('@/lib/storage', () => ({ @@ -40,7 +41,7 @@ import { employeeHoursConfigRepository } from '@/server/repositories/employee-ho import { employeeHoursRecordService } from './employee-hours-record.service' const recordRepository = employeeHoursRecordRepository as jest.Mocked -const ruleRepository = employeeHoursConfigRepository as jest.Mocked> +const ruleRepository = employeeHoursConfigRepository as jest.Mocked const employee = { id: 'owner-config-1', nickname: '青山', department: '供应链中心' } const rule = { diff --git a/furniture-3d-system/src/server/services/employee-hours-record.service.ts b/furniture-3d-system/src/server/services/employee-hours-record.service.ts index fa5b82ae..65e3a14f 100644 --- a/furniture-3d-system/src/server/services/employee-hours-record.service.ts +++ b/furniture-3d-system/src/server/services/employee-hours-record.service.ts @@ -11,8 +11,8 @@ import type { import { calculateEmployeeHoursDuration, DEFAULT_EMPLOYEE_HOURS_SORT, EMPLOYEE_HOURS_SORT_KEYS } from '@/lib/employee-hours' import { normalizeObjectStorageUrlForPersistence } from '@/lib/storage' import { AppError, ErrorCode } from '@/server/core/errors' -import { employeeHoursConfigRepository } from '@/server/repositories/employee-hours-config.repository' import { employeeHoursRecordRepository } from '@/server/repositories/employee-hours-record.repository' +import { employeeHoursConfigRepository } from '@/server/repositories/employee-hours-config.repository' import { assertEmployeeHoursRecordAccess, type EmployeeHoursScope } from './employee-hours-access.service' const DATE_PATTERN = /^(\d{4})-(\d{1,2})-(\d{1,2})$/