Compare commits
33 Commits
0956bf907f
...
v1.11.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
b065e23306 | ||
|
|
1c0a000a67 | ||
|
|
6b3c62268a | ||
|
|
bb86208d32 | ||
|
|
3be7959067 | ||
|
|
91f29a1167 | ||
|
|
abad61758c | ||
|
|
d0c745e243 | ||
|
|
fe6cdbf076 | ||
|
|
188117e5ce | ||
|
|
0560b3c84a | ||
|
|
fb3bdbc493 | ||
|
|
c6f67e49a4 | ||
|
|
d16f2d1af0 | ||
|
|
4150a13175 | ||
|
|
d0f8ad0fef | ||
|
|
4a7c220baa | ||
|
|
f51cae0f6f | ||
|
|
7601b5f176 | ||
|
|
e2669af870 | ||
|
|
e54d94fce2 | ||
|
|
9791a84047 | ||
|
|
b5ba18b595 | ||
|
|
13fb7bcf46 | ||
|
|
0ca17a1807 | ||
|
|
54a3ac680a | ||
|
|
16b2882729 | ||
|
|
e97ec63433 | ||
|
|
9556891dea | ||
|
|
fa57f9e564 | ||
|
|
9300f3455f | ||
|
|
7e521da3f1 | ||
|
|
130e0602d1 |
@@ -4,7 +4,7 @@
|
||||
# 部署说明：
|
||||
# 1. 复制此文件为 config.yaml
|
||||
# 2. 根据实际环境修改配置值
|
||||
# 3. 设置 database.activeType 为 mysql 或 sqlserver
|
||||
# 3. 设置 database.activeType 为 mysql、sqlserver 或 postgresql
|
||||
# ================================
|
||||
# 注意：ERP 认证信息存储在数据库 (dbo_BIPUsers) 中，按用户管理
|
||||
# ================================
|
||||
@@ -29,6 +29,14 @@ database:
|
||||
driver: 'ODBC Driver 18 for SQL Server'
|
||||
trustServerCertificate: true
|
||||
|
||||
postgresql:
|
||||
host: <PG_HOST>
|
||||
port: 5432
|
||||
database: <DATABASE_NAME>
|
||||
username: <USERNAME>
|
||||
password: <PASSWORD>
|
||||
maxPoolSize: 10
|
||||
|
||||
paths:
|
||||
dataDir: './data/'
|
||||
defaultOutput: 'output.xlsx'
|
||||
|
||||
@@ -11,20 +11,20 @@
|
||||
|
||||
### 失败测试分布
|
||||
|
||||
| 测试文件 | 失败数量 | 根因分类 | 预计工时 |
|
||||
|---------|---------|---------|---------|
|
||||
| `logger.test.ts` | 11 failures | Winston format mock + 循环依赖 | 2-3h |
|
||||
| `update-service.test.ts` | 1 failure | Mock 参数不匹配 | 30min |
|
||||
| `update-installer.test.ts` | 1 failure | 路径断言错误 | 15min |
|
||||
| **总计** | **13 failures** | - | **~3-4h** |
|
||||
| 测试文件 | 失败数量 | 根因分类 | 预计工时 |
|
||||
| -------------------------- | --------------- | ------------------------------ | --------- |
|
||||
| `logger.test.ts` | 11 failures | Winston format mock + 循环依赖 | 2-3h |
|
||||
| `update-service.test.ts` | 1 failure | Mock 参数不匹配 | 30min |
|
||||
| `update-installer.test.ts` | 1 failure | 路径断言错误 | 15min |
|
||||
| **总计** | **13 failures** | - | **~3-4h** |
|
||||
|
||||
### 测试通过率
|
||||
|
||||
| 指标 | 当前 | 修复后 |
|
||||
|------|------|--------|
|
||||
| 失败套件 | 3 suites | 0 suites |
|
||||
| 失败测试 | 13 tests | 0 tests |
|
||||
| 通过率 | 95% (311/327) | 100% (327/327) |
|
||||
| 指标 | 当前 | 修复后 |
|
||||
| -------- | ------------- | -------------- |
|
||||
| 失败套件 | 3 suites | 0 suites |
|
||||
| 失败测试 | 13 tests | 0 tests |
|
||||
| 通过率 | 95% (311/327) | 100% (327/327) |
|
||||
|
||||
---
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
#### 问题诊断
|
||||
|
||||
**失败模式**:
|
||||
|
||||
```
|
||||
TypeError: __vite_ssr_import_0__.default.format(...) is not a function
|
||||
at src/main/services/logger/index.ts:114:4
|
||||
@@ -54,6 +55,7 @@ TypeError: __vite_ssr_import_0__.default.format(...) is not a function
|
||||
3. **具体表现**: 第 114 行的 `winston.format()` 链式调用在 mock 环境中返回 undefined
|
||||
|
||||
**调用栈**:
|
||||
|
||||
```
|
||||
logger.test.ts
|
||||
→ imports logger.ts
|
||||
@@ -63,6 +65,7 @@ logger.test.ts
|
||||
```
|
||||
|
||||
**文件位置**:
|
||||
|
||||
- 测试文件：`tests/unit/logger.test.ts`
|
||||
- 被 mock 文件：`src/main/services/logger/index.ts:100-116`
|
||||
- Setup mock: `tests/setup.ts` (无 winston mock 冲突)
|
||||
@@ -135,11 +138,13 @@ vi.mock('winston', () => ({
|
||||
**方案 B: 将 logger.test.ts 转为集成测试 (2 小时)**
|
||||
|
||||
如果 mock 过于复杂，可以考虑:
|
||||
|
||||
- 使用 vi.resetModules() 确保每次测试都重新加载
|
||||
- 使用 vi.mock(importOriginal) 混合真实模块
|
||||
- 或完全重写测试，只测试 logger 的公共 API
|
||||
|
||||
**预期结果**:
|
||||
|
||||
- ✅ 18/18 tests passing
|
||||
- ✅ format().combine().timestamp().printf() 链式调用正常工作
|
||||
- ✅ logger 创建、子 logger、日志输出测试全部通过
|
||||
@@ -165,8 +170,9 @@ vi.mock('winston', () => ({
|
||||
**失败测试**: `checks updates for user and auto-downloads available recommendation`
|
||||
|
||||
**错误信息**:
|
||||
|
||||
```
|
||||
AssertionError: expected "vi.fn()" to be called with arguments:
|
||||
AssertionError: expected "vi.fn()" to be called with arguments:
|
||||
['stable/1.1.0.exe', 'preview/1.1.0.exe']
|
||||
|
||||
Number of calls: 0
|
||||
@@ -175,6 +181,7 @@ Number of calls: 0
|
||||
**根因**: Mock 调用参数与实际调用不匹配
|
||||
|
||||
**代码位置**:
|
||||
|
||||
- 测试文件：`tests/unit/update-service.test.ts:165-175`
|
||||
- 被测文件：`src/main/services/update/update-service.ts`
|
||||
|
||||
@@ -200,12 +207,14 @@ it('checks updates for user and auto-downloads available recommendation', async
|
||||
**步骤 2.2.3**: 更新测试断言
|
||||
|
||||
**选项 A: 匹配实际调用**
|
||||
|
||||
```typescript
|
||||
// 如果实际只调用了一个参数
|
||||
expect(mockDownload).toHaveBeenCalledWith('stable/1.1.0.exe')
|
||||
```
|
||||
|
||||
**选项 B: 使用更松散的断言**
|
||||
|
||||
```typescript
|
||||
// 如果参数顺序或数量有变化
|
||||
expect(mockDownload).toHaveBeenCalled()
|
||||
@@ -213,14 +222,12 @@ expect(mockDownload.mock.calls[0]).toContain('stable/1.1.0.exe')
|
||||
```
|
||||
|
||||
**选项 C: 调整 mock 设置**
|
||||
|
||||
```typescript
|
||||
// 确保 mock 正确设置
|
||||
mockDownload.mockClear()
|
||||
// ... 触发动作 ...
|
||||
expect(mockDownload).toHaveBeenCalledWith(
|
||||
expect.stringContaining('stable'),
|
||||
expect.any(String)
|
||||
)
|
||||
expect(mockDownload).toHaveBeenCalledWith(expect.stringContaining('stable'), expect.any(String))
|
||||
```
|
||||
|
||||
#### 成功标准
|
||||
@@ -243,8 +250,9 @@ expect(mockDownload).toHaveBeenCalledWith(
|
||||
**失败测试**: `builds downloaded package path under userData pending-update`
|
||||
|
||||
**错误信息**:
|
||||
|
||||
```
|
||||
AssertionError: expected 'D:\...\test-user-data\pending-update\stable-1.2.3.exe'
|
||||
AssertionError: expected 'D:\...\test-user-data\pending-update\stable-1.2.3.exe'
|
||||
to contain 'logs\pending-update'
|
||||
|
||||
Expected: "logs\pending-update"
|
||||
@@ -254,6 +262,7 @@ Received: "D:\...\test-user-data\pending-update\stable-1.2.3.exe"
|
||||
**根因**: Electron mock 的 `app.getPath('userData')` 返回 `test-user-data`，但测试期望路径包含 `logs`
|
||||
|
||||
**代码位置**:
|
||||
|
||||
- 测试文件：`tests/unit/update-installer.test.ts:13-16`
|
||||
- Setup mock: `tests/setup.ts:17-24`
|
||||
|
||||
@@ -286,6 +295,7 @@ userData: path.join(process.cwd(), 'logs')
|
||||
```
|
||||
|
||||
**推荐**: 方案 2.3.1 (测试适应 mock)
|
||||
|
||||
- 理由：mock 是为了测试隔离，测试应该适应 mock 环境
|
||||
|
||||
#### 成功标准
|
||||
@@ -310,6 +320,7 @@ npm run test:run tests/unit/logger.test.ts
|
||||
```
|
||||
|
||||
**失败时排查**:
|
||||
|
||||
1. 检查 vi.mock 是否在文件顶部 (hoisted)
|
||||
2. 清除 vitest 缓存：`npx vitest --clearCache`
|
||||
3. 检查是否有多个 winston mock 冲突
|
||||
@@ -354,11 +365,11 @@ npm run test:run 2>&1 | Select-String "Test Files.*failed"
|
||||
|
||||
### 技术指标
|
||||
|
||||
| 指标 | 修复前 | 修复后 | 验证命令 |
|
||||
|------|-------|-------|---------|
|
||||
| 失败套件 | 3 suites | 0 suites | `npm run test:run` |
|
||||
| 失败测试 | 13 tests | 0 tests | `npm run test:run` |
|
||||
| 通过率 | 95% (311/327) | **100%** (327/327) | 测试报告 |
|
||||
| 指标 | 修复前 | 修复后 | 验证命令 |
|
||||
| -------- | ------------- | ------------------ | ------------------ |
|
||||
| 失败套件 | 3 suites | 0 suites | `npm run test:run` |
|
||||
| 失败测试 | 13 tests | 0 tests | `npm run test:run` |
|
||||
| 通过率 | 95% (311/327) | **100%** (327/327) | 测试报告 |
|
||||
|
||||
### 验收条件
|
||||
|
||||
@@ -373,11 +384,11 @@ npm run test:run 2>&1 | Select-String "Test Files.*failed"
|
||||
|
||||
### 技术风险
|
||||
|
||||
| 风险 | 可能性 | 影响 | 缓解措施 |
|
||||
|------|--------|------|---------|
|
||||
| logger mock 实现复杂 | 中 | 高 | 采用延迟 mock，先跑通一部分测试 |
|
||||
| 链式调用 mock 不完整 | 高 | 中 | 使用 createFormatFn 工厂函数 |
|
||||
| 循环依赖难解耦 | 低 | 高 | 只修复 mock，不重构依赖关系 |
|
||||
| 风险 | 可能性 | 影响 | 缓解措施 |
|
||||
| -------------------- | ------ | ---- | ------------------------------- |
|
||||
| logger mock 实现复杂 | 中 | 高 | 采用延迟 mock，先跑通一部分测试 |
|
||||
| 链式调用 mock 不完整 | 高 | 中 | 使用 createFormatFn 工厂函数 |
|
||||
| 循环依赖难解耦 | 低 | 高 | 只修复 mock，不重构依赖关系 |
|
||||
|
||||
### 时间风险
|
||||
|
||||
@@ -386,6 +397,7 @@ npm run test:run 2>&1 | Select-String "Test Files.*failed"
|
||||
- **保守估计**: 6 小时 (遇到意外问题)
|
||||
|
||||
**风险缓解**: 如果 logger mock 问题超过 3 小时无法解决，考虑：
|
||||
|
||||
1. 暂时跳过 logger.test.ts (保持 95% 通过率)
|
||||
2. 先修复简单的 update 测试 (13 failures → 2 failures)
|
||||
3. 记录问题，后续专门花精力解决
|
||||
@@ -401,6 +413,7 @@ npm run test:run 2>&1 | Select-String "Test Files.*failed"
|
||||
**实际工时**: X 小时
|
||||
|
||||
**修复步骤**:
|
||||
|
||||
1. [ ] 诊断 mock 问题
|
||||
2. [ ] 实现 formatFn 工厂
|
||||
3. [ ] 添加所有链式方法
|
||||
@@ -408,10 +421,12 @@ npm run test:run 2>&1 | Select-String "Test Files.*failed"
|
||||
5. [ ] 验证测试通过
|
||||
|
||||
**遇到的问题**:
|
||||
|
||||
- 问题 1: [描述] → 解决方案: [方案]
|
||||
- 问题 2: [描述] → 解决方案: [方案]
|
||||
|
||||
**关键代码**:
|
||||
|
||||
```typescript
|
||||
// 最终有效的 mock 实现
|
||||
```
|
||||
@@ -424,7 +439,8 @@ npm run test:run 2>&1 | Select-String "Test Files.*failed"
|
||||
**结束时间**: HH:MM
|
||||
**实际工时**: X 分钟
|
||||
|
||||
**修复方式**:
|
||||
**修复方式**:
|
||||
|
||||
- [ ] 修改断言
|
||||
- [ ] 修改 mock 参数
|
||||
- [ ] 其他: [描述]
|
||||
@@ -439,7 +455,8 @@ npm run test:run 2>&1 | Select-String "Test Files.*failed"
|
||||
**结束时间**: HH:MM
|
||||
**实际工时**: X 分钟
|
||||
|
||||
**修复方式**:
|
||||
**修复方式**:
|
||||
|
||||
- [ ] 修改断言
|
||||
- [ ] 修改 mock
|
||||
- [ ] 其他: [描述]
|
||||
|
||||
781
docs/TEST_COVERAGE_IMPROVEMENT_PLAN.md
Normal file
781
docs/TEST_COVERAGE_IMPROVEMENT_PLAN.md
Normal file
@@ -0,0 +1,781 @@
|
||||
# ERPAuto 测试覆盖率提升计划
|
||||
|
||||
## 1. 执行摘要
|
||||
|
||||
### 1.1 当前状态评估
|
||||
|
||||
| 指标 | 当前值 | 目标值 | 差距 |
|
||||
| ------------------ | ------ | ------ | ------- |
|
||||
| **总体行覆盖率** | 11.36% | 70% | -58.64% |
|
||||
| **总体函数覆盖率** | 21.29% | 70% | -48.71% |
|
||||
| **总体分支覆盖率** | 10.08% | 60% | -49.92% |
|
||||
| **测试文件总数** | 54 | 100+ | -46+ |
|
||||
|
||||
**关键模块覆盖率差距：**
|
||||
|
||||
| 模块 | 当前覆盖率 | 要求阈值 | 优先级 |
|
||||
| ---------------------------------------- | ---------- | -------- | ------------- |
|
||||
| ERP 服务 (`src/main/services/erp/**`) | 11.68% | 80% | P0 |
|
||||
| 更新服务 (`src/main/services/update/**`) | 42.45% | 80% | P0 |
|
||||
| 数据库服务 | 17.24% | 70% | P1 |
|
||||
| 配置管理 | 20.56% | 70% | P1 |
|
||||
| 日志服务 | 70.67% | 70% | P2 (已达标的) |
|
||||
|
||||
### 1.2 提升目标
|
||||
|
||||
**阶段性目标：**
|
||||
|
||||
- **Phase 1 (4 周)**：ERP 服务达到 60%，更新服务达到 70%
|
||||
- **Phase 2 (4 周)**：数据库服务达到 60%，配置管理达到 60%
|
||||
- **Phase 3 (4 周)**：所有关键模块达到目标阈值，总体覆盖率达到 70%
|
||||
|
||||
**最终目标：**
|
||||
|
||||
- 全局覆盖率：70% 行 / 70% 函数 / 60% 分支
|
||||
- ERP 服务：80% 行 / 80% 函数 / 70% 分支
|
||||
- 更新服务：80% 行 / 80% 函数 / 70% 分支
|
||||
|
||||
### 1.3 时间线估算
|
||||
|
||||
| 阶段 | 持续时间 | 里程碑 |
|
||||
| -------- | --------- | ---------------------- |
|
||||
| Phase 1 | 4 周 | ERP 核心服务测试完成 |
|
||||
| Phase 2 | 4 周 | 数据层与配置层测试完成 |
|
||||
| Phase 3 | 4 周 | 集成测试与 E2E 补全 |
|
||||
| 缓冲期 | 2 周 | 修复与优化 |
|
||||
| **总计** | **14 周** | **达到目标覆盖率** |
|
||||
|
||||
---
|
||||
|
||||
## 2. 分阶段提升计划
|
||||
|
||||
### Phase 1: ERP 核心服务测试攻坚（第 1-4 周）
|
||||
|
||||
**目标：** ERP 服务覆盖率从 11.68% 提升至 60%
|
||||
|
||||
**工作内容：**
|
||||
|
||||
| 模块 | 文件数 | 新增测试数 | 优先级 |
|
||||
| ---------------------- | ------ | ---------- | ------ |
|
||||
| `erp-auth.ts` | 1 | 15 | P0 |
|
||||
| `extractor.ts` | 1 | 20 | P0 |
|
||||
| `extractor-core.ts` | 1 | 15 | P0 |
|
||||
| `cleaner.ts` | 1 | 12 | P0 |
|
||||
| `ErpBrowserManager.ts` | 1 | 10 | P1 |
|
||||
| `order-resolver.ts` | 1 | 8 | P1 |
|
||||
| `page-diagnostics.ts` | 1 | 6 | P2 |
|
||||
| `erp-error-context.ts` | 1 | 5 | P2 |
|
||||
| `locators.ts` | 1 | 8 | P1 |
|
||||
|
||||
**预计投入：** 80-100 小时
|
||||
|
||||
**成功标准：**
|
||||
|
||||
- [ ] ERP 服务行覆盖率 ≥ 60%
|
||||
- [ ] ERP 服务函数覆盖率 ≥ 70%
|
||||
- [ ] 新增测试文件：9 个
|
||||
- [ ] 所有 P0 模块有完整测试覆盖
|
||||
|
||||
---
|
||||
|
||||
### Phase 2: 数据层与配置层测试（第 5-8 周）
|
||||
|
||||
**目标：** 数据库服务与配置管理覆盖率达标
|
||||
|
||||
**工作内容：**
|
||||
|
||||
#### 2.1 数据库服务（17.24% → 60%）
|
||||
|
||||
| 模块 | 文件数 | 新增测试数 | 优先级 |
|
||||
| ---------------------------------------------- | ------ | ---------- | ------ |
|
||||
| `mysql.ts` / `sql-server.ts` / `postgresql.ts` | 3 | 18 | P0 |
|
||||
| `data-source.ts` | 1 | 8 | P0 |
|
||||
| `data-importer.ts` | 1 | 10 | P0 |
|
||||
| DAO 层文件 | 4 | 16 | P1 |
|
||||
| Repository 层 | 2 | 8 | P1 |
|
||||
| 数据库实体 | 2 | 6 | P2 |
|
||||
|
||||
#### 2.2 配置管理（20.56% → 60%）
|
||||
|
||||
| 模块 | 文件数 | 新增测试数 | 优先级 |
|
||||
| ------------------- | ------ | ---------- | ------ |
|
||||
| `config-manager.ts` | 1 | 20 | P0 |
|
||||
| 配置 Schema 验证 | 1 | 10 | P1 |
|
||||
|
||||
#### 2.3 用户服务（新增）
|
||||
|
||||
| 模块 | 文件数 | 新增测试数 | 优先级 |
|
||||
| ---------------------------- | ------ | ---------- | ------ |
|
||||
| `session-manager.ts` | 1 | 8 | P1 |
|
||||
| `user-erp-config-service.ts` | 1 | 10 | P1 |
|
||||
| `bip-users-dao.ts` | 1 | 6 | P2 |
|
||||
|
||||
**预计投入：** 100-120 小时
|
||||
|
||||
**成功标准：**
|
||||
|
||||
- [ ] 数据库服务行覆盖率 ≥ 60%
|
||||
- [ ] 配置管理行覆盖率 ≥ 60%
|
||||
- [ ] 新增测试文件：15 个
|
||||
- [ ] 所有数据库方言有完整测试
|
||||
|
||||
---
|
||||
|
||||
### Phase 3: 更新服务与其他模块补全（第 9-12 周）
|
||||
|
||||
**目标：** 更新服务达到 80%，其他服务达到 70%
|
||||
|
||||
**工作内容：**
|
||||
|
||||
#### 3.1 更新服务（42.45% → 80%）
|
||||
|
||||
| 模块 | 文件数 | 新增测试数 | 优先级 |
|
||||
| ---------------------------- | ------ | ---------- | ------ |
|
||||
| `update-service.ts` | 1 | 15 | P0 |
|
||||
| `update-catalog-service.ts` | 1 | 12 | P0 |
|
||||
| `update-installer.ts` | 1 | 10 | P0 |
|
||||
| `update-storage-client.ts` | 1 | 10 | P0 |
|
||||
| `update-status-publisher.ts` | 1 | 6 | P1 |
|
||||
| `update-support.ts` | 1 | 5 | P1 |
|
||||
| `update-utils.ts` | 1 | 5 | P2 |
|
||||
|
||||
#### 3.2 其他关键服务
|
||||
|
||||
| 模块 | 文件数 | 新增测试数 | 优先级 |
|
||||
| -------------------------- | ------ | ---------- | ------ |
|
||||
| 验证服务 (`validation/**`) | 3 | 15 | P1 |
|
||||
| 清理服务 (`cleaner/**`) | 2 | 10 | P1 |
|
||||
| Excel 服务 | 2 | 8 | P2 |
|
||||
| 报告生成 | 1 | 6 | P2 |
|
||||
| Playwright 浏览器服务 | 2 | 10 | P1 |
|
||||
| RustFS 服务 | 2 | 8 | P2 |
|
||||
|
||||
**预计投入：** 100-120 小时
|
||||
|
||||
**成功标准：**
|
||||
|
||||
- [ ] 更新服务行覆盖率 ≥ 80%
|
||||
- [ ] 更新服务函数覆盖率 ≥ 80%
|
||||
- [ ] 新增测试文件：17 个
|
||||
- [ ] 所有 P0/P1 模块覆盖率达标
|
||||
|
||||
---
|
||||
|
||||
### Phase 4: 集成测试与 E2E 强化（第 13-14 周）
|
||||
|
||||
**目标：** 强化集成测试与端到端测试
|
||||
|
||||
**工作内容：**
|
||||
|
||||
#### 4.1 集成测试扩展（7 → 20 个）
|
||||
|
||||
| 测试场景 | 优先级 | 描述 |
|
||||
| -------------------------- | ------ | ---------------------- |
|
||||
| ERP 登录 + 提取完整流程 | P0 | 验证认证与数据提取集成 |
|
||||
| 数据库事务完整流程 | P0 | 验证 TypeORM 事务边界 |
|
||||
| 配置热加载与验证 | P1 | 验证配置更新传播 |
|
||||
| 更新检查 + 下载 + 安装流程 | P0 | 验证更新完整链路 |
|
||||
| 日志异步写入与轮转 | P1 | 验证日志系统 |
|
||||
| 用户会话切换流程 | P1 | 验证多用户场景 |
|
||||
| Excel 导入导出完整流程 | P2 | 验证文件处理链 |
|
||||
|
||||
#### 4.2 E2E 测试扩展（3 → 15 个）
|
||||
|
||||
| 用户旅程 | 优先级 | 描述 |
|
||||
| -------------------- | ------ | -------------------------------- |
|
||||
| 管理员完整工作流程 | P0 | 登录 → 提取 → 清理 → 验证 → 登出 |
|
||||
| 普通用户数据提取流程 | P0 | 登录 → 提取 → 查看结果 |
|
||||
| Guest 只读访问流程 | P1 | 登录 → 查看历史记录 |
|
||||
| 配置管理流程 | P1 | 修改配置 → 保存 → 验证生效 |
|
||||
| 自动更新流程 | P0 | 检查更新 → 下载 → 安装 → 重启 |
|
||||
| 错误恢复流程 | P1 | 断网重连、会话过期恢复 |
|
||||
| 批量处理流程 | P1 | 大批量订单处理性能验证 |
|
||||
|
||||
**预计投入：** 60-80 小时
|
||||
|
||||
**成功标准：**
|
||||
|
||||
- [ ] 集成测试文件：20 个
|
||||
- [ ] E2E 测试文件：15 个
|
||||
- [ ] 关键用户旅程 100% 覆盖
|
||||
- [ ] 整体覆盖率达到 70%
|
||||
|
||||
---
|
||||
|
||||
## 3. 逐模块测试计划
|
||||
|
||||
### 3.1 ERP 服务模块
|
||||
|
||||
#### 3.1.1 `erp-auth.ts` (P0)
|
||||
|
||||
**当前覆盖率：** < 20%
|
||||
**目标覆盖率：** 80%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| ------------------- | -------- | ------------------------------- | ------------------- |
|
||||
| 成功登录流程 | 单元 | Playwright Browser/Context/Page | 返回有效 ErpSession |
|
||||
| 登录失败 - 网络错误 | 单元 | Playwright + 模拟网络错误 | 抛出连接错误 |
|
||||
| 登录失败 - 凭证错误 | 单元 | Page + 模拟错误消息 | 抛出认证错误 |
|
||||
| 会话复用 - 已登录 | 单元 | Session Mock | 直接返回现有会话 |
|
||||
| 登出流程 | 单元 | Browser/Context Mock | 资源正确释放 |
|
||||
| 会话超时检测 | 单元 | Page + 超时 Mock | 返回未登录状态 |
|
||||
| 页面元素定位失败 | 单元 | Page + Selector 失败 | 抛出元素未找到错误 |
|
||||
| SSL 证书错误处理 | 集成 | 真实 Browser + 自签名证书 | 成功建立连接 |
|
||||
|
||||
**预计测试数：** 15
|
||||
|
||||
---
|
||||
|
||||
#### 3.1.2 `extractor.ts` (P0)
|
||||
|
||||
**当前覆盖率：** ~30%
|
||||
**目标覆盖率：** 80%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| -------------- | -------- | -------------------------- | -------------------- |
|
||||
| 单订单提取成功 | 单元 | ErpAuthService + Page | 返回 ExtractorResult |
|
||||
| 批量订单提取 | 单元 | ErpAuthService + 循环 Mock | 正确分批处理 |
|
||||
| 订单号无效处理 | 单元 | Page + 错误响应 | 记录错误，继续处理 |
|
||||
| 下载文件合并 | 单元 | ExcelJS + fs Mock | 生成合并文件 |
|
||||
| 数据库持久化 | 集成 | DatabaseService Mock | 记录成功导入 |
|
||||
| 并发限制控制 | 单元 | 信号量 Mock | 不超过并发上限 |
|
||||
| 提取中断恢复 | 集成 | 模拟中断 + 恢复 | 从断点继续 |
|
||||
| 结果统计准确性 | 单元 | 完整 Mock 链 | 统计数字准确 |
|
||||
|
||||
**预计测试数：** 20
|
||||
|
||||
---
|
||||
|
||||
#### 3.1.3 `extractor-core.ts` (P0)
|
||||
|
||||
**当前覆盖率：** < 10%
|
||||
**目标覆盖率：** 80%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| ---------------- | -------- | ---------------- | ------------ |
|
||||
| 页面导航到列表页 | 单元 | Page + Frame | 成功导航 |
|
||||
| 订单号输入 | 单元 | Locator Mock | 正确填充 |
|
||||
| 查询按钮点击 | 单元 | Locator Mock | 触发查询 |
|
||||
| 表格数据解析 | 单元 | Table Locator | 返回物料列表 |
|
||||
| 分页处理 | 单元 | Page + 多页 Mock | 遍历所有页 |
|
||||
| 下载按钮点击 | 单元 | Locator + Dialog | 触发下载 |
|
||||
| 下载完成等待 | 单元 | fs + 文件事件 | 文件落地 |
|
||||
| 错误弹窗检测 | 单元 | Page + 错误元素 | 捕获错误消息 |
|
||||
|
||||
**预计测试数：** 15
|
||||
|
||||
---
|
||||
|
||||
#### 3.1.4 `cleaner.ts` (P0)
|
||||
|
||||
**当前覆盖率：** ~25%
|
||||
**目标覆盖率：** 80%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| ---------------- | -------- | ------------------ | ------------ |
|
||||
| 单物料删除成功 | 单元 | Page + Locator | 删除成功 |
|
||||
| 批量物料删除 | 单元 | 循环删除 Mock | 全部删除 |
|
||||
| 物料不存在处理 | 单元 | Page + 空结果 | 跳过并记录 |
|
||||
| 删除按钮失效处理 | 单元 | Locator + disabled | 跳过该物料 |
|
||||
| 干运行模式 | 单元 | 不执行实际删除 | 返回预览结果 |
|
||||
| 并发控制 | 单元 | 信号量 Mock | 限制并发数 |
|
||||
| 错误重试机制 | 集成 | 失败→成功 Mock | 重试成功 |
|
||||
| 删除结果统计 | 单元 | 完整 Mock 链 | 统计准确 |
|
||||
|
||||
**预计测试数：** 12
|
||||
|
||||
---
|
||||
|
||||
### 3.2 数据库服务模块
|
||||
|
||||
#### 3.2.1 数据库连接服务 (P0)
|
||||
|
||||
**文件：** `mysql.ts`, `sql-server.ts`, `postgresql.ts`
|
||||
|
||||
**当前覆盖率：** ~20%
|
||||
**目标覆盖率：** 70%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| ------------------- | -------- | ----------------------- | ------------ |
|
||||
| MySQL 连接成功 | 单元 | mysql2 Pool Mock | 返回连接实例 |
|
||||
| SQL Server 连接成功 | 单元 | mssql Connection Mock | 返回连接实例 |
|
||||
| PostgreSQL 连接成功 | 单元 | pg Pool Mock | 返回连接实例 |
|
||||
| 连接失败处理 | 单元 | 模拟连接拒绝 | 抛出错误 |
|
||||
| 查询执行成功 | 集成 | 数据库 Mock + 返回结果 | 正确返回数据 |
|
||||
| 事务提交 | 集成 | Transaction Mock | 成功提交 |
|
||||
| 事务回滚 | 集成 | Transaction Mock + 错误 | 正确回滚 |
|
||||
| 连接池释放 | 单元 | Pool Mock | 正确关闭 |
|
||||
|
||||
**预计测试数：** 18 (3 个数据库 × 6 场景)
|
||||
|
||||
---
|
||||
|
||||
#### 3.2.2 数据源管理 (P0)
|
||||
|
||||
**文件：** `data-source.ts`
|
||||
|
||||
**当前覆盖率：** < 10%
|
||||
**目标覆盖率：** 70%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| --------------- | -------- | --------------- | -------------- |
|
||||
| TypeORM 初始化 | 单元 | DataSource Mock | 成功初始化 |
|
||||
| 数据源销毁 | 单元 | DataSource Mock | 正确释放 |
|
||||
| Repository 获取 | 单元 | Repository Mock | 返回对应仓库 |
|
||||
| 实体注册验证 | 单元 | Entity Mock | 所有实体已注册 |
|
||||
| 多次初始化防护 | 单元 | 状态检查 Mock | 不重复初始化 |
|
||||
|
||||
**预计测试数：** 8
|
||||
|
||||
---
|
||||
|
||||
#### 3.2.3 数据导入器 (P0)
|
||||
|
||||
**文件：** `data-importer.ts`
|
||||
|
||||
**当前覆盖率：** < 15%
|
||||
**目标覆盖率：** 70%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| -------------- | -------- | ------------------------ | ------------ |
|
||||
| Excel 读取成功 | 集成 | ExcelJS + 测试文件 | 解析数据结构 |
|
||||
| 数据验证通过 | 单元 | Schema 验证 Mock | 数据合法 |
|
||||
| 数据验证失败 | 单元 | Schema 验证 Mock | 抛出验证错误 |
|
||||
| 批量插入 | 集成 | Repository Mock | 正确分批插入 |
|
||||
| 重复数据处理 | 单元 | Repository + exists 检查 | 跳过或更新 |
|
||||
| 插入失败回滚 | 集成 | Transaction Mock + 错误 | 全部回滚 |
|
||||
| 导入进度追踪 | 单元 | EventEmitter Mock | 发送进度事件 |
|
||||
| 导入结果统计 | 单元 | 完整 Mock 链 | 统计准确 |
|
||||
|
||||
**预计测试数：** 10
|
||||
|
||||
---
|
||||
|
||||
### 3.3 配置管理模块
|
||||
|
||||
#### 3.3.1 `config-manager.ts` (P0)
|
||||
|
||||
**当前覆盖率：** ~25%
|
||||
**目标覆盖率：** 70%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| ---------------- | -------- | -------------------- | ------------ |
|
||||
| 配置文件加载成功 | 单元 | fs + yaml Mock | 返回有效配置 |
|
||||
| 配置文件不存在 | 单元 | fs Mock + 不存在 | 使用默认配置 |
|
||||
| 配置文件格式错误 | 单元 | yaml Mock + 解析失败 | 抛出解析错误 |
|
||||
| Zod 验证失败 | 单元 | 无效配置数据 | 抛出验证错误 |
|
||||
| 配置更新 | 单元 | fs + yaml Mock | 文件正确写入 |
|
||||
| 重置为默认值 | 单元 | 完整 Mock 链 | 恢复默认 |
|
||||
| 导出为 YAML | 单元 | yaml.stringify Mock | 格式正确 |
|
||||
| 数据库类型切换 | 单元 | 状态 Mock | 返回正确配置 |
|
||||
| 日志配置应用 | 集成 | Winston Mock | 日志级别生效 |
|
||||
| 审计配置应用 | 集成 | AuditLogger Mock | 审计配置生效 |
|
||||
| 单例模式验证 | 单元 | 多次 getInstance | 返回同一实例 |
|
||||
| 并发读取安全 | 集成 | 并发 Mock + 竞争 | 数据一致 |
|
||||
|
||||
**预计测试数：** 20
|
||||
|
||||
---
|
||||
|
||||
### 3.4 更新服务模块
|
||||
|
||||
#### 3.4.1 `update-service.ts` (P0)
|
||||
|
||||
**当前覆盖率：** ~50%
|
||||
**目标覆盖率：** 80%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| ------------------- | -------- | ------------------------- | ------------ |
|
||||
| 服务初始化 | 单元 | ConfigManager + 依赖 Mock | 服务就绪 |
|
||||
| 获取更新状态 | 单元 | 状态 Mock | 返回当前状态 |
|
||||
| 获取更新目录 | 单元 | CatalogService Mock | 返回目录结构 |
|
||||
| 检查更新 - 有新版本 | 集成 | S3Client Mock + 新版本 | 返回更新列表 |
|
||||
| 检查更新 - 无新版本 | 集成 | S3Client Mock + 最新版 | 返回空列表 |
|
||||
| 下载更新 - 成功 | 集成 | S3Client + fs Mock | 文件下载成功 |
|
||||
| 下载更新 - 失败 | 集成 | S3Client + 网络错误 | 抛出错误 |
|
||||
| 校验 SHA256 - 通过 | 单元 | crypto Mock | 校验通过 |
|
||||
| 校验 SHA256 - 失败 | 单元 | crypto Mock + 不匹配 | 抛出校验错误 |
|
||||
| 安装更新 | 集成 | child_process Mock | 启动安装器 |
|
||||
| 用户权限检查 | 单元 | UserType Mock | 正确过滤 |
|
||||
| 定期自动检查 | 集成 | setInterval Mock | 按时检查 |
|
||||
|
||||
**预计测试数：** 15
|
||||
|
||||
---
|
||||
|
||||
#### 3.4.2 `update-catalog-service.ts` (P0)
|
||||
|
||||
**当前覆盖率：** ~40%
|
||||
**目标覆盖率：** 80%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| ------------ | -------- | ------------------ | ------------ |
|
||||
| 构建更新目录 | 单元 | StorageClient Mock | 返回分类目录 |
|
||||
| 稳定版过滤 | 单元 | UserType + 目录 | 只看 stable |
|
||||
| 管理员全访问 | 单元 | AdminType + 目录 | 看全部通道 |
|
||||
| 更新历史记录 | 单元 | Repository Mock | 返回历史记录 |
|
||||
| 限制记录数量 | 单元 | 数据截断 | 不超过上限 |
|
||||
|
||||
**预计测试数：** 12
|
||||
|
||||
---
|
||||
|
||||
#### 3.4.3 `update-storage-client.ts` (P0)
|
||||
|
||||
**当前覆盖率：** ~35%
|
||||
**目标覆盖率：** 80%
|
||||
|
||||
| 测试场景 | 测试类型 | Mock 对象 | 预期结果 |
|
||||
| --------------- | -------- | ------------------- | -------------- |
|
||||
| S3 客户端初始化 | 单元 | AWS SDK Mock | 客户端创建成功 |
|
||||
| 列出更新包 | 单元 | S3 listObjects Mock | 返回对象列表 |
|
||||
| 下载文件 | 单元 | S3 getObject Mock | 返回文件流 |
|
||||
| 下载失败处理 | 单元 | S3 + 网络错误 | 抛出错误 |
|
||||
| 计算 SHA256 | 单元 | crypto Mock | 哈希值正确 |
|
||||
| 重试机制 | 集成 | 失败→成功 Mock | 重试成功 |
|
||||
|
||||
**预计测试数：** 10
|
||||
|
||||
---
|
||||
|
||||
## 4. 测试类别实施指南
|
||||
|
||||
### 4.1 单元测试
|
||||
|
||||
**适用范围：**
|
||||
|
||||
- 服务类（Service）的业务逻辑
|
||||
- 工具函数（Utility Functions）
|
||||
- 数据处理函数
|
||||
- 类型转换函数
|
||||
|
||||
**Mock 策略：**
|
||||
|
||||
```typescript
|
||||
// 使用现有 Mock 库
|
||||
import {
|
||||
createMockLogger,
|
||||
createMockConfigManager,
|
||||
createMockErpAuthService,
|
||||
createMockDatabaseService,
|
||||
createMockDataSource,
|
||||
createMockRepository
|
||||
} from '@/tests/mocks'
|
||||
|
||||
// 示例：ERP Auth 测试
|
||||
describe('ErpAuthService', () => {
|
||||
const mockConfig = { url: 'https://test.com', username: 'test', password: 'test' }
|
||||
const mockPage = createMockPage() // 来自 mocks/index.ts
|
||||
|
||||
it('should login successfully', async () => {
|
||||
mockPage.goto.mockResolvedValue(undefined)
|
||||
mockPage.waitForSelector.mockResolvedValue(undefined)
|
||||
|
||||
const authService = new ErpAuthService(mockConfig)
|
||||
// 注入 mock (需要构造函数支持或使用 vi.mock)
|
||||
const session = await authService.login()
|
||||
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
**测试覆盖重点：**
|
||||
|
||||
1. **正常路径：** 主要业务流程成功执行
|
||||
2. **异常路径：** 错误处理、回滚、重试
|
||||
3. **边界条件：** 空输入、极大值、极小值
|
||||
4. **分支覆盖：** if/else、switch/case 所有分支
|
||||
|
||||
---
|
||||
|
||||
### 4.2 集成测试
|
||||
|
||||
**适用范围：**
|
||||
|
||||
- 多服务协作场景
|
||||
- 数据库事务边界
|
||||
- 文件系统交互
|
||||
- 外部服务调用（需 Stub）
|
||||
|
||||
**测试模式：**
|
||||
|
||||
```typescript
|
||||
import { describe, it, expect, beforeEach, afterEach } from 'vitest'
|
||||
import { DatabaseService } from '@/main/services/database'
|
||||
import { ConfigManager } from '@/main/services/config'
|
||||
|
||||
describe('Database + Config Integration', () => {
|
||||
let db: DatabaseService
|
||||
let configManager: ConfigManager
|
||||
|
||||
beforeEach(async () => {
|
||||
// 使用内存数据库或测试配置
|
||||
configManager = ConfigManager.getInstance()
|
||||
db = new DatabaseService(configManager)
|
||||
await db.connect()
|
||||
})
|
||||
|
||||
afterEach(async () => {
|
||||
await db.disconnect()
|
||||
})
|
||||
|
||||
it('should persist and retrieve data', async () => {
|
||||
// 实际数据库操作
|
||||
await db.query('INSERT INTO ...')
|
||||
const result = await db.query('SELECT ...')
|
||||
|
||||
expect(result.rows).toHaveLength(1)
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
**集成测试清单：**
|
||||
|
||||
| 集成场景 | 涉及模块 | 预期时间 |
|
||||
| --------------- | --------------------------- | -------- |
|
||||
| ERP 登录 + 提取 | ErpAuth + Extractor | < 5s |
|
||||
| 数据库事务 | DataSource + Repository | < 2s |
|
||||
| 配置更新传播 | ConfigManager + Logger | < 1s |
|
||||
| 文件导入导出 | ExcelParser + fs | < 3s |
|
||||
| 更新下载校验 | UpdateService + S3 + crypto | < 10s |
|
||||
|
||||
---
|
||||
|
||||
### 4.3 E2E 测试
|
||||
|
||||
**适用范围：**
|
||||
|
||||
- 完整用户旅程
|
||||
- UI 交互验证
|
||||
- 真实浏览器行为
|
||||
- 跨进程通信
|
||||
|
||||
**Playwright 测试模式：**
|
||||
|
||||
```typescript
|
||||
import { test, expect } from '@playwright/test'
|
||||
|
||||
test('complete extraction workflow', async ({ page }) => {
|
||||
// 1. 导航到登录页
|
||||
await page.goto('http://localhost:5173/login')
|
||||
|
||||
// 2. 登录
|
||||
await page.getByPlaceholder('用户名').fill('admin')
|
||||
await page.getByPlaceholder('密码').fill('admin123')
|
||||
await page.getByRole('button', { name: '登录' }).click()
|
||||
|
||||
// 3. 等待跳转
|
||||
await expect(page).toHaveURL(/dashboard/)
|
||||
|
||||
// 4. 进入提取页面
|
||||
await page.getByText('数据提取').click()
|
||||
|
||||
// 5. 输入订单号
|
||||
await page.getByPlaceholder('请输入订单号').fill('SC202601001')
|
||||
|
||||
// 6. 开始提取
|
||||
await page.getByRole('button', { name: '开始提取' }).click()
|
||||
|
||||
// 7. 等待完成
|
||||
await expect(page.getByText('提取完成')).toBeVisible({ timeout: 30000 })
|
||||
|
||||
// 8. 验证结果
|
||||
await expect(page.getByText('记录数：')).toBeVisible()
|
||||
})
|
||||
```
|
||||
|
||||
**E2E 测试关键场景：**
|
||||
|
||||
| 用户旅程 | 步骤数 | 预期时间 | 优先级 |
|
||||
| ---------------- | ------ | -------- | ------ |
|
||||
| 管理员完整工作流 | 15 | < 60s | P0 |
|
||||
| 普通用户提取 | 8 | < 45s | P0 |
|
||||
| 配置管理 | 10 | < 30s | P1 |
|
||||
| 自动更新 | 8 | < 90s | P0 |
|
||||
| 错误恢复 | 6 | < 40s | P1 |
|
||||
|
||||
---
|
||||
|
||||
## 5. 资源与工作量估算
|
||||
|
||||
### 5.1 人员配置建议
|
||||
|
||||
| 角色 | 人数 | 职责 |
|
||||
| -------------- | -------- | ----------------------- |
|
||||
| 测试开发工程师 | 2 人 | 单元测试、集成测试编写 |
|
||||
| 全栈工程师 | 1 人 | E2E 测试、Mock 基础设施 |
|
||||
| 代码审查员 | 1 人 | 测试代码质量审查 |
|
||||
| **总计** | **4 人** | **14 周完成** |
|
||||
|
||||
**单人模式调整：**
|
||||
|
||||
若只有 1 人负责，时间调整为：
|
||||
|
||||
- 周投入：20-25 小时
|
||||
- 总周期：20-24 周
|
||||
- 优先级：P0 → P1 → P2
|
||||
|
||||
---
|
||||
|
||||
### 5.2 工作量分解
|
||||
|
||||
| 阶段 | 任务 | 估算小时 |
|
||||
| -------- | ----------------- | ---------------- |
|
||||
| Phase 1 | ERP 服务单元测试 | 80-100 |
|
||||
| | Mock 基础设施优化 | 10-15 |
|
||||
| Phase 2 | 数据库单元测试 | 60-80 |
|
||||
| | 配置单元测试 | 20-30 |
|
||||
| | 集成测试 | 20-30 |
|
||||
| Phase 3 | 更新服务测试 | 60-80 |
|
||||
| | 其他服务测试 | 40-50 |
|
||||
| Phase 4 | E2E 测试 | 40-60 |
|
||||
| | 覆盖率优化 | 20-30 |
|
||||
| **总计** | | **350-475 小时** |
|
||||
|
||||
---
|
||||
|
||||
### 5.3 风险因素
|
||||
|
||||
| 风险 | 可能性 | 影响 | 缓解措施 |
|
||||
| --------------------------- | ------ | ---- | ------------------------ |
|
||||
| Playwright 浏览器兼容性问题 | 中 | 高 | 提前验证浏览器版本 |
|
||||
| 数据库连接不稳定 | 低 | 中 | 使用内存数据库或容器 |
|
||||
| Mock 与实现不同步 | 高 | 中 | 定期同步，添加类型检查 |
|
||||
| 测试维护成本过高 | 中 | 中 | 使用工厂模式，避免硬编码 |
|
||||
| 覆盖率工具性能影响 | 低 | 低 | CI 中仅对变更文件检查 |
|
||||
|
||||
---
|
||||
|
||||
## 6. 成功度量标准
|
||||
|
||||
### 6.1 覆盖率指标
|
||||
|
||||
| 里程碑 | 总体行覆盖率 | ERP 服务 | 更新服务 | 数据库 |
|
||||
| ------------ | ------------ | -------- | -------- | ------- |
|
||||
| Phase 1 完成 | 25% | 60% | 50% | 25% |
|
||||
| Phase 2 完成 | 45% | 65% | 60% | 60% |
|
||||
| Phase 3 完成 | 65% | 75% | 80% | 65% |
|
||||
| Phase 4 完成 | **70%** | **80%** | **80%** | **70%** |
|
||||
|
||||
---
|
||||
|
||||
### 6.2 测试数量目标
|
||||
|
||||
| 类型 | 当前 | Phase 1 | Phase 2 | Phase 3 | Phase 4 |
|
||||
| -------------- | ------ | ------- | ------- | ------- | ------- |
|
||||
| 单元测试文件 | 40 | 50 | 60 | 75 | 85 |
|
||||
| 集成测试文件 | 7 | 8 | 12 | 15 | 20 |
|
||||
| E2E 测试文件 | 3 | 3 | 3 | 5 | 15 |
|
||||
| **总测试文件** | **50** | **61** | **75** | **95** | **120** |
|
||||
|
||||
---
|
||||
|
||||
### 6.3 质量门禁
|
||||
|
||||
**每个 PR 必须满足：**
|
||||
|
||||
1. **新增代码覆盖率 ≥ 80%** (使用 `vitest --coverage --changed`)
|
||||
2. **无测试失败**
|
||||
3. **测试执行时间 < 30s** (单元测试) / < 120s (集成) / < 5min (E2E)
|
||||
4. **无 Mock 滥用** (真实逻辑必须有真实测试)
|
||||
|
||||
**CI/CD 检查：**
|
||||
|
||||
```yaml
|
||||
# GitHub Actions 示例
|
||||
- name: Test & Coverage
|
||||
run: |
|
||||
npm run test:coverage
|
||||
# 检查覆盖率阈值
|
||||
npx vitest --coverage --thresholds
|
||||
# 生成报告
|
||||
npx vitest --coverage --reporter=html
|
||||
# 上传覆盖率
|
||||
uses: codecov/codecov-action@v4
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. 立即行动项（本周）
|
||||
|
||||
### 7.1 优先级 P0 - 必须完成
|
||||
|
||||
| 任务 | 负责人 | 截止日期 | 状态 |
|
||||
| -------------------------------- | ------ | -------- | ---- |
|
||||
| 创建 ERP Auth 测试文件框架 | - | Day 2 | ☐ |
|
||||
| 创建 Extractor Core 测试文件框架 | - | Day 3 | ☐ |
|
||||
| 扩展现有 Mock 库支持新增场景 | - | Day 4 | ☐ |
|
||||
| 运行首次覆盖率基准测试 | - | Day 1 | ☐ |
|
||||
|
||||
### 7.2 优先级 P1 - 建议完成
|
||||
|
||||
| 任务 | 负责人 | 截止日期 | 状态 |
|
||||
| -------------------------- | ------ | -------- | ---- |
|
||||
| 整理现有测试文件结构 | - | Day 3 | ☐ |
|
||||
| 创建测试模板和最佳实践文档 | - | Day 5 | ☐ |
|
||||
| 设置覆盖率 CI 报告 | - | Day 5 | ☐ |
|
||||
|
||||
### 7.3 技术准备清单
|
||||
|
||||
```bash
|
||||
# 1. 安装覆盖率报告工具
|
||||
npm install --save-dev @vitest/coverage-v8
|
||||
|
||||
# 2. 运行基准测试
|
||||
npm run test:coverage
|
||||
|
||||
# 3. 查看 HTML 报告
|
||||
npm run test:coverage
|
||||
# 打开 coverage/index.html
|
||||
|
||||
# 4. 按文件查看详细覆盖率
|
||||
npx vitest --coverage --reporter=verbose
|
||||
```
|
||||
|
||||
### 7.4 第一个 Sprint 目标（Week 1-2）
|
||||
|
||||
**目标：ERP Auth 测试完成 50%**
|
||||
|
||||
- [ ] `tests/unit/services/erp/erp-auth.test.ts` 创建
|
||||
- [ ] 成功登录场景测试（3 个）
|
||||
- [ ] 失败场景测试（5 个）
|
||||
- [ ] 会话管理测试（3 个）
|
||||
- [ ] Mock 优化支持 Page 生命周期事件
|
||||
- [ ] 运行测试，覆盖率 ≥ 40%
|
||||
|
||||
---
|
||||
|
||||
## 附录
|
||||
|
||||
### A. 现有测试资源
|
||||
|
||||
| 资源 | 路径 | 状态 |
|
||||
| --------- | ---------------------------- | ------------------ |
|
||||
| 测试设置 | `tests/setup.ts` | 完整 Electron Mock |
|
||||
| 测试工厂 | `tests/fixtures/factory.ts` | 8 个工厂类 |
|
||||
| Mock 库 | `tests/mocks/index.ts` | 15+ Mock 函数 |
|
||||
| 测试文档 | `docs/TEST_FACTORY_USAGE.md` | 工厂使用指南 |
|
||||
| Mock 文档 | `docs/MOCK_LIBRARY_USAGE.md` | Mock 使用指南 |
|
||||
|
||||
### B. 推荐测试工具
|
||||
|
||||
| 工具 | 用途 |
|
||||
| ---------------------- | ------------- |
|
||||
| `vitest` | 单元测试框架 |
|
||||
| `@playwright/test` | E2E 测试框架 |
|
||||
| `@vitest/coverage-v8` | V8 覆盖率引擎 |
|
||||
| `vitest-html-reporter` | HTML 报告生成 |
|
||||
|
||||
### C. 相关文件
|
||||
|
||||
- `vitest.config.ts` - Vitest 配置与覆盖率阈值
|
||||
- `package.json` - 测试脚本定义
|
||||
- `.github/workflows/test.yml` - CI 测试工作流
|
||||
|
||||
---
|
||||
|
||||
**文档版本：** 1.0
|
||||
**创建日期：** 2026-04-05
|
||||
**最后更新：** 2026-04-05
|
||||
**维护者：** ERPAuto 开发团队
|
||||
931
docs/TEST_QUALITY_REVIEW_REPORT.md
Normal file
931
docs/TEST_QUALITY_REVIEW_REPORT.md
Normal file
@@ -0,0 +1,931 @@
|
||||
# ERPAuto 测试质量审查报告
|
||||
|
||||
**审查日期**: 2026-04-05
|
||||
**审查范围**: 新增的 ERP 服务单元测试文件
|
||||
**审查者**: AI Code Review Agent
|
||||
|
||||
---
|
||||
|
||||
## 执行摘要
|
||||
|
||||
本次审查覆盖了 6 个新增的 ERP 服务单元测试文件，共计 **117 个测试用例**（114 个通过，3 个待实现）。测试整体质量**优秀**，符合企业级测试标准。
|
||||
|
||||
### 总体评分：**A (90/100)**
|
||||
|
||||
| 评估维度 | 得分 | 权重 | 加权分 |
|
||||
| ------------ | ------ | -------- | -------- |
|
||||
| 测试覆盖率 | 85/100 | 30% | 25.5 |
|
||||
| 测试设计质量 | 92/100 | 25% | 23.0 |
|
||||
| Mock 策略 | 90/100 | 20% | 18.0 |
|
||||
| 可维护性 | 88/100 | 15% | 13.2 |
|
||||
| 错误处理测试 | 95/100 | 10% | 9.5 |
|
||||
| **总计** | | **100%** | **89.2** |
|
||||
|
||||
---
|
||||
|
||||
## 1. 测试文件概览
|
||||
|
||||
### 1.1 文件统计
|
||||
|
||||
| 测试文件 | 测试用例数 | 通过 | 失败 | 跳过/Todo | 行数 |
|
||||
| --------------------------- | ---------- | ------- | ----- | --------- | -------- |
|
||||
| `erp-auth.test.ts` | 11 | 11 | 0 | 0 | 216 |
|
||||
| `cleaner.test.ts` | 20 | 20 | 0 | 0 | 272 |
|
||||
| `ErpBrowserManager.test.ts` | 20 | 20 | 0 | 0 | 252 |
|
||||
| `extractor-core.test.ts` | 11 | 8 | 0 | 3 | 265 |
|
||||
| `extractor.test.ts` | 17 | 17 | 0 | 0 | 350 |
|
||||
| `order-resolver.test.ts` | 26 | 26 | 0 | 0 | 363 |
|
||||
| `page-diagnostics.test.ts` | 6 | 6 | 0 | 0 | - |
|
||||
| `erp-error-context.test.ts` | 7 | 7 | 0 | 0 | - |
|
||||
| **总计** | **118** | **115** | **0** | **3** | **1718** |
|
||||
|
||||
### 1.2 测试执行结果
|
||||
|
||||
```
|
||||
✓ 8 个测试文件全部通过
|
||||
✓ 114 个测试用例通过
|
||||
✓ 0 个测试失败
|
||||
⚠ 3 个测试标记为 todo（需要集成测试环境）
|
||||
✓ 执行时间：< 1.5 秒（优秀）
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 2. 详细质量评估
|
||||
|
||||
### 2.1 `erp-auth.test.ts` - **A+ (95/100)**
|
||||
|
||||
**测试对象**: `ErpAuthService` - ERP 认证服务
|
||||
|
||||
#### 优点 ✅
|
||||
|
||||
1. **完整的生命周期测试**
|
||||
- 构造函数初始化验证
|
||||
- 登录流程（成功/失败）
|
||||
- 会话复用机制
|
||||
- 登出/关闭处理
|
||||
|
||||
2. **优秀的 Mock 策略**
|
||||
|
||||
```typescript
|
||||
vi.mock('playwright', () => ({
|
||||
chromium: { launch: vi.fn() }
|
||||
}))
|
||||
```
|
||||
|
||||
- 外部依赖完全隔离
|
||||
- 模拟对象结构清晰
|
||||
|
||||
3. **边界条件覆盖**
|
||||
- `contentFrame` 返回 `null` 的异常处理
|
||||
- 重复登录的会话复用
|
||||
- 未登录时调用 `getSession()` 的错误处理
|
||||
|
||||
4. **测试命名规范**
|
||||
- 使用 `should/could` 语义
|
||||
- 清晰表达测试意图
|
||||
|
||||
#### 改进建议 🔧
|
||||
|
||||
1. **缺少真实场景集成测试**
|
||||
|
||||
```typescript
|
||||
// TODO: 添加集成测试
|
||||
it('should login with real browser (integration)', async () => {
|
||||
// 使用真实 Playwright 浏览器测试
|
||||
})
|
||||
```
|
||||
|
||||
2. **错误消息验证不够精确**
|
||||
|
||||
```typescript
|
||||
// 当前
|
||||
expect(() => service.getSession()).toThrow('Not logged in')
|
||||
|
||||
// 建议
|
||||
expect(() => service.getSession()).toThrow('Not logged in. Call login() first.')
|
||||
```
|
||||
|
||||
3. **缺少性能测试**
|
||||
```typescript
|
||||
it('should complete login within 5 seconds', async () => {
|
||||
const start = Date.now()
|
||||
await service.login()
|
||||
expect(Date.now() - start).toBeLessThan(5000)
|
||||
})
|
||||
```
|
||||
|
||||
#### 覆盖率评估
|
||||
|
||||
| 方法 | 测试覆盖 | 评价 |
|
||||
| --------------- | ----------------- | ---- |
|
||||
| `constructor()` | ✓ 完全覆盖 | 优秀 |
|
||||
| `login()` | ✓ 主要路径 + 异常 | 优秀 |
|
||||
| `getSession()` | ✓ 覆盖 | 良好 |
|
||||
| `isActive()` | ✓ 覆盖 | 良好 |
|
||||
| `close()` | ✓ 覆盖 | 良好 |
|
||||
|
||||
---
|
||||
|
||||
### 2.2 `cleaner.test.ts` - **A (90/100)**
|
||||
|
||||
**测试对象**: `CleanerService` - 物料清理服务
|
||||
|
||||
#### 优点 ✅
|
||||
|
||||
1. **纯函数测试设计优秀**
|
||||
|
||||
```typescript
|
||||
describe('shouldDeleteMaterial()', () => {
|
||||
it('should return true when material matches all deletion criteria', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({...})
|
||||
expect(result).toBe(true)
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
- 无副作用，易于测试
|
||||
- 输入输出明确
|
||||
|
||||
2. **边界值测试完备**
|
||||
|
||||
```typescript
|
||||
it('should respect boundary row numbers', () => {
|
||||
// Row 1999: can delete
|
||||
expect(...).toBe(true)
|
||||
// Row 2000: protected
|
||||
expect(...).toBe(false)
|
||||
// Row 7999: protected
|
||||
expect(...).toBe(false)
|
||||
// Row 8000: can delete
|
||||
expect(...).toBe(true)
|
||||
})
|
||||
```
|
||||
|
||||
3. **辅助函数测试充分**
|
||||
- `createBatches()`: 数组分批逻辑
|
||||
- `runWithConcurrency()`: 并发控制验证
|
||||
- `getMissingOrders()`: 集合差集计算
|
||||
|
||||
4. **并发测试验证**
|
||||
```typescript
|
||||
it('should limit parallelism to specified concurrency', async () => {
|
||||
let running = 0
|
||||
let peak = 0
|
||||
await runWithConcurrency(items, 2, async () => {
|
||||
running += 1
|
||||
peak = Math.max(peak, running)
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
running -= 1
|
||||
})
|
||||
expect(peak).toBeLessThanOrEqual(2)
|
||||
expect(peak).toBe(2)
|
||||
})
|
||||
```
|
||||
|
||||
#### 改进建议 🔧
|
||||
|
||||
1. **缺少 `clean()` 主方法测试**
|
||||
- 文件顶部有 TODO 注释说明需要集成测试
|
||||
- 建议补充：
|
||||
|
||||
```typescript
|
||||
describe('clean() - Integration', () => {
|
||||
it('should complete full cleanup workflow', async () => {
|
||||
// 完整流程集成测试
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
2. **错误场景测试不足**
|
||||
|
||||
```typescript
|
||||
// 建议添加
|
||||
it('should handle page navigation failure', async () => {
|
||||
// Mock 导航失败场景
|
||||
})
|
||||
```
|
||||
|
||||
3. **干运行模式测试可以更详细**
|
||||
```typescript
|
||||
it('should not delete materials in dry-run mode', async () => {
|
||||
// 验证 dryRun=true 时不执行实际删除
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2.3 `ErpBrowserManager.test.ts` - **A+ (95/100)**
|
||||
|
||||
**测试对象**: `ErpBrowserManager` - 浏览器管理器
|
||||
|
||||
#### 优点 ✅
|
||||
|
||||
1. **状态管理测试完备**
|
||||
|
||||
```typescript
|
||||
it('should return existing browser if running', async () => {
|
||||
const firstBrowser = await manager.launch()
|
||||
const secondBrowser = await manager.launch()
|
||||
expect(firstBrowser).toBe(secondBrowser)
|
||||
expect(chromium.launch).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
```
|
||||
|
||||
2. **参数化测试**
|
||||
|
||||
```typescript
|
||||
it.each([true, false])('should launch with headless=%s', async (headless) => {
|
||||
const manager = new ErpBrowserManager({ headless })
|
||||
await manager.launch()
|
||||
expect(chromium.launch).toHaveBeenCalledWith(expect.objectContaining({ headless }))
|
||||
})
|
||||
```
|
||||
|
||||
3. **错误恢复测试**
|
||||
|
||||
```typescript
|
||||
it('should close browser even if context.close fails', async () => {
|
||||
mockContext.close.mockRejectedValue(new Error('Context close error'))
|
||||
await manager.close()
|
||||
expect(mockBrowser.close).toHaveBeenCalled()
|
||||
})
|
||||
```
|
||||
|
||||
4. **生命周期覆盖全面**
|
||||
- 启动 → 初始化 → 导航 → 创建上下文 → 关闭
|
||||
- 所有公开方法都有测试
|
||||
|
||||
#### 改进建议 🔧
|
||||
|
||||
1. **缺少超时测试**
|
||||
|
||||
```typescript
|
||||
it('should timeout on slow page navigation', async () => {
|
||||
mockPage.goto.mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 60000)))
|
||||
await expect(manager.navigate('http://slow.com')).rejects.toThrow('timeout')
|
||||
})
|
||||
```
|
||||
|
||||
2. **可以添加内存泄漏检测**
|
||||
```typescript
|
||||
it('should release all resources after close', async () => {
|
||||
await manager.launch()
|
||||
await manager.close()
|
||||
// 验证没有悬空引用
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2.4 `extractor-core.test.ts` - **B+ (85/100)**
|
||||
|
||||
**测试对象**: `ExtractorCore` - 提取核心逻辑
|
||||
|
||||
#### 优点 ✅
|
||||
|
||||
1. **私有方法测试策略合理**
|
||||
|
||||
```typescript
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await extractorCore.waitForLoading(mockWorkFrame)
|
||||
```
|
||||
|
||||
- 使用 `@ts-ignore` 测试私有方法是可接受的
|
||||
- 避免了为了测试而暴露内部实现
|
||||
|
||||
2. **进度回调测试精确**
|
||||
|
||||
```typescript
|
||||
it('should calculate progress correctly', async () => {
|
||||
await extractorCore.downloadAllBatches(input)
|
||||
expect(progressCallback).toHaveBeenNthCalledWith(1, '处理批次 1/2', 40, {...})
|
||||
expect(progressCallback).toHaveBeenNthCalledWith(2, '处理批次 2/2', 60, {...})
|
||||
})
|
||||
```
|
||||
|
||||
3. **错误处理验证**
|
||||
|
||||
```typescript
|
||||
it('should handle errors in batch download gracefully', async () => {
|
||||
vi.spyOn(extractorCore as any, 'downloadBatch')
|
||||
.mockResolvedValueOnce('/path/file1.xlsx')
|
||||
.mockRejectedValueOnce(new Error('Network error'))
|
||||
|
||||
const result = await extractorCore.downloadAllBatches(input)
|
||||
expect(result.errors).toHaveLength(1)
|
||||
})
|
||||
```
|
||||
|
||||
#### 不足 ⚠️
|
||||
|
||||
1. **3 个测试标记为 TODO**
|
||||
|
||||
```typescript
|
||||
it.todo('TODO: needs integration test setup - should handle complete navigation flow')
|
||||
it.todo('TODO: needs integration test setup - should handle download events correctly')
|
||||
it.todo('TODO: needs integration test setup - should verify locator interactions')
|
||||
```
|
||||
|
||||
- **影响**: 核心功能缺少完整流程测试
|
||||
- **建议**: 优先级 P0，尽快补充集成测试
|
||||
|
||||
2. **Mock 过于复杂**
|
||||
- `navigateToExtractorPage` 和 `downloadBatch` 都被 Mock
|
||||
- 实际只测试了流程编排，未测试真实逻辑
|
||||
|
||||
#### 改进建议 🔧
|
||||
|
||||
**高优先级**:
|
||||
|
||||
```typescript
|
||||
// 集成测试示例
|
||||
describe('ExtractorCore - Integration', () => {
|
||||
it('should handle real iframe navigation', async () => {
|
||||
// 使用真实 Playwright 浏览器
|
||||
// 测试完整的 iframe 查找和内容帧获取
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2.5 `extractor.test.ts` - **A (90/100)**
|
||||
|
||||
**测试对象**: `ExtractorService` - 提取服务
|
||||
|
||||
#### 优点 ✅
|
||||
|
||||
1. **依赖注入测试**
|
||||
|
||||
```typescript
|
||||
beforeEach(() => {
|
||||
mockExcelParserInstance = { parse: vi.fn().mockResolvedValue(undefined) }
|
||||
mockDataImportInstance = { importFromExcel: vi.fn().mockResolvedValue({...}) }
|
||||
mockExtractorCoreInstance = { downloadAllBatches: vi.fn().mockResolvedValue({...}) }
|
||||
})
|
||||
```
|
||||
|
||||
2. **私有方法测试合理**
|
||||
|
||||
```typescript
|
||||
// @ts-ignore - accessing private method for testing
|
||||
const result = await service.mergeFiles(['./file1.xlsx'], ['ORD001'])
|
||||
```
|
||||
|
||||
3. **错误传播测试**
|
||||
|
||||
```typescript
|
||||
it('should handle extraction errors gracefully', async () => {
|
||||
mockExtractorCoreInstance.downloadAllBatches.mockRejectedValue(new Error('Network error'))
|
||||
const result = await service.extract({ orderNumbers: ['ORD001'] })
|
||||
expect(Array.isArray(result.errors)).toBe(true)
|
||||
})
|
||||
```
|
||||
|
||||
4. **性能监控集成测试**
|
||||
```typescript
|
||||
it('should wrap import in trackDuration', async () => {
|
||||
await service.importToDatabaseWithLogging('./merged.xlsx', onLog)
|
||||
expect(trackDuration).toHaveBeenCalledWith(
|
||||
expect.any(Function),
|
||||
expect.objectContaining({ operationName: 'Database Import' })
|
||||
)
|
||||
})
|
||||
```
|
||||
|
||||
#### 改进建议 🔧
|
||||
|
||||
1. **缺少 `extract()` 主方法完整流程测试**
|
||||
- 只有基础行为测试
|
||||
- 建议添加完整 E2E 流程
|
||||
|
||||
2. **Mock 重置策略可以更清晰**
|
||||
```typescript
|
||||
// 建议在每个测试前明确重置所有 Mock
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mockExcelParserInstance.lastOrders = [] // 显式清空
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2.6 `order-resolver.test.ts` - **A+ (95/100)**
|
||||
|
||||
**测试对象**: `OrderNumberResolver` - 订单号解析器
|
||||
|
||||
#### 优点 ✅
|
||||
|
||||
1. **测试覆盖率最高**
|
||||
- 26 个测试用例，覆盖所有公开方法
|
||||
- 包含性能测试
|
||||
|
||||
2. **类型识别测试完备**
|
||||
|
||||
```typescript
|
||||
describe('isProductionId()', () => {
|
||||
it('should recognize valid production IDs', () => {
|
||||
expect(resolver.isProductionId('22A1')).toBe(true)
|
||||
expect(resolver.isProductionId('26B10617')).toBe(true)
|
||||
})
|
||||
it('should reject invalid formats', () => {
|
||||
expect(resolver.isProductionId('SC70202602120085')).toBe(false)
|
||||
expect(resolver.isProductionId('abc')).toBe(false)
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
3. **去重逻辑测试**
|
||||
|
||||
```typescript
|
||||
it('deduplicates identical inputs', async () => {
|
||||
const results = await resolver.resolve(['22A1', '22A1', '22A1'])
|
||||
expect(results).toHaveLength(1) // deduplicated
|
||||
})
|
||||
```
|
||||
|
||||
4. **性能测试**
|
||||
|
||||
```typescript
|
||||
it('performance with large order sets', async () => {
|
||||
const largeInput = Array.from({ length: 100 }, (_, i) => `22A${i}`)
|
||||
const startTime = Date.now()
|
||||
const results = await resolver.resolve(largeInput)
|
||||
const elapsed = Date.now() - startTime
|
||||
expect(elapsed).toBeLessThan(5000)
|
||||
})
|
||||
```
|
||||
|
||||
5. **统计和报告测试**
|
||||
- `getStats()`: 统计数据准确性
|
||||
- `getWarnings()`: 警告消息格式化
|
||||
- `getDeduplicationReport()`: 去重报告生成
|
||||
|
||||
#### 改进建议 🔧
|
||||
|
||||
1. **可以添加数据库连接失败的重试测试**
|
||||
|
||||
```typescript
|
||||
it('should retry on transient database errors', async () => {
|
||||
// Mock 第一次失败，第二次成功
|
||||
// 验证重试逻辑
|
||||
})
|
||||
```
|
||||
|
||||
2. **缓存策略测试可以更详细**
|
||||
```typescript
|
||||
it('should cache resolved mappings', async () => {
|
||||
// 验证相同输入不会重复查询数据库
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. 共性问题与建议
|
||||
|
||||
### 3.1 Mock 策略优化
|
||||
|
||||
**当前做法**:
|
||||
|
||||
```typescript
|
||||
vi.mock('playwright', () => ({
|
||||
chromium: { launch: vi.fn() }
|
||||
}))
|
||||
```
|
||||
|
||||
**建议改进**:
|
||||
|
||||
```typescript
|
||||
// 使用工厂函数创建可重置的 Mock
|
||||
const createMockPlaywright = () => ({
|
||||
chromium: {
|
||||
launch: vi.fn().mockResolvedValue(createMockBrowser()),
|
||||
connect: vi.fn()
|
||||
}
|
||||
})
|
||||
|
||||
beforeEach(() => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(createMockBrowser())
|
||||
})
|
||||
```
|
||||
|
||||
**好处**:
|
||||
|
||||
- 每个测试独立的 Mock 状态
|
||||
- 避免测试间的相互影响
|
||||
- 更易维护
|
||||
|
||||
### 3.2 测试数据工厂
|
||||
|
||||
**当前**: 手动创建测试数据
|
||||
|
||||
```typescript
|
||||
const config = {
|
||||
url: 'https://test-erp.com',
|
||||
username: 'testuser',
|
||||
password: 'testpass',
|
||||
headless: true
|
||||
}
|
||||
```
|
||||
|
||||
**建议**: 使用工厂函数
|
||||
|
||||
```typescript
|
||||
// tests/fixtures/factory.ts
|
||||
const ErpConfigFactory = {
|
||||
create: (overrides?: Partial<ErpConfig>) => ({
|
||||
url: 'https://test-erp.com',
|
||||
username: 'testuser',
|
||||
password: 'testpass',
|
||||
headless: true,
|
||||
...overrides
|
||||
})
|
||||
}
|
||||
|
||||
// 测试中
|
||||
const config = ErpConfigFactory.create({ headless: false })
|
||||
```
|
||||
|
||||
### 3.3 错误消息断言
|
||||
|
||||
**当前**:
|
||||
|
||||
```typescript
|
||||
await expect(service.login()).rejects.toThrow('Failed to access')
|
||||
```
|
||||
|
||||
**建议**: 使用更精确的匹配
|
||||
|
||||
```typescript
|
||||
await expect(service.login()).rejects.toThrow(
|
||||
expect.objectContaining({
|
||||
message: expect.stringContaining('Failed to access forwardFrame')
|
||||
})
|
||||
)
|
||||
```
|
||||
|
||||
### 3.4 集成测试缺失
|
||||
|
||||
**问题**: 多个文件有 TODO 注释说明需要集成测试
|
||||
|
||||
**建议优先级**:
|
||||
|
||||
1. **P0**: `extractor-core.test.ts` - 3 个 TODO
|
||||
2. **P1**: `extractor.test.ts` - `extract()` 完整流程
|
||||
3. **P1**: `cleaner.test.ts` - `clean()` 完整流程
|
||||
|
||||
**集成测试框架建议**:
|
||||
|
||||
```typescript
|
||||
// tests/integration/erp/extractor.integration.test.ts
|
||||
import { test, expect } from '@playwright/test'
|
||||
|
||||
test('complete extraction workflow', async () => {
|
||||
// 使用真实浏览器
|
||||
// 测试完整提取流程
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. 测试设计模式评估
|
||||
|
||||
### 4.1 AAA 模式 (Arrange-Act-Assert)
|
||||
|
||||
**评分**: **优秀** ✅
|
||||
|
||||
所有测试都遵循 AAA 模式：
|
||||
|
||||
```typescript
|
||||
it('should create session on successful login', async () => {
|
||||
// Arrange
|
||||
service = new ErpAuthService(config)
|
||||
|
||||
// Act
|
||||
const session = await service.login()
|
||||
|
||||
// Assert
|
||||
expect(chromium.launch).toHaveBeenCalledWith(...)
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
})
|
||||
```
|
||||
|
||||
### 4.2 测试独立性
|
||||
|
||||
**评分**: **良好** ⚠️
|
||||
|
||||
**优点**:
|
||||
|
||||
- 每个测试使用 `beforeEach` 重置状态
|
||||
- `vi.clearAllMocks()` 调用普遍
|
||||
|
||||
**改进点**:
|
||||
|
||||
- 部分测试依赖前一个测试的 Mock 状态
|
||||
- 建议在每个测试中完全独立设置 Mock
|
||||
|
||||
### 4.3 测试可读性
|
||||
|
||||
**评分**: **优秀** ✅
|
||||
|
||||
- 测试命名清晰：`should/could` 语义
|
||||
- 分组合理：`describe` 层次分明
|
||||
- 注释充分：关键步骤有说明
|
||||
|
||||
### 4.4 测试可维护性
|
||||
|
||||
**评分**: **良好** ⚠️
|
||||
|
||||
**优点**:
|
||||
|
||||
- 代码结构清晰
|
||||
- 重复代码较少
|
||||
|
||||
**改进点**:
|
||||
|
||||
- 缺少测试数据工厂
|
||||
- Mock 设置代码重复
|
||||
- 魔法数字（如 `40`, `60` 进度值）缺少常量定义
|
||||
|
||||
---
|
||||
|
||||
## 5. 覆盖率分析
|
||||
|
||||
### 5.1 方法覆盖率
|
||||
|
||||
| 服务 | 公开方法 | 已测试 | 覆盖率 |
|
||||
| --------------------- | -------- | ------ | ------ |
|
||||
| `ErpAuthService` | 5 | 5 | 100% |
|
||||
| `CleanerService` | 7 | 4 | 57% ⚠️ |
|
||||
| `ErpBrowserManager` | 9 | 9 | 100% |
|
||||
| `ExtractorCore` | 3 | 2 | 67% ⚠️ |
|
||||
| `ExtractorService` | 5 | 4 | 80% |
|
||||
| `OrderNumberResolver` | 10 | 10 | 100% |
|
||||
|
||||
### 5.2 分支覆盖率估算
|
||||
|
||||
| 服务 | 条件分支 | 已覆盖 | 估算覆盖率 |
|
||||
| --------------------- | -------- | ------ | ---------- |
|
||||
| `ErpAuthService` | 8 | 7 | 87% |
|
||||
| `CleanerService` | 15 | 12 | 80% |
|
||||
| `ErpBrowserManager` | 10 | 9 | 90% |
|
||||
| `ExtractorCore` | 12 | 8 | 67% |
|
||||
| `ExtractorService` | 14 | 11 | 78% |
|
||||
| `OrderNumberResolver` | 20 | 18 | 90% |
|
||||
|
||||
### 5.3 未覆盖的关键路径
|
||||
|
||||
1. **CleanerService**
|
||||
- `clean()` 主方法的完整流程
|
||||
- 重试机制 (`retryFailedOrders`)
|
||||
- 进度发布 (`publishProgress`)
|
||||
|
||||
2. **ExtractorCore**
|
||||
- `navigateToExtractorPage()` 完整导航逻辑
|
||||
- `downloadBatch()` 实际下载流程
|
||||
- iframe 交互的真实场景
|
||||
|
||||
3. **ExtractorService**
|
||||
- `extract()` 方法的完整编排流程
|
||||
- 并发控制在实际场景中的表现
|
||||
|
||||
---
|
||||
|
||||
## 6. 性能测试评估
|
||||
|
||||
### 6.1 现有性能测试
|
||||
|
||||
**优秀示例**:
|
||||
|
||||
```typescript
|
||||
it('performance with large order sets', async () => {
|
||||
const largeInput = Array.from({ length: 100 }, (_, i) => `22A${i}`)
|
||||
const startTime = Date.now()
|
||||
const results = await resolver.resolve(largeInput)
|
||||
const elapsed = Date.now() - startTime
|
||||
expect(elapsed).toBeLessThan(5000)
|
||||
})
|
||||
```
|
||||
|
||||
### 6.2 缺失的性能测试
|
||||
|
||||
1. **并发性能**
|
||||
|
||||
```typescript
|
||||
it('should handle 1000 concurrent orders', async () => {
|
||||
const orders = Array.from({ length: 1000 }, (_, i) => `ORD${i}`)
|
||||
const start = Date.now()
|
||||
await resolver.resolve(orders)
|
||||
expect(Date.now() - start).toBeLessThan(10000)
|
||||
})
|
||||
```
|
||||
|
||||
2. **内存使用**
|
||||
```typescript
|
||||
it('should not leak memory on repeated calls', async () => {
|
||||
const initialMemory = process.memoryUsage().heapUsed
|
||||
for (let i = 0; i < 100; i++) {
|
||||
await service.extract({ orderNumbers: ['ORD001'] })
|
||||
}
|
||||
const finalMemory = process.memoryUsage().heapUsed
|
||||
expect(finalMemory - initialMemory).toBeLessThan(10 * 1024 * 1024) // < 10MB
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. 错误处理测试评估
|
||||
|
||||
### 7.1 优秀实践 ✅
|
||||
|
||||
1. **网络错误处理**
|
||||
|
||||
```typescript
|
||||
mockExtractorCoreInstance.downloadAllBatches.mockRejectedValue(new Error('Network error'))
|
||||
```
|
||||
|
||||
2. **数据库连接失败**
|
||||
|
||||
```typescript
|
||||
vi.mocked(mockDbService.query).mockRejectedValue(new Error('Database connection failed'))
|
||||
```
|
||||
|
||||
3. **元素未找到**
|
||||
```typescript
|
||||
mockPage.locator = vi.fn().mockReturnValue({
|
||||
contentFrame: vi.fn().mockResolvedValue(null)
|
||||
})
|
||||
await expect(service.login()).rejects.toThrow('Failed to access')
|
||||
```
|
||||
|
||||
### 7.2 改进建议 🔧
|
||||
|
||||
1. **添加错误类型验证**
|
||||
|
||||
```typescript
|
||||
it('should throw specific error types', async () => {
|
||||
await expect(service.login()).rejects.toThrow(ErpAuthenticationError)
|
||||
})
|
||||
```
|
||||
|
||||
2. **错误上下文验证**
|
||||
```typescript
|
||||
it('should include context in error messages', async () => {
|
||||
try {
|
||||
await service.login()
|
||||
} catch (error) {
|
||||
expect(error.context).toEqual({
|
||||
url: 'https://test-erp.com',
|
||||
step: 'login'
|
||||
})
|
||||
}
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 8. 与测试覆盖率提升计划对标
|
||||
|
||||
### 8.1 计划目标回顾
|
||||
|
||||
根据 `TEST_COVERAGE_IMPROVEMENT_PLAN.md`:
|
||||
|
||||
| 模块 | 当前覆盖率 | 目标覆盖率 | 优先级 |
|
||||
| ---------------------- | ---------- | ---------- | ------ |
|
||||
| `erp-auth.ts` | < 20% | 80% | P0 |
|
||||
| `extractor.ts` | ~30% | 80% | P0 |
|
||||
| `extractor-core.ts` | < 10% | 80% | P0 |
|
||||
| `cleaner.ts` | ~25% | 80% | P0 |
|
||||
| `ErpBrowserManager.ts` | N/A | 80% | P1 |
|
||||
| `order-resolver.ts` | N/A | 80% | P1 |
|
||||
|
||||
### 8.2 当前进展
|
||||
|
||||
**估算覆盖率提升**:
|
||||
|
||||
| 模块 | 测试前 | 测试后（估算） | 提升 | 达标状态 |
|
||||
| ---------------------- | ------ | -------------- | ---- | ------------------- |
|
||||
| `erp-auth.ts` | < 20% | ~75% | +55% | ⚠️ 接近达标 |
|
||||
| `extractor.ts` | ~30% | ~70% | +40% | ⚠️ 接近达标 |
|
||||
| `extractor-core.ts` | < 10% | ~55% | +45% | ❌ 需补充集成测试 |
|
||||
| `cleaner.ts` | ~25% | ~65% | +40% | ⚠️ 需补充主方法测试 |
|
||||
| `ErpBrowserManager.ts` | N/A | ~85% | N/A | ✅ 已达标 |
|
||||
| `order-resolver.ts` | N/A | ~90% | N/A | ✅ 已达标 |
|
||||
|
||||
### 8.3 下一步行动
|
||||
|
||||
**P0 - 立即执行**:
|
||||
|
||||
1. 补充 `extractor-core.test.ts` 的 3 个 TODO 测试
|
||||
2. 添加 `cleaner.ts` 的 `clean()` 方法集成测试
|
||||
3. 补充 `extractor.ts` 的 `extract()` 完整流程测试
|
||||
|
||||
**P1 - 本周执行**:
|
||||
|
||||
1. 为所有错误路径添加断言
|
||||
2. 添加性能测试覆盖关键路径
|
||||
3. 创建测试数据工厂减少重复代码
|
||||
|
||||
---
|
||||
|
||||
## 9. 总体评价与建议
|
||||
|
||||
### 9.1 优点总结
|
||||
|
||||
1. **测试设计优秀**
|
||||
- AAA 模式遵循良好
|
||||
- 测试命名清晰
|
||||
- 分组合理
|
||||
|
||||
2. **Mock 策略成熟**
|
||||
- 外部依赖完全隔离
|
||||
- Mock 对象结构清晰
|
||||
- 参数化测试使用得当
|
||||
|
||||
3. **错误处理充分**
|
||||
- 主要错误场景都有覆盖
|
||||
- 异常传播验证到位
|
||||
|
||||
4. **边界条件重视**
|
||||
- 边界值测试普遍
|
||||
- 特殊情况考虑周全
|
||||
|
||||
### 9.2 改进优先级
|
||||
|
||||
**P0 - 必须完成（本周）**:
|
||||
|
||||
1. ✅ 补充 `extractor-core.test.ts` 的集成测试
|
||||
2. ✅ 添加 `cleaner()` 主方法测试
|
||||
3. ✅ 完成 `extractor.extract()` 完整流程测试
|
||||
|
||||
**P1 - 强烈建议（下周）**:
|
||||
|
||||
1. 创建测试数据工厂
|
||||
2. 统一 Mock 设置模式
|
||||
3. 添加性能基准测试
|
||||
|
||||
**P2 - 建议（本月）**:
|
||||
|
||||
1. 添加内存泄漏检测测试
|
||||
2. 补充错误类型验证
|
||||
3. 完善并发场景测试
|
||||
|
||||
### 9.3 测试文化建议
|
||||
|
||||
1. **测试审查流程**
|
||||
- 将测试审查纳入 PR 必选项
|
||||
- 使用本报告的评分标准
|
||||
|
||||
2. **测试文档**
|
||||
- 编写《测试最佳实践》文档
|
||||
- 建立测试模式库
|
||||
|
||||
3. **覆盖率门禁**
|
||||
- CI/CD 中设置覆盖率阈值
|
||||
- 新增代码覆盖率要求 ≥ 80%
|
||||
|
||||
---
|
||||
|
||||
## 10. 结论
|
||||
|
||||
本次审查的测试文件整体质量**优秀**，展现了团队对测试工作的重视和高超的测试设计能力。主要优势在于：
|
||||
|
||||
- ✅ 测试设计模式成熟（AAA 模式）
|
||||
- ✅ Mock 策略合理，依赖隔离充分
|
||||
- ✅ 错误处理和边界条件覆盖全面
|
||||
- ✅ 测试可读性和可维护性良好
|
||||
|
||||
需要改进的方面：
|
||||
|
||||
- ⚠️ 集成测试缺失（3 个 TODO 待实现）
|
||||
- ⚠️ 部分主方法测试不完整
|
||||
- ⚠️ 缺少性能基准测试
|
||||
- ⚠️ 测试数据工厂可进一步优化
|
||||
|
||||
**总体评分：A (90/100)**
|
||||
|
||||
按照本报告的改进建议执行后，预计可将 ERP 服务模块的测试覆盖率提升至 **75-85%**，达到项目设定的阶段性目标。
|
||||
|
||||
---
|
||||
|
||||
**附录 A: 测试运行统计**
|
||||
|
||||
```
|
||||
Test Files: 8 passed (8)
|
||||
Tests: 114 passed | 3 todo (117)
|
||||
Duration: ~1.0s
|
||||
Setup: ~259ms
|
||||
Transform: ~708ms
|
||||
```
|
||||
|
||||
**附录 B: 审查工具**
|
||||
|
||||
- Vitest 测试运行器
|
||||
- Playwright Mock 库
|
||||
- TypeScript 类型检查
|
||||
- ESLint 代码规范检查
|
||||
|
||||
---
|
||||
|
||||
**报告结束**
|
||||
308
docs/cleaner-role-based-flow.md
Normal file
308
docs/cleaner-role-based-flow.md
Normal file
@@ -0,0 +1,308 @@
|
||||
# 清理器角色差异流程 — Admin vs User
|
||||
|
||||
**文档版本**: 1.1
|
||||
**创建日期**: 2026-04-06
|
||||
**面向对象**: 开发人员
|
||||
|
||||
## 概述
|
||||
|
||||
清理器（Cleaner）在决定"哪些物料需要被清除"时，Admin 和 User 两个角色存在系统性的差异。这些差异贯穿三个阶段：**初始化 → 校验确认 → 执行清理**。
|
||||
|
||||
本文档使用 Mermaid 图表说明每个阶段的角色分支逻辑。
|
||||
|
||||
---
|
||||
|
||||
## 全局流程概览
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
subgraph init["阶段一：页面初始化"]
|
||||
I1([页面加载]) --> I2{角色判断}
|
||||
I2 -->|Admin| I3["管理员列表 ← 全部负责人<br/>默认选中全部"]
|
||||
I2 -->|User| I4["管理员列表 ← 空<br/>默认选中仅自己"]
|
||||
end
|
||||
|
||||
subgraph validate["阶段二：校验 → 勾选 → 同步数据库"]
|
||||
V1([点击校验]) --> V2["后端查询物料<br/>（不区分角色）"]
|
||||
V2 --> V3["物料匹配算法<br/>（User 有覆盖匹配）"]
|
||||
V3 --> V4{角色判断}
|
||||
V4 -->|Admin| V5["显示全部物料<br/>侧边栏可按负责人筛选"]
|
||||
V4 -->|User| V6["仅显示自己的物料<br/>+ 无负责人的物料"]
|
||||
V5 --> V7["用户勾选/取消勾选"]
|
||||
V6 --> V7
|
||||
V7 --> V8{点击同步数据库}
|
||||
V8 --> V9{角色判断}
|
||||
V9 -->|Admin| V10["处理范围：全部校验结果"]
|
||||
V9 -->|User| V11["处理范围：仅筛选后结果"]
|
||||
end
|
||||
|
||||
subgraph execute["阶段三：执行清理（ERP 删除）"]
|
||||
E1([点击执行清理]) --> E2["getCleanerData(selectedManagers)<br/>获取物料代码"]
|
||||
E2 --> E3{角色判断}
|
||||
E3 -->|Admin| E3a{selectedManagers<br/>非空?}
|
||||
E3a -->|"是"| E4["SQL WHERE ManagerName IN (选中)<br/>从 MaterialsToBeDeleted 获取"]
|
||||
E3a -->|"否"| E4b["从 DiscreteMaterialPlanData<br/>按 orderNumbers 获取"]
|
||||
E3 -->|User| E5["SQL WHERE ManagerName = 用户<br/>仅获取自己的物料代码"]
|
||||
E4 --> E6["传递给 runCleaner 执行"]
|
||||
E4b --> E6
|
||||
E5 --> E6
|
||||
E6 --> E7([在 ERP 中删除物料])
|
||||
end
|
||||
|
||||
init --> validate --> execute
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 阶段一：页面初始化
|
||||
|
||||
**源码位置**: `src/renderer/src/hooks/cleaner/api.ts:25-52` 与 `src/renderer/src/hooks/useCleaner.ts:98-112`
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
Start([页面加载]) --> GetAdmin["调用 auth:isAdmin<br/>判断是否管理员"]
|
||||
GetAdmin --> GetUser["调用 auth:getCurrentUser<br/>获取当前用户名"]
|
||||
GetUser --> RoleCheck{isAdmin?}
|
||||
|
||||
RoleCheck -->|Admin| GetManagers["调用 materials:getManagers<br/>获取全部负责人列表"]
|
||||
GetManagers --> SelectAll["selectedManagers ← 全部负责人<br/>（默认全选）"]
|
||||
SelectAll --> RenderSidebar["渲染 CleanerSidebar<br/>显示负责人复选框"]
|
||||
|
||||
RoleCheck -->|User| SetSelf["selectedManagers ← {currentUsername}<br/>（仅选中自己）"]
|
||||
SetSelf --> NoSidebar["不渲染 CleanerSidebar<br/>无侧边栏"]
|
||||
|
||||
RenderSidebar --> Ready([就绪])
|
||||
NoSidebar --> Ready
|
||||
```
|
||||
|
||||
**差异总结**:
|
||||
|
||||
| 维度 | Admin | User |
|
||||
|------|-------|------|
|
||||
| 侧边栏 | 有 CleanerSidebar | 无 |
|
||||
| 管理员列表 | 查询全部负责人 | 不查询 |
|
||||
| 默认选中 | 所有负责人 | 仅自己 |
|
||||
|
||||
---
|
||||
|
||||
## 阶段二：校验 → 勾选 → 同步数据库
|
||||
|
||||
### 2.1 物料校验（后端，不区分角色）
|
||||
|
||||
**源码位置**: `src/main/services/validation/validation-application-service.ts`
|
||||
|
||||
校验阶段后端查询不区分角色，Admin 和 User 拿到相同的物料数据。区别在于**匹配算法**：
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
Start([遍历每条物料记录]) --> P1{"优先级1<br/>MaterialsToBeDeleted<br/>精确匹配 MaterialCode?"}
|
||||
|
||||
P1 -->|"匹配"| SetManager["managerName ← 表中记录<br/>isMarkedForDeletion = true"]
|
||||
P1 -->|"未匹配"| P2{"优先级2<br/>MaterialsTypeToBeDeleted<br/>MaterialName 包含匹配?"}
|
||||
|
||||
P2 -->|"匹配"| SetType["managerName ← 类型关键词负责人<br/>matchedTypeKeyword ← 匹配项"]
|
||||
P2 -->|"未匹配"| SetNull["managerName = null"]
|
||||
|
||||
SetManager --> RoleCheck{角色?}
|
||||
SetType --> RoleCheck
|
||||
SetNull --> RoleCheck
|
||||
|
||||
RoleCheck -->|"Admin"| Skip["跳过覆盖<br/>使用当前结果"]
|
||||
RoleCheck -->|"User"| P3{"优先级3（User 覆盖）<br/>自己的类型关键词匹配?"}
|
||||
|
||||
P3 -->|"匹配"| Override["强制覆盖<br/>managerName ← 当前用户"]
|
||||
P3 -->|"未匹配"| Keep["保持当前结果"]
|
||||
Skip --> Next(["下一条物料"])
|
||||
Override --> Next
|
||||
Keep --> Next
|
||||
```
|
||||
|
||||
**匹配优先级说明**:
|
||||
|
||||
| 优先级 | 数据源 | 匹配方式 | 适用角色 |
|
||||
|--------|--------|----------|----------|
|
||||
| 1（最高） | `MaterialsToBeDeleted` | MaterialCode 精确匹配 | 全部 |
|
||||
| 2 | `MaterialsTypeToBeDeleted` | MaterialName 包含匹配 | 全部 |
|
||||
| 3（User 覆盖） | 当前用户的类型关键词 | MaterialName 包含匹配 | 仅 User |
|
||||
|
||||
> **优先级 3 的作用**：当某个物料按优先级 2 被分配给其他负责人，但当前 User 有匹配的类型关键词时，会强制覆盖为自己的。这确保 User 不会为他人操作物料。
|
||||
|
||||
### 2.2 前端显示过滤
|
||||
|
||||
**源码位置**: `src/renderer/src/hooks/cleaner/helpers.ts:34-57`
|
||||
|
||||
校验结果返回前端后，会根据角色进行显示过滤：
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
Input([校验结果 validationResults]) --> RoleCheck{角色判断}
|
||||
|
||||
RoleCheck -->|Admin| FilterManagers["按侧边栏选中的负责人过滤<br/>selectedManagers.has(managerName)<br/>|| !managerName"]
|
||||
RoleCheck -->|User| FilterSelf["仅显示自己的 + 无负责人的<br/>managerName === currentUsername<br/>|| !managerName"]
|
||||
|
||||
FilterManagers --> FilterHidden["排除已隐藏的物料<br/>!hiddenItems.has(materialCode)"]
|
||||
FilterSelf --> FilterHidden
|
||||
|
||||
FilterHidden --> Output([filteredResults<br/>用于表格显示])
|
||||
```
|
||||
|
||||
### 2.3 确认删除（同步数据库）
|
||||
|
||||
**源码位置**: `src/renderer/src/hooks/useCleaner.ts:289-344`
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
Start([点击确认删除]) --> RoleScope{角色判断}
|
||||
|
||||
RoleScope -->|Admin| UseAll["resultsToProcess = validationResults<br/>处理全部校验结果"]
|
||||
RoleScope -->|User| UseFiltered["resultsToProcess = filteredResults<br/>仅处理筛选后结果"]
|
||||
|
||||
UseAll --> BuildPlan["buildDeletionPlan(resultsToProcess, selectedItems)"]
|
||||
UseFiltered --> BuildPlan
|
||||
|
||||
BuildPlan --> Loop["遍历 resultsToProcess"]
|
||||
Loop --> Check{物料是否勾选?}
|
||||
|
||||
Check -->|"已勾选"| HasManager{有负责人?}
|
||||
Check -->|"未勾选"| ToDelete["加入 materialsToDelete<br/>从数据库移除标记"]
|
||||
|
||||
HasManager -->|"有"| ToUpsert["加入 materialsToUpsert<br/>写入/更新到数据库"]
|
||||
HasManager -->|"无"| Missing["加入 missingManager<br/>阻止操作"]
|
||||
|
||||
ToUpsert --> Save["调用 materials:upsertBatch"]
|
||||
ToDelete --> Del["调用 materials:delete"]
|
||||
Missing --> Warn(["弹窗警告：缺少负责人"])
|
||||
Save --> Done([完成])
|
||||
Del --> Done
|
||||
```
|
||||
|
||||
**关键代码**:
|
||||
|
||||
```typescript
|
||||
// Admin 处理全部结果，User 只处理筛选后的结果
|
||||
const resultsToProcess = isAdmin ? validationResults : filteredResults
|
||||
```
|
||||
|
||||
**差异总结**:
|
||||
|
||||
| 维度 | Admin | User |
|
||||
|------|-------|------|
|
||||
| 处理范围 | `validationResults`（全部） | `filteredResults`（自己的+无负责人的） |
|
||||
| 可操作物料 | 所有负责人的物料 | 仅自己的 + 无负责人的 |
|
||||
| 能否修改他人数据 | 是 | 否 |
|
||||
|
||||
---
|
||||
|
||||
## 阶段三：执行清理（ERP 删除）
|
||||
|
||||
**源码位置**:
|
||||
- 前端调用: `src/renderer/src/hooks/cleaner/api.ts:116-166`
|
||||
- 获取数据: `src/main/services/validation/validation-application-service.ts:497-655`
|
||||
- 执行删除: `src/main/services/cleaner/cleaner-application-service.ts`
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant UI as 前端 useCleaner
|
||||
participant API as api.ts
|
||||
participant Main as 主进程
|
||||
participant DB as 数据库
|
||||
participant ERP as ERP 系统
|
||||
|
||||
UI->>API: runCleanerExecution({ dryRun, selectedManagers, ... })
|
||||
API->>Main: getCleanerData({ selectedManagers })
|
||||
|
||||
alt Admin + selectedManagers 非空
|
||||
Main->>DB: SELECT MaterialCode FROM MaterialsToBeDeleted<br/>WHERE ManagerName IN (@manager0, @manager1, ...)
|
||||
Note over Main,DB: 按选中的负责人过滤<br/>从 MaterialsToBeDeleted 获取
|
||||
else Admin + selectedManagers 为空
|
||||
Main->>DB: SELECT DISTINCT MaterialCode FROM DiscreteMaterialPlanData<br/>WHERE SourceNumber IN (orderNumbers)
|
||||
Note over Main,DB: 按订单号查询<br/>从 DiscreteMaterialPlanData 获取
|
||||
else User
|
||||
Main->>DB: SELECT MaterialCode FROM MaterialsToBeDeleted<br/>WHERE ManagerName = @username
|
||||
Note over Main,DB: 按 ManagerName 过滤<br/>仅获取自己的物料代码
|
||||
end
|
||||
|
||||
DB-->>Main: materialCodes[]
|
||||
Main-->>API: { orderNumbers, materialCodes }
|
||||
|
||||
Note over API: 传入角色过滤后的 materialCodes
|
||||
API->>Main: cleaner.runCleaner({ orderNumbers, materialCodes, ... })
|
||||
|
||||
Main->>ERP: 按订单遍历，删除指定物料
|
||||
ERP-->>Main: 删除结果
|
||||
Main-->>API: CleanerResult
|
||||
API-->>UI: 显示执行报告
|
||||
```
|
||||
|
||||
**SQL 差异**:
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
subgraph AdminWithMgr["Admin + selectedManagers 非空"]
|
||||
A1["SELECT MaterialCode<br/>FROM MaterialsToBeDeleted<br/>WHERE ManagerName IN (@manager0, ...)<br/>AND MaterialCode IS NOT NULL"]
|
||||
end
|
||||
|
||||
subgraph AdminNoMgr["Admin + selectedManagers 为空"]
|
||||
A2["SELECT DISTINCT MaterialCode<br/>FROM DiscreteMaterialPlanData<br/>WHERE SourceNumber IN (orderNumbers)"]
|
||||
end
|
||||
|
||||
subgraph User["User 查询"]
|
||||
U1["SELECT MaterialCode<br/>FROM MaterialsToBeDeleted<br/>WHERE ManagerName = @username<br/>AND MaterialCode IS NOT NULL"]
|
||||
end
|
||||
|
||||
AdminWithMgr --> |"按选中负责人过滤"| Result([传入 runCleaner])
|
||||
AdminNoMgr --> |"按订单号查 DiscreteMaterialPlanData"| Result
|
||||
User --> |"仅返回自己的物料代码"| Result
|
||||
```
|
||||
|
||||
**差异总结**:
|
||||
|
||||
| 维度 | Admin（有 selectedManagers） | Admin（无 selectedManagers） | User |
|
||||
|------|---------------------------|----------------------------|------|
|
||||
| 数据源 | `MaterialsToBeDeleted` | `DiscreteMaterialPlanData` | `MaterialsToBeDeleted` |
|
||||
| 查询条件 | `WHERE ManagerName IN (...)` | `WHERE SourceNumber IN (orderNumbers)` | `WHERE ManagerName = @username` |
|
||||
| 可删除物料 | 选中负责人的物料 | 订单关联的全部物料 | 仅自己标记的物料 |
|
||||
| 无订单号时 | — | 返回空数组 | — |
|
||||
|
||||
---
|
||||
|
||||
## 数据安全边界
|
||||
|
||||
角色隔离在**三个层面**同时生效，形成纵深防御：
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
subgraph layer1["第一层：前端过滤"]
|
||||
L1["filterValidationResults()<br/>User 仅看到自己的物料"]
|
||||
end
|
||||
|
||||
subgraph layer2["第二层：同步范围"]
|
||||
L2["handleConfirmDeletion()<br/>User 仅同步 filteredResults"]
|
||||
end
|
||||
|
||||
subgraph layer3["第三层：后端查询"]
|
||||
L3["loadMaterialCodesForCleaner()<br/>Admin: WHERE ManagerName IN (selectedManagers)<br/>User: SQL WHERE ManagerName = user"]
|
||||
end
|
||||
|
||||
L1 -->|"防止误操作"| L2
|
||||
L2 -->|"缩小同步范围"| L3
|
||||
L3 -->|"最终保证"| Safe([User 无法删除他人物料])
|
||||
```
|
||||
|
||||
> **注意**：`runCleaner()` 本身不做角色过滤，它信任上游传入的 `materialCodes` 已经过角色过滤。安全性由 `getCleanerData()` 的 SQL 查询保证。
|
||||
|
||||
---
|
||||
|
||||
## 涉及文件索引
|
||||
|
||||
| 文件 | 关键函数/逻辑 | 行号 |
|
||||
|------|---------------|------|
|
||||
| `src/renderer/src/hooks/cleaner/api.ts` | `initializeCleanerPage()`, `runCleanerExecution()` | 25-52, 116-166 |
|
||||
| `src/renderer/src/hooks/useCleaner.ts` | `handleConfirmDeletion()`, 初始化逻辑 | 98-120, 289-345 |
|
||||
| `src/renderer/src/hooks/cleaner/helpers.ts` | `filterValidationResults()`, `buildDeletionPlan()` | 34-57, 59-92 |
|
||||
| `src/main/services/validation/validation-application-service.ts` | `getCleanerData()`, `loadMaterialCodesForCleaner()`, `queryMaterialCodesByManagers()` | 232-305, 497-604, 606-655 |
|
||||
| `src/main/services/cleaner/cleaner-application-service.ts` | `runCleaner()` | 31-168 |
|
||||
| `src/main/ipc/cleaner-handler.ts` | `CLEANER_RUN` handler | 16-22 |
|
||||
| `src/main/ipc/validation-handler.ts` | `getCleanerData` handler | 194-223 |
|
||||
| `src/preload/api/validation.ts` | `getCleanerData()` IPC 桥接 | 11-12 |
|
||||
| `src/renderer/src/pages/CleanerPage.tsx` | 页面组件，条件渲染侧边栏 | 74-82 |
|
||||
@@ -44,12 +44,10 @@ export interface SqlDialect {
|
||||
}): string
|
||||
|
||||
// 分页
|
||||
paginate(p: {
|
||||
paginate(p: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
limit: number
|
||||
offset?: number
|
||||
paramIndex: number
|
||||
}): { sql: string; paramIndex: number }
|
||||
}
|
||||
|
||||
// 批量限制
|
||||
maxBatchRows(columnsPerRow: number): number
|
||||
@@ -60,13 +58,14 @@ export interface SqlDialect {
|
||||
|
||||
新建 `src/main/services/database/dialects/` 目录：
|
||||
|
||||
| 文件 | 数据库 | param(n) | quoteTableName | currentTimestamp | upsert | paginate |
|
||||
|------|--------|----------|---------------|-----------------|--------|----------|
|
||||
| `mysql-dialect.ts` | MySQL | `?` | `dbo_Table` | `NOW()` | `ON DUPLICATE KEY` | `LIMIT x OFFSET y` |
|
||||
| `sqlserver-dialect.ts` | SQL Server | `@p{n}` | `[dbo].[Table]` | `GETDATE()` | `MERGE` | `OFFSET/FETCH` |
|
||||
| `postgresql-dialect.ts` | PostgreSQL | `${n+1}` | `"dbo"."Table"` | `CURRENT_TIMESTAMP` | `ON CONFLICT` | `LIMIT x OFFSET y` |
|
||||
| 文件 | 数据库 | param(n) | quoteTableName | currentTimestamp | upsert | paginate |
|
||||
| ----------------------- | ---------- | -------- | --------------- | ------------------- | ------------------ | ------------------ |
|
||||
| `mysql-dialect.ts` | MySQL | `?` | `dbo_Table` | `NOW()` | `ON DUPLICATE KEY` | `LIMIT x OFFSET y` |
|
||||
| `sqlserver-dialect.ts` | SQL Server | `@p{n}` | `[dbo].[Table]` | `GETDATE()` | `MERGE` | `OFFSET/FETCH` |
|
||||
| `postgresql-dialect.ts` | PostgreSQL | `${n+1}` | `"dbo"."Table"` | `CURRENT_TIMESTAMP` | `ON CONFLICT` | `LIMIT x OFFSET y` |
|
||||
|
||||
方言工厂 `dialects/index.ts`：
|
||||
|
||||
```typescript
|
||||
export function createDialect(type: DatabaseType): SqlDialect
|
||||
```
|
||||
@@ -76,16 +75,19 @@ export function createDialect(type: DatabaseType): SqlDialect
|
||||
每个 DAO 新增 `dialect` 成员，替代原有的 `getTableName()`、`buildPlaceholders()` 和所有 `isSqlServer` 分支：
|
||||
|
||||
**删除：**
|
||||
|
||||
- `getTableName()` 私有方法
|
||||
- `buildPlaceholders()` 私有方法
|
||||
- 所有 `isSqlServer` 局部变量和条件分支
|
||||
- `*_CONFIG` 中的 `TABLE_NAME_SQLSERVER` / `TABLE_NAME_MYSQL` → 合并为 `TABLE_SCHEMA` + `TABLE_NAME`
|
||||
|
||||
**新增：**
|
||||
|
||||
- `private dialect: SqlDialect | null = null`
|
||||
- `private getDialect(): SqlDialect`
|
||||
|
||||
**涉及 DAO：**
|
||||
|
||||
- `DiscreteMaterialPlanDAO` — 占位符、表名、批量大小
|
||||
- `MaterialsToBeDeletedDAO` — 占位符、表名、MERGE/ON DUPLICATE KEY → `upsert()`
|
||||
- `MaterialsTypeToBeDeletedDAO` — 同上
|
||||
@@ -94,6 +96,7 @@ export function createDialect(type: DatabaseType): SqlDialect
|
||||
### 4. PostgreSQL 服务层
|
||||
|
||||
新建 `src/main/services/database/postgresql.ts`：
|
||||
|
||||
- 使用 `pg` 驱动，`Pool` 连接池
|
||||
- 实现 `IDatabaseService` 接口
|
||||
- `query()` 直接传递参数数组给 `pg`
|
||||
@@ -113,22 +116,22 @@ export function createDialect(type: DatabaseType): SqlDialect
|
||||
|
||||
## 改动范围
|
||||
|
||||
| 层 | 文件 | 动作 |
|
||||
|---|---|---|
|
||||
| 类型 | `types/database.types.ts` | 修改 |
|
||||
| 方言 | `database/dialects/index.ts` | 新建 |
|
||||
| 方言 | `database/dialects/mysql-dialect.ts` | 新建 |
|
||||
| 方言 | `database/dialects/sqlserver-dialect.ts` | 新建 |
|
||||
| 方言 | `database/dialects/postgresql-dialect.ts` | 新建 |
|
||||
| 服务 | `database/postgresql.ts` | 新建 |
|
||||
| 工厂 | `database/index.ts` | 修改 |
|
||||
| TypeORM | `database/data-source.ts` | 修改 |
|
||||
| DAO | `database/discrete-material-plan-dao.ts` | 重构 |
|
||||
| DAO | `database/materials-to-be-deleted-dao.ts` | 重构 |
|
||||
| DAO | `database/materials-type-to-be-deleted-dao.ts` | 重构 |
|
||||
| DAO | `database/extractor-operation-history-dao.ts` | 重构 |
|
||||
| 配置 | `config.template.yaml` | 修改 |
|
||||
| 依赖 | `package.json` | 修改 |
|
||||
| 层 | 文件 | 动作 |
|
||||
| ------- | ---------------------------------------------- | ---- |
|
||||
| 类型 | `types/database.types.ts` | 修改 |
|
||||
| 方言 | `database/dialects/index.ts` | 新建 |
|
||||
| 方言 | `database/dialects/mysql-dialect.ts` | 新建 |
|
||||
| 方言 | `database/dialects/sqlserver-dialect.ts` | 新建 |
|
||||
| 方言 | `database/dialects/postgresql-dialect.ts` | 新建 |
|
||||
| 服务 | `database/postgresql.ts` | 新建 |
|
||||
| 工厂 | `database/index.ts` | 修改 |
|
||||
| TypeORM | `database/data-source.ts` | 修改 |
|
||||
| DAO | `database/discrete-material-plan-dao.ts` | 重构 |
|
||||
| DAO | `database/materials-to-be-deleted-dao.ts` | 重构 |
|
||||
| DAO | `database/materials-type-to-be-deleted-dao.ts` | 重构 |
|
||||
| DAO | `database/extractor-operation-history-dao.ts` | 重构 |
|
||||
| 配置 | `config.template.yaml` | 修改 |
|
||||
| 依赖 | `package.json` | 修改 |
|
||||
|
||||
共 **4 个新文件 + 10 个修改文件**。
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
## Task 1: SqlDialect Interface & Type Definitions
|
||||
|
||||
**Files:**
|
||||
|
||||
- Create: `src/main/types/sql-dialect.types.ts`
|
||||
- Modify: `src/main/types/database.types.ts:11` (extend `DatabaseType`)
|
||||
- Modify: `src/main/types/config.schema.ts:15` (extend Zod enum)
|
||||
@@ -20,11 +21,13 @@
|
||||
**Step 1: Add `'postgresql'` to `DatabaseType`**
|
||||
|
||||
In `src/main/types/database.types.ts:11`, change:
|
||||
|
||||
```typescript
|
||||
export type DatabaseType = 'mysql' | 'sqlserver' | 'postgresql'
|
||||
```
|
||||
|
||||
Add after line 104 (after `SqlServerConfig`):
|
||||
|
||||
```typescript
|
||||
/**
|
||||
* PostgreSQL-specific configuration
|
||||
@@ -44,11 +47,13 @@ export interface PostgreSqlConfig extends DatabaseConfig {
|
||||
In `src/main/types/config.schema.ts`:
|
||||
|
||||
Change line 15:
|
||||
|
||||
```typescript
|
||||
export const databaseTypeSchema = z.enum(['mysql', 'sqlserver', 'postgresql'])
|
||||
```
|
||||
|
||||
Add after `sqlServerConfigSchema` (after line 58):
|
||||
|
||||
```typescript
|
||||
/**
|
||||
* PostgreSQL 配置 Schema
|
||||
@@ -65,6 +70,7 @@ export type PostgreSqlConfig = z.infer<typeof postgresqlConfigSchema>
|
||||
```
|
||||
|
||||
Change `databaseConfigSchema` (line 63):
|
||||
|
||||
```typescript
|
||||
export const databaseConfigSchema = z.object({
|
||||
activeType: databaseTypeSchema.default('mysql'),
|
||||
@@ -77,6 +83,7 @@ export const databaseConfigSchema = z.object({
|
||||
**Step 3: Create `SqlDialect` interface**
|
||||
|
||||
Create `src/main/types/sql-dialect.types.ts`:
|
||||
|
||||
```typescript
|
||||
/**
|
||||
* SQL Dialect Abstraction
|
||||
@@ -152,12 +159,10 @@ export interface SqlDialect {
|
||||
*
|
||||
* @returns Object with modified sql and next param index
|
||||
*/
|
||||
paginate(params: {
|
||||
paginate(params: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
limit: number
|
||||
offset?: number
|
||||
paramIndex: number
|
||||
}): { sql: string; nextParamIndex: number }
|
||||
nextParamIndex: number
|
||||
}
|
||||
|
||||
/**
|
||||
* Maximum rows per batch given columns per row
|
||||
@@ -185,6 +190,7 @@ git commit -m "feat(db): add SqlDialect interface and PostgreSQL type definition
|
||||
## Task 2: Implement Three Dialect Classes
|
||||
|
||||
**Files:**
|
||||
|
||||
- Create: `src/main/services/database/dialects/mysql-dialect.ts`
|
||||
- Create: `src/main/services/database/dialects/sqlserver-dialect.ts`
|
||||
- Create: `src/main/services/database/dialects/postgresql-dialect.ts`
|
||||
@@ -196,6 +202,7 @@ git commit -m "feat(db): add SqlDialect interface and PostgreSQL type definition
|
||||
**Step 1: Write tests for all three dialects**
|
||||
|
||||
Create `tests/unit/dialects/mysql-dialect.test.ts`:
|
||||
|
||||
```typescript
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { MySqlDialect } from '@main/services/database/dialects/mysql-dialect'
|
||||
@@ -255,6 +262,7 @@ describe('MySqlDialect', () => {
|
||||
```
|
||||
|
||||
Create `tests/unit/dialects/sqlserver-dialect.test.ts`:
|
||||
|
||||
```typescript
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { SqlServerDialect } from '@main/services/database/dialects/sqlserver-dialect'
|
||||
@@ -327,6 +335,7 @@ describe('SqlServerDialect', () => {
|
||||
```
|
||||
|
||||
Create `tests/unit/dialects/postgresql-dialect.test.ts`:
|
||||
|
||||
```typescript
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { PostgreSqlDialect } from '@main/services/database/dialects/postgresql-dialect'
|
||||
@@ -393,6 +402,7 @@ Expected: FAIL — modules not found
|
||||
**Step 3: Implement MySqlDialect**
|
||||
|
||||
Create `src/main/services/database/dialects/mysql-dialect.ts`:
|
||||
|
||||
```typescript
|
||||
import type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
import type { DatabaseType } from '../../../types/database.types'
|
||||
@@ -437,12 +447,10 @@ export class MySqlDialect implements SqlDialect {
|
||||
return { sql, nextParamIndex: p.startParamIndex + p.allColumns.length }
|
||||
}
|
||||
|
||||
paginate(p: {
|
||||
paginate(p: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
limit: number
|
||||
offset?: number
|
||||
paramIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
nextParamIndex: number
|
||||
} {
|
||||
let sql = p.sql
|
||||
if (p.offset !== undefined) {
|
||||
sql += ` LIMIT ${p.limit} OFFSET ${p.offset}`
|
||||
@@ -461,6 +469,7 @@ export class MySqlDialect implements SqlDialect {
|
||||
**Step 4: Implement SqlServerDialect**
|
||||
|
||||
Create `src/main/services/database/dialects/sqlserver-dialect.ts`:
|
||||
|
||||
```typescript
|
||||
import type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
import type { DatabaseType } from '../../../types/database.types'
|
||||
@@ -490,21 +499,15 @@ export class SqlServerDialect implements SqlDialect {
|
||||
allColumns: string[]
|
||||
startParamIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
const sourceValues = p.allColumns
|
||||
.map((_, i) => `@p${p.startParamIndex + i}`)
|
||||
.join(', ')
|
||||
const sourceValues = p.allColumns.map((_, i) => `@p${p.startParamIndex + i}`).join(', ')
|
||||
const sourceColumns = p.allColumns.join(', ')
|
||||
const keyMatch = p.keyColumns
|
||||
.map((col) => `target.${col} = source.${col}`)
|
||||
.join(' AND ')
|
||||
const keyMatch = p.keyColumns.map((col) => `target.${col} = source.${col}`).join(' AND ')
|
||||
const updateSet = p.allColumns
|
||||
.filter((col) => !p.keyColumns.includes(col))
|
||||
.map((col) => `${col} = source.${col}`)
|
||||
.join(', ')
|
||||
const insertColumns = p.allColumns.join(', ')
|
||||
const insertValues = p.allColumns
|
||||
.map((col) => `source.${col}`)
|
||||
.join(', ')
|
||||
const insertValues = p.allColumns.map((col) => `source.${col}`).join(', ')
|
||||
|
||||
const sql = `
|
||||
MERGE ${p.table} AS target
|
||||
@@ -516,12 +519,10 @@ export class SqlServerDialect implements SqlDialect {
|
||||
return { sql, nextParamIndex: p.startParamIndex + p.allColumns.length }
|
||||
}
|
||||
|
||||
paginate(p: {
|
||||
paginate(p: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
limit: number
|
||||
offset?: number
|
||||
paramIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
nextParamIndex: number
|
||||
} {
|
||||
let sql = p.sql
|
||||
let nextIndex = p.paramIndex
|
||||
|
||||
@@ -547,6 +548,7 @@ export class SqlServerDialect implements SqlDialect {
|
||||
**Step 5: Implement PostgreSqlDialect**
|
||||
|
||||
Create `src/main/services/database/dialects/postgresql-dialect.ts`:
|
||||
|
||||
```typescript
|
||||
import type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
import type { DatabaseType } from '../../../types/database.types'
|
||||
@@ -577,9 +579,7 @@ export class PostgreSqlDialect implements SqlDialect {
|
||||
allColumns: string[]
|
||||
startParamIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
const placeholders = p.allColumns
|
||||
.map((_, i) => `$${p.startParamIndex + i + 1}`)
|
||||
.join(', ')
|
||||
const placeholders = p.allColumns.map((_, i) => `$${p.startParamIndex + i + 1}`).join(', ')
|
||||
const columns = p.allColumns.join(', ')
|
||||
const conflictKeys = p.keyColumns.map((k) => `"${k}"`).join(', ')
|
||||
const updateSet = p.allColumns
|
||||
@@ -595,12 +595,10 @@ export class PostgreSqlDialect implements SqlDialect {
|
||||
return { sql, nextParamIndex: p.startParamIndex + p.allColumns.length }
|
||||
}
|
||||
|
||||
paginate(p: {
|
||||
paginate(p: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
limit: number
|
||||
offset?: number
|
||||
paramIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
nextParamIndex: number
|
||||
} {
|
||||
let sql = p.sql
|
||||
if (p.offset !== undefined) {
|
||||
sql += ` LIMIT ${p.limit} OFFSET ${p.offset}`
|
||||
@@ -619,6 +617,7 @@ export class PostgreSqlDialect implements SqlDialect {
|
||||
**Step 6: Create dialect factory index**
|
||||
|
||||
Create `src/main/services/database/dialects/index.ts`:
|
||||
|
||||
```typescript
|
||||
export { MySqlDialect } from './mysql-dialect'
|
||||
export { SqlServerDialect } from './sqlserver-dialect'
|
||||
@@ -659,12 +658,14 @@ git commit -m "feat(db): implement SqlDialect abstraction with MySQL, SQL Server
|
||||
## Task 3: PostgreSqlService Implementation
|
||||
|
||||
**Files:**
|
||||
|
||||
- Create: `src/main/services/database/postgresql.ts`
|
||||
- Test: `tests/unit/postgresql.test.ts`
|
||||
|
||||
**Step 1: Write tests**
|
||||
|
||||
Create `tests/unit/postgresql.test.ts`:
|
||||
|
||||
```typescript
|
||||
import { describe, it, expect, beforeEach } from 'vitest'
|
||||
import { PostgreSqlService } from '@main/services/database/postgresql'
|
||||
@@ -743,6 +744,7 @@ Run: `npm install pg && npm install -D @types/pg`
|
||||
**Step 4: Implement PostgreSqlService**
|
||||
|
||||
Create `src/main/services/database/postgresql.ts`:
|
||||
|
||||
```typescript
|
||||
import { Pool } from 'pg'
|
||||
import type {
|
||||
@@ -902,6 +904,7 @@ git commit -m "feat(db): add PostgreSqlService with pg driver"
|
||||
## Task 4: Refactor DiscreteMaterialPlanDAO
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `src/main/services/database/discrete-material-plan-dao.ts`
|
||||
- Modify: `src/main/services/database/materials-to-be-deleted-dao.ts`
|
||||
- Modify: `src/main/services/database/materials-type-to-be-deleted-dao.ts`
|
||||
@@ -914,11 +917,13 @@ This is the largest task. Each DAO follows the same pattern — replace `isSqlSe
|
||||
**Step 1: Add dialect import and member**
|
||||
|
||||
At top of file, add import:
|
||||
|
||||
```typescript
|
||||
import { createDialect, type SqlDialect } from './dialects'
|
||||
```
|
||||
|
||||
In class body, add:
|
||||
|
||||
```typescript
|
||||
private dialect: SqlDialect | null = null
|
||||
|
||||
@@ -933,6 +938,7 @@ private getDialect(): SqlDialect {
|
||||
**Step 2: Remove `getTableName()` and `buildPlaceholders()` methods**
|
||||
|
||||
Replace with:
|
||||
|
||||
```typescript
|
||||
private getTableName(): string {
|
||||
return this.getDialect().quoteTableName('dbo', 'DiscreteMaterialPlanData')
|
||||
@@ -944,11 +950,14 @@ Delete `buildPlaceholders()` entirely — replaced by `dialect.params()`.
|
||||
**Step 3: Replace all `isSqlServer` local variables**
|
||||
|
||||
Replace patterns like:
|
||||
|
||||
```typescript
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
```
|
||||
|
||||
With:
|
||||
|
||||
```typescript
|
||||
const dialect = this.getDialect()
|
||||
const placeholder = dialect.param(0)
|
||||
@@ -961,6 +970,7 @@ Replace `isSqlServer ? '@p0' : '?'` single placeholders with `dialect.param(0)`.
|
||||
**Step 4: Refactor `buildRowValues()`**
|
||||
|
||||
Change from:
|
||||
|
||||
```typescript
|
||||
if (isSqlServer) {
|
||||
return `@p${values.length - 1}`
|
||||
@@ -968,7 +978,9 @@ if (isSqlServer) {
|
||||
return '?'
|
||||
}
|
||||
```
|
||||
|
||||
To:
|
||||
|
||||
```typescript
|
||||
return this.getDialect().param(values.length - 1)
|
||||
```
|
||||
@@ -976,13 +988,16 @@ return this.getDialect().param(values.length - 1)
|
||||
**Step 5: Refactor `batchInsert()` batch size**
|
||||
|
||||
Change from:
|
||||
|
||||
```typescript
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const effectiveBatchSize = isSqlServer
|
||||
? Math.min(batchSize, Math.floor(sqlServerMaxParams / columnsPerRow))
|
||||
: batchSize
|
||||
```
|
||||
|
||||
To:
|
||||
|
||||
```typescript
|
||||
const dialect = this.getDialect()
|
||||
const effectiveBatchSize = Math.min(batchSize, dialect.maxBatchRows(columnsPerRow))
|
||||
@@ -995,6 +1010,7 @@ Same pattern as above, plus refactor UPSERT methods:
|
||||
**Step 6: Replace MERGE/ON DUPLICATE KEY with `dialect.upsert()`**
|
||||
|
||||
In `upsertMaterial()`, replace the entire if/else block:
|
||||
|
||||
```typescript
|
||||
if (isSqlServer) {
|
||||
// MERGE ...
|
||||
@@ -1002,7 +1018,9 @@ if (isSqlServer) {
|
||||
// ON DUPLICATE KEY UPDATE ...
|
||||
}
|
||||
```
|
||||
|
||||
With:
|
||||
|
||||
```typescript
|
||||
const dialect = this.getDialect()
|
||||
const { sql: sqlString } = dialect.upsert({
|
||||
@@ -1034,6 +1052,7 @@ Additionally, refactor `updateMaterial()` — the entire if/else block that dupl
|
||||
Plus specific changes:
|
||||
|
||||
In `insertBatchRecords()`, replace the if/else with:
|
||||
|
||||
```typescript
|
||||
const dialect = this.getDialect()
|
||||
const sqlString = `
|
||||
@@ -1045,6 +1064,7 @@ const sqlString = `
|
||||
```
|
||||
|
||||
In `getBatches()`, replace pagination logic with:
|
||||
|
||||
```typescript
|
||||
if (options?.limit) {
|
||||
const result = dialect.paginate({
|
||||
@@ -1075,6 +1095,7 @@ git commit -m "refactor(db): replace isSqlServer checks with SqlDialect abstract
|
||||
## Task 5: Database Factory & Config Integration
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: `src/main/services/database/index.ts`
|
||||
- Modify: `src/main/services/config/config-manager.ts:47-69,302-308`
|
||||
- Modify: `src/main/services/database/data-source.ts`
|
||||
@@ -1085,12 +1106,14 @@ git commit -m "refactor(db): replace isSqlServer checks with SqlDialect abstract
|
||||
In `src/main/services/database/index.ts`:
|
||||
|
||||
Add imports:
|
||||
|
||||
```typescript
|
||||
import { PostgreSqlService } from './postgresql'
|
||||
import type { PostgreSqlConfig } from '../../types/database.types'
|
||||
```
|
||||
|
||||
Add config factory:
|
||||
|
||||
```typescript
|
||||
export function createPostgreSqlConfig(): PostgreSqlConfig {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
@@ -1107,6 +1130,7 @@ export function createPostgreSqlConfig(): PostgreSqlConfig {
|
||||
```
|
||||
|
||||
Update `create()` function (line 89):
|
||||
|
||||
```typescript
|
||||
if (dbType === 'postgresql') {
|
||||
log.info('Creating PostgreSQL database service')
|
||||
@@ -1121,6 +1145,7 @@ if (dbType === 'postgresql') {
|
||||
```
|
||||
|
||||
Add to re-exports:
|
||||
|
||||
```typescript
|
||||
export { PostgreSqlService } from './postgresql'
|
||||
```
|
||||
@@ -1128,6 +1153,7 @@ export { PostgreSqlService } from './postgresql'
|
||||
**Step 2: Update ConfigManager defaults**
|
||||
|
||||
In `src/main/services/config/config-manager.ts`, add to `DEFAULT_CONFIG.database` (after line 69):
|
||||
|
||||
```typescript
|
||||
postgresql: {
|
||||
host: 'localhost',
|
||||
@@ -1140,6 +1166,7 @@ postgresql: {
|
||||
```
|
||||
|
||||
Update `getActiveDatabaseConfig()` (line 302-308):
|
||||
|
||||
```typescript
|
||||
public getActiveDatabaseConfig(): MySqlConfig | SqlServerConfig | PostgreSqlConfig {
|
||||
const { activeType, mysql, sqlserver, postgresql } = this.config.database
|
||||
@@ -1156,19 +1183,24 @@ public getActiveDatabaseConfig(): MySqlConfig | SqlServerConfig | PostgreSqlConf
|
||||
In `src/main/services/database/data-source.ts`:
|
||||
|
||||
Update `getDatabaseType()`:
|
||||
|
||||
```typescript
|
||||
function getDatabaseType(): 'mysql' | 'mssql' | 'postgres' {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const dbType = configManager.getDatabaseType()
|
||||
switch (dbType) {
|
||||
case 'sqlserver': return 'mssql'
|
||||
case 'postgresql': return 'postgres'
|
||||
default: return 'mysql'
|
||||
case 'sqlserver':
|
||||
return 'mssql'
|
||||
case 'postgresql':
|
||||
return 'postgres'
|
||||
default:
|
||||
return 'mysql'
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Add postgres branch in `buildDataSourceOptions()`:
|
||||
|
||||
```typescript
|
||||
if (type === 'mssql') {
|
||||
// ... existing mssql config
|
||||
@@ -1191,17 +1223,19 @@ if (type === 'mssql') {
|
||||
**Step 4: Update config template**
|
||||
|
||||
In `config.template.yaml`, add after sqlserver section:
|
||||
|
||||
```yaml
|
||||
postgresql:
|
||||
host: <PG_HOST>
|
||||
port: 5432
|
||||
database: <DATABASE_NAME>
|
||||
username: <USERNAME>
|
||||
password: <PASSWORD>
|
||||
maxPoolSize: 10
|
||||
postgresql:
|
||||
host: <PG_HOST>
|
||||
port: 5432
|
||||
database: <DATABASE_NAME>
|
||||
username: <USERNAME>
|
||||
password: <PASSWORD>
|
||||
maxPoolSize: 10
|
||||
```
|
||||
|
||||
Update header comment to mention postgresql:
|
||||
|
||||
```yaml
|
||||
# 3. 设置 database.activeType 为 mysql、sqlserver 或 postgresql
|
||||
```
|
||||
@@ -1228,6 +1262,7 @@ git commit -m "feat(db): integrate PostgreSQL into factory, config, and TypeORM
|
||||
## Task 6: Verification & Smoke Test
|
||||
|
||||
**Files:**
|
||||
|
||||
- Test: Manual integration verification
|
||||
|
||||
**Step 1: Run full typecheck**
|
||||
@@ -1252,6 +1287,7 @@ Run: `npm run format`
|
||||
**Step 5: Verify config.yaml can be parsed with postgresql section**
|
||||
|
||||
Create a temporary test that validates the config schema accepts postgresql:
|
||||
|
||||
```typescript
|
||||
// In a scratch test file
|
||||
import { validateConfig } from '../../src/main/types/config.schema'
|
||||
@@ -1262,7 +1298,13 @@ const config = {
|
||||
activeType: 'postgresql',
|
||||
mysql: { host: 'localhost', port: 3306, database: 'test', username: 'root', password: '' },
|
||||
sqlserver: { server: 'localhost', port: 1433, database: 'test', username: 'sa', password: '' },
|
||||
postgresql: { host: '192.168.31.83', port: 5432, database: 'CompanyDB', username: 'admin', password: 'test' }
|
||||
postgresql: {
|
||||
host: '192.168.31.83',
|
||||
port: 5432,
|
||||
database: 'CompanyDB',
|
||||
username: 'admin',
|
||||
password: 'test'
|
||||
}
|
||||
},
|
||||
paths: { dataDir: './data/' },
|
||||
extraction: {},
|
||||
@@ -1287,13 +1329,13 @@ git commit -m "chore: format and verify PostgreSQL integration"
|
||||
|
||||
## Summary
|
||||
|
||||
| Task | Description | New Files | Modified Files |
|
||||
|------|-------------|-----------|---------------|
|
||||
| 1 | Types & SqlDialect interface | 1 | 2 |
|
||||
| 2 | Three dialect implementations + tests | 4 + 3 tests | 0 |
|
||||
| 3 | PostgreSqlService + test | 1 + 1 test | 1 (package.json) |
|
||||
| 4 | Refactor all 4 DAOs | 0 | 4 |
|
||||
| 5 | Factory, config, TypeORM integration | 0 | 4 |
|
||||
| 6 | Verification | 0 | 0 |
|
||||
| Task | Description | New Files | Modified Files |
|
||||
| ---- | ------------------------------------- | ----------- | ---------------- |
|
||||
| 1 | Types & SqlDialect interface | 1 | 2 |
|
||||
| 2 | Three dialect implementations + tests | 4 + 3 tests | 0 |
|
||||
| 3 | PostgreSqlService + test | 1 + 1 test | 1 (package.json) |
|
||||
| 4 | Refactor all 4 DAOs | 0 | 4 |
|
||||
| 5 | Factory, config, TypeORM integration | 0 | 4 |
|
||||
| 6 | Verification | 0 | 0 |
|
||||
|
||||
**Total:** 6 tasks, ~14 files touched (9 new, 10 modified), 5 commits
|
||||
|
||||
16
docs/releases/1.10.0.md
Normal file
16
docs/releases/1.10.0.md
Normal file
@@ -0,0 +1,16 @@
|
||||
# 1.10.0
|
||||
|
||||
## 数据库
|
||||
|
||||
- **新增 PostgreSQL 支持**：应用现可连接 PostgreSQL 数据库，与 MySQL、SQL Server 并列可选。
|
||||
- 数据库方言自动适配，SQL 语句根据数据库类型生成正确的标识符引用格式。
|
||||
|
||||
## 稳定性
|
||||
|
||||
- 修复 PostgreSQL 环境下表名双引号导致的 SQL 语法错误。
|
||||
- 修复 PostgreSQL 关键字冲突和大小写敏感问题，自动处理标识符转义。
|
||||
|
||||
## 质量改进
|
||||
|
||||
- 扩展核心业务模块（认证、清理、校验）的单元测试覆盖，提升回归检测能力。
|
||||
- 改进测试隔离性，减少跨用例状态泄漏和测试日志噪音。
|
||||
16
docs/releases/1.11.0.md
Normal file
16
docs/releases/1.11.0.md
Normal file
@@ -0,0 +1,16 @@
|
||||
# 1.11.0
|
||||
|
||||
## 物料清理
|
||||
|
||||
- 管理员执行清理时可按负责人筛选物料，仅处理指定负责人的数据，避免误删其他人的标记。
|
||||
- 未选择负责人时自动按订单号关联查询物料，保证清理范围准确。
|
||||
|
||||
## 审计日志
|
||||
|
||||
- 统一审计记录中的计算机名称来源，消除多来源不一致的情况。
|
||||
- 增强审计日志的类型安全性和覆盖范围，异常情况下不再丢失日志。
|
||||
|
||||
## 质量改进
|
||||
|
||||
- 端到端测试迁移至 Playwright 框架，提升测试稳定性和执行效率。
|
||||
- 改进单元测试的隔离性和模拟驱动覆盖，减少跨用例状态干扰。
|
||||
5
docs/releases/1.11.1.md
Normal file
5
docs/releases/1.11.1.md
Normal file
@@ -0,0 +1,5 @@
|
||||
# 1.11.1
|
||||
|
||||
## 问题修复
|
||||
|
||||
- 修复管理员按负责人筛选清理时，因类型声明缺失导致构建失败的问题。
|
||||
165
package-lock.json
generated
165
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "erpauto",
|
||||
"version": "1.9.0",
|
||||
"version": "1.11.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "erpauto",
|
||||
"version": "1.9.0",
|
||||
"version": "1.11.1",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.929.0",
|
||||
@@ -24,6 +24,7 @@
|
||||
"lucide-react": "^0.575.0",
|
||||
"mssql": "^12.2.0",
|
||||
"mysql2": "^3.18.2",
|
||||
"pg": "^8.20.0",
|
||||
"playwright": "^1.58.2",
|
||||
"playwright-core": "^1.58.2",
|
||||
"react-focus-lock": "^2.13.7",
|
||||
@@ -48,6 +49,7 @@
|
||||
"@playwright/test": "^1.58.2",
|
||||
"@types/mssql": "^9.1.9",
|
||||
"@types/node": "^22.19.13",
|
||||
"@types/pg": "^8.20.0",
|
||||
"@types/react": "^19.2.7",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@types/uuid": "^10.0.0",
|
||||
@@ -5020,6 +5022,18 @@
|
||||
"undici-types": "~6.21.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/pg": {
|
||||
"version": "8.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.20.0.tgz",
|
||||
"integrity": "sha512-bEPFOaMAHTEP1EzpvHTbmwR8UsFyHSKsRisLIHVMXnpNefSbGA1bD6CVy+qKjGSqmZqNqBDV2azOBo8TgkcVow==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/node": "*",
|
||||
"pg-protocol": "*",
|
||||
"pg-types": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/plist": {
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz",
|
||||
@@ -13532,6 +13546,96 @@
|
||||
"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg": {
|
||||
"version": "8.20.0",
|
||||
"resolved": "https://registry.npmjs.org/pg/-/pg-8.20.0.tgz",
|
||||
"integrity": "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==",
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"pg-connection-string": "^2.12.0",
|
||||
"pg-pool": "^3.13.0",
|
||||
"pg-protocol": "^1.13.0",
|
||||
"pg-types": "2.2.0",
|
||||
"pgpass": "1.0.5"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 16.0.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"pg-cloudflare": "^1.3.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"pg-native": ">=3.0.1"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"pg-native": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/pg-cloudflare": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz",
|
||||
"integrity": "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==",
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/pg-connection-string": {
|
||||
"version": "2.12.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.12.0.tgz",
|
||||
"integrity": "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg-int8": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
|
||||
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-pool": {
|
||||
"version": "3.13.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.13.0.tgz",
|
||||
"integrity": "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"pg": ">=8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-protocol": {
|
||||
"version": "1.13.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
|
||||
"integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg-types": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
|
||||
"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"pg-int8": "1.0.1",
|
||||
"postgres-array": "~2.0.0",
|
||||
"postgres-bytea": "~1.0.0",
|
||||
"postgres-date": "~1.0.4",
|
||||
"postgres-interval": "^1.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/pgpass": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
|
||||
"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"split2": "^4.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/picocolors": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
|
||||
@@ -13641,6 +13745,45 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/postgres-array": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
|
||||
"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-bytea": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz",
|
||||
"integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-date": {
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
|
||||
"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-interval": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
|
||||
"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"xtend": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postject": {
|
||||
"version": "1.0.0-alpha.6",
|
||||
"resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
|
||||
@@ -14912,6 +15055,15 @@
|
||||
"url": "https://github.com/sponsors/wooorm"
|
||||
}
|
||||
},
|
||||
"node_modules/split2": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
|
||||
"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">= 10.x"
|
||||
}
|
||||
},
|
||||
"node_modules/sprintf-js": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
|
||||
@@ -17836,6 +17988,15 @@
|
||||
"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/xtend": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
|
||||
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/y18n": {
|
||||
"version": "5.0.8",
|
||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "erpauto",
|
||||
"version": "1.9.0",
|
||||
"version": "1.11.1",
|
||||
"description": "An Electron application with React and TypeScript",
|
||||
"main": "./out/main/index.js",
|
||||
"author": "example.com",
|
||||
@@ -48,6 +48,7 @@
|
||||
"lucide-react": "^0.575.0",
|
||||
"mssql": "^12.2.0",
|
||||
"mysql2": "^3.18.2",
|
||||
"pg": "^8.20.0",
|
||||
"playwright": "^1.58.2",
|
||||
"playwright-core": "^1.58.2",
|
||||
"react-focus-lock": "^2.13.7",
|
||||
@@ -72,6 +73,7 @@
|
||||
"@playwright/test": "^1.58.2",
|
||||
"@types/mssql": "^9.1.9",
|
||||
"@types/node": "^22.19.13",
|
||||
"@types/pg": "^8.20.0",
|
||||
"@types/react": "^19.2.7",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@types/uuid": "^10.0.0",
|
||||
|
||||
@@ -1,34 +1,42 @@
|
||||
import { app } from 'electron'
|
||||
import logger from '../services/logger/index'
|
||||
import { logAudit, closeAuditLogger } from '../services/logger/audit-logger'
|
||||
import { logAudit, closeAuditLogger, cachedHostname } from '../services/logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../types/audit.types'
|
||||
import { serializeError } from '../services/logger/error-utils'
|
||||
|
||||
export function setupProcessGuards(): void {
|
||||
process.on('uncaughtException', (err) => {
|
||||
logger.error('Uncaught exception', { error: err })
|
||||
logAudit('SYSTEM_CRASH', 'system', {
|
||||
username: 'system',
|
||||
computerName: process.env.COMPUTERNAME || 'unknown',
|
||||
resource: 'main-process',
|
||||
status: 'failure',
|
||||
metadata: { error: err.message, stack: err.stack }
|
||||
})
|
||||
setTimeout(() => process.exit(1), 1000)
|
||||
try {
|
||||
logAudit(AuditAction.SYSTEM_CRASH, 'system', {
|
||||
username: 'system',
|
||||
computerName: cachedHostname,
|
||||
resource: 'main-process',
|
||||
status: AuditStatus.FAILURE,
|
||||
metadata: { error: err.message, stack: err.stack }
|
||||
})
|
||||
} catch (auditError) {
|
||||
logger.error('Failed to write crash audit log', { error: auditError })
|
||||
} finally {
|
||||
setTimeout(() => process.exit(1), 1000)
|
||||
}
|
||||
})
|
||||
|
||||
process.on('unhandledRejection', (reason) => {
|
||||
const errorMeta =
|
||||
reason instanceof Error
|
||||
? { error: serializeError(reason) }
|
||||
: { reason: String(reason) }
|
||||
reason instanceof Error ? { error: serializeError(reason) } : { reason: String(reason) }
|
||||
logger.error('Unhandled Rejection', errorMeta)
|
||||
logAudit('SYSTEM_ERROR', 'system', {
|
||||
username: 'system',
|
||||
computerName: process.env.COMPUTERNAME || 'unknown',
|
||||
resource: 'main-process',
|
||||
status: 'failure',
|
||||
metadata: errorMeta
|
||||
})
|
||||
try {
|
||||
logAudit(AuditAction.SYSTEM_ERROR, 'system', {
|
||||
username: 'system',
|
||||
computerName: cachedHostname,
|
||||
resource: 'main-process',
|
||||
status: AuditStatus.FAILURE,
|
||||
metadata: errorMeta
|
||||
})
|
||||
} catch (auditError) {
|
||||
logger.error('Failed to write unhandled rejection audit log', { error: auditError })
|
||||
}
|
||||
})
|
||||
|
||||
app.on('render-process-gone', (_, webContents, details) => {
|
||||
|
||||
@@ -5,7 +5,8 @@ import { OrderNumberResolver } from '../services/erp/order-resolver'
|
||||
import { create, type IDatabaseService } from '../services/database'
|
||||
import { ExtractorOperationHistoryDAO } from '../services/database/extractor-operation-history-dao'
|
||||
import { createLogger } from '../services/logger'
|
||||
import { logAudit } from '../services/logger/audit-logger'
|
||||
import { logAuditWithCurrentUser } from '../services/logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../types/audit.types'
|
||||
import { SessionManager } from '../services/user/session-manager'
|
||||
import { withErrorHandling, type IpcResult } from './index'
|
||||
import { ErpConnectionError, ValidationError, DatabaseQueryError } from '../types/errors'
|
||||
@@ -278,24 +279,17 @@ export function registerExtractorHandlers(): void {
|
||||
}
|
||||
|
||||
// Audit log: EXTRACT (non-blocking)
|
||||
const os = await import('os')
|
||||
if (currentUser) {
|
||||
const auditStatus: 'success' | 'failure' | 'partial' =
|
||||
const auditStatus: AuditStatus =
|
||||
result.errors.length > 0 && result.recordCount > 0
|
||||
? 'partial'
|
||||
? AuditStatus.PARTIAL
|
||||
: result.errors.length > 0
|
||||
? 'failure'
|
||||
: 'success'
|
||||
logAudit('EXTRACT', String(currentUser.id), {
|
||||
username: currentUser.username,
|
||||
computerName: os.hostname(),
|
||||
resource: 'MATERIAL_PLAN',
|
||||
status: auditStatus,
|
||||
metadata: {
|
||||
orderCount: validOrderNumbers.length,
|
||||
recordCount: result.recordCount,
|
||||
errorCount: result.errors.length
|
||||
}
|
||||
? AuditStatus.FAILURE
|
||||
: AuditStatus.SUCCESS
|
||||
logAuditWithCurrentUser(AuditAction.EXTRACT, 'MATERIAL_PLAN', auditStatus, {
|
||||
orderCount: validOrderNumbers.length,
|
||||
recordCount: result.recordCount,
|
||||
errorCount: result.errors.length
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@ import { UserErpConfigService } from '../services/user/user-erp-config-service'
|
||||
import { MySqlService } from '../services/database/mysql'
|
||||
import { SqlServerService } from '../services/database/sql-server'
|
||||
import { createLogger } from '../services/logger'
|
||||
import { logAudit } from '../services/logger/audit-logger'
|
||||
import { logAuditWithCurrentUser } from '../services/logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../types/audit.types'
|
||||
import type { UserType, ConnectionTestResult, SaveSettingsResult } from '../types/settings.types'
|
||||
import { IPC_CHANNELS } from '../../shared/ipc-channels'
|
||||
import { ValidationError } from '../types/errors'
|
||||
@@ -67,13 +68,9 @@ export function registerSettingsHandlers(): void {
|
||||
})
|
||||
|
||||
// Audit log: SETTINGS_CHANGE (non-blocking)
|
||||
const os = await import('os')
|
||||
logAudit('SETTINGS_CHANGE', String(currentUser.id), {
|
||||
username: currentUser.username,
|
||||
computerName: os.hostname(),
|
||||
resource: 'ERP_CONFIG',
|
||||
status: 'success',
|
||||
metadata: { changeType: 'erp_credentials', usernameChanged: !!settings.erp.username }
|
||||
logAuditWithCurrentUser(AuditAction.SETTINGS_CHANGE, 'ERP_CONFIG', AuditStatus.SUCCESS, {
|
||||
changeType: 'erp_credentials',
|
||||
usernameChanged: !!settings.erp.username
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -194,7 +194,8 @@ export function registerValidationHandlers(): void {
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.VALIDATION_GET_CLEANER_DATA,
|
||||
async (
|
||||
event
|
||||
event,
|
||||
params?: { selectedManagers?: string[] }
|
||||
): Promise<{
|
||||
success: boolean
|
||||
orderNumbers?: string[]
|
||||
@@ -213,7 +214,11 @@ export function registerValidationHandlers(): void {
|
||||
}
|
||||
}
|
||||
|
||||
return validationApplicationService.getCleanerData(userInfo, event.sender.id)
|
||||
return validationApplicationService.getCleanerData(
|
||||
userInfo,
|
||||
event.sender.id,
|
||||
params?.selectedManagers ?? []
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { SessionManager } from '../user/session-manager'
|
||||
import { UpdateService } from '../update/update-service'
|
||||
import { createLogger, run, getRequestId, getContext } from '../logger'
|
||||
import { logAudit } from '../logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../../types/audit.types'
|
||||
import { ValidationError } from '../../types/errors'
|
||||
import type { UserInfo } from '../../types/user.types'
|
||||
import type {
|
||||
@@ -73,11 +74,11 @@ export class AuthApplicationService {
|
||||
userId: userInfo.id
|
||||
})
|
||||
|
||||
this.writeAuditLog('LOGIN', String(userInfo.id), {
|
||||
this.writeAuditLog(AuditAction.LOGIN, String(userInfo.id), {
|
||||
username: userInfo.username,
|
||||
computerName: hostname(),
|
||||
resource: 'ERP_SYSTEM',
|
||||
status: 'success',
|
||||
status: AuditStatus.SUCCESS,
|
||||
metadata: { loginType: 'silent', userType: userInfo.userType }
|
||||
})
|
||||
|
||||
@@ -127,11 +128,11 @@ export class AuthApplicationService {
|
||||
const userInfo = this.sessionManager.getUserInfo()
|
||||
|
||||
if (!success || !userInfo) {
|
||||
this.writeAuditLog('LOGIN', '0', {
|
||||
this.writeAuditLog(AuditAction.LOGIN, '0', {
|
||||
username,
|
||||
computerName: hostname(),
|
||||
resource: 'ERP_SYSTEM',
|
||||
status: 'failure',
|
||||
status: AuditStatus.FAILURE,
|
||||
metadata: { loginType: 'credentials', reason: 'invalid_credentials' }
|
||||
})
|
||||
|
||||
@@ -155,11 +156,11 @@ export class AuthApplicationService {
|
||||
})
|
||||
await this.updateService.setUserContext(userInfo.userType)
|
||||
|
||||
this.writeAuditLog('LOGIN', String(userInfo.id), {
|
||||
this.writeAuditLog(AuditAction.LOGIN, String(userInfo.id), {
|
||||
username: userInfo.username,
|
||||
computerName: hostname(),
|
||||
resource: 'ERP_SYSTEM',
|
||||
status: 'success',
|
||||
status: AuditStatus.SUCCESS,
|
||||
metadata: { loginType: 'credentials', userType: userInfo.userType }
|
||||
})
|
||||
|
||||
@@ -204,11 +205,11 @@ export class AuthApplicationService {
|
||||
})
|
||||
|
||||
if (userInfo) {
|
||||
this.writeAuditLog('LOGOUT', String(userInfo.id), {
|
||||
this.writeAuditLog(AuditAction.LOGOUT, String(userInfo.id), {
|
||||
username: userInfo.username,
|
||||
computerName: hostname(),
|
||||
resource: 'ERP_SYSTEM',
|
||||
status: 'success',
|
||||
status: AuditStatus.SUCCESS,
|
||||
metadata: { userType: userInfo.userType }
|
||||
})
|
||||
}
|
||||
@@ -310,7 +311,7 @@ export class AuthApplicationService {
|
||||
}
|
||||
|
||||
private writeAuditLog(
|
||||
action: 'LOGIN' | 'LOGOUT',
|
||||
action: AuditAction.LOGIN | AuditAction.LOGOUT,
|
||||
actorId: string,
|
||||
payload: Parameters<typeof logAudit>[2]
|
||||
): void {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import type { WebContents } from 'electron'
|
||||
import type { MySqlService } from '../database/mysql'
|
||||
import type { SqlServerService } from '../database/sql-server'
|
||||
import type { IDatabaseService } from '../../types/database.types'
|
||||
import { ErpAuthService } from '../erp/erp-auth'
|
||||
import { CleanerService } from '../erp/cleaner'
|
||||
import { OrderNumberResolver } from '../erp/order-resolver'
|
||||
import { MySqlService as MySqlServiceImpl } from '../database/mysql'
|
||||
import { SqlServerService as SqlServerServiceImpl } from '../database/sql-server'
|
||||
import { PostgreSqlService as PostgreSqlServiceImpl } from '../database/postgresql'
|
||||
import { ConfigManager } from '../config/config-manager'
|
||||
import { ResultExporter } from '../excel/result-exporter'
|
||||
import { CleanerReportGenerator } from '../report/cleaner-report-generator'
|
||||
@@ -13,7 +13,8 @@ import { RustfsService } from '../rustfs'
|
||||
import { SessionManager } from '../user/session-manager'
|
||||
import { UserErpConfigService } from '../user/user-erp-config-service'
|
||||
import { createLogger } from '../logger'
|
||||
import { logAudit } from '../logger/audit-logger'
|
||||
import { logAuditWithCurrentUser } from '../logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../../types/audit.types'
|
||||
import { IPC_CHANNELS } from '../../../shared/ipc-channels'
|
||||
import { DatabaseQueryError, ErpConnectionError, ValidationError } from '../../types/errors'
|
||||
import type {
|
||||
@@ -26,13 +27,11 @@ import type {
|
||||
|
||||
const log = createLogger('CleanerApplicationService')
|
||||
|
||||
type DatabaseService = MySqlService | SqlServerService
|
||||
|
||||
export class CleanerApplicationService {
|
||||
async runCleaner(eventSender: WebContents, input: CleanerInput): Promise<CleanerResult> {
|
||||
const startTime = Date.now()
|
||||
let authService: ErpAuthService | null = null
|
||||
let dbService: DatabaseService | null = null
|
||||
let dbService: IDatabaseService | null = null
|
||||
|
||||
try {
|
||||
log.info('Fetching ERP configuration from database...')
|
||||
@@ -46,7 +45,7 @@ export class CleanerApplicationService {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const dbType = configManager.getDatabaseType()
|
||||
log.info(
|
||||
`Connecting to ${dbType === 'sqlserver' ? 'SQL Server' : 'MySQL'} for order resolution...`
|
||||
`Connecting to ${dbType === 'sqlserver' ? 'SQL Server' : dbType === 'postgresql' ? 'PostgreSQL' : 'MySQL'} for order resolution...`
|
||||
)
|
||||
|
||||
try {
|
||||
@@ -201,7 +200,7 @@ export class CleanerApplicationService {
|
||||
}
|
||||
}
|
||||
|
||||
private async getDatabaseService(): Promise<DatabaseService> {
|
||||
private async getDatabaseService(): Promise<IDatabaseService> {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const config = configManager.getConfig()
|
||||
const dbType = configManager.getDatabaseType()
|
||||
@@ -223,6 +222,19 @@ export class CleanerApplicationService {
|
||||
return sqlServerService
|
||||
}
|
||||
|
||||
if (dbType === 'postgresql') {
|
||||
const dbConfig = config.database.postgresql
|
||||
const pgService = new PostgreSqlServiceImpl({
|
||||
host: dbConfig.host,
|
||||
port: dbConfig.port,
|
||||
user: dbConfig.username,
|
||||
password: dbConfig.password,
|
||||
database: dbConfig.database
|
||||
})
|
||||
await pgService.connect()
|
||||
return pgService
|
||||
}
|
||||
|
||||
const dbConfig = config.database.mysql
|
||||
const mysqlService = new MySqlServiceImpl({
|
||||
host: dbConfig.host,
|
||||
@@ -267,27 +279,21 @@ export class CleanerApplicationService {
|
||||
return
|
||||
}
|
||||
|
||||
const status: 'success' | 'failure' | 'partial' =
|
||||
const status: AuditStatus =
|
||||
result.errors.length > 0 && result.materialsDeleted > 0
|
||||
? 'partial'
|
||||
? AuditStatus.PARTIAL
|
||||
: result.errors.length > 0
|
||||
? 'failure'
|
||||
: 'success'
|
||||
? AuditStatus.FAILURE
|
||||
: AuditStatus.SUCCESS
|
||||
|
||||
logAudit('CLEAN', String(currentUser.id), {
|
||||
username: currentUser.username,
|
||||
computerName: (await import('os')).hostname(),
|
||||
resource: 'MATERIAL_PLAN',
|
||||
status,
|
||||
metadata: {
|
||||
orderCount,
|
||||
dryRun: input.dryRun ?? false,
|
||||
queryBatchSize: input.queryBatchSize ?? 100,
|
||||
processConcurrency: input.processConcurrency ?? 1,
|
||||
materialsDeleted: result.materialsDeleted,
|
||||
materialsSkipped: result.materialsSkipped,
|
||||
errorCount: result.errors.length
|
||||
}
|
||||
logAuditWithCurrentUser(AuditAction.CLEAN, 'MATERIAL_PLAN', status, {
|
||||
orderCount,
|
||||
dryRun: input.dryRun ?? false,
|
||||
queryBatchSize: input.queryBatchSize ?? 100,
|
||||
processConcurrency: input.processConcurrency ?? 1,
|
||||
materialsDeleted: result.materialsDeleted,
|
||||
materialsSkipped: result.materialsSkipped,
|
||||
errorCount: result.errors.length
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ import { dirname } from 'path'
|
||||
import { app } from 'electron'
|
||||
import yaml from 'js-yaml'
|
||||
import { z } from 'zod'
|
||||
import { createLogger, applyLoggingConfig, trackDuration } from '../logger'
|
||||
import { createLogger, applyLoggingConfig } from '../logger'
|
||||
import { applyAuditConfig } from '../logger/audit-logger'
|
||||
import {
|
||||
fullConfigSchema,
|
||||
@@ -28,6 +28,7 @@ import {
|
||||
type DatabaseType,
|
||||
type MySqlConfig,
|
||||
type SqlServerConfig,
|
||||
type PostgreSqlConfig,
|
||||
type LoggingConfig
|
||||
} from '../../types/config.schema'
|
||||
|
||||
@@ -66,6 +67,14 @@ const DEFAULT_CONFIG: FullConfig = {
|
||||
password: '',
|
||||
driver: 'ODBC Driver 18 for SQL Server',
|
||||
trustServerCertificate: true
|
||||
},
|
||||
postgresql: {
|
||||
host: 'localhost',
|
||||
port: 5432,
|
||||
database: 'erp_db',
|
||||
username: 'postgres',
|
||||
password: '',
|
||||
maxPoolSize: 10
|
||||
}
|
||||
},
|
||||
paths: {
|
||||
@@ -299,13 +308,20 @@ export class ConfigManager {
|
||||
/**
|
||||
* 获取当前激活的数据库配置
|
||||
*/
|
||||
public getActiveDatabaseConfig(): MySqlConfig | SqlServerConfig {
|
||||
public getActiveDatabaseConfig(): MySqlConfig | SqlServerConfig | PostgreSqlConfig {
|
||||
if (!this.config) {
|
||||
throw new Error('Configuration not initialized')
|
||||
}
|
||||
|
||||
const { activeType, mysql, sqlserver } = this.config.database
|
||||
return activeType === 'mysql' ? mysql : sqlserver
|
||||
const { activeType, mysql, sqlserver, postgresql } = this.config.database
|
||||
switch (activeType) {
|
||||
case 'postgresql':
|
||||
return postgresql
|
||||
case 'sqlserver':
|
||||
return sqlserver
|
||||
default:
|
||||
return mysql
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
*/
|
||||
|
||||
import { createLogger } from '../logger'
|
||||
import { logAuditWithCurrentUser } from '../logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../../types/audit.types'
|
||||
import { DiscreteMaterialPlanDAO, type MaterialPlanRecord } from './discrete-material-plan-dao'
|
||||
|
||||
const log = createLogger('DataImportService')
|
||||
@@ -148,6 +150,20 @@ export class DataImportService {
|
||||
}
|
||||
}
|
||||
|
||||
// Audit log: DATA_IMPORT
|
||||
logAuditWithCurrentUser(
|
||||
AuditAction.DATA_IMPORT,
|
||||
'MATERIAL_PLAN',
|
||||
result.success ? AuditStatus.SUCCESS : AuditStatus.FAILURE,
|
||||
{
|
||||
recordsRead: result.recordsRead,
|
||||
recordsDeleted: result.recordsDeleted,
|
||||
recordsImported: result.recordsImported,
|
||||
uniqueSourceNumbers: result.uniqueSourceNumbers,
|
||||
errorCount: result.errors.length
|
||||
}
|
||||
)
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TypeORM Data Source Configuration
|
||||
*
|
||||
* Provides a centralized database connection for TypeORM entities.
|
||||
* Supports both MySQL and SQL Server based on configuration.
|
||||
* Supports MySQL, SQL Server, and PostgreSQL based on configuration.
|
||||
*
|
||||
* Note: Configuration is now loaded from config.yaml via ConfigManager,
|
||||
* not from environment variables.
|
||||
@@ -18,10 +18,17 @@ const log = createLogger('DataSource')
|
||||
/**
|
||||
* Get database type from config manager
|
||||
*/
|
||||
function getDatabaseType(): 'mysql' | 'mssql' {
|
||||
function getDatabaseType(): 'mysql' | 'mssql' | 'postgres' {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const dbType = configManager.getDatabaseType()
|
||||
return dbType === 'sqlserver' ? 'mssql' : 'mysql'
|
||||
switch (dbType) {
|
||||
case 'sqlserver':
|
||||
return 'mssql'
|
||||
case 'postgresql':
|
||||
return 'postgres'
|
||||
default:
|
||||
return 'mysql'
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -54,6 +61,17 @@ function buildDataSourceOptions(): DataSourceOptions {
|
||||
},
|
||||
...commonOptions
|
||||
} as DataSourceOptions
|
||||
} else if (type === 'postgres') {
|
||||
const dbConfig = config.database.postgresql
|
||||
return {
|
||||
type: 'postgres',
|
||||
host: dbConfig.host,
|
||||
port: dbConfig.port,
|
||||
username: dbConfig.username,
|
||||
password: dbConfig.password,
|
||||
database: dbConfig.database,
|
||||
...commonOptions
|
||||
} as DataSourceOptions
|
||||
}
|
||||
|
||||
const dbConfig = config.database.mysql
|
||||
|
||||
28
src/main/services/database/dialects/index.ts
Normal file
28
src/main/services/database/dialects/index.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
/**
|
||||
* SQL Dialect Factory
|
||||
*
|
||||
* Creates the appropriate SqlDialect implementation based on database type.
|
||||
*/
|
||||
|
||||
import type { DatabaseType } from '../../../types/database.types'
|
||||
import type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
|
||||
import { MySqlDialect } from './mysql-dialect'
|
||||
import { PostgreSqlDialect } from './postgresql-dialect'
|
||||
import { SqlServerDialect } from './sqlserver-dialect'
|
||||
|
||||
export { MySqlDialect } from './mysql-dialect'
|
||||
export { PostgreSqlDialect } from './postgresql-dialect'
|
||||
export { SqlServerDialect } from './sqlserver-dialect'
|
||||
export type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
|
||||
export function createDialect(type: DatabaseType): SqlDialect {
|
||||
switch (type) {
|
||||
case 'sqlserver':
|
||||
return new SqlServerDialect()
|
||||
case 'postgresql':
|
||||
return new PostgreSqlDialect()
|
||||
default:
|
||||
return new MySqlDialect()
|
||||
}
|
||||
}
|
||||
71
src/main/services/database/dialects/mysql-dialect.ts
Normal file
71
src/main/services/database/dialects/mysql-dialect.ts
Normal file
@@ -0,0 +1,71 @@
|
||||
/**
|
||||
* MySQL SQL Dialect Implementation
|
||||
*
|
||||
* Encapsulates MySQL-specific SQL syntax for:
|
||||
* - Table name quoting (underscore-separated)
|
||||
* - Positional parameter placeholders (?)
|
||||
* - INSERT ... ON DUPLICATE KEY UPDATE upsert
|
||||
* - LIMIT/OFFSET pagination
|
||||
*/
|
||||
|
||||
import type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
|
||||
export class MySqlDialect implements SqlDialect {
|
||||
readonly dbType = 'mysql' as const
|
||||
|
||||
quoteTableName(schema: string, table: string): string {
|
||||
return `${schema}_${table}`
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
param(_index: number): string {
|
||||
return '?'
|
||||
}
|
||||
|
||||
params(count: number): string {
|
||||
return Array.from({ length: count }, () => '?').join(',')
|
||||
}
|
||||
|
||||
currentTimestamp(): string {
|
||||
return 'NOW()'
|
||||
}
|
||||
|
||||
upsert(params: {
|
||||
table: string
|
||||
keyColumns: string[]
|
||||
allColumns: string[]
|
||||
startParamIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
const { table, keyColumns, allColumns, startParamIndex } = params
|
||||
|
||||
const columns = allColumns.join(', ')
|
||||
const placeholders = allColumns.map(() => '?').join(', ')
|
||||
|
||||
const nonKeyColumns = allColumns.filter((col) => !keyColumns.includes(col))
|
||||
const updateClause = nonKeyColumns.map((col) => `${col} = VALUES(${col})`).join(', ')
|
||||
|
||||
const sql = `INSERT INTO ${table} (${columns}) VALUES (${placeholders}) ON DUPLICATE KEY UPDATE ${updateClause}`
|
||||
|
||||
return {
|
||||
sql,
|
||||
nextParamIndex: startParamIndex + allColumns.length
|
||||
}
|
||||
}
|
||||
|
||||
paginate(params: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
nextParamIndex: number
|
||||
} {
|
||||
const { sql, limit, offset, paramIndex } = params
|
||||
|
||||
return {
|
||||
sql: `${sql} LIMIT ${limit} OFFSET ${offset ?? 0}`,
|
||||
nextParamIndex: paramIndex
|
||||
}
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
maxBatchRows(_columnsPerRow: number): number {
|
||||
return 1000
|
||||
}
|
||||
}
|
||||
76
src/main/services/database/dialects/postgresql-dialect.ts
Normal file
76
src/main/services/database/dialects/postgresql-dialect.ts
Normal file
@@ -0,0 +1,76 @@
|
||||
/**
|
||||
* PostgreSQL Dialect Implementation
|
||||
*
|
||||
* Encapsulates PostgreSQL-specific SQL syntax for:
|
||||
* - Table name quoting (double-quoted "schema"."table")
|
||||
* - Positional parameter placeholders ($1, $2, ...) — 1-based
|
||||
* - INSERT ... ON CONFLICT ... DO UPDATE SET upsert
|
||||
* - LIMIT/OFFSET pagination
|
||||
*/
|
||||
|
||||
import type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
|
||||
export class PostgreSqlDialect implements SqlDialect {
|
||||
readonly dbType = 'postgresql' as const
|
||||
|
||||
quoteTableName(schema: string, table: string): string {
|
||||
return `"${schema}"."${table}"`
|
||||
}
|
||||
|
||||
param(index: number): string {
|
||||
return `$${index + 1}`
|
||||
}
|
||||
|
||||
params(count: number): string {
|
||||
return Array.from({ length: count }, (_, i) => `$${i + 1}`).join(',')
|
||||
}
|
||||
|
||||
currentTimestamp(): string {
|
||||
return 'CURRENT_TIMESTAMP'
|
||||
}
|
||||
|
||||
upsert(params: {
|
||||
table: string
|
||||
keyColumns: string[]
|
||||
allColumns: string[]
|
||||
startParamIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
const { table, keyColumns, allColumns, startParamIndex } = params
|
||||
|
||||
const columns = allColumns.join(', ')
|
||||
const placeholders = allColumns.map((_, i) => `$${startParamIndex + i + 1}`).join(', ')
|
||||
|
||||
const conflictKeys = keyColumns.map((col) => `"${col}"`).join(', ')
|
||||
|
||||
const nonKeyColumns = allColumns.filter((col) => !keyColumns.includes(col))
|
||||
const updateSet = nonKeyColumns.map((col) => `"${col}" = EXCLUDED."${col}"`).join(', ')
|
||||
|
||||
const sql = [
|
||||
`INSERT INTO ${table} (${columns}) VALUES (${placeholders})`,
|
||||
`ON CONFLICT (${conflictKeys})`,
|
||||
`DO UPDATE SET ${updateSet}`
|
||||
].join(' ')
|
||||
|
||||
return {
|
||||
sql,
|
||||
nextParamIndex: startParamIndex + allColumns.length
|
||||
}
|
||||
}
|
||||
|
||||
paginate(params: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
nextParamIndex: number
|
||||
} {
|
||||
const { sql, limit, offset, paramIndex } = params
|
||||
|
||||
return {
|
||||
sql: `${sql} LIMIT ${limit} OFFSET ${offset ?? 0}`,
|
||||
nextParamIndex: paramIndex
|
||||
}
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
maxBatchRows(_columnsPerRow: number): number {
|
||||
return 1000
|
||||
}
|
||||
}
|
||||
88
src/main/services/database/dialects/sqlserver-dialect.ts
Normal file
88
src/main/services/database/dialects/sqlserver-dialect.ts
Normal file
@@ -0,0 +1,88 @@
|
||||
/**
|
||||
* SQL Server Dialect Implementation
|
||||
*
|
||||
* Encapsulates SQL Server-specific SQL syntax for:
|
||||
* - Table name quoting (bracket notation [schema].[table])
|
||||
* - Named parameter placeholders (@p0, @p1, ...)
|
||||
* - MERGE ... USING upsert
|
||||
* - OFFSET/FETCH pagination
|
||||
*/
|
||||
|
||||
import type { SqlDialect } from '../../../types/sql-dialect.types'
|
||||
|
||||
export class SqlServerDialect implements SqlDialect {
|
||||
readonly dbType = 'sqlserver' as const
|
||||
|
||||
quoteTableName(schema: string, table: string): string {
|
||||
return `[${schema}].[${table}]`
|
||||
}
|
||||
|
||||
param(index: number): string {
|
||||
return `@p${index}`
|
||||
}
|
||||
|
||||
params(count: number): string {
|
||||
return Array.from({ length: count }, (_, i) => `@p${i}`).join(',')
|
||||
}
|
||||
|
||||
currentTimestamp(): string {
|
||||
return 'GETDATE()'
|
||||
}
|
||||
|
||||
upsert(params: {
|
||||
table: string
|
||||
keyColumns: string[]
|
||||
allColumns: string[]
|
||||
startParamIndex: number
|
||||
}): { sql: string; nextParamIndex: number } {
|
||||
const { table, keyColumns, allColumns, startParamIndex } = params
|
||||
|
||||
const valueParams = allColumns.map((_, i) => `@p${startParamIndex + i}`).join(', ')
|
||||
const sourceColumns = allColumns.join(', ')
|
||||
|
||||
const joinCondition = keyColumns.map((col) => `target.${col} = source.${col}`).join(' AND ')
|
||||
|
||||
const nonKeyColumns = allColumns.filter((col) => !keyColumns.includes(col))
|
||||
const updateSet = nonKeyColumns.map((col) => `target.${col} = source.${col}`).join(', ')
|
||||
|
||||
const insertColumns = allColumns.join(', ')
|
||||
const insertValues = allColumns.map((col) => `source.${col}`).join(', ')
|
||||
|
||||
const sql = [
|
||||
`MERGE ${table} AS target`,
|
||||
`USING (VALUES (${valueParams})) AS source (${sourceColumns})`,
|
||||
`ON ${joinCondition}`,
|
||||
`WHEN MATCHED THEN UPDATE SET ${updateSet}`,
|
||||
`WHEN NOT MATCHED THEN INSERT (${insertColumns}) VALUES (${insertValues});`
|
||||
].join(' ')
|
||||
|
||||
return {
|
||||
sql,
|
||||
nextParamIndex: startParamIndex + allColumns.length
|
||||
}
|
||||
}
|
||||
|
||||
paginate(params: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
nextParamIndex: number
|
||||
} {
|
||||
const { sql, offset, paramIndex } = params
|
||||
void params.limit // used by caller to push param values
|
||||
|
||||
if (offset !== undefined) {
|
||||
return {
|
||||
sql: `${sql} OFFSET @p${paramIndex} ROWS FETCH NEXT @p${paramIndex + 1} ROWS ONLY`,
|
||||
nextParamIndex: paramIndex + 2
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
sql: `${sql} OFFSET 0 ROWS FETCH NEXT @p${paramIndex} ROWS ONLY`,
|
||||
nextParamIndex: paramIndex + 1
|
||||
}
|
||||
}
|
||||
|
||||
maxBatchRows(columnsPerRow: number): number {
|
||||
return Math.floor(2000 / columnsPerRow)
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,8 @@
|
||||
*/
|
||||
|
||||
import { create, type IDatabaseService } from './index'
|
||||
import { createLogger, run, getRequestId, trackDuration } from '../logger'
|
||||
import { createDialect, type SqlDialect } from './dialects'
|
||||
import { createLogger, getRequestId, trackDuration } from '../logger'
|
||||
|
||||
const log = createLogger('DiscreteMaterialPlanDAO')
|
||||
|
||||
@@ -53,8 +54,6 @@ export interface MaterialPlanRecord {
|
||||
* Configuration for DiscreteMaterialPlanData table
|
||||
*/
|
||||
export const DISCRETE_MATERIAL_PLAN_CONFIG = {
|
||||
TABLE_NAME_SQLSERVER: '[dbo].[DiscreteMaterialPlanData]',
|
||||
TABLE_NAME_MYSQL: 'dbo_DiscreteMaterialPlanData',
|
||||
COLUMNS: {
|
||||
ID: 'ID',
|
||||
FACTORY: 'Factory',
|
||||
@@ -94,15 +93,20 @@ export const DISCRETE_MATERIAL_PLAN_CONFIG = {
|
||||
*/
|
||||
export class DiscreteMaterialPlanDAO {
|
||||
private dbService: IDatabaseService | null = null
|
||||
private dialect: SqlDialect | null = null
|
||||
|
||||
private getDialect(): SqlDialect {
|
||||
if (!this.dialect) {
|
||||
this.dialect = createDialect(this.dbService!.type)
|
||||
}
|
||||
return this.dialect
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the appropriate table name based on database type
|
||||
*/
|
||||
private getTableName(): string {
|
||||
const isSqlServer = this.dbService?.type === 'sqlserver'
|
||||
return isSqlServer
|
||||
? DISCRETE_MATERIAL_PLAN_CONFIG.TABLE_NAME_SQLSERVER
|
||||
: DISCRETE_MATERIAL_PLAN_CONFIG.TABLE_NAME_MYSQL
|
||||
return this.getDialect().quoteTableName('dbo', 'DiscreteMaterialPlanData')
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -117,15 +121,6 @@ export class DiscreteMaterialPlanDAO {
|
||||
return this.dbService
|
||||
}
|
||||
|
||||
/**
|
||||
* Build placeholders for IN clause based on database type
|
||||
*/
|
||||
private buildPlaceholders(count: number, isSqlServer: boolean): string {
|
||||
return isSqlServer
|
||||
? Array.from({ length: count }, (_, idx) => `@p${idx}`).join(',')
|
||||
: Array.from({ length: count }, () => '?').join(',')
|
||||
}
|
||||
|
||||
// ==================== QUERY ALL ====================
|
||||
|
||||
/**
|
||||
@@ -219,13 +214,13 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
const batchSize = 1500
|
||||
const allResults: any[] = []
|
||||
|
||||
for (let i = 0; i < sourceNumbers.length; i += batchSize) {
|
||||
const batch = sourceNumbers.slice(i, i + batchSize)
|
||||
const placeholders = this.buildPlaceholders(batch.length, isSqlServer)
|
||||
const placeholders = dialect.params(batch.length)
|
||||
|
||||
const sqlString = `
|
||||
SELECT *
|
||||
@@ -273,13 +268,13 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
const batchSize = 1500
|
||||
const allResults: any[] = []
|
||||
|
||||
for (let i = 0; i < sourceNumbers.length; i += batchSize) {
|
||||
const batch = sourceNumbers.slice(i, i + batchSize)
|
||||
const placeholders = this.buildPlaceholders(batch.length, isSqlServer)
|
||||
const placeholders = dialect.params(batch.length)
|
||||
|
||||
const sqlString = `
|
||||
WITH RankedRecords AS (
|
||||
@@ -338,9 +333,9 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT *
|
||||
FROM ${tableName}
|
||||
@@ -377,9 +372,9 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT *
|
||||
FROM ${tableName}
|
||||
@@ -418,13 +413,13 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
const batchSize = 1500
|
||||
const allResults: any[] = []
|
||||
|
||||
for (let i = 0; i < planNumbers.length; i += batchSize) {
|
||||
const batch = planNumbers.slice(i, i + batchSize)
|
||||
const placeholders = this.buildPlaceholders(batch.length, isSqlServer)
|
||||
const placeholders = dialect.params(batch.length)
|
||||
|
||||
const sqlString = `
|
||||
SELECT *
|
||||
@@ -476,7 +471,7 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
const batchSize = 2000
|
||||
|
||||
// Get unique source numbers
|
||||
@@ -495,7 +490,7 @@ export class DiscreteMaterialPlanDAO {
|
||||
for (let i = 0; i < uniqueSourceNumbers.length; i += batchSize) {
|
||||
const batch = uniqueSourceNumbers.slice(i, i + batchSize)
|
||||
const batchNumber = Math.floor(i / batchSize) + 1
|
||||
const placeholders = this.buildPlaceholders(batch.length, isSqlServer)
|
||||
const placeholders = dialect.params(batch.length)
|
||||
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
@@ -565,23 +560,19 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
// SQL Server has a limit of 2100 parameters per query
|
||||
// Each record has 28 columns, so max rows per batch = 2100 / 28 = 75
|
||||
// Leave some margin for query overhead
|
||||
const columnsPerRow = 28
|
||||
const sqlServerMaxParams = 2000
|
||||
const effectiveBatchSize = isSqlServer
|
||||
? Math.min(batchSize, Math.floor(sqlServerMaxParams / columnsPerRow))
|
||||
: batchSize
|
||||
const effectiveBatchSize = Math.min(batchSize, dialect.maxBatchRows(columnsPerRow))
|
||||
const totalBatches = Math.ceil(records.length / effectiveBatchSize)
|
||||
|
||||
log.info('Batch insert started', {
|
||||
tableName,
|
||||
operationType: 'INSERT',
|
||||
requestId: batchId,
|
||||
isSqlServer,
|
||||
dbType: dbService.type,
|
||||
columnsPerRow,
|
||||
effectiveBatchSize,
|
||||
@@ -598,7 +589,6 @@ export class DiscreteMaterialPlanDAO {
|
||||
dbService,
|
||||
tableName,
|
||||
batch,
|
||||
isSqlServer,
|
||||
batchId,
|
||||
batchNumber,
|
||||
totalBatches
|
||||
@@ -643,7 +633,6 @@ export class DiscreteMaterialPlanDAO {
|
||||
dbService: IDatabaseService,
|
||||
tableName: string,
|
||||
records: MaterialPlanRecord[],
|
||||
isSqlServer: boolean,
|
||||
batchId: string,
|
||||
batchNumber: number,
|
||||
totalBatches: number
|
||||
@@ -689,7 +678,7 @@ export class DiscreteMaterialPlanDAO {
|
||||
const rowPlaceholders: string[] = []
|
||||
|
||||
records.forEach((record, rowIndex) => {
|
||||
const rowValues = this.buildRowValues(record, columns, rowIndex, isSqlServer, values)
|
||||
const rowValues = this.buildRowValues(record, columns, rowIndex, values)
|
||||
rowPlaceholders.push(`(${rowValues.join(',')})`)
|
||||
})
|
||||
|
||||
@@ -718,10 +707,9 @@ export class DiscreteMaterialPlanDAO {
|
||||
private async insertBatch(
|
||||
dbService: IDatabaseService,
|
||||
tableName: string,
|
||||
records: MaterialPlanRecord[],
|
||||
isSqlServer: boolean
|
||||
records: MaterialPlanRecord[]
|
||||
): Promise<number> {
|
||||
return this.insertBatchWithTracking(dbService, tableName, records, isSqlServer, 'unknown', 1, 1)
|
||||
return this.insertBatchWithTracking(dbService, tableName, records, 'unknown', 1, 1)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -731,18 +719,14 @@ export class DiscreteMaterialPlanDAO {
|
||||
record: MaterialPlanRecord,
|
||||
columns: string[],
|
||||
_rowIndex: number,
|
||||
isSqlServer: boolean,
|
||||
values: any[]
|
||||
): string[] {
|
||||
const dialect = this.getDialect()
|
||||
return columns.map((col) => {
|
||||
const value = this.getColumnValue(record, col)
|
||||
values.push(value)
|
||||
|
||||
if (isSqlServer) {
|
||||
return `@p${values.length - 1}`
|
||||
} else {
|
||||
return '?'
|
||||
}
|
||||
return dialect.param(values.length - 1)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -839,9 +823,9 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM ${tableName}
|
||||
@@ -876,7 +860,7 @@ export class DiscreteMaterialPlanDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (sourceNumbers && sourceNumbers.length > 0) {
|
||||
const batchSize = 1500
|
||||
@@ -884,7 +868,7 @@ export class DiscreteMaterialPlanDAO {
|
||||
|
||||
for (let i = 0; i < sourceNumbers.length; i += batchSize) {
|
||||
const batch = sourceNumbers.slice(i, i + batchSize)
|
||||
const placeholders = this.buildPlaceholders(batch.length, isSqlServer)
|
||||
const placeholders = dialect.params(batch.length)
|
||||
|
||||
const sqlString = `
|
||||
SELECT DISTINCT MaterialName
|
||||
@@ -975,6 +959,7 @@ export class DiscreteMaterialPlanDAO {
|
||||
if (this.dbService) {
|
||||
await this.dbService.disconnect()
|
||||
this.dbService = null
|
||||
this.dialect = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
*/
|
||||
|
||||
import { create, type IDatabaseService } from './index'
|
||||
import { createLogger, run, getRequestId, trackDuration } from '../logger'
|
||||
import { createDialect, type SqlDialect } from './dialects'
|
||||
import { createLogger, getRequestId, trackDuration } from '../logger'
|
||||
import type {
|
||||
OperationHistoryRecord,
|
||||
BatchStats,
|
||||
@@ -36,8 +37,6 @@ function formatDateTime(value: unknown): string {
|
||||
* Configuration for ExtractorOperationHistory table
|
||||
*/
|
||||
export const EXTRACTOR_OPERATION_HISTORY_CONFIG = {
|
||||
TABLE_NAME_SQLSERVER: '[dbo].[ExtractorOperationHistory]',
|
||||
TABLE_NAME_MYSQL: 'dbo_ExtractorOperationHistory',
|
||||
COLUMNS: {
|
||||
ID: 'ID',
|
||||
BATCH_ID: 'BatchId',
|
||||
@@ -57,15 +56,20 @@ export const EXTRACTOR_OPERATION_HISTORY_CONFIG = {
|
||||
*/
|
||||
export class ExtractorOperationHistoryDAO {
|
||||
private dbService: IDatabaseService | null = null
|
||||
private dialect: SqlDialect | null = null
|
||||
|
||||
private getDialect(): SqlDialect {
|
||||
if (!this.dialect) {
|
||||
this.dialect = createDialect(this.dbService!.type)
|
||||
}
|
||||
return this.dialect
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the appropriate table name based on database type
|
||||
*/
|
||||
private getTableName(): string {
|
||||
const isSqlServer = this.dbService?.type === 'sqlserver'
|
||||
return isSqlServer
|
||||
? EXTRACTOR_OPERATION_HISTORY_CONFIG.TABLE_NAME_SQLSERVER
|
||||
: EXTRACTOR_OPERATION_HISTORY_CONFIG.TABLE_NAME_MYSQL
|
||||
return this.getDialect().quoteTableName('dbo', 'ExtractorOperationHistory')
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -80,15 +84,6 @@ export class ExtractorOperationHistoryDAO {
|
||||
return this.dbService
|
||||
}
|
||||
|
||||
/**
|
||||
* Build placeholders for IN clause based on database type
|
||||
*/
|
||||
private buildPlaceholders(count: number, isSqlServer: boolean): string {
|
||||
return isSqlServer
|
||||
? Array.from({ length: count }, (_, idx) => `@p${idx}`).join(',')
|
||||
: Array.from({ length: count }, () => '?').join(',')
|
||||
}
|
||||
|
||||
// ==================== INSERT ====================
|
||||
|
||||
/**
|
||||
@@ -119,7 +114,7 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
log.info('Batch records insertion started', {
|
||||
tableName,
|
||||
@@ -133,49 +128,26 @@ export class ExtractorOperationHistoryDAO {
|
||||
|
||||
for (const record of records) {
|
||||
try {
|
||||
if (isSqlServer) {
|
||||
const sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(BatchId, UserId, Username, ProductionId, OrderNumber, OperationTime, Status)
|
||||
VALUES
|
||||
(@p0, @p1, @p2, @p3, @p4, GETDATE(), 'pending')
|
||||
`
|
||||
await trackDuration(
|
||||
async () =>
|
||||
await dbService.query(sqlString, [
|
||||
batchId,
|
||||
userId,
|
||||
username,
|
||||
record.productionId || null,
|
||||
record.orderNumber
|
||||
]),
|
||||
{
|
||||
operationName: 'ExtractorOperationHistoryDAO.insertBatchRecords',
|
||||
context: { tableName, operationType: 'INSERT', batchId }
|
||||
}
|
||||
)
|
||||
} else {
|
||||
const sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(BatchId, UserId, Username, ProductionId, OrderNumber, OperationTime, Status)
|
||||
VALUES
|
||||
(?, ?, ?, ?, ?, NOW(), 'pending')
|
||||
`
|
||||
await trackDuration(
|
||||
async () =>
|
||||
await dbService.query(sqlString, [
|
||||
batchId,
|
||||
userId,
|
||||
username,
|
||||
record.productionId || null,
|
||||
record.orderNumber
|
||||
]),
|
||||
{
|
||||
operationName: 'ExtractorOperationHistoryDAO.insertBatchRecords',
|
||||
context: { tableName, operationType: 'INSERT', batchId }
|
||||
}
|
||||
)
|
||||
}
|
||||
const sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(BatchId, UserId, Username, ProductionId, OrderNumber, OperationTime, Status)
|
||||
VALUES
|
||||
(${dialect.param(0)}, ${dialect.param(1)}, ${dialect.param(2)}, ${dialect.param(3)}, ${dialect.param(4)}, ${dialect.currentTimestamp()}, 'pending')
|
||||
`
|
||||
await trackDuration(
|
||||
async () =>
|
||||
await dbService.query(sqlString, [
|
||||
batchId,
|
||||
userId,
|
||||
username,
|
||||
record.productionId || null,
|
||||
record.orderNumber
|
||||
]),
|
||||
{
|
||||
operationName: 'ExtractorOperationHistoryDAO.insertBatchRecords',
|
||||
context: { tableName, operationType: 'INSERT', batchId }
|
||||
}
|
||||
)
|
||||
} catch (error) {
|
||||
log.error('Error inserting individual record', {
|
||||
tableName,
|
||||
@@ -221,16 +193,16 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET Status = ${isSqlServer ? '@p0' : '?'}
|
||||
WHERE BatchId = ${isSqlServer ? '@p1' : '?'}
|
||||
SET Status = ${dialect.param(0)}
|
||||
WHERE BatchId = ${dialect.param(1)}
|
||||
`
|
||||
const params = [status, batchId]
|
||||
|
||||
const result = await trackDuration(async () => await dbService.query(sqlString, params), {
|
||||
await trackDuration(async () => await dbService.query(sqlString, params), {
|
||||
operationName: 'ExtractorOperationHistoryDAO.updateBatchStatus',
|
||||
context: { tableName, operationType: 'UPDATE', batchId }
|
||||
})
|
||||
@@ -274,7 +246,7 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
let sqlString: string
|
||||
let params: (string | number | null)[]
|
||||
@@ -282,20 +254,20 @@ export class ExtractorOperationHistoryDAO {
|
||||
if (recordCount !== undefined) {
|
||||
sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET Status = ${isSqlServer ? '@p0' : '?'},
|
||||
ErrorMessage = ${isSqlServer ? '@p1' : '?'},
|
||||
RecordCount = ${isSqlServer ? '@p2' : '?'}
|
||||
WHERE BatchId = ${isSqlServer ? '@p3' : '?'}
|
||||
AND OrderNumber = ${isSqlServer ? '@p4' : '?'}
|
||||
SET Status = ${dialect.param(0)},
|
||||
ErrorMessage = ${dialect.param(1)},
|
||||
RecordCount = ${dialect.param(2)}
|
||||
WHERE BatchId = ${dialect.param(3)}
|
||||
AND OrderNumber = ${dialect.param(4)}
|
||||
`
|
||||
params = [status, errorMessage || null, recordCount, batchId, orderNumber]
|
||||
} else {
|
||||
sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET Status = ${isSqlServer ? '@p0' : '?'},
|
||||
ErrorMessage = ${isSqlServer ? '@p1' : '?'}
|
||||
WHERE BatchId = ${isSqlServer ? '@p2' : '?'}
|
||||
AND OrderNumber = ${isSqlServer ? '@p3' : '?'}
|
||||
SET Status = ${dialect.param(0)},
|
||||
ErrorMessage = ${dialect.param(1)}
|
||||
WHERE BatchId = ${dialect.param(2)}
|
||||
AND OrderNumber = ${dialect.param(3)}
|
||||
`
|
||||
params = [status, errorMessage || null, batchId, orderNumber]
|
||||
}
|
||||
@@ -331,7 +303,7 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
let sqlString = `
|
||||
SELECT
|
||||
@@ -350,11 +322,10 @@ export class ExtractorOperationHistoryDAO {
|
||||
const params: (number | string)[] = []
|
||||
|
||||
if (userId !== undefined) {
|
||||
sqlString += isSqlServer ? ` WHERE UserId = @p0 ` : ` WHERE UserId = ? `
|
||||
sqlString += ` WHERE UserId = ${dialect.param(params.length)} `
|
||||
params.push(userId)
|
||||
} else if (options?.usernames && options.usernames.length > 0) {
|
||||
const placeholders = this.buildPlaceholders(options.usernames.length, isSqlServer)
|
||||
sqlString += ` WHERE Username IN (${placeholders}) `
|
||||
sqlString += ` WHERE Username IN (${dialect.params(options.usernames.length)}) `
|
||||
params.push(...options.usernames)
|
||||
}
|
||||
|
||||
@@ -367,24 +338,19 @@ export class ExtractorOperationHistoryDAO {
|
||||
const safeLimit = Math.floor(options.limit)
|
||||
const safeOffset = options.offset !== undefined ? Math.floor(options.offset) : undefined
|
||||
|
||||
if (isSqlServer) {
|
||||
const offsetIndex = params.length
|
||||
const result = dialect.paginate({
|
||||
sql: sqlString,
|
||||
limit: safeLimit,
|
||||
offset: safeOffset,
|
||||
paramIndex: params.length
|
||||
})
|
||||
sqlString = result.sql
|
||||
|
||||
if (dialect.dbType === 'sqlserver') {
|
||||
if (safeOffset !== undefined) {
|
||||
params.push(safeOffset)
|
||||
}
|
||||
params.push(safeLimit)
|
||||
|
||||
if (safeOffset !== undefined) {
|
||||
sqlString += ` OFFSET @p${offsetIndex} ROWS FETCH NEXT @p${offsetIndex + 1} ROWS ONLY`
|
||||
} else {
|
||||
sqlString += ` OFFSET 0 ROWS FETCH NEXT @p${offsetIndex} ROWS ONLY`
|
||||
}
|
||||
} else {
|
||||
if (safeOffset !== undefined) {
|
||||
sqlString += ` LIMIT ${safeLimit} OFFSET ${safeOffset}`
|
||||
} else {
|
||||
sqlString += ` LIMIT ${safeLimit}`
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -425,9 +391,9 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT
|
||||
ID,
|
||||
@@ -483,9 +449,9 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT
|
||||
BatchId,
|
||||
@@ -554,7 +520,7 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
// First check if the batch exists and if the user has permission
|
||||
const batchStats = await this.getBatchStats(batchId)
|
||||
@@ -569,7 +535,7 @@ export class ExtractorOperationHistoryDAO {
|
||||
}
|
||||
|
||||
// Delete the batch
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE BatchId = ${placeholder}
|
||||
@@ -612,9 +578,9 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE UserId = ${placeholder}
|
||||
@@ -648,9 +614,9 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM ${tableName}
|
||||
@@ -684,7 +650,7 @@ export class ExtractorOperationHistoryDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
let sqlString = `
|
||||
SELECT COUNT(DISTINCT BatchId) as count
|
||||
@@ -694,11 +660,10 @@ export class ExtractorOperationHistoryDAO {
|
||||
const params: (number | string)[] = []
|
||||
|
||||
if (userId !== undefined) {
|
||||
sqlString += isSqlServer ? ` WHERE UserId = @p0 ` : ` WHERE UserId = ? `
|
||||
sqlString += ` WHERE UserId = ${dialect.param(params.length)} `
|
||||
params.push(userId)
|
||||
} else if (usernames && usernames.length > 0) {
|
||||
const placeholders = this.buildPlaceholders(usernames.length, isSqlServer)
|
||||
sqlString += ` WHERE Username IN (${placeholders}) `
|
||||
sqlString += ` WHERE Username IN (${dialect.params(usernames.length)}) `
|
||||
params.push(...usernames)
|
||||
}
|
||||
|
||||
@@ -725,6 +690,7 @@ export class ExtractorOperationHistoryDAO {
|
||||
if (this.dbService) {
|
||||
await this.dbService.disconnect()
|
||||
this.dbService = null
|
||||
this.dialect = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,17 +2,19 @@
|
||||
* Database Factory
|
||||
*
|
||||
* Creates and manages database service instances based on configuration.
|
||||
* Supports both MySQL and SQL Server databases.
|
||||
* Supports MySQL, SQL Server, and PostgreSQL databases.
|
||||
*/
|
||||
|
||||
import { ConfigManager } from '../config/config-manager'
|
||||
import { MySqlService } from './mysql'
|
||||
import { SqlServerService } from './sql-server'
|
||||
import { PostgreSqlService } from './postgresql'
|
||||
import type {
|
||||
IDatabaseService,
|
||||
DatabaseType,
|
||||
MySqlConfig,
|
||||
SqlServerConfig
|
||||
SqlServerConfig,
|
||||
PostgreSqlConfig
|
||||
} from '../../types/database.types'
|
||||
import { createLogger } from '../logger'
|
||||
|
||||
@@ -65,6 +67,22 @@ export function createSqlServerConfig(): SqlServerConfig {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create PostgreSQL configuration from config manager
|
||||
*/
|
||||
export function createPostgreSqlConfig(): PostgreSqlConfig {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const dbConfig = configManager.getConfig().database.postgresql
|
||||
return {
|
||||
host: dbConfig.host,
|
||||
port: dbConfig.port,
|
||||
user: dbConfig.username,
|
||||
password: dbConfig.password,
|
||||
database: dbConfig.database,
|
||||
maxPoolSize: dbConfig.maxPoolSize
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a database service instance
|
||||
*
|
||||
@@ -86,7 +104,10 @@ export async function create(type?: DatabaseType): Promise<IDatabaseService> {
|
||||
// Create new instance
|
||||
let service: IDatabaseService
|
||||
|
||||
if (dbType === 'sqlserver') {
|
||||
if (dbType === 'postgresql') {
|
||||
log.info('Creating PostgreSQL database service')
|
||||
service = new PostgreSqlService(createPostgreSqlConfig())
|
||||
} else if (dbType === 'sqlserver') {
|
||||
log.info('Creating SQL Server database service')
|
||||
service = new SqlServerService(createSqlServerConfig())
|
||||
} else {
|
||||
@@ -175,10 +196,12 @@ export function isConnected(type?: DatabaseType): boolean {
|
||||
// Re-export types and services
|
||||
export { MySqlService } from './mysql'
|
||||
export { SqlServerService } from './sql-server'
|
||||
export { PostgreSqlService } from './postgresql'
|
||||
export type {
|
||||
IDatabaseService,
|
||||
DatabaseType,
|
||||
QueryResult,
|
||||
MySqlConfig,
|
||||
SqlServerConfig
|
||||
SqlServerConfig,
|
||||
PostgreSqlConfig
|
||||
} from '../../types/database.types'
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
*/
|
||||
|
||||
import { create, type IDatabaseService } from './index'
|
||||
import { createLogger, run, getRequestId, trackDuration } from '../logger'
|
||||
import { createDialect, type SqlDialect } from './dialects'
|
||||
import { createLogger, getRequestId, trackDuration } from '../logger'
|
||||
|
||||
const log = createLogger('MaterialsToBeDeletedDAO')
|
||||
|
||||
@@ -44,8 +45,6 @@ export interface MaterialStats {
|
||||
* Configuration for MaterialsToBeDeleted table
|
||||
*/
|
||||
export const MATERIALS_TO_BE_DELETED_CONFIG = {
|
||||
TABLE_NAME_SQLSERVER: '[dbo].[MaterialsToBeDeleted]',
|
||||
TABLE_NAME_MYSQL: 'dbo_MaterialsToBeDeleted',
|
||||
COLUMNS: {
|
||||
ID: 'ID',
|
||||
MATERIAL_CODE: 'MaterialCode',
|
||||
@@ -58,15 +57,20 @@ export const MATERIALS_TO_BE_DELETED_CONFIG = {
|
||||
*/
|
||||
export class MaterialsToBeDeletedDAO {
|
||||
private dbService: IDatabaseService | null = null
|
||||
private dialect: SqlDialect | null = null
|
||||
|
||||
private getDialect(): SqlDialect {
|
||||
if (!this.dialect) {
|
||||
this.dialect = createDialect(this.dbService!.type)
|
||||
}
|
||||
return this.dialect
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the appropriate table name based on database type
|
||||
*/
|
||||
private getTableName(): string {
|
||||
const isSqlServer = this.dbService?.type === 'sqlserver'
|
||||
return isSqlServer
|
||||
? MATERIALS_TO_BE_DELETED_CONFIG.TABLE_NAME_SQLSERVER
|
||||
: MATERIALS_TO_BE_DELETED_CONFIG.TABLE_NAME_MYSQL
|
||||
return this.getDialect().quoteTableName('dbo', 'MaterialsToBeDeleted')
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,15 +85,6 @@ export class MaterialsToBeDeletedDAO {
|
||||
return this.dbService
|
||||
}
|
||||
|
||||
/**
|
||||
* Build placeholders for IN clause based on database type
|
||||
*/
|
||||
private buildPlaceholders(count: number, isSqlServer: boolean): string {
|
||||
return isSqlServer
|
||||
? Array.from({ length: count }, (_, idx) => `@p${idx}`).join(',')
|
||||
: Array.from({ length: count }, () => '?').join(',')
|
||||
}
|
||||
|
||||
// ==================== UPSERT (MERGE) ====================
|
||||
|
||||
/**
|
||||
@@ -113,33 +108,19 @@ export class MaterialsToBeDeletedDAO {
|
||||
const tableName = this.getTableName()
|
||||
const code = materialCode.trim()
|
||||
const manager = managerName?.trim() || null
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (isSqlServer) {
|
||||
const sqlString = `
|
||||
MERGE ${tableName} AS target
|
||||
USING (VALUES (@p0, @p1)) AS source (MaterialCode, ManagerName)
|
||||
ON target.MaterialCode = source.MaterialCode
|
||||
WHEN MATCHED THEN UPDATE SET ManagerName = source.ManagerName
|
||||
WHEN NOT MATCHED THEN INSERT (MaterialCode, ManagerName) VALUES (source.MaterialCode, source.ManagerName);
|
||||
`
|
||||
const { sql: sqlString } = dialect.upsert({
|
||||
table: tableName,
|
||||
keyColumns: ['MaterialCode'],
|
||||
allColumns: ['MaterialCode', 'ManagerName'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
await trackDuration(async () => await dbService.query(sqlString, [code, manager]), {
|
||||
operationName: 'MaterialsToBeDeletedDAO.upsertMaterial',
|
||||
context: { tableName, operationType: 'MERGE' }
|
||||
})
|
||||
} else {
|
||||
const sqlString = `
|
||||
INSERT INTO ${tableName} (MaterialCode, ManagerName)
|
||||
VALUES (?, ?)
|
||||
ON DUPLICATE KEY UPDATE ManagerName = VALUES(ManagerName)
|
||||
`
|
||||
|
||||
await trackDuration(async () => await dbService.query(sqlString, [code, manager]), {
|
||||
operationName: 'MaterialsToBeDeletedDAO.upsertMaterial',
|
||||
context: { tableName, operationType: 'INSERT' }
|
||||
})
|
||||
}
|
||||
await trackDuration(async () => await dbService.query(sqlString, [code, manager]), {
|
||||
operationName: 'MaterialsToBeDeletedDAO.upsertMaterial',
|
||||
context: { tableName, operationType: 'UPSERT' }
|
||||
})
|
||||
|
||||
return true
|
||||
} catch (error) {
|
||||
@@ -176,7 +157,7 @@ export class MaterialsToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
log.info('Batch upsert started', {
|
||||
tableName,
|
||||
@@ -196,37 +177,20 @@ export class MaterialsToBeDeletedDAO {
|
||||
}
|
||||
|
||||
try {
|
||||
if (isSqlServer) {
|
||||
const sqlString = `
|
||||
MERGE ${tableName} AS target
|
||||
USING (VALUES (@p0, @p1)) AS source (MaterialCode, ManagerName)
|
||||
ON target.MaterialCode = source.MaterialCode
|
||||
WHEN MATCHED THEN UPDATE SET ManagerName = source.ManagerName
|
||||
WHEN NOT MATCHED THEN INSERT (MaterialCode, ManagerName) VALUES (source.MaterialCode, source.ManagerName);
|
||||
`
|
||||
const { sql: sqlString } = dialect.upsert({
|
||||
table: tableName,
|
||||
keyColumns: ['MaterialCode'],
|
||||
allColumns: ['MaterialCode', 'ManagerName'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
await trackDuration(
|
||||
async () => await dbService.query(sqlString, [materialCode, managerName || null]),
|
||||
{
|
||||
operationName: 'MaterialsToBeDeletedDAO.upsertBatch',
|
||||
context: { tableName, operationType: 'MERGE', batchId }
|
||||
}
|
||||
)
|
||||
} else {
|
||||
const sqlString = `
|
||||
INSERT INTO ${tableName} (MaterialCode, ManagerName)
|
||||
VALUES (?, ?)
|
||||
ON DUPLICATE KEY UPDATE ManagerName = VALUES(ManagerName)
|
||||
`
|
||||
|
||||
await trackDuration(
|
||||
async () => await dbService.query(sqlString, [materialCode, managerName || null]),
|
||||
{
|
||||
operationName: 'MaterialsToBeDeletedDAO.upsertBatch',
|
||||
context: { tableName, operationType: 'INSERT', batchId }
|
||||
}
|
||||
)
|
||||
}
|
||||
await trackDuration(
|
||||
async () => await dbService.query(sqlString, [materialCode, managerName || null]),
|
||||
{
|
||||
operationName: 'MaterialsToBeDeletedDAO.upsertBatch',
|
||||
context: { tableName, operationType: 'UPSERT', batchId }
|
||||
}
|
||||
)
|
||||
|
||||
stats.success++
|
||||
} catch (error) {
|
||||
@@ -276,25 +240,15 @@ export class MaterialsToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (isSqlServer) {
|
||||
const sqlString = `
|
||||
MERGE ${tableName} AS target
|
||||
USING (VALUES (@p0, @p1)) AS source (MaterialCode, ManagerName)
|
||||
ON target.MaterialCode = source.MaterialCode
|
||||
WHEN MATCHED THEN UPDATE SET ManagerName = source.ManagerName
|
||||
WHEN NOT MATCHED THEN INSERT (MaterialCode, ManagerName) VALUES (source.MaterialCode, source.ManagerName);
|
||||
`
|
||||
await dbService.query(sqlString, [materialCode, managerName || null])
|
||||
} else {
|
||||
const sqlString = `
|
||||
INSERT INTO ${tableName} (MaterialCode, ManagerName)
|
||||
VALUES (?, ?)
|
||||
ON DUPLICATE KEY UPDATE ManagerName = VALUES(ManagerName)
|
||||
`
|
||||
await dbService.query(sqlString, [materialCode, managerName || null])
|
||||
}
|
||||
const { sql: sqlString } = dialect.upsert({
|
||||
table: tableName,
|
||||
keyColumns: ['MaterialCode'],
|
||||
allColumns: ['MaterialCode', 'ManagerName'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
await dbService.query(sqlString, [materialCode, managerName || null])
|
||||
|
||||
return { success: true }
|
||||
} catch (error) {
|
||||
@@ -387,9 +341,9 @@ export class MaterialsToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT ID, MaterialCode, ManagerName
|
||||
FROM ${tableName}
|
||||
@@ -462,9 +416,9 @@ export class MaterialsToBeDeletedDAO {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const code = materialCode.trim()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT ID, MaterialCode, ManagerName
|
||||
FROM ${tableName}
|
||||
@@ -509,9 +463,9 @@ export class MaterialsToBeDeletedDAO {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const code = materialCode.trim()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE MaterialCode = ${placeholder}
|
||||
@@ -542,9 +496,9 @@ export class MaterialsToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE ManagerName = ${placeholder}
|
||||
@@ -612,7 +566,7 @@ export class MaterialsToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
const totalBatches = Math.ceil(materialCodes.length / batchSize)
|
||||
|
||||
log.info('Batch delete started', {
|
||||
@@ -627,7 +581,7 @@ export class MaterialsToBeDeletedDAO {
|
||||
for (let i = 0; i < materialCodes.length; i += batchSize) {
|
||||
const batch = materialCodes.slice(i, i + batchSize)
|
||||
const batchNumber = Math.floor(i / batchSize) + 1
|
||||
const placeholders = this.buildPlaceholders(batch.length, isSqlServer)
|
||||
const placeholders = dialect.params(batch.length)
|
||||
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
@@ -688,9 +642,9 @@ export class MaterialsToBeDeletedDAO {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const code = materialCode.trim()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM ${tableName}
|
||||
@@ -749,9 +703,9 @@ export class MaterialsToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM ${tableName}
|
||||
@@ -845,6 +799,7 @@ export class MaterialsToBeDeletedDAO {
|
||||
if (this.dbService) {
|
||||
await this.dbService.disconnect()
|
||||
this.dbService = null
|
||||
this.dialect = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
*/
|
||||
|
||||
import { create, type IDatabaseService } from './index'
|
||||
import { createLogger, run, getRequestId, trackDuration } from '../logger'
|
||||
import { createDialect, type SqlDialect } from './dialects'
|
||||
import { createLogger, getRequestId, trackDuration } from '../logger'
|
||||
|
||||
const log = createLogger('MaterialsTypeToBeDeletedDAO')
|
||||
|
||||
@@ -32,8 +33,6 @@ export interface MaterialTypeBatchRequest {
|
||||
* Configuration for MaterialsTypeToBeDeleted table
|
||||
*/
|
||||
export const MATERIALS_TYPE_TO_BE_DELETED_CONFIG = {
|
||||
TABLE_NAME_SQLSERVER: '[dbo].[MaterialsTypeToBeDeleted]',
|
||||
TABLE_NAME_MYSQL: 'dbo_MaterialsTypeToBeDeleted',
|
||||
COLUMNS: {
|
||||
ID: 'ID',
|
||||
MATERIAL_NAME: 'MaterialName',
|
||||
@@ -46,15 +45,20 @@ export const MATERIALS_TYPE_TO_BE_DELETED_CONFIG = {
|
||||
*/
|
||||
export class MaterialsTypeToBeDeletedDAO {
|
||||
private dbService: IDatabaseService | null = null
|
||||
private dialect: SqlDialect | null = null
|
||||
|
||||
private getDialect(): SqlDialect {
|
||||
if (!this.dialect) {
|
||||
this.dialect = createDialect(this.dbService!.type)
|
||||
}
|
||||
return this.dialect
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the appropriate table name based on database type
|
||||
*/
|
||||
private getTableName(): string {
|
||||
const isSqlServer = this.dbService?.type === 'sqlserver'
|
||||
return isSqlServer
|
||||
? MATERIALS_TYPE_TO_BE_DELETED_CONFIG.TABLE_NAME_SQLSERVER
|
||||
: MATERIALS_TYPE_TO_BE_DELETED_CONFIG.TABLE_NAME_MYSQL
|
||||
return this.getDialect().quoteTableName('dbo', 'MaterialsTypeToBeDeleted')
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -116,9 +120,9 @@ export class MaterialsTypeToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
const placeholder = dialect.param(0)
|
||||
const sqlString = `
|
||||
SELECT ID, MaterialName, ManagerName
|
||||
FROM ${tableName}
|
||||
@@ -204,33 +208,19 @@ export class MaterialsTypeToBeDeletedDAO {
|
||||
const tableName = this.getTableName()
|
||||
const name = materialName.trim()
|
||||
const manager = managerName?.trim() || null
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (isSqlServer) {
|
||||
const sqlString = `
|
||||
MERGE ${tableName} AS target
|
||||
USING (VALUES (@p0, @p1)) AS source (MaterialName, ManagerName)
|
||||
ON target.MaterialName = source.MaterialName
|
||||
WHEN MATCHED THEN UPDATE SET ManagerName = source.ManagerName
|
||||
WHEN NOT MATCHED THEN INSERT (MaterialName, ManagerName) VALUES (source.MaterialName, source.ManagerName);
|
||||
`
|
||||
const { sql: sqlString } = dialect.upsert({
|
||||
table: tableName,
|
||||
keyColumns: ['MaterialName'],
|
||||
allColumns: ['MaterialName', 'ManagerName'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
await trackDuration(async () => await dbService.query(sqlString, [name, manager]), {
|
||||
operationName: 'MaterialsTypeToBeDeletedDAO.upsertMaterial',
|
||||
context: { tableName, operationType: 'MERGE' }
|
||||
})
|
||||
} else {
|
||||
const sqlString = `
|
||||
INSERT INTO ${tableName} (MaterialName, ManagerName)
|
||||
VALUES (?, ?)
|
||||
ON DUPLICATE KEY UPDATE ManagerName = VALUES(ManagerName)
|
||||
`
|
||||
|
||||
await trackDuration(async () => await dbService.query(sqlString, [name, manager]), {
|
||||
operationName: 'MaterialsTypeToBeDeletedDAO.upsertMaterial',
|
||||
context: { tableName, operationType: 'INSERT' }
|
||||
})
|
||||
}
|
||||
await trackDuration(async () => await dbService.query(sqlString, [name, manager]), {
|
||||
operationName: 'MaterialsTypeToBeDeletedDAO.upsertMaterial',
|
||||
context: { tableName, operationType: 'UPSERT' }
|
||||
})
|
||||
|
||||
return true
|
||||
} catch (error) {
|
||||
@@ -257,25 +247,16 @@ export class MaterialsTypeToBeDeletedDAO {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const name = materialName.trim()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
let sqlString: string
|
||||
let params: (string | null)[]
|
||||
|
||||
if (managerName) {
|
||||
const placeholder1 = isSqlServer ? '@p0' : '?'
|
||||
const placeholder2 = isSqlServer ? '@p1' : '?'
|
||||
sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE MaterialName = ${placeholder1} AND ManagerName = ${placeholder2}
|
||||
`
|
||||
sqlString = `DELETE FROM ${tableName} WHERE MaterialName = ${dialect.param(0)} AND ManagerName = ${dialect.param(1)}`
|
||||
params = [name, managerName.trim()]
|
||||
} else {
|
||||
const placeholder = isSqlServer ? '@p0' : '?'
|
||||
sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE MaterialName = ${placeholder}
|
||||
`
|
||||
sqlString = `DELETE FROM ${tableName} WHERE MaterialName = ${dialect.param(0)}`
|
||||
params = [name]
|
||||
}
|
||||
|
||||
@@ -314,49 +295,27 @@ export class MaterialsTypeToBeDeletedDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const isSqlServer = dbService.type === 'sqlserver'
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (isSqlServer) {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET MaterialName = @p0, ManagerName = @p1
|
||||
WHERE MaterialName = @p2 AND ManagerName = @p3
|
||||
`
|
||||
const result = await trackDuration(
|
||||
async () =>
|
||||
await dbService.query(sqlString, [
|
||||
newName.trim(),
|
||||
newManager.trim(),
|
||||
oldName.trim(),
|
||||
oldManager.trim()
|
||||
]),
|
||||
{
|
||||
operationName: 'MaterialsTypeToBeDeletedDAO.updateMaterial',
|
||||
context: { tableName, operationType: 'UPDATE' }
|
||||
}
|
||||
)
|
||||
return result.result.rowCount > 0
|
||||
} else {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET MaterialName = ?, ManagerName = ?
|
||||
WHERE MaterialName = ? AND ManagerName = ?
|
||||
`
|
||||
const result = await trackDuration(
|
||||
async () =>
|
||||
await dbService.query(sqlString, [
|
||||
newName.trim(),
|
||||
newManager.trim(),
|
||||
oldName.trim(),
|
||||
oldManager.trim()
|
||||
]),
|
||||
{
|
||||
operationName: 'MaterialsTypeToBeDeletedDAO.updateMaterial',
|
||||
context: { tableName, operationType: 'UPDATE' }
|
||||
}
|
||||
)
|
||||
return result.result.rowCount > 0
|
||||
}
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET MaterialName = ${dialect.param(0)}, ManagerName = ${dialect.param(1)}
|
||||
WHERE MaterialName = ${dialect.param(2)} AND ManagerName = ${dialect.param(3)}
|
||||
`
|
||||
const result = await trackDuration(
|
||||
async () =>
|
||||
await dbService.query(sqlString, [
|
||||
newName.trim(),
|
||||
newManager.trim(),
|
||||
oldName.trim(),
|
||||
oldManager.trim()
|
||||
]),
|
||||
{
|
||||
operationName: 'MaterialsTypeToBeDeletedDAO.updateMaterial',
|
||||
context: { tableName, operationType: 'UPDATE' }
|
||||
}
|
||||
)
|
||||
return result.result.rowCount > 0
|
||||
} catch (error) {
|
||||
log.error('Update material error', {
|
||||
tableName: this.getTableName(),
|
||||
@@ -456,6 +415,7 @@ export class MaterialsTypeToBeDeletedDAO {
|
||||
if (this.dbService) {
|
||||
await this.dbService.disconnect()
|
||||
this.dbService = null
|
||||
this.dialect = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
641
src/main/services/database/postgresql.ts
Normal file
641
src/main/services/database/postgresql.ts
Normal file
@@ -0,0 +1,641 @@
|
||||
import { Pool } from 'pg'
|
||||
import type {
|
||||
IDatabaseService,
|
||||
DatabaseType,
|
||||
QueryResult,
|
||||
PostgreSqlConfig
|
||||
} from '../../types/database.types'
|
||||
import { createLogger, trackDuration } from '../logger'
|
||||
|
||||
const log = createLogger('PostgreSqlService')
|
||||
|
||||
export type { PostgreSqlConfig } from '../../types/database.types'
|
||||
|
||||
/**
|
||||
* SQL keywords that should NOT be double-quoted during identifier preprocessing.
|
||||
* PostgreSQL lowercases unquoted identifiers, but SSMA-migrated databases
|
||||
* have uppercase column names that require double-quoting to preserve case.
|
||||
*
|
||||
* This list covers PostgreSQL reserved words across multiple categories:
|
||||
* - DML (Data Manipulation Language)
|
||||
* - DDL (Data Definition Language)
|
||||
* - Window functions
|
||||
* - CTEs (Common Table Expressions)
|
||||
* - Advanced GROUP BY clauses
|
||||
* - JSON operations
|
||||
* - Type system
|
||||
* - Table sampling
|
||||
* - Transaction control
|
||||
*/
|
||||
const SQL_KEYWORDS = new Set([
|
||||
// ==================== DML (Data Manipulation Language) ====================
|
||||
'SELECT',
|
||||
'FROM',
|
||||
'WHERE',
|
||||
'AND',
|
||||
'OR',
|
||||
'NOT',
|
||||
'IN',
|
||||
'IS',
|
||||
'NULL',
|
||||
'INSERT',
|
||||
'INTO',
|
||||
'VALUES',
|
||||
'UPDATE',
|
||||
'SET',
|
||||
'DELETE',
|
||||
|
||||
// ==================== Ordering & Limiting ====================
|
||||
'ORDER',
|
||||
'BY',
|
||||
'ASC',
|
||||
'DESC',
|
||||
'LIMIT',
|
||||
'OFFSET',
|
||||
'FETCH',
|
||||
'NEXT',
|
||||
'ROWS',
|
||||
'ONLY',
|
||||
|
||||
// ==================== Joins ====================
|
||||
'JOIN',
|
||||
'LEFT',
|
||||
'RIGHT',
|
||||
'INNER',
|
||||
'OUTER',
|
||||
'CROSS',
|
||||
'FULL',
|
||||
'ON',
|
||||
'NATURAL',
|
||||
'LATERAL',
|
||||
|
||||
// ==================== Set Operations ====================
|
||||
'UNION',
|
||||
'ALL',
|
||||
'INTERSECT',
|
||||
'EXCEPT',
|
||||
|
||||
// ==================== Grouping & Aggregation ====================
|
||||
'GROUP',
|
||||
'HAVING',
|
||||
'DISTINCT',
|
||||
'GROUPING',
|
||||
'SETS',
|
||||
'ROLLUP',
|
||||
'CUBE',
|
||||
'FILTER',
|
||||
'WITHIN',
|
||||
|
||||
// ==================== Window Functions ====================
|
||||
'OVER',
|
||||
'PARTITION',
|
||||
'WINDOW',
|
||||
'RANGE',
|
||||
'UNBOUNDED',
|
||||
'PRECEDING',
|
||||
'FOLLOWING',
|
||||
'CURRENT',
|
||||
'ROW',
|
||||
'GROUPS',
|
||||
'EXCLUDE',
|
||||
'TIES',
|
||||
'RANK',
|
||||
'DENSE_RANK',
|
||||
'ROW_NUMBER',
|
||||
'NTILE',
|
||||
'LAG',
|
||||
'LEAD',
|
||||
'FIRST_VALUE',
|
||||
'LAST_VALUE',
|
||||
'NTH_VALUE',
|
||||
|
||||
// ==================== CTE (Common Table Expressions) ====================
|
||||
'WITH',
|
||||
'RECURSIVE',
|
||||
'MATERIALIZED',
|
||||
'SEARCH',
|
||||
'CYCLE',
|
||||
'PATH',
|
||||
'ROOT',
|
||||
'SIBLINGS',
|
||||
|
||||
// ==================== CASE Expressions ====================
|
||||
'CASE',
|
||||
'WHEN',
|
||||
'THEN',
|
||||
'ELSE',
|
||||
'END',
|
||||
|
||||
// ==================== DDL (Data Definition Language) ====================
|
||||
'CREATE',
|
||||
'ALTER',
|
||||
'DROP',
|
||||
'TABLE',
|
||||
'INDEX',
|
||||
'COLUMN',
|
||||
'ADD',
|
||||
'MODIFY',
|
||||
'RENAME',
|
||||
'TO',
|
||||
'GENERATED',
|
||||
'ALWAYS',
|
||||
'IDENTITY',
|
||||
'INCLUDE',
|
||||
'TEMP',
|
||||
'TEMPORARY',
|
||||
'UNLOGGED',
|
||||
|
||||
// ==================== PostgreSQL Specific - UPSERT/MERGE ====================
|
||||
'CONFLICT',
|
||||
'DO',
|
||||
'NOTHING',
|
||||
'EXCLUDED',
|
||||
'RETURNING',
|
||||
'MERGE',
|
||||
'USING',
|
||||
'MATCHED',
|
||||
'TARGET',
|
||||
'SOURCE',
|
||||
|
||||
// ==================== Aggregate Functions ====================
|
||||
'COUNT',
|
||||
'SUM',
|
||||
'AVG',
|
||||
'MIN',
|
||||
'MAX',
|
||||
'EXISTS',
|
||||
'COALESCE',
|
||||
'NULLIF',
|
||||
'CAST',
|
||||
'AS',
|
||||
|
||||
// ==================== JSON Operations ====================
|
||||
'JSON',
|
||||
'JSONB',
|
||||
'JSON_ARRAY',
|
||||
'JSON_OBJECT',
|
||||
'JSON_AGG',
|
||||
'JSONB_AGG',
|
||||
'JSONB_OBJECT_AGG',
|
||||
|
||||
// ==================== Types & Casting ====================
|
||||
'DECIMAL',
|
||||
'NUMERIC',
|
||||
'BOOLEAN',
|
||||
'CHARACTER',
|
||||
'VARYING',
|
||||
'PRECISION',
|
||||
'REAL',
|
||||
'DOUBLE',
|
||||
'FLOAT',
|
||||
'TEXT',
|
||||
'INTEGER',
|
||||
'SERIAL',
|
||||
'BIGINT',
|
||||
'SMALLINT',
|
||||
'DATE',
|
||||
'TIME',
|
||||
'TIMESTAMP',
|
||||
'TIMESTAMPTZ',
|
||||
'TIMEZONE',
|
||||
'INTERVAL',
|
||||
'BIGSERIAL',
|
||||
'SMALLSERIAL',
|
||||
|
||||
// ==================== Table Sampling ====================
|
||||
'TABLESAMPLE',
|
||||
'BERNOULLI',
|
||||
'SYSTEM',
|
||||
'REPEATABLE',
|
||||
'SEED',
|
||||
|
||||
// ==================== Transaction Control ====================
|
||||
'BEGIN',
|
||||
'COMMIT',
|
||||
'ROLLBACK',
|
||||
'SAVEPOINT',
|
||||
'WORK',
|
||||
'ISOLATION',
|
||||
'LEVEL',
|
||||
'READ',
|
||||
'WRITE',
|
||||
'COMMITTED',
|
||||
'REPEATABLE',
|
||||
'SERIALIZABLE',
|
||||
|
||||
// ==================== Types & Values ====================
|
||||
'TRUE',
|
||||
'FALSE',
|
||||
'DEFAULT',
|
||||
'PRIMARY',
|
||||
'KEY',
|
||||
'REFERENCES',
|
||||
'FOREIGN',
|
||||
'CONSTRAINT',
|
||||
'UNIQUE',
|
||||
'CHECK',
|
||||
'NULLS',
|
||||
'FIRST',
|
||||
'LAST',
|
||||
|
||||
// ==================== Scalar & String Functions ====================
|
||||
'UPPER',
|
||||
'LOWER',
|
||||
'TRIM',
|
||||
'LTRIM',
|
||||
'RTRIM',
|
||||
'BTRIM',
|
||||
'SUBSTRING',
|
||||
'CONCAT',
|
||||
'LENGTH',
|
||||
'CHAR_LENGTH',
|
||||
'CHARACTER_LENGTH',
|
||||
'REPLACE',
|
||||
'POSITION',
|
||||
'OVERLAY',
|
||||
'LPAD',
|
||||
'RPAD',
|
||||
'REPEAT',
|
||||
'REVERSE',
|
||||
'SPLIT_PART',
|
||||
'INITCAP',
|
||||
'NORMALIZE',
|
||||
'CHR',
|
||||
'ASCII',
|
||||
'FORMAT',
|
||||
|
||||
// ==================== Numeric Functions ====================
|
||||
'ABS',
|
||||
'CEIL',
|
||||
'CEILING',
|
||||
'FLOOR',
|
||||
'ROUND',
|
||||
'POWER',
|
||||
'SQRT',
|
||||
'MOD',
|
||||
'SIGN',
|
||||
'TRUNC',
|
||||
|
||||
// ==================== Date/Time Functions ====================
|
||||
'EXTRACT',
|
||||
'DATE_TRUNC',
|
||||
'TO_CHAR',
|
||||
'TO_DATE',
|
||||
'TO_TIMESTAMP',
|
||||
'TO_NUMBER',
|
||||
'AGE',
|
||||
|
||||
// ==================== Pattern Matching ====================
|
||||
'BETWEEN',
|
||||
'LIKE',
|
||||
'ILIKE',
|
||||
'SIMILAR',
|
||||
'ESCAPE',
|
||||
'ANY',
|
||||
'SOME',
|
||||
|
||||
// ==================== Functions & Procedures ====================
|
||||
'AFTER',
|
||||
'BEFORE',
|
||||
'EACH',
|
||||
'STATEMENT',
|
||||
'TRIGGER',
|
||||
'FUNCTION',
|
||||
'PROCEDURE',
|
||||
'LANGUAGE',
|
||||
'SQL',
|
||||
'PLPGSQL',
|
||||
'RETURNS',
|
||||
'CALLED',
|
||||
'STRICT',
|
||||
'SECURITY',
|
||||
'INVOKER',
|
||||
'DEFINER',
|
||||
'VOLATILE',
|
||||
'STABLE',
|
||||
'IMMUTABLE',
|
||||
'PARALLEL',
|
||||
'SAFE',
|
||||
'RESTRICTED',
|
||||
'UNSAFE',
|
||||
|
||||
// ==================== Utility Commands ====================
|
||||
'CONCURRENTLY',
|
||||
'REINDEX',
|
||||
'VACUUM',
|
||||
'ANALYZE',
|
||||
'EXPLAIN',
|
||||
'LOCAL',
|
||||
'GLOBAL',
|
||||
'ORDINALITY',
|
||||
'FREEZE',
|
||||
'VERBOSE',
|
||||
'BUFFERS',
|
||||
'FORMAT',
|
||||
'XML',
|
||||
'YAML',
|
||||
|
||||
// ==================== Additional Reserved Words ====================
|
||||
'IF',
|
||||
'CURRENT_TIMESTAMP',
|
||||
'NOW',
|
||||
'GETDATE'
|
||||
])
|
||||
|
||||
/**
|
||||
* Prepare SQL for PostgreSQL execution by quoting unquoted identifiers.
|
||||
*
|
||||
* PostgreSQL lowercases unquoted identifiers, but SSMA-migrated tables
|
||||
* have uppercase column names (e.g., "UserName", "ID") that require
|
||||
* double-quoting to preserve case.
|
||||
*
|
||||
* This function:
|
||||
* - Preserves string literals ('...')
|
||||
* - Preserves already-quoted identifiers ("...")
|
||||
* - Preserves parameter placeholders ($1, $2, ...)
|
||||
* - Preserves SQL keywords
|
||||
* - Double-quotes remaining identifiers
|
||||
*/
|
||||
export function prepareSql(sql: string): string {
|
||||
const result: string[] = []
|
||||
let i = 0
|
||||
const len = sql.length
|
||||
|
||||
while (i < len) {
|
||||
const ch = sql[i]
|
||||
|
||||
// Skip whitespace
|
||||
if (/\s/.test(ch)) {
|
||||
result.push(ch)
|
||||
i++
|
||||
continue
|
||||
}
|
||||
|
||||
// Skip single-line comments (--)
|
||||
if (ch === '-' && i + 1 < len && sql[i + 1] === '-') {
|
||||
while (i < len && sql[i] !== '\n') {
|
||||
result.push(sql[i++])
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Preserve string literals ('...')
|
||||
if (ch === "'") {
|
||||
result.push(ch)
|
||||
i++
|
||||
while (i < len) {
|
||||
if (sql[i] === "'") {
|
||||
result.push(sql[i++])
|
||||
// Handle escaped quotes ('')
|
||||
if (i < len && sql[i] === "'") {
|
||||
result.push(sql[i++])
|
||||
} else {
|
||||
break
|
||||
}
|
||||
} else {
|
||||
result.push(sql[i++])
|
||||
}
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Preserve already-quoted identifiers ("...")
|
||||
if (ch === '"') {
|
||||
result.push(ch)
|
||||
i++
|
||||
while (i < len && sql[i] !== '"') {
|
||||
result.push(sql[i++])
|
||||
}
|
||||
if (i < len) {
|
||||
result.push(sql[i++])
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Preserve parameter placeholders ($N)
|
||||
if (ch === '$') {
|
||||
result.push(ch)
|
||||
i++
|
||||
while (i < len && /\d/.test(sql[i])) {
|
||||
result.push(sql[i++])
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Preserve @param placeholders
|
||||
if (ch === '@') {
|
||||
result.push(ch)
|
||||
i++
|
||||
while (i < len && /\w/.test(sql[i])) {
|
||||
result.push(sql[i++])
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Preserve ? placeholders
|
||||
if (ch === '?') {
|
||||
result.push(ch)
|
||||
i++
|
||||
continue
|
||||
}
|
||||
|
||||
// Collect word tokens (identifiers and keywords)
|
||||
if (/[a-zA-Z_]/.test(ch)) {
|
||||
let word = ''
|
||||
while (i < len && /\w/.test(sql[i])) {
|
||||
word += sql[i++]
|
||||
}
|
||||
|
||||
// Check if it's a SQL keyword (case-insensitive)
|
||||
if (SQL_KEYWORDS.has(word.toUpperCase())) {
|
||||
result.push(word)
|
||||
} else {
|
||||
// Quote the identifier to preserve case
|
||||
result.push(`"${word}"`)
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Everything else (operators, punctuation, numbers): pass through
|
||||
result.push(ch)
|
||||
i++
|
||||
}
|
||||
|
||||
return result.join('')
|
||||
}
|
||||
|
||||
export class PostgreSqlService implements IDatabaseService {
|
||||
/** Database type identifier */
|
||||
readonly type: DatabaseType = 'postgresql'
|
||||
|
||||
private pool: Pool | null = null
|
||||
private config: PostgreSqlConfig
|
||||
|
||||
constructor(config: PostgreSqlConfig) {
|
||||
this.config = config
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to PostgreSQL database
|
||||
*/
|
||||
async connect(): Promise<void> {
|
||||
if (this.pool) {
|
||||
log.warn('Already connected to PostgreSQL')
|
||||
throw new Error('Already connected to PostgreSQL')
|
||||
}
|
||||
|
||||
try {
|
||||
this.pool = new Pool({
|
||||
host: this.config.host,
|
||||
port: this.config.port,
|
||||
user: this.config.user,
|
||||
password: this.config.password,
|
||||
database: this.config.database,
|
||||
max: this.config.maxPoolSize ?? 10,
|
||||
/**
|
||||
* Connection timeout in milliseconds.
|
||||
* Time to wait when connecting to PostgreSQL before failing.
|
||||
* Prevents hanging during network issues or server overload.
|
||||
*/
|
||||
connectionTimeoutMillis: 10000,
|
||||
/**
|
||||
* PostgreSQL statement timeout in milliseconds.
|
||||
* Limits execution time for individual SQL statements.
|
||||
* Prevents long-running queries from blocking the connection pool.
|
||||
*/
|
||||
statement_timeout: 30000,
|
||||
/**
|
||||
* Idle connection timeout in milliseconds.
|
||||
* Closes connections that have been idle for this duration.
|
||||
* Frees up pool resources and prevents stale connections.
|
||||
*/
|
||||
idleTimeoutMillis: 30000,
|
||||
/**
|
||||
* Query timeout in milliseconds (pg driver level).
|
||||
* Fallback protection to abort queries that exceed this duration.
|
||||
* Should be longer than statement_timeout to allow PG to handle first.
|
||||
*/
|
||||
query_timeout: 60000
|
||||
})
|
||||
|
||||
// Test connection
|
||||
const client = await this.pool.connect()
|
||||
client.release()
|
||||
|
||||
log.info('Connected to PostgreSQL', {
|
||||
host: this.config.host,
|
||||
port: this.config.port,
|
||||
database: this.config.database
|
||||
})
|
||||
} catch (error) {
|
||||
this.pool = null
|
||||
log.error('Failed to connect to PostgreSQL', {
|
||||
host: this.config.host,
|
||||
port: this.config.port,
|
||||
database: this.config.database,
|
||||
error
|
||||
})
|
||||
throw new Error(`Failed to connect to PostgreSQL: ${(error as Error).message}`)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Disconnect from PostgreSQL database
|
||||
*/
|
||||
async disconnect(): Promise<void> {
|
||||
if (!this.pool) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
await this.pool.end()
|
||||
this.pool = null
|
||||
log.info('Disconnected from PostgreSQL')
|
||||
} catch (error) {
|
||||
log.error('Failed to disconnect from PostgreSQL', { error })
|
||||
throw new Error(`Failed to disconnect from PostgreSQL: ${(error as Error).message}`)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if connected to PostgreSQL database
|
||||
*/
|
||||
isConnected(): boolean {
|
||||
return this.pool !== null
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute a query and return results
|
||||
*/
|
||||
async query(sql: string, params?: any[]): Promise<QueryResult> {
|
||||
if (!this.pool) {
|
||||
throw new Error('Not connected to PostgreSQL. Call connect() first.')
|
||||
}
|
||||
|
||||
// Quote unquoted identifiers to preserve case for SSMA-migrated columns
|
||||
const preparedSql = prepareSql(sql)
|
||||
const sqlPreview = preparedSql.substring(0, 100)
|
||||
const paramCount = params?.length ?? 0
|
||||
|
||||
try {
|
||||
const { result: queryResult } = await trackDuration(
|
||||
async () => {
|
||||
const result = await this.pool!.query(preparedSql, params)
|
||||
|
||||
// Extract column names from fields
|
||||
const columns = result.fields ? result.fields.map((field) => field.name) : []
|
||||
|
||||
// Result rows
|
||||
const rows = (result.rows as Record<string, unknown>[]) || []
|
||||
const rowCount = result.rowCount ?? rows.length
|
||||
|
||||
return { rows, columns, rowCount }
|
||||
},
|
||||
{ operationName: 'PostgreSqlService.query' }
|
||||
)
|
||||
|
||||
log.debug('Query executed', { sqlPreview, rowCount: queryResult.rowCount, paramCount })
|
||||
return queryResult
|
||||
} catch (error) {
|
||||
log.error('PostgreSQL query failed', { sqlPreview, paramCount, error })
|
||||
throw new Error(`PostgreSQL query failed: ${(error as Error).message}`)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute multiple queries in a transaction
|
||||
*/
|
||||
async transaction(queries: { sql: string; params?: any[] }[]): Promise<void> {
|
||||
if (!this.pool) {
|
||||
throw new Error('Not connected to PostgreSQL. Call connect() first.')
|
||||
}
|
||||
|
||||
const queryCount = queries.length
|
||||
log.info('Transaction started', { queryCount })
|
||||
|
||||
const client = await this.pool.connect()
|
||||
|
||||
try {
|
||||
await client.query('BEGIN')
|
||||
|
||||
for (let i = 0; i < queries.length; i++) {
|
||||
const { sql, params } = queries[i]
|
||||
const preparedSql = prepareSql(sql)
|
||||
await client.query(preparedSql, params)
|
||||
log.debug('Transaction query executed', {
|
||||
index: i,
|
||||
sqlPreview: preparedSql.substring(0, 100)
|
||||
})
|
||||
}
|
||||
|
||||
await client.query('COMMIT')
|
||||
log.info('Transaction committed', { queryCount })
|
||||
} catch (error) {
|
||||
await client.query('ROLLBACK')
|
||||
log.warn('Transaction rolled back', { queryCount, error })
|
||||
throw new Error(`PostgreSQL transaction failed: ${(error as Error).message}`)
|
||||
} finally {
|
||||
client.release()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -58,22 +58,33 @@ export class OrderNumberResolver {
|
||||
|
||||
/**
|
||||
* Get table name based on database type
|
||||
* Converts MySQL schema_tablename format to SQL Server [schema].[tablename] format
|
||||
* e.g., productionContractData_26年压力表合同数据 -> [productionContractData].[26年压力表合同数据]
|
||||
* dbo_MaterialsToBeDeleted -> [dbo].[MaterialsToBeDeleted]
|
||||
* Converts schema_tablename format to database-specific quoting:
|
||||
* - SQL Server: [schema].[tablename]
|
||||
* - PostgreSQL: "schema"."tablename"
|
||||
* - MySQL: schema_tablename (as-is)
|
||||
* e.g., productionContractData_26年压力表合同数据 ->
|
||||
* SQL Server: [productionContractData].[26年压力表合同数据]
|
||||
* PostgreSQL: "productionContractData"."26年压力表合同数据"
|
||||
* MySQL: productionContractData_26年压力表合同数据
|
||||
*/
|
||||
private getTableName(tableName: string): string {
|
||||
if (this.dbService.type === 'sqlserver') {
|
||||
if (this.dbService.type === 'sqlserver' || this.dbService.type === 'postgresql') {
|
||||
// Find the FIRST underscore to split schema and table name
|
||||
// This handles patterns like: schema_tablename
|
||||
const firstUnderscoreIndex = tableName.indexOf('_')
|
||||
if (firstUnderscoreIndex > 0) {
|
||||
const schema = tableName.substring(0, firstUnderscoreIndex)
|
||||
const actualTableName = tableName.substring(firstUnderscoreIndex + 1)
|
||||
return `[${schema}].[${actualTableName}]`
|
||||
if (this.dbService.type === 'sqlserver') {
|
||||
return `[${schema}].[${actualTableName}]`
|
||||
}
|
||||
return `"${schema}"."${actualTableName}"`
|
||||
}
|
||||
// If no underscore found, default to dbo schema
|
||||
return `[dbo].[${tableName}]`
|
||||
// If no underscore found, default schema
|
||||
if (this.dbService.type === 'sqlserver') {
|
||||
return `[dbo].[${tableName}]`
|
||||
}
|
||||
return `"public"."${tableName}"`
|
||||
}
|
||||
return tableName
|
||||
}
|
||||
@@ -107,6 +118,12 @@ export class OrderNumberResolver {
|
||||
// 使用 COLLATE 指定不区分大小写的排序规则
|
||||
sql = `SELECT TOP 1 [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] COLLATE SQL_Latin1_General_CP1_CI_AS = @p0`
|
||||
params = [productionId]
|
||||
} else if (this.dbService.type === 'postgresql') {
|
||||
// PostgreSQL: 使用双引号保护中文标识符，UPPER 实现不区分大小写
|
||||
// prepareSql() 会保留已双引号包裹的标识符
|
||||
// 注意：getTableName() 已返回带双引号的表名，不应再加引号
|
||||
sql = `SELECT DISTINCT "${dbConfig.FIELD_PRODUCTION_ID}", "${dbConfig.FIELD_ORDER_NUMBER}" FROM ${tableName} WHERE UPPER("${dbConfig.FIELD_PRODUCTION_ID}") = UPPER($1) LIMIT 1`
|
||||
params = [productionId]
|
||||
} else {
|
||||
// MySQL 默认不区分大小写，但显式使用 UPPER 确保一致性
|
||||
sql = `SELECT \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE UPPER(\`${dbConfig.FIELD_PRODUCTION_ID}\`) = UPPER(?) LIMIT 1`
|
||||
@@ -155,6 +172,11 @@ export class OrderNumberResolver {
|
||||
// P0: Use DISTINCT to prevent duplicates from one-to-many relationships
|
||||
// 使用 COLLATE 指定不区分大小写的排序规则
|
||||
sql = `SELECT DISTINCT [${dbConfig.FIELD_PRODUCTION_ID}], [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] COLLATE SQL_Latin1_General_CP1_CI_AS IN (${placeholders})`
|
||||
} else if (this.dbService.type === 'postgresql') {
|
||||
// PostgreSQL: 使用双引号保护中文标识符，UPPER 实现不区分大小写
|
||||
// 注意：getTableName() 已返回带双引号的表名，不应再加引号
|
||||
const pgPlaceholders = uniqueProductionIds.map((_, i) => `UPPER($${i + 1})`).join(', ')
|
||||
sql = `SELECT DISTINCT "${dbConfig.FIELD_PRODUCTION_ID}", "${dbConfig.FIELD_ORDER_NUMBER}" FROM ${tableName} WHERE UPPER("${dbConfig.FIELD_PRODUCTION_ID}") IN (${pgPlaceholders})`
|
||||
} else {
|
||||
const idPlaceholders = uniqueProductionIds.map(() => 'UPPER(?)').join(', ')
|
||||
// P0: Use DISTINCT to prevent duplicates from one-to-many relationships
|
||||
|
||||
@@ -3,6 +3,8 @@ import path from 'path'
|
||||
import { app } from 'electron'
|
||||
import fs from 'fs'
|
||||
import { createLogger } from '../logger'
|
||||
import { logAuditWithCurrentUser } from '../logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../../types/audit.types'
|
||||
import type { ExportResultItem, ExportResultResponse } from '../../types/cleaner.types'
|
||||
|
||||
const log = createLogger('ResultExporter')
|
||||
@@ -37,8 +39,8 @@ export class ResultExporter {
|
||||
* @returns Export result with file path or error
|
||||
*/
|
||||
async exportValidationResults(items: ExportResultItem[]): Promise<ExportResultResponse> {
|
||||
const filePath = path.join(this.exportDir, this.fileName)
|
||||
try {
|
||||
const filePath = path.join(this.exportDir, this.fileName)
|
||||
log.info('Exporting validation results', { count: items.length, path: filePath })
|
||||
|
||||
const workbook = new ExcelJS.Workbook()
|
||||
@@ -97,6 +99,12 @@ export class ResultExporter {
|
||||
await workbook.xlsx.writeFile(filePath)
|
||||
log.info('Export completed', { path: filePath, rows: items.length })
|
||||
|
||||
// Audit log: RESULT_EXPORT success
|
||||
logAuditWithCurrentUser(AuditAction.RESULT_EXPORT, 'VALIDATION_RESULT', AuditStatus.SUCCESS, {
|
||||
itemCount: items.length,
|
||||
filePath
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
filePath
|
||||
@@ -104,6 +112,14 @@ export class ResultExporter {
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : String(error)
|
||||
log.error('Export failed', { error: errorMessage })
|
||||
|
||||
// Audit log: RESULT_EXPORT failure
|
||||
logAuditWithCurrentUser(AuditAction.RESULT_EXPORT, 'VALIDATION_RESULT', AuditStatus.FAILURE, {
|
||||
itemCount: items.length,
|
||||
filePath,
|
||||
error: errorMessage
|
||||
})
|
||||
|
||||
return {
|
||||
success: false,
|
||||
error: errorMessage
|
||||
|
||||
@@ -6,33 +6,12 @@
|
||||
import winston from 'winston'
|
||||
import DailyRotateFile from 'winston-daily-rotate-file'
|
||||
import path from 'path'
|
||||
import { hostname } from 'os'
|
||||
import { app } from 'electron'
|
||||
import { getLogDir } from './shared'
|
||||
|
||||
/**
|
||||
* Audit log entry structure
|
||||
* All 8 required fields for comprehensive audit tracking
|
||||
*/
|
||||
export interface AuditEntry {
|
||||
/** ISO 8601 timestamp of the audit event */
|
||||
timestamp: string
|
||||
/** The action that was performed (e.g., 'LOGIN', 'EXTRACT', 'DELETE') */
|
||||
action: string
|
||||
/** User ID who performed the action */
|
||||
userId: string
|
||||
/** Username of the user who performed the action */
|
||||
username: string
|
||||
/** Computer name from which the action was performed */
|
||||
computerName: string
|
||||
/** Application version when the action was performed */
|
||||
appVersion: string
|
||||
/** The resource that was affected (e.g., table name, file path) */
|
||||
resource: string
|
||||
/** Status of the action: 'success' | 'failure' | 'partial' */
|
||||
status: 'success' | 'failure' | 'partial'
|
||||
/** Additional metadata about the audit event */
|
||||
metadata: Record<string, unknown>
|
||||
}
|
||||
import { SessionManager } from '../user/session-manager'
|
||||
import type { AuditEntry } from '../../types/audit.types'
|
||||
import { AuditAction, AuditStatus } from '../../types/audit.types'
|
||||
|
||||
/**
|
||||
* JSONL formatter - outputs one JSON object per line
|
||||
@@ -91,31 +70,58 @@ export function applyAuditConfig(retentionDays: number): void {
|
||||
* @param details - Additional details including username, computerName, resource, status, and optional metadata
|
||||
*/
|
||||
export function logAudit(
|
||||
action: string,
|
||||
action: AuditAction,
|
||||
userId: string,
|
||||
details: {
|
||||
username: string
|
||||
computerName: string
|
||||
resource: string
|
||||
status: 'success' | 'failure' | 'partial'
|
||||
status: AuditStatus
|
||||
metadata?: Record<string, unknown>
|
||||
}
|
||||
): void {
|
||||
const entry: AuditEntry = {
|
||||
timestamp: new Date().toISOString(),
|
||||
action,
|
||||
userId,
|
||||
username: details.username,
|
||||
computerName: details.computerName,
|
||||
appVersion: app.getVersion(),
|
||||
resource: details.resource,
|
||||
status: details.status,
|
||||
metadata: details.metadata || {}
|
||||
}
|
||||
try {
|
||||
const entry: AuditEntry = {
|
||||
timestamp: new Date().toISOString(),
|
||||
action,
|
||||
userId,
|
||||
username: details.username,
|
||||
computerName: details.computerName,
|
||||
appVersion: app.getVersion(),
|
||||
resource: details.resource,
|
||||
status: details.status,
|
||||
metadata: details.metadata ?? {}
|
||||
}
|
||||
|
||||
// Write as JSONL - one JSON object per line
|
||||
// Using info level with the entry stringified as the message
|
||||
auditLogger.info(JSON.stringify(entry))
|
||||
// Write as JSONL - one JSON object per line
|
||||
// Using info level with the entry stringified as the message
|
||||
auditLogger.info(JSON.stringify(entry))
|
||||
} catch (error) {
|
||||
console.error('Audit logging failed:', error)
|
||||
}
|
||||
}
|
||||
|
||||
/** Cached hostname — invariant for the app lifecycle */
|
||||
export const cachedHostname = hostname()
|
||||
|
||||
/**
|
||||
* Audit log shortcut that auto-resolves the current user context.
|
||||
* Falls back to 'anonymous' if no user is logged in, so the record is always written.
|
||||
*/
|
||||
export function logAuditWithCurrentUser(
|
||||
action: AuditAction,
|
||||
resource: string,
|
||||
status: AuditStatus,
|
||||
metadata?: Record<string, unknown>
|
||||
): void {
|
||||
const user = SessionManager.getInstance().getUserInfo()
|
||||
logAudit(action, user ? String(user.id) : 'anonymous', {
|
||||
username: user?.username ?? 'anonymous',
|
||||
computerName: cachedHostname,
|
||||
resource,
|
||||
status,
|
||||
metadata: metadata ?? {}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -119,7 +119,6 @@ export async function trackDuration<T>(
|
||||
return { result, durationMs, isSlow }
|
||||
} catch (error) {
|
||||
const durationMs = performance.now() - startTime
|
||||
const isSlow = durationMs > slowThresholdMs
|
||||
|
||||
// Log the error with duration
|
||||
logger.error(`${message} failed after ${durationMs.toFixed(2)}ms`, {
|
||||
|
||||
@@ -15,7 +15,7 @@ import {
|
||||
type GetObjectCommandInput,
|
||||
type DeleteObjectCommandInput
|
||||
} from '@aws-sdk/client-s3'
|
||||
import { createLogger, run, trackDuration, PerformanceTracker } from '../logger'
|
||||
import { createLogger } from '../logger'
|
||||
import type { RustfsConfig } from '../../types/config.schema'
|
||||
import * as fs from 'fs'
|
||||
import * as path from 'path'
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import * as fs from 'fs'
|
||||
import { ConfigManager } from '../config/config-manager'
|
||||
import { createLogger, run, trackDuration, PerformanceTracker } from '../logger'
|
||||
import { createLogger } from '../logger'
|
||||
import { logAuditWithCurrentUser } from '../logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../../types/audit.types'
|
||||
import type { UpdateConfig } from '../../types/config.schema'
|
||||
import type { UserType } from '../../types/user.types'
|
||||
import type {
|
||||
@@ -281,10 +283,21 @@ export class UpdateService {
|
||||
log.error('Update package hash mismatch', {
|
||||
version: request.version,
|
||||
channel: request.channel,
|
||||
expectedHash: request.sha256,
|
||||
actualHash: hash
|
||||
expectedHash: request.sha256.substring(0, 16),
|
||||
actualHash: hash.substring(0, 16)
|
||||
})
|
||||
await fs.promises.rm(downloadPath, { force: true })
|
||||
|
||||
// Audit log: APP_UPDATE download hash mismatch
|
||||
logAuditWithCurrentUser(AuditAction.APP_UPDATE, 'UPDATE_PACKAGE', AuditStatus.FAILURE, {
|
||||
version: request.version,
|
||||
channel: request.channel,
|
||||
phase: 'download',
|
||||
error: 'Hash mismatch',
|
||||
expectedHash: request.sha256.substring(0, 16),
|
||||
actualHash: hash.substring(0, 16)
|
||||
})
|
||||
|
||||
throw new Error('更新包校验失败，文件哈希不匹配')
|
||||
}
|
||||
|
||||
@@ -294,6 +307,13 @@ export class UpdateService {
|
||||
downloadPath
|
||||
})
|
||||
|
||||
// Audit log: APP_UPDATE download success
|
||||
logAuditWithCurrentUser(AuditAction.APP_UPDATE, 'UPDATE_PACKAGE', AuditStatus.SUCCESS, {
|
||||
version: request.version,
|
||||
channel: request.channel,
|
||||
phase: 'download'
|
||||
})
|
||||
|
||||
this.publishStatus({
|
||||
phase: 'downloaded',
|
||||
progress: 100,
|
||||
@@ -336,11 +356,29 @@ export class UpdateService {
|
||||
error: undefined
|
||||
})
|
||||
|
||||
await this.installer.installDownloadedRelease(downloaded)
|
||||
log.info('Update installation completed', {
|
||||
version: downloaded.version,
|
||||
channel: downloaded.channel
|
||||
})
|
||||
try {
|
||||
await this.installer.installDownloadedRelease(downloaded)
|
||||
log.info('Update installation completed', {
|
||||
version: downloaded.version,
|
||||
channel: downloaded.channel
|
||||
})
|
||||
|
||||
// Audit log: APP_UPDATE install success
|
||||
logAuditWithCurrentUser(AuditAction.APP_UPDATE, 'UPDATE_PACKAGE', AuditStatus.SUCCESS, {
|
||||
version: downloaded.version,
|
||||
channel: downloaded.channel,
|
||||
phase: 'install'
|
||||
})
|
||||
} catch (installError) {
|
||||
const msg = installError instanceof Error ? installError.message : String(installError)
|
||||
logAuditWithCurrentUser(AuditAction.APP_UPDATE, 'UPDATE_PACKAGE', AuditStatus.FAILURE, {
|
||||
version: downloaded.version,
|
||||
channel: downloaded.channel,
|
||||
phase: 'install',
|
||||
error: msg
|
||||
})
|
||||
throw installError
|
||||
}
|
||||
}
|
||||
|
||||
private ensureInitialized(): void {
|
||||
|
||||
@@ -8,10 +8,8 @@
|
||||
* - Create, update, delete users
|
||||
*/
|
||||
|
||||
import { MySqlService } from '../database/mysql'
|
||||
import { SqlServerService } from '../database/sql-server'
|
||||
import { ConfigManager } from '../config/config-manager'
|
||||
import sql from 'mssql'
|
||||
import { create, type IDatabaseService } from '../database/index'
|
||||
import { createDialect, type SqlDialect } from '../database/dialects'
|
||||
import type { UserInfo } from '../../types/user.types'
|
||||
import { createLogger, logError } from '../logger'
|
||||
|
||||
@@ -21,10 +19,6 @@ const log = createLogger('BipUsersDao')
|
||||
* Database configuration for BIPUsers table
|
||||
*/
|
||||
export const BIP_USERS_CONFIG = {
|
||||
/** Table name in SQL Server: [dbo].[BIPUsers] */
|
||||
TABLE_NAME_SQLSERVER: '[dbo].[BIPUsers]',
|
||||
/** Table name in MySQL: dbo_BIPUsers */
|
||||
TABLE_NAME_MYSQL: 'dbo_BIPUsers',
|
||||
/** Column names */
|
||||
COLUMNS: {
|
||||
ID: 'ID',
|
||||
@@ -44,71 +38,37 @@ export const BIP_USERS_CONFIG = {
|
||||
* BIPUsers DAO Class
|
||||
*/
|
||||
export class BIPUsersDAO {
|
||||
private mysqlService: MySqlService | null = null
|
||||
private sqlServerService: SqlServerService | null = null
|
||||
private dbType: 'mysql' | 'sqlserver' = 'mysql'
|
||||
private configManager: ConfigManager
|
||||
|
||||
/**
|
||||
* Constructor - get database type from ConfigManager
|
||||
*/
|
||||
constructor() {
|
||||
this.configManager = ConfigManager.getInstance()
|
||||
this.dbType = this.configManager.getDatabaseType()
|
||||
}
|
||||
private dbService: IDatabaseService | null = null
|
||||
private dialect: SqlDialect | null = null
|
||||
|
||||
/**
|
||||
* Get the appropriate table name based on database type
|
||||
*/
|
||||
private getTableName(): string {
|
||||
return this.dbType === 'sqlserver'
|
||||
? BIP_USERS_CONFIG.TABLE_NAME_SQLSERVER
|
||||
: BIP_USERS_CONFIG.TABLE_NAME_MYSQL
|
||||
return this.getDialect().quoteTableName('dbo', 'BIPUsers')
|
||||
}
|
||||
|
||||
/**
|
||||
* Get database service instance (MySQL or SQL Server)
|
||||
* Get dialect instance
|
||||
*/
|
||||
private async getDatabaseService(): Promise<MySqlService | SqlServerService> {
|
||||
const config = this.configManager.getConfig()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
if (this.sqlServerService && this.sqlServerService.isConnected()) {
|
||||
return this.sqlServerService
|
||||
}
|
||||
|
||||
const dbConfig = config.database.sqlserver
|
||||
this.sqlServerService = new SqlServerService({
|
||||
server: dbConfig.server,
|
||||
port: dbConfig.port,
|
||||
user: dbConfig.username,
|
||||
password: dbConfig.password,
|
||||
database: dbConfig.database,
|
||||
options: {
|
||||
encrypt: false,
|
||||
trustServerCertificate: dbConfig.trustServerCertificate
|
||||
}
|
||||
})
|
||||
|
||||
await this.sqlServerService.connect()
|
||||
return this.sqlServerService
|
||||
} else {
|
||||
if (this.mysqlService && this.mysqlService.isConnected()) {
|
||||
return this.mysqlService
|
||||
}
|
||||
|
||||
const dbConfig = config.database.mysql
|
||||
this.mysqlService = new MySqlService({
|
||||
host: dbConfig.host,
|
||||
port: dbConfig.port,
|
||||
user: dbConfig.username,
|
||||
password: dbConfig.password,
|
||||
database: dbConfig.database
|
||||
})
|
||||
|
||||
await this.mysqlService.connect()
|
||||
return this.mysqlService
|
||||
private getDialect(): SqlDialect {
|
||||
if (!this.dialect) {
|
||||
this.dialect = createDialect(this.dbService!.type)
|
||||
}
|
||||
return this.dialect
|
||||
}
|
||||
|
||||
/**
|
||||
* Get database service instance via DatabaseFactory
|
||||
*/
|
||||
private async getDatabaseService(): Promise<IDatabaseService> {
|
||||
if (this.dbService && this.dbService.isConnected()) {
|
||||
return this.dbService
|
||||
}
|
||||
|
||||
this.dbService = await create()
|
||||
this.dialect = null // Reset dialect when service changes
|
||||
return this.dbService
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -121,52 +81,30 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
SELECT ID, UserName, UserType
|
||||
FROM ${tableName}
|
||||
WHERE UserName = @username AND Password = @password
|
||||
`
|
||||
const sqlString = `
|
||||
SELECT ID, UserName, UserType
|
||||
FROM ${tableName}
|
||||
WHERE UserName = ${dialect.param(0)} AND Password = ${dialect.param(1)}
|
||||
`
|
||||
|
||||
const result = await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
username: { value: username, type: sql.NVarChar(255) },
|
||||
password: { value: password, type: sql.NVarChar(255) }
|
||||
})
|
||||
const result = await dbService.query(sqlString, [username, password])
|
||||
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
id: row.ID as number,
|
||||
username: row.UserName as string,
|
||||
userType: row.UserType as 'Admin' | 'User'
|
||||
}
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
id: row.ID as number,
|
||||
username: row.UserName as string,
|
||||
userType: row.UserType as 'Admin' | 'User'
|
||||
}
|
||||
return null
|
||||
} else {
|
||||
const sqlString = `
|
||||
SELECT ID, UserName, UserType
|
||||
FROM ${tableName}
|
||||
WHERE UserName = ? AND Password = ?
|
||||
`
|
||||
|
||||
const result = await (dbService as MySqlService).query(sqlString, [username, password])
|
||||
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
id: row.ID as number,
|
||||
username: row.UserName as string,
|
||||
userType: row.UserType as 'Admin' | 'User'
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
return null
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Authenticate failed',
|
||||
operation: 'authenticate',
|
||||
context: { username, dbType: this.dbType }
|
||||
context: { username, dbType: this.dbService?.type }
|
||||
})
|
||||
return null
|
||||
}
|
||||
@@ -181,51 +119,30 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
SELECT ID, UserName, UserType
|
||||
FROM ${tableName}
|
||||
WHERE ComputerName = @computerName
|
||||
`
|
||||
const sqlString = `
|
||||
SELECT ID, UserName, UserType
|
||||
FROM ${tableName}
|
||||
WHERE ComputerName = ${dialect.param(0)}
|
||||
`
|
||||
|
||||
const result = await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
computerName: { value: computerName, type: sql.NVarChar(255) }
|
||||
})
|
||||
const result = await dbService.query(sqlString, [computerName])
|
||||
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
id: row.ID as number,
|
||||
username: row.UserName as string,
|
||||
userType: row.UserType as 'Admin' | 'User'
|
||||
}
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
id: row.ID as number,
|
||||
username: row.UserName as string,
|
||||
userType: row.UserType as 'Admin' | 'User'
|
||||
}
|
||||
return null
|
||||
} else {
|
||||
const sqlString = `
|
||||
SELECT ID, UserName, UserType
|
||||
FROM ${tableName}
|
||||
WHERE ComputerName = ?
|
||||
`
|
||||
|
||||
const result = await (dbService as MySqlService).query(sqlString, [computerName])
|
||||
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
id: row.ID as number,
|
||||
username: row.UserName as string,
|
||||
userType: row.UserType as 'Admin' | 'User'
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
return null
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Silent login failed',
|
||||
operation: 'authenticateByComputerName',
|
||||
context: { computerName, dbType: this.dbType }
|
||||
context: { computerName, dbType: this.dbService?.type }
|
||||
})
|
||||
return null
|
||||
}
|
||||
@@ -246,10 +163,7 @@ export class BIPUsersDAO {
|
||||
ORDER BY UserName
|
||||
`
|
||||
|
||||
const result =
|
||||
this.dbType === 'sqlserver'
|
||||
? await (dbService as SqlServerService).query(sqlString)
|
||||
: await (dbService as MySqlService).query(sqlString)
|
||||
const result = await dbService.query(sqlString)
|
||||
|
||||
return result.rows.map((row) => ({
|
||||
id: row.ID as number,
|
||||
@@ -261,7 +175,7 @@ export class BIPUsersDAO {
|
||||
logError(log, error, {
|
||||
message: 'Get all users failed',
|
||||
operation: 'getAllUsers',
|
||||
context: { dbType: this.dbType }
|
||||
context: { dbType: this.dbService?.type }
|
||||
})
|
||||
return []
|
||||
}
|
||||
@@ -284,72 +198,34 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
let sqlString: string
|
||||
let params: Record<
|
||||
string,
|
||||
{
|
||||
value: unknown
|
||||
type?: sql.ISqlType | sql.ISqlTypeFactoryWithLength | sql.ISqlTypeWithLength
|
||||
}
|
||||
>
|
||||
let sqlString: string
|
||||
let params: string[]
|
||||
|
||||
if (computerName) {
|
||||
sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(UserName, Password, UserType, ComputerName)
|
||||
VALUES (@username, @password, @userType, @computerName)
|
||||
`
|
||||
params = {
|
||||
username: { value: username, type: sql.NVarChar(255) },
|
||||
password: { value: password, type: sql.NVarChar(255) },
|
||||
userType: { value: userType, type: sql.NVarChar(255) },
|
||||
computerName: { value: computerName, type: sql.NVarChar(255) }
|
||||
}
|
||||
} else {
|
||||
sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(UserName, Password, UserType)
|
||||
VALUES (@username, @password, @userType)
|
||||
`
|
||||
params = {
|
||||
username: { value: username, type: sql.NVarChar(255) },
|
||||
password: { value: password, type: sql.NVarChar(255) },
|
||||
userType: { value: userType, type: sql.NVarChar(255) }
|
||||
}
|
||||
}
|
||||
|
||||
await (dbService as SqlServerService).queryWithParams(sqlString, params)
|
||||
return true
|
||||
if (computerName) {
|
||||
sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(UserName, Password, UserType, ComputerName)
|
||||
VALUES (${dialect.param(0)}, ${dialect.param(1)}, ${dialect.param(2)}, ${dialect.param(3)})
|
||||
`
|
||||
params = [username, password, userType, computerName]
|
||||
} else {
|
||||
let sqlString: string
|
||||
let params: unknown[]
|
||||
|
||||
if (computerName) {
|
||||
sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(UserName, Password, UserType, ComputerName)
|
||||
VALUES (?, ?, ?, ?)
|
||||
`
|
||||
params = [username, password, userType, computerName]
|
||||
} else {
|
||||
sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(UserName, Password, UserType)
|
||||
VALUES (?, ?, ?)
|
||||
`
|
||||
params = [username, password, userType]
|
||||
}
|
||||
|
||||
await (dbService as MySqlService).query(sqlString, params)
|
||||
return true
|
||||
sqlString = `
|
||||
INSERT INTO ${tableName}
|
||||
(UserName, Password, UserType)
|
||||
VALUES (${dialect.param(0)}, ${dialect.param(1)}, ${dialect.param(2)})
|
||||
`
|
||||
params = [username, password, userType]
|
||||
}
|
||||
|
||||
await dbService.query(sqlString, params)
|
||||
return true
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Create user failed',
|
||||
operation: 'createUser',
|
||||
context: { username, userType, dbType: this.dbType }
|
||||
context: { username, userType, dbType: this.dbService?.type }
|
||||
})
|
||||
return false
|
||||
}
|
||||
@@ -365,34 +241,21 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET UserType = @userType
|
||||
WHERE UserName = @username
|
||||
`
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET UserType = ${dialect.param(0)}
|
||||
WHERE UserName = ${dialect.param(1)}
|
||||
`
|
||||
|
||||
await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
username: { value: username, type: sql.NVarChar(255) },
|
||||
userType: { value: userType, type: sql.NVarChar(255) }
|
||||
})
|
||||
return true
|
||||
} else {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET UserType = ?
|
||||
WHERE UserName = ?
|
||||
`
|
||||
|
||||
await (dbService as MySqlService).query(sqlString, [userType, username])
|
||||
return true
|
||||
}
|
||||
await dbService.query(sqlString, [userType, username])
|
||||
return true
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Update user type failed',
|
||||
operation: 'updateUserType',
|
||||
context: { username, userType, dbType: this.dbType }
|
||||
context: { username, userType, dbType: this.dbService?.type }
|
||||
})
|
||||
return false
|
||||
}
|
||||
@@ -408,34 +271,21 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET Password = @newPassword
|
||||
WHERE UserName = @username
|
||||
`
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET Password = ${dialect.param(0)}
|
||||
WHERE UserName = ${dialect.param(1)}
|
||||
`
|
||||
|
||||
await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
username: { value: username, type: sql.NVarChar(255) },
|
||||
newPassword: { value: newPassword, type: sql.NVarChar(255) }
|
||||
})
|
||||
return true
|
||||
} else {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET Password = ?
|
||||
WHERE UserName = ?
|
||||
`
|
||||
|
||||
await (dbService as MySqlService).query(sqlString, [newPassword, username])
|
||||
return true
|
||||
}
|
||||
await dbService.query(sqlString, [newPassword, username])
|
||||
return true
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Update password failed',
|
||||
operation: 'updatePassword',
|
||||
context: { username, dbType: this.dbType }
|
||||
context: { username, dbType: this.dbService?.type }
|
||||
})
|
||||
return false
|
||||
}
|
||||
@@ -450,31 +300,20 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE UserName = @username
|
||||
`
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE UserName = ${dialect.param(0)}
|
||||
`
|
||||
|
||||
await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
username: { value: username, type: sql.NVarChar(255) }
|
||||
})
|
||||
return true
|
||||
} else {
|
||||
const sqlString = `
|
||||
DELETE FROM ${tableName}
|
||||
WHERE UserName = ?
|
||||
`
|
||||
|
||||
await (dbService as MySqlService).query(sqlString, [username])
|
||||
return true
|
||||
}
|
||||
await dbService.query(sqlString, [username])
|
||||
return true
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Delete user failed',
|
||||
operation: 'deleteUser',
|
||||
context: { username, dbType: this.dbType }
|
||||
context: { username, dbType: this.dbService?.type }
|
||||
})
|
||||
return false
|
||||
}
|
||||
@@ -489,33 +328,21 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM ${tableName}
|
||||
WHERE UserName = @username
|
||||
`
|
||||
const sqlString = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM ${tableName}
|
||||
WHERE UserName = ${dialect.param(0)}
|
||||
`
|
||||
|
||||
const result = await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
username: { value: username, type: sql.NVarChar(255) }
|
||||
})
|
||||
return result.rows.length > 0 && (result.rows[0].count as number) > 0
|
||||
} else {
|
||||
const sqlString = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM ${tableName}
|
||||
WHERE UserName = ?
|
||||
`
|
||||
|
||||
const result = await (dbService as MySqlService).query(sqlString, [username])
|
||||
return result.rows.length > 0 && (result.rows[0].count as number) > 0
|
||||
}
|
||||
const result = await dbService.query(sqlString, [username])
|
||||
return result.rows.length > 0 && (result.rows[0].count as number) > 0
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Check user exists failed',
|
||||
operation: 'userExists',
|
||||
context: { username, dbType: this.dbType }
|
||||
context: { username, dbType: this.dbService?.type }
|
||||
})
|
||||
return false
|
||||
}
|
||||
@@ -533,50 +360,30 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
const cols = BIP_USERS_CONFIG.COLUMNS
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
SELECT ${cols.ERP_USERNAME}, ${cols.ERP_PASSWORD}
|
||||
FROM ${tableName}
|
||||
WHERE UserName = @username
|
||||
`
|
||||
const sqlString = `
|
||||
SELECT ${cols.ERP_USERNAME}, ${cols.ERP_PASSWORD}
|
||||
FROM ${tableName}
|
||||
WHERE UserName = ${dialect.param(0)}
|
||||
`
|
||||
|
||||
const result = await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
username: { value: username, type: sql.NVarChar(255) }
|
||||
})
|
||||
const result = await dbService.query(sqlString, [username])
|
||||
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
username: (row[cols.ERP_USERNAME] as string) || '',
|
||||
password: (row[cols.ERP_PASSWORD] as string) || ''
|
||||
}
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
username: (row[cols.ERP_USERNAME] as string) || '',
|
||||
password: (row[cols.ERP_PASSWORD] as string) || ''
|
||||
}
|
||||
return null
|
||||
} else {
|
||||
const sqlString = `
|
||||
SELECT ${cols.ERP_USERNAME}, ${cols.ERP_PASSWORD}
|
||||
FROM ${tableName}
|
||||
WHERE UserName = ?
|
||||
`
|
||||
|
||||
const result = await (dbService as MySqlService).query(sqlString, [username])
|
||||
|
||||
if (result.rows.length > 0) {
|
||||
const row = result.rows[0]
|
||||
return {
|
||||
username: (row[cols.ERP_USERNAME] as string) || '',
|
||||
password: (row[cols.ERP_PASSWORD] as string) || ''
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
return null
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Get user ERP credentials failed',
|
||||
operation: 'getUserErpCredentials',
|
||||
context: { username, dbType: this.dbType }
|
||||
context: { username, dbType: this.dbService?.type }
|
||||
})
|
||||
return null
|
||||
}
|
||||
@@ -597,38 +404,23 @@ export class BIPUsersDAO {
|
||||
try {
|
||||
const dbService = await this.getDatabaseService()
|
||||
const tableName = this.getTableName()
|
||||
const dialect = this.getDialect()
|
||||
const cols = BIP_USERS_CONFIG.COLUMNS
|
||||
|
||||
if (this.dbType === 'sqlserver') {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET ${cols.ERP_USERNAME} = @erpUsername,
|
||||
${cols.ERP_PASSWORD} = @erpPassword
|
||||
WHERE UserName = @username
|
||||
`
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET ${cols.ERP_USERNAME} = ${dialect.param(0)},
|
||||
${cols.ERP_PASSWORD} = ${dialect.param(1)}
|
||||
WHERE UserName = ${dialect.param(2)}
|
||||
`
|
||||
|
||||
await (dbService as SqlServerService).queryWithParams(sqlString, {
|
||||
username: { value: username, type: sql.NVarChar(255) },
|
||||
erpUsername: { value: erpUsername, type: sql.NVarChar(255) },
|
||||
erpPassword: { value: erpPassword, type: sql.NVarChar(255) }
|
||||
})
|
||||
return true
|
||||
} else {
|
||||
const sqlString = `
|
||||
UPDATE ${tableName}
|
||||
SET ${cols.ERP_USERNAME} = ?,
|
||||
${cols.ERP_PASSWORD} = ?
|
||||
WHERE UserName = ?
|
||||
`
|
||||
|
||||
await (dbService as MySqlService).query(sqlString, [erpUsername, erpPassword, username])
|
||||
return true
|
||||
}
|
||||
await dbService.query(sqlString, [erpUsername, erpPassword, username])
|
||||
return true
|
||||
} catch (error) {
|
||||
logError(log, error, {
|
||||
message: 'Update user ERP credentials failed',
|
||||
operation: 'updateUserErpCredentials',
|
||||
context: { username, dbType: this.dbType }
|
||||
context: { username, dbType: this.dbService?.type }
|
||||
})
|
||||
return false
|
||||
}
|
||||
@@ -656,10 +448,7 @@ export class BIPUsersDAO {
|
||||
ORDER BY ${cols.USERNAME}
|
||||
`
|
||||
|
||||
const result =
|
||||
this.dbType === 'sqlserver'
|
||||
? await (dbService as SqlServerService).query(sqlString)
|
||||
: await (dbService as MySqlService).query(sqlString)
|
||||
const result = await dbService.query(sqlString)
|
||||
|
||||
return result.rows.map((row) => ({
|
||||
username: row[cols.USERNAME] as string,
|
||||
@@ -670,7 +459,7 @@ export class BIPUsersDAO {
|
||||
logError(log, error, {
|
||||
message: 'Get all users ERP config failed',
|
||||
operation: 'getAllUsersErpConfig',
|
||||
context: { dbType: this.dbType }
|
||||
context: { dbType: this.dbService?.type }
|
||||
})
|
||||
return []
|
||||
}
|
||||
@@ -680,13 +469,10 @@ export class BIPUsersDAO {
|
||||
* Disconnect from database
|
||||
*/
|
||||
async disconnect(): Promise<void> {
|
||||
if (this.mysqlService) {
|
||||
await this.mysqlService.disconnect()
|
||||
this.mysqlService = null
|
||||
}
|
||||
if (this.sqlServerService) {
|
||||
await this.sqlServerService.disconnect()
|
||||
this.sqlServerService = null
|
||||
if (this.dbService) {
|
||||
await this.dbService.disconnect()
|
||||
this.dbService = null
|
||||
this.dialect = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
import { BIPUsersDAO } from './bip-users-dao'
|
||||
import { SessionManager } from './session-manager'
|
||||
import { createLogger } from '../logger'
|
||||
import { logAuditWithCurrentUser } from '../logger/audit-logger'
|
||||
import { AuditAction, AuditStatus } from '../../types/audit.types'
|
||||
|
||||
const log = createLogger('UserErpConfigService')
|
||||
|
||||
@@ -131,9 +133,22 @@ export class UserErpConfigService {
|
||||
log.error('Failed to update ERP credentials', { username: currentUser.username })
|
||||
}
|
||||
|
||||
logAuditWithCurrentUser(
|
||||
AuditAction.ERP_CREDENTIALS_UPDATE,
|
||||
'ERP_CREDENTIALS',
|
||||
success ? AuditStatus.SUCCESS : AuditStatus.FAILURE,
|
||||
{ targetUsername: currentUser.username, updateType: 'self' }
|
||||
)
|
||||
|
||||
return success
|
||||
} catch (error) {
|
||||
log.error('Error updating current user ERP credentials', { error })
|
||||
logAuditWithCurrentUser(
|
||||
AuditAction.ERP_CREDENTIALS_UPDATE,
|
||||
'ERP_CREDENTIALS',
|
||||
AuditStatus.FAILURE,
|
||||
{ targetUsername: 'unknown', updateType: 'self', error: String(error) }
|
||||
)
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -159,9 +174,22 @@ export class UserErpConfigService {
|
||||
log.error('Failed to update ERP credentials', { username })
|
||||
}
|
||||
|
||||
logAuditWithCurrentUser(
|
||||
AuditAction.ERP_CREDENTIALS_UPDATE,
|
||||
'ERP_CREDENTIALS',
|
||||
success ? AuditStatus.SUCCESS : AuditStatus.FAILURE,
|
||||
{ targetUsername: username, updateType: 'admin' }
|
||||
)
|
||||
|
||||
return success
|
||||
} catch (error) {
|
||||
log.error('Error updating user ERP credentials', { error })
|
||||
logAuditWithCurrentUser(
|
||||
AuditAction.ERP_CREDENTIALS_UPDATE,
|
||||
'ERP_CREDENTIALS',
|
||||
AuditStatus.FAILURE,
|
||||
{ targetUsername: username, updateType: 'admin', error: String(error) }
|
||||
)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ export async function getSourceNumbersFromInputs(
|
||||
const productionIds: string[] = []
|
||||
const orderNumbers: string[] = []
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const isSqlServer = configManager.getDatabaseType() === 'sqlserver'
|
||||
const dbType = configManager.getDatabaseType()
|
||||
|
||||
for (const item of inputs) {
|
||||
const type = identifyInputType(item)
|
||||
@@ -44,7 +44,7 @@ export async function getSourceNumbersFromInputs(
|
||||
const contractTableName = getValidationTableName('productionContractData_26年压力表合同数据')
|
||||
const batchSize = 2000
|
||||
|
||||
if (isSqlServer) {
|
||||
if (dbType === 'sqlserver') {
|
||||
const sql = await import('mssql')
|
||||
const allOrderNumbers: string[] = []
|
||||
|
||||
@@ -71,6 +71,22 @@ export async function getSourceNumbersFromInputs(
|
||||
)
|
||||
}
|
||||
|
||||
orderNumbers.push(...allOrderNumbers)
|
||||
} else if (dbType === 'postgresql') {
|
||||
const allOrderNumbers: string[] = []
|
||||
|
||||
for (let i = 0; i < productionIds.length; i += batchSize) {
|
||||
const batch = productionIds.slice(i, i + batchSize)
|
||||
const placeholders = batch.map((_, idx) => `$${idx + 1}`).join(',')
|
||||
const contractSql = `
|
||||
SELECT DISTINCT "生产订单号"
|
||||
FROM ${contractTableName}
|
||||
WHERE "总排号" IN (${placeholders})
|
||||
`
|
||||
const contractResult = await dbService.query(contractSql, batch)
|
||||
allOrderNumbers.push(...contractResult.rows.map((row) => row.生产订单号 as string))
|
||||
}
|
||||
|
||||
orderNumbers.push(...allOrderNumbers)
|
||||
} else {
|
||||
const allOrderNumbers: string[] = []
|
||||
|
||||
@@ -231,7 +231,8 @@ export class ValidationApplicationService {
|
||||
|
||||
async getCleanerData(
|
||||
userInfo: UserInfo,
|
||||
senderId: number
|
||||
senderId: number,
|
||||
selectedManagers: string[] = []
|
||||
): Promise<{
|
||||
success: boolean
|
||||
orderNumbers?: string[]
|
||||
@@ -250,6 +251,7 @@ export class ValidationApplicationService {
|
||||
userId: userInfo.id,
|
||||
username,
|
||||
isAdmin,
|
||||
selectedManagers,
|
||||
requestId
|
||||
})
|
||||
|
||||
@@ -270,7 +272,13 @@ export class ValidationApplicationService {
|
||||
})
|
||||
}
|
||||
|
||||
const materialCodes = await this.loadMaterialCodesForCleaner(dbService, username, isAdmin)
|
||||
const materialCodes = await this.loadMaterialCodesForCleaner(
|
||||
dbService,
|
||||
username,
|
||||
isAdmin,
|
||||
selectedManagers,
|
||||
orderNumbers
|
||||
)
|
||||
log.info('Cleaner data retrieved', {
|
||||
userId: userInfo.id,
|
||||
orderCount: orderNumbers.length,
|
||||
@@ -463,6 +471,18 @@ export class ValidationApplicationService {
|
||||
)
|
||||
}
|
||||
|
||||
if (dbService.type === 'postgresql') {
|
||||
return dbService.query(
|
||||
`
|
||||
SELECT "MaterialName", "Specification", "Model"
|
||||
FROM ${detailTableName}
|
||||
WHERE "MaterialCode" = $1
|
||||
LIMIT 1
|
||||
`,
|
||||
[materialCode]
|
||||
)
|
||||
}
|
||||
|
||||
return dbService.query(
|
||||
`
|
||||
SELECT MaterialName, Specification, Model
|
||||
@@ -477,27 +497,54 @@ export class ValidationApplicationService {
|
||||
private async loadMaterialCodesForCleaner(
|
||||
dbService: ValidationDatabaseService,
|
||||
username: string,
|
||||
isAdmin: boolean
|
||||
isAdmin: boolean,
|
||||
selectedManagers: string[],
|
||||
orderNumbers: string[]
|
||||
): Promise<string[]> {
|
||||
const markedTableName = getValidationTableName('dbo_MaterialsToBeDeleted')
|
||||
|
||||
if (isAdmin) {
|
||||
const result = await dbService.query(
|
||||
`
|
||||
SELECT MaterialCode
|
||||
FROM ${markedTableName}
|
||||
WHERE MaterialCode IS NOT NULL
|
||||
`
|
||||
// Admin with selected managers: filter MaterialsToBeDeleted by ManagerName IN (selectedManagers)
|
||||
if (isAdmin && selectedManagers && selectedManagers.length > 0) {
|
||||
const materialCodes = await this.queryMaterialCodesByManagers(
|
||||
dbService,
|
||||
markedTableName,
|
||||
selectedManagers
|
||||
)
|
||||
const materialCodes = result.rows.map((row) => row.MaterialCode as string).filter(Boolean)
|
||||
log.info(`Admin user: got ${materialCodes.length} materials`, {
|
||||
log.info(`Admin with selected managers: got ${materialCodes.length} materials`, {
|
||||
userId: username,
|
||||
isAdmin: true,
|
||||
selectedManagers,
|
||||
materialCount: materialCodes.length
|
||||
})
|
||||
return materialCodes
|
||||
}
|
||||
|
||||
// Admin without selected managers: query all materials from DiscreteMaterialPlanData by orderNumbers
|
||||
if (isAdmin) {
|
||||
if (orderNumbers.length === 0) {
|
||||
log.warn('Admin without selected managers but no orderNumbers available', {
|
||||
userId: username
|
||||
})
|
||||
return []
|
||||
}
|
||||
const materialDao = new DiscreteMaterialPlanDAO()
|
||||
const records = await materialDao.queryBySourceNumbersDistinct(orderNumbers)
|
||||
const materialCodes = [
|
||||
...new Set(records.map((r) => r.MaterialCode as string).filter(Boolean))
|
||||
]
|
||||
log.info(
|
||||
`Admin without selected managers: got ${materialCodes.length} materials from DiscreteMaterialPlanData`,
|
||||
{
|
||||
userId: username,
|
||||
isAdmin: true,
|
||||
orderCount: orderNumbers.length,
|
||||
materialCount: materialCodes.length
|
||||
}
|
||||
)
|
||||
return materialCodes
|
||||
}
|
||||
|
||||
// Regular user: filter MaterialsToBeDeleted by ManagerName = username
|
||||
if (dbService.type === 'sqlserver') {
|
||||
const sql = await import('mssql')
|
||||
const result = await (dbService as SqlServerService).queryWithParams(
|
||||
@@ -521,6 +568,24 @@ export class ValidationApplicationService {
|
||||
return materialCodes
|
||||
}
|
||||
|
||||
if (dbService.type === 'postgresql') {
|
||||
const result = await dbService.query(
|
||||
`
|
||||
SELECT "MaterialCode"
|
||||
FROM ${markedTableName}
|
||||
WHERE "ManagerName" = $1 AND "MaterialCode" IS NOT NULL
|
||||
`,
|
||||
[username]
|
||||
)
|
||||
const materialCodes = result.rows.map((row) => row.MaterialCode as string).filter(Boolean)
|
||||
log.info(`Regular user: got ${materialCodes.length} materials`, {
|
||||
userId: username,
|
||||
isAdmin: false,
|
||||
materialCount: materialCodes.length
|
||||
})
|
||||
return materialCodes
|
||||
}
|
||||
|
||||
const result = await dbService.query(
|
||||
`
|
||||
SELECT MaterialCode
|
||||
@@ -538,6 +603,57 @@ export class ValidationApplicationService {
|
||||
return materialCodes
|
||||
}
|
||||
|
||||
private async queryMaterialCodesByManagers(
|
||||
dbService: ValidationDatabaseService,
|
||||
tableName: string,
|
||||
managers: string[]
|
||||
): Promise<string[]> {
|
||||
if (dbService.type === 'sqlserver') {
|
||||
const sql = await import('mssql')
|
||||
const params: Record<string, { value: string; type: any }> = {}
|
||||
const paramNames = managers.map((m, i) => {
|
||||
const name = `@manager${i}`
|
||||
params[`manager${i}`] = { value: m, type: sql.default.NVarChar }
|
||||
return name
|
||||
})
|
||||
const result = await (dbService as SqlServerService).queryWithParams(
|
||||
`
|
||||
SELECT MaterialCode
|
||||
FROM ${tableName}
|
||||
WHERE ManagerName IN (${paramNames.join(', ')}) AND MaterialCode IS NOT NULL
|
||||
`,
|
||||
params
|
||||
)
|
||||
return result.rows
|
||||
.map((row: Record<string, unknown>) => row.MaterialCode as string)
|
||||
.filter(Boolean)
|
||||
}
|
||||
|
||||
if (dbService.type === 'postgresql') {
|
||||
const placeholders = managers.map((_, i) => `$${i + 1}`).join(', ')
|
||||
const result = await dbService.query(
|
||||
`
|
||||
SELECT "MaterialCode"
|
||||
FROM ${tableName}
|
||||
WHERE "ManagerName" IN (${placeholders}) AND "MaterialCode" IS NOT NULL
|
||||
`,
|
||||
managers
|
||||
)
|
||||
return result.rows.map((row) => row.MaterialCode as string).filter(Boolean)
|
||||
}
|
||||
|
||||
const placeholders = managers.map(() => '?').join(', ')
|
||||
const result = await dbService.query(
|
||||
`
|
||||
SELECT MaterialCode
|
||||
FROM ${tableName}
|
||||
WHERE ManagerName IN (${placeholders}) AND MaterialCode IS NOT NULL
|
||||
`,
|
||||
managers
|
||||
)
|
||||
return result.rows.map((row) => row.MaterialCode as string).filter(Boolean)
|
||||
}
|
||||
|
||||
private async disconnectQuietly(dbService: ValidationDatabaseService): Promise<void> {
|
||||
try {
|
||||
await dbService.disconnect()
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { ConfigManager } from '../config/config-manager'
|
||||
import { MySqlService } from '../database/mysql'
|
||||
import { SqlServerService } from '../database/sql-server'
|
||||
import { PostgreSqlService } from '../database/postgresql'
|
||||
|
||||
export type ValidationDatabaseService = MySqlService | SqlServerService
|
||||
export type ValidationDatabaseService = MySqlService | SqlServerService | PostgreSqlService
|
||||
|
||||
export async function createValidationDatabaseService(): Promise<ValidationDatabaseService> {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
@@ -26,6 +27,19 @@ export async function createValidationDatabaseService(): Promise<ValidationDatab
|
||||
return sqlServerService
|
||||
}
|
||||
|
||||
if (dbType === 'postgresql') {
|
||||
const dbConfig = config.database.postgresql
|
||||
const pgService = new PostgreSqlService({
|
||||
host: dbConfig.host,
|
||||
port: dbConfig.port,
|
||||
user: dbConfig.username,
|
||||
password: dbConfig.password,
|
||||
database: dbConfig.database
|
||||
})
|
||||
await pgService.connect()
|
||||
return pgService
|
||||
}
|
||||
|
||||
const dbConfig = config.database.mysql
|
||||
const mysqlService = new MySqlService({
|
||||
host: dbConfig.host,
|
||||
@@ -42,14 +56,20 @@ export function getValidationTableName(mysqlTableName: string): string {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const dbType = configManager.getDatabaseType()
|
||||
|
||||
if (dbType === 'sqlserver') {
|
||||
if (dbType === 'sqlserver' || dbType === 'postgresql') {
|
||||
const firstUnderscoreIndex = mysqlTableName.indexOf('_')
|
||||
if (firstUnderscoreIndex > 0) {
|
||||
const schema = mysqlTableName.substring(0, firstUnderscoreIndex)
|
||||
const tableName = mysqlTableName.substring(firstUnderscoreIndex + 1)
|
||||
return `[${schema}].[${tableName}]`
|
||||
if (dbType === 'sqlserver') {
|
||||
return `[${schema}].[${tableName}]`
|
||||
}
|
||||
return `"${schema}"."${tableName}"`
|
||||
}
|
||||
return `[dbo].[${mysqlTableName}]`
|
||||
if (dbType === 'sqlserver') {
|
||||
return `[dbo].[${mysqlTableName}]`
|
||||
}
|
||||
return `"public"."${mysqlTableName}"`
|
||||
}
|
||||
|
||||
return mysqlTableName
|
||||
|
||||
@@ -10,23 +10,31 @@ export enum AuditAction {
|
||||
LOGOUT = 'LOGOUT',
|
||||
EXTRACT = 'EXTRACT',
|
||||
CLEAN = 'CLEAN',
|
||||
SETTINGS_CHANGE = 'SETTINGS_CHANGE'
|
||||
SETTINGS_CHANGE = 'SETTINGS_CHANGE',
|
||||
SYSTEM_CRASH = 'SYSTEM_CRASH',
|
||||
SYSTEM_ERROR = 'SYSTEM_ERROR',
|
||||
DATA_IMPORT = 'DATA_IMPORT',
|
||||
RESULT_EXPORT = 'RESULT_EXPORT',
|
||||
APP_UPDATE = 'APP_UPDATE',
|
||||
ERP_CREDENTIALS_UPDATE = 'ERP_CREDENTIALS_UPDATE'
|
||||
}
|
||||
|
||||
/**
|
||||
* Audit status enumeration
|
||||
* Note: Values are lowercase to match JSON logging conventions
|
||||
*/
|
||||
export enum AuditStatus {
|
||||
SUCCESS = 'SUCCESS',
|
||||
FAILURE = 'FAILURE'
|
||||
SUCCESS = 'success',
|
||||
FAILURE = 'failure',
|
||||
PARTIAL = 'partial'
|
||||
}
|
||||
|
||||
/**
|
||||
* Audit entry interface
|
||||
*/
|
||||
export interface AuditEntry {
|
||||
/** Timestamp of the action */
|
||||
timestamp: Date
|
||||
/** ISO timestamp of the action */
|
||||
timestamp: string
|
||||
/** Action performed */
|
||||
action: AuditAction
|
||||
/** User ID who performed the action */
|
||||
@@ -38,9 +46,9 @@ export interface AuditEntry {
|
||||
/** Application version when action was performed */
|
||||
appVersion: string
|
||||
/** Resource affected by the action */
|
||||
resource?: string
|
||||
resource: string
|
||||
/** Status of the action */
|
||||
status: AuditStatus
|
||||
/** Additional metadata in JSON format */
|
||||
metadata?: string
|
||||
/** Additional metadata */
|
||||
metadata: Record<string, unknown>
|
||||
}
|
||||
|
||||
@@ -64,12 +64,10 @@ export interface SqlDialect {
|
||||
* MySQL/PostgreSQL: LIMIT x OFFSET y
|
||||
* SQL Server: OFFSET x ROWS FETCH NEXT y ROWS ONLY
|
||||
*/
|
||||
paginate(params: {
|
||||
paginate(params: { sql: string; limit: number; offset?: number; paramIndex: number }): {
|
||||
sql: string
|
||||
limit: number
|
||||
offset?: number
|
||||
paramIndex: number
|
||||
}): { sql: string; nextParamIndex: number }
|
||||
nextParamIndex: number
|
||||
}
|
||||
|
||||
/**
|
||||
* Maximum rows per batch given columns per row
|
||||
|
||||
@@ -8,5 +8,6 @@ export const validationApi = {
|
||||
invokeIpc(IPC_CHANNELS.VALIDATION_SET_SHARED_PRODUCTION_IDS, productionIds),
|
||||
getSharedProductionIds: () => invokeIpc(IPC_CHANNELS.VALIDATION_GET_SHARED_PRODUCTION_IDS),
|
||||
clearSharedProductionIds: () => invokeIpc(IPC_CHANNELS.VALIDATION_CLEAR_SHARED_PRODUCTION_IDS),
|
||||
getCleanerData: () => invokeIpc(IPC_CHANNELS.VALIDATION_GET_CLEANER_DATA)
|
||||
getCleanerData: (params?: { selectedManagers?: string[] }) =>
|
||||
invokeIpc(IPC_CHANNELS.VALIDATION_GET_CLEANER_DATA, params ?? { selectedManagers: [] })
|
||||
} as const
|
||||
|
||||
2
src/preload/index.d.ts
vendored
2
src/preload/index.d.ts
vendored
@@ -59,7 +59,7 @@ export interface ValidationAPI {
|
||||
setSharedProductionIds: (productionIds: string[]) => Promise<IpcResult<void>>
|
||||
getSharedProductionIds: () => Promise<IpcResult<{ productionIds: string[] }>>
|
||||
clearSharedProductionIds: () => Promise<IpcResult<void>>
|
||||
getCleanerData: () => Promise<
|
||||
getCleanerData: (params?: { selectedManagers?: string[] }) => Promise<
|
||||
IpcResult<{
|
||||
orderNumbers: string[]
|
||||
materialCodes: string[]
|
||||
|
||||
@@ -118,8 +118,11 @@ export async function runCleanerExecution(params: {
|
||||
headless: boolean
|
||||
queryBatchSize: number
|
||||
processConcurrency: number
|
||||
selectedManagers: string[]
|
||||
}): Promise<CleanerReportData> {
|
||||
const cleanerDataResult = await window.electron.validation.getCleanerData()
|
||||
const cleanerDataResult = await window.electron.validation.getCleanerData({
|
||||
selectedManagers: params.selectedManagers
|
||||
})
|
||||
const cleanerData = cleanerDataResult.success
|
||||
? (cleanerDataResult.data as CleanerDataPayload | null)
|
||||
: null
|
||||
|
||||
@@ -376,7 +376,8 @@ export function useCleaner() {
|
||||
dryRun,
|
||||
headless,
|
||||
queryBatchSize,
|
||||
processConcurrency
|
||||
processConcurrency,
|
||||
selectedManagers: Array.from(selectedManagers)
|
||||
})
|
||||
setReportData(result)
|
||||
} catch (err) {
|
||||
|
||||
@@ -85,8 +85,10 @@ test.describe('Authentication Flow', () => {
|
||||
const errorMessage = page.locator('.error, [role="alert"], .text-red')
|
||||
const hasError = await errorMessage.count()
|
||||
|
||||
// Either error shown or still on login page
|
||||
expect(hasError >= 0).toBe(true)
|
||||
// Verify login was rejected: either error shown or still on login page
|
||||
const loginDialog = page.locator('[data-testid="login-dialog"]')
|
||||
const isStillOnLoginPage = await loginDialog.isVisible().catch(() => false)
|
||||
expect(hasError > 0 || isStillOnLoginPage).toBe(true)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -5,45 +5,39 @@
|
||||
* Run: npx playwright test tests/e2e/extractor-workflow.test.ts
|
||||
*/
|
||||
|
||||
import { _electron as electron } from '@playwright/test'
|
||||
import { describe, it, expect, beforeAll, afterAll } from 'vitest'
|
||||
import type { ElectronApplication, Page, BrowserWindow } from 'playwright'
|
||||
import { test, expect, type ElectronApplication, type Page } from '@playwright/test'
|
||||
import { _electron as electron } from 'playwright'
|
||||
import { join } from 'path'
|
||||
|
||||
describe('Extractor E2E Workflow', () => {
|
||||
let electronApp: ElectronApplication
|
||||
let window: BrowserWindow
|
||||
let page: Page
|
||||
|
||||
beforeAll(async () => {
|
||||
// Build the app first (if not already built)
|
||||
// npm run build
|
||||
let electronApp: ElectronApplication
|
||||
let page: Page
|
||||
|
||||
test.describe('Extractor E2E Workflow', () => {
|
||||
test.beforeAll(async () => {
|
||||
// Launch Electron app for testing
|
||||
electronApp = await electron.launch({
|
||||
args: [join(process.cwd(), 'out/main/index.js')]
|
||||
})
|
||||
|
||||
// Get the main window
|
||||
window = await electronApp.firstWindow()
|
||||
page = await electronApp.firstWindow()
|
||||
|
||||
// Wait for app to load
|
||||
await page.waitForLoadState('domcontentloaded')
|
||||
}, 60000)
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
test.afterAll(async () => {
|
||||
if (electronApp) {
|
||||
await electronApp.close()
|
||||
}
|
||||
}, 60000)
|
||||
})
|
||||
|
||||
it('should launch the application', async () => {
|
||||
test('should launch the application', async () => {
|
||||
const title = await page.title()
|
||||
expect(title).toBeDefined()
|
||||
})
|
||||
|
||||
it('should navigate to Extractor page', async () => {
|
||||
test('should navigate to Extractor page', async () => {
|
||||
// Click on the "数据提取" link
|
||||
await page.click('a:has-text("数据提取")')
|
||||
|
||||
@@ -55,7 +49,7 @@ describe('Extractor E2E Workflow', () => {
|
||||
expect(pageTitle).toContain('ERP 数据提取')
|
||||
})
|
||||
|
||||
it('should display order number input', async () => {
|
||||
test('should display order number input', async () => {
|
||||
// Check if order number textarea is visible
|
||||
const textarea = page.locator('.order-textarea')
|
||||
await expect(textarea).toBeVisible()
|
||||
@@ -65,7 +59,7 @@ describe('Extractor E2E Workflow', () => {
|
||||
expect(placeholder).toContain('订单号')
|
||||
})
|
||||
|
||||
it('should update order count when typing', async () => {
|
||||
test('should update order count when typing', async () => {
|
||||
// Fill in order numbers
|
||||
const textarea = page.locator('.order-textarea')
|
||||
await textarea.fill('SC70202602120085\nSC70202602120120')
|
||||
@@ -79,7 +73,7 @@ describe('Extractor E2E Workflow', () => {
|
||||
expect(countText).toContain('2')
|
||||
})
|
||||
|
||||
it('should show error when extracting without order numbers', async () => {
|
||||
test('should show error when extracting without order numbers', async () => {
|
||||
// Clear the textarea
|
||||
const textarea = page.locator('.order-textarea')
|
||||
await textarea.fill('')
|
||||
@@ -90,7 +84,7 @@ describe('Extractor E2E Workflow', () => {
|
||||
expect(isDisabled).toBe(true)
|
||||
})
|
||||
|
||||
it('should have batch size input', async () => {
|
||||
test('should have batch size input', async () => {
|
||||
const batchSizeInput = page.locator('input[type="number"]')
|
||||
await expect(batchSizeInput).toBeVisible()
|
||||
|
||||
@@ -98,7 +92,7 @@ describe('Extractor E2E Workflow', () => {
|
||||
expect(value).toBe('100')
|
||||
})
|
||||
|
||||
it('should have reset button', async () => {
|
||||
test('should have reset button', async () => {
|
||||
const resetButton = page.locator('.btn-secondary:has-text("重置")')
|
||||
await expect(resetButton).toBeVisible()
|
||||
|
||||
@@ -111,7 +105,7 @@ describe('Extractor E2E Workflow', () => {
|
||||
expect(value).toBe('')
|
||||
})
|
||||
|
||||
it('should navigate back to home', async () => {
|
||||
test('should navigate back to home', async () => {
|
||||
// Click back button
|
||||
await page.click('.nav-btn:has-text("返回主页")')
|
||||
|
||||
|
||||
16
tests/fixtures/factory.ts
vendored
16
tests/fixtures/factory.ts
vendored
@@ -73,10 +73,12 @@ export class UserFactory {
|
||||
/**
|
||||
* Generate unique user ID
|
||||
*
|
||||
* @returns Unique ID string in format USR-{timestamp}-{random}
|
||||
* @returns Unique numeric ID
|
||||
*/
|
||||
private static generateId(): string {
|
||||
return `USR-${Date.now()}-${Math.random().toString(36).substr(2, 6)}`
|
||||
private static idCounter = 0
|
||||
|
||||
private static generateId(): number {
|
||||
return ++UserFactory.idCounter
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -417,11 +419,11 @@ export class AuditLogFactory {
|
||||
*
|
||||
* @example
|
||||
* // Successful login audit
|
||||
* const entry = AuditLogFactory.createAuditLog('LOGIN', 'SUCCESS')
|
||||
* const entry = AuditLogFactory.createAuditLog(AuditAction.LOGIN, AuditStatus.SUCCESS)
|
||||
*
|
||||
* @example
|
||||
* // Failed extract audit
|
||||
* const entry = AuditLogFactory.createAuditLog('EXTRACT', 'FAILURE', { resource: 'Order SC123' })
|
||||
* const entry = AuditLogFactory.createAuditLog(AuditAction.EXTRACT, AuditStatus.FAILURE, { resource: 'Order SC123' })
|
||||
*/
|
||||
static createAuditLog(
|
||||
action: AuditAction = AuditAction.LOGIN,
|
||||
@@ -429,13 +431,15 @@ export class AuditLogFactory {
|
||||
overrides?: Partial<AuditEntry>
|
||||
): AuditEntry {
|
||||
return {
|
||||
timestamp: new Date(),
|
||||
timestamp: new Date().toISOString(),
|
||||
action,
|
||||
userId: 'USR-001',
|
||||
username: 'test_user',
|
||||
computerName: 'TEST-PC',
|
||||
appVersion: '1.0.0',
|
||||
resource: 'test-resource',
|
||||
status,
|
||||
metadata: {},
|
||||
...overrides
|
||||
}
|
||||
}
|
||||
|
||||
2
tests/fixtures/other-factories.test.ts
vendored
2
tests/fixtures/other-factories.test.ts
vendored
@@ -91,7 +91,7 @@ describe('AuditLogFactory', () => {
|
||||
it('creates audit log with default values', () => {
|
||||
const entry = AuditLogFactory.createAuditLog()
|
||||
|
||||
expect(entry.timestamp).toBeInstanceOf(Date)
|
||||
expect(typeof entry.timestamp).toBe('string')
|
||||
expect(entry.action).toBe(AuditAction.LOGIN)
|
||||
expect(entry.status).toBe(AuditStatus.SUCCESS)
|
||||
expect(entry.userId).toBe('USR-001')
|
||||
|
||||
4
tests/fixtures/types.ts
vendored
4
tests/fixtures/types.ts
vendored
@@ -88,8 +88,8 @@ export interface Order {
|
||||
* Simplified user data for creating test users.
|
||||
*/
|
||||
export interface TestUser {
|
||||
/** User ID */
|
||||
id: string
|
||||
/** User ID (matches UserInfo.id: number) */
|
||||
id: number
|
||||
/** Username for login */
|
||||
username: string
|
||||
/** User type/role */
|
||||
|
||||
11
tests/fixtures/user-factory.test.ts
vendored
11
tests/fixtures/user-factory.test.ts
vendored
@@ -2,17 +2,22 @@
|
||||
* UserFactory Unit Tests
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { describe, it, expect, beforeEach } from 'vitest'
|
||||
import { UserFactory } from './factory'
|
||||
|
||||
describe('UserFactory', () => {
|
||||
beforeEach(() => {
|
||||
// Reset ID counter to ensure test isolation
|
||||
;(UserFactory as any).idCounter = 0
|
||||
})
|
||||
|
||||
it('creates user with default role', () => {
|
||||
const user = UserFactory.createUser()
|
||||
|
||||
expect(user.username).toMatch(/^test_user_\d+$/)
|
||||
expect(user.userType).toBe('User')
|
||||
expect(user.permissions).toEqual(['read', 'write'])
|
||||
expect(user.id).toMatch(/^USR-\d+-[a-z0-9]+$/)
|
||||
expect(user.id).toBeTypeOf('number')
|
||||
})
|
||||
|
||||
it('creates admin with correct permissions', () => {
|
||||
@@ -20,7 +25,7 @@ describe('UserFactory', () => {
|
||||
|
||||
expect(admin.userType).toBe('Admin')
|
||||
expect(admin.permissions).toEqual(['read', 'write', 'delete', 'admin'])
|
||||
expect(admin.id).toMatch(/^USR-\d+-[a-z0-9]+$/)
|
||||
expect(admin.id).toBeTypeOf('number')
|
||||
})
|
||||
|
||||
it('generates unique IDs', () => {
|
||||
|
||||
@@ -21,16 +21,20 @@ describe('Cleaner Service (Integration)', () => {
|
||||
const hasCredentials = !!(config.url && config.username && config.password)
|
||||
|
||||
describe('Dry-run mode', () => {
|
||||
it.skipIf(!hasCredentials)('should initialize with dry-run mode', async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should initialize with dry-run mode',
|
||||
async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
|
||||
expect(cleaner.isDryRun()).toBe(true)
|
||||
expect(cleaner.isDryRun()).toBe(true)
|
||||
|
||||
await authService.close()
|
||||
}, 30000)
|
||||
await authService.close()
|
||||
},
|
||||
30000
|
||||
)
|
||||
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should track materials to delete without actually deleting (dry-run)',
|
||||
@@ -83,115 +87,131 @@ describe('Cleaner Service (Integration)', () => {
|
||||
})
|
||||
|
||||
describe('Order processing', () => {
|
||||
it.skipIf(!hasCredentials)('should process single order and return details', async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should process single order and return details',
|
||||
async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const orderContent = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = orderContent
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 1) // Test single order
|
||||
const orderContent = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = orderContent
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 1) // Test single order
|
||||
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [], // Empty list - nothing to delete
|
||||
dryRun: true
|
||||
})
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [], // Empty list - nothing to delete
|
||||
dryRun: true
|
||||
})
|
||||
|
||||
expect(result.ordersProcessed).toBe(1)
|
||||
expect(result.details).toHaveLength(1)
|
||||
expect(result.details[0].orderNumber).toBe(orderNumbers[0])
|
||||
expect(result.ordersProcessed).toBe(1)
|
||||
expect(result.details).toHaveLength(1)
|
||||
expect(result.details[0].orderNumber).toBe(orderNumbers[0])
|
||||
|
||||
await authService.close()
|
||||
}, 60000)
|
||||
await authService.close()
|
||||
},
|
||||
60000
|
||||
)
|
||||
|
||||
it.skipIf(!hasCredentials)('should handle order with "审批通过" status', async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should handle order with "审批通过" status',
|
||||
async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const orderContent = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = orderContent
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 1)
|
||||
const orderContent = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = orderContent
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 1)
|
||||
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [],
|
||||
dryRun: true
|
||||
})
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [],
|
||||
dryRun: true
|
||||
})
|
||||
|
||||
// Order details should include status information
|
||||
const detail = result.details[0]
|
||||
console.log(
|
||||
`Order ${detail.orderNumber} - Materials deleted: ${detail.materialsDeleted}, Skipped: ${detail.materialsSkipped}`
|
||||
)
|
||||
// Order details should include status information
|
||||
const detail = result.details[0]
|
||||
console.log(
|
||||
`Order ${detail.orderNumber} - Materials deleted: ${detail.materialsDeleted}, Skipped: ${detail.materialsSkipped}`
|
||||
)
|
||||
|
||||
expect(detail).toBeDefined()
|
||||
expect(detail).toBeDefined()
|
||||
|
||||
await authService.close()
|
||||
}, 60000)
|
||||
await authService.close()
|
||||
},
|
||||
60000
|
||||
)
|
||||
|
||||
it.skipIf(!hasCredentials)('should handle multiple orders with progress callback', async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should handle multiple orders with progress callback',
|
||||
async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const orderContent = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = orderContent
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 3) // Test 3 orders
|
||||
const orderContent = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = orderContent
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 3) // Test 3 orders
|
||||
|
||||
const progressMessages: string[] = []
|
||||
const progressMessages: string[] = []
|
||||
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [],
|
||||
dryRun: true,
|
||||
onProgress: (message, progress) => {
|
||||
progressMessages.push(`${progress?.toFixed(0)}%: ${message}`)
|
||||
}
|
||||
})
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [],
|
||||
dryRun: true,
|
||||
onProgress: (message, progress) => {
|
||||
progressMessages.push(`${progress?.toFixed(0)}%: ${message}`)
|
||||
}
|
||||
})
|
||||
|
||||
expect(result.ordersProcessed).toBe(3)
|
||||
expect(progressMessages.length).toBeGreaterThan(0)
|
||||
expect(result.ordersProcessed).toBe(3)
|
||||
expect(progressMessages.length).toBeGreaterThan(0)
|
||||
|
||||
console.log('Progress messages:', progressMessages.slice(0, 5))
|
||||
console.log('Progress messages:', progressMessages.slice(0, 5))
|
||||
|
||||
await authService.close()
|
||||
}, 180000)
|
||||
await authService.close()
|
||||
},
|
||||
180000
|
||||
)
|
||||
})
|
||||
|
||||
describe('Error handling', () => {
|
||||
it.skipIf(!hasCredentials)('should continue processing after order error', async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should continue processing after order error',
|
||||
async () => {
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const orderNumbers = ['INVALID_ORDER_12345', 'INVALID_ORDER_67890']
|
||||
const orderNumbers = ['INVALID_ORDER_12345', 'INVALID_ORDER_67890']
|
||||
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
const cleaner = new CleanerService(authService, { dryRun: true })
|
||||
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [],
|
||||
dryRun: true
|
||||
})
|
||||
const result = await cleaner.clean({
|
||||
orderNumbers,
|
||||
materialCodes: [],
|
||||
dryRun: true
|
||||
})
|
||||
|
||||
// Should still process (even if with errors)
|
||||
expect(result.details.length).toBeGreaterThan(0)
|
||||
// Should still process (even if with errors)
|
||||
expect(result.details.length).toBeGreaterThan(0)
|
||||
|
||||
await authService.close()
|
||||
}, 120000)
|
||||
await authService.close()
|
||||
},
|
||||
120000
|
||||
)
|
||||
})
|
||||
|
||||
describe('Navigation', () => {
|
||||
|
||||
@@ -19,22 +19,30 @@ describe('ERP Authentication Service (Integration)', () => {
|
||||
authService = new ErpAuthService(config)
|
||||
})
|
||||
|
||||
it.skipIf(!hasCredentials)('should login successfully', async () => {
|
||||
const session = await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should login successfully',
|
||||
async () => {
|
||||
const session = await authService.login()
|
||||
|
||||
expect(session).toBeDefined()
|
||||
expect(session.browser).toBeDefined()
|
||||
expect(session.context).toBeDefined()
|
||||
expect(session.page).toBeDefined()
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
}, 30000)
|
||||
expect(session).toBeDefined()
|
||||
expect(session.browser).toBeDefined()
|
||||
expect(session.context).toBeDefined()
|
||||
expect(session.page).toBeDefined()
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
},
|
||||
30000
|
||||
)
|
||||
|
||||
it.skipIf(!hasCredentials)('should navigate to main page after login', async () => {
|
||||
const session = await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should navigate to main page after login',
|
||||
async () => {
|
||||
const session = await authService.login()
|
||||
|
||||
const url = session.page.url()
|
||||
expect(url).toContain(config.url)
|
||||
}, 30000)
|
||||
const url = session.page.url()
|
||||
expect(url).toContain(config.url)
|
||||
},
|
||||
30000
|
||||
)
|
||||
|
||||
afterAll(async () => {
|
||||
if (hasCredentials && authService) {
|
||||
|
||||
@@ -18,117 +18,129 @@ describe('Extractor Service (Integration)', () => {
|
||||
// Check if we have ERP credentials
|
||||
const hasCredentials = !!(config.url && config.username && config.password)
|
||||
|
||||
it.skipIf(!hasCredentials)('should extract data for single order number', async () => {
|
||||
// Create fresh auth service for this test
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should extract data for single order number',
|
||||
async () => {
|
||||
// Create fresh auth service for this test
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const extractor = new ExtractorService(authService)
|
||||
const extractor = new ExtractorService(authService)
|
||||
|
||||
const result = await extractor.extract({
|
||||
orderNumbers: [testOrderNumber]
|
||||
})
|
||||
const result = await extractor.extract({
|
||||
orderNumbers: [testOrderNumber]
|
||||
})
|
||||
|
||||
expect(result.downloadedFiles).toHaveLength(1)
|
||||
expect(result.errors).toHaveLength(0)
|
||||
expect(result.downloadedFiles).toHaveLength(1)
|
||||
expect(result.errors).toHaveLength(0)
|
||||
|
||||
// Verify file exists
|
||||
const filePath = result.downloadedFiles[0]
|
||||
const stats = await fs.stat(filePath)
|
||||
expect(stats.size).toBeGreaterThan(0)
|
||||
|
||||
// Clean up
|
||||
await authService.close()
|
||||
}, 60000)
|
||||
|
||||
it.skipIf(!hasCredentials)('should extract data for multiple order numbers', async () => {
|
||||
// Create fresh auth service for this test
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const extractor = new ExtractorService(authService)
|
||||
|
||||
// Read order numbers from productionID.txt file
|
||||
const productionIdFile = path.join(process.cwd(), '../references/demo/productionID.txt')
|
||||
const content = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = content
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 5) // Test first 5 orders
|
||||
|
||||
console.log(`Testing with ${orderNumbers.length} order numbers:`, orderNumbers)
|
||||
|
||||
const result = await extractor.extract({
|
||||
orderNumbers,
|
||||
batchSize: 100 // Process all in one batch
|
||||
})
|
||||
|
||||
console.log(`Downloaded ${result.downloadedFiles.length} files`)
|
||||
if (result.errors.length > 0) {
|
||||
console.log('Errors:', result.errors)
|
||||
}
|
||||
|
||||
expect(result.downloadedFiles.length).toBeGreaterThanOrEqual(1)
|
||||
|
||||
// Clean up
|
||||
await authService.close()
|
||||
}, 120000) // Increase timeout to 2 minutes
|
||||
|
||||
it.skipIf(!hasCredentials)('should extract data for 300 orders with batch size 70', async () => {
|
||||
// Create fresh auth service for this test
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const extractor = new ExtractorService(authService)
|
||||
|
||||
// Read all order numbers from productionID.txt file
|
||||
const productionIdFile = path.join(process.cwd(), '../references/demo/productionID.txt')
|
||||
const content = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = content
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
|
||||
console.log(`Testing with ${orderNumbers.length} order numbers`)
|
||||
console.log(`Batch size: 70, Expected batches: ${Math.ceil(orderNumbers.length / 70)}`)
|
||||
|
||||
const startTime = Date.now()
|
||||
|
||||
const result = await extractor.extract({
|
||||
orderNumbers,
|
||||
batchSize: 70 // Process 70 orders per batch
|
||||
})
|
||||
|
||||
const endTime = Date.now()
|
||||
const duration = ((endTime - startTime) / 1000).toFixed(2)
|
||||
|
||||
console.log(`\n=== Extraction Summary ===`)
|
||||
console.log(`Total orders: ${orderNumbers.length}`)
|
||||
console.log(`Batch size: 70`)
|
||||
console.log(`Expected batches: ${Math.ceil(orderNumbers.length / 70)}`)
|
||||
console.log(`Downloaded files: ${result.downloadedFiles.length}`)
|
||||
console.log(`Total duration: ${duration}s`)
|
||||
console.log(
|
||||
`Average time per batch: ${(duration / result.downloadedFiles.length).toFixed(2)}s`
|
||||
)
|
||||
|
||||
if (result.errors.length > 0) {
|
||||
console.log(`\nErrors encountered: ${result.errors.length}`)
|
||||
result.errors.forEach((err, idx) => console.log(` ${idx + 1}. ${err}`))
|
||||
}
|
||||
|
||||
// Verify results
|
||||
expect(result.downloadedFiles.length).toBeGreaterThanOrEqual(1)
|
||||
|
||||
// Verify each downloaded file exists and has content
|
||||
for (const filePath of result.downloadedFiles) {
|
||||
// Verify file exists
|
||||
const filePath = result.downloadedFiles[0]
|
||||
const stats = await fs.stat(filePath)
|
||||
console.log(` - ${path.basename(filePath)}: ${(stats.size / 1024).toFixed(2)} KB`)
|
||||
expect(stats.size).toBeGreaterThan(0)
|
||||
}
|
||||
|
||||
// Clean up
|
||||
await authService.close()
|
||||
}, 600000) // 10 minutes timeout for large batch test
|
||||
// Clean up
|
||||
await authService.close()
|
||||
},
|
||||
60000
|
||||
)
|
||||
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should extract data for multiple order numbers',
|
||||
async () => {
|
||||
// Create fresh auth service for this test
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const extractor = new ExtractorService(authService)
|
||||
|
||||
// Read order numbers from productionID.txt file
|
||||
const productionIdFile = path.join(process.cwd(), '../references/demo/productionID.txt')
|
||||
const content = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = content
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
.slice(0, 5) // Test first 5 orders
|
||||
|
||||
console.log(`Testing with ${orderNumbers.length} order numbers:`, orderNumbers)
|
||||
|
||||
const result = await extractor.extract({
|
||||
orderNumbers,
|
||||
batchSize: 100 // Process all in one batch
|
||||
})
|
||||
|
||||
console.log(`Downloaded ${result.downloadedFiles.length} files`)
|
||||
if (result.errors.length > 0) {
|
||||
console.log('Errors:', result.errors)
|
||||
}
|
||||
|
||||
expect(result.downloadedFiles.length).toBeGreaterThanOrEqual(1)
|
||||
|
||||
// Clean up
|
||||
await authService.close()
|
||||
},
|
||||
120000
|
||||
) // Increase timeout to 2 minutes
|
||||
|
||||
it.skipIf(!hasCredentials)(
|
||||
'should extract data for 300 orders with batch size 70',
|
||||
async () => {
|
||||
// Create fresh auth service for this test
|
||||
const authService = new ErpAuthService(config)
|
||||
await authService.login()
|
||||
|
||||
const extractor = new ExtractorService(authService)
|
||||
|
||||
// Read all order numbers from productionID.txt file
|
||||
const productionIdFile = path.join(process.cwd(), '../references/demo/productionID.txt')
|
||||
const content = await fs.readFile(productionIdFile, 'utf-8')
|
||||
const orderNumbers = content
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
|
||||
console.log(`Testing with ${orderNumbers.length} order numbers`)
|
||||
console.log(`Batch size: 70, Expected batches: ${Math.ceil(orderNumbers.length / 70)}`)
|
||||
|
||||
const startTime = Date.now()
|
||||
|
||||
const result = await extractor.extract({
|
||||
orderNumbers,
|
||||
batchSize: 70 // Process 70 orders per batch
|
||||
})
|
||||
|
||||
const endTime = Date.now()
|
||||
const duration = ((endTime - startTime) / 1000).toFixed(2)
|
||||
|
||||
console.log(`\n=== Extraction Summary ===`)
|
||||
console.log(`Total orders: ${orderNumbers.length}`)
|
||||
console.log(`Batch size: 70`)
|
||||
console.log(`Expected batches: ${Math.ceil(orderNumbers.length / 70)}`)
|
||||
console.log(`Downloaded files: ${result.downloadedFiles.length}`)
|
||||
console.log(`Total duration: ${duration}s`)
|
||||
console.log(
|
||||
`Average time per batch: ${(duration / result.downloadedFiles.length).toFixed(2)}s`
|
||||
)
|
||||
|
||||
if (result.errors.length > 0) {
|
||||
console.log(`\nErrors encountered: ${result.errors.length}`)
|
||||
result.errors.forEach((err, idx) => console.log(` ${idx + 1}. ${err}`))
|
||||
}
|
||||
|
||||
// Verify results
|
||||
expect(result.downloadedFiles.length).toBeGreaterThanOrEqual(1)
|
||||
|
||||
// Verify each downloaded file exists and has content
|
||||
for (const filePath of result.downloadedFiles) {
|
||||
const stats = await fs.stat(filePath)
|
||||
console.log(` - ${path.basename(filePath)}: ${(stats.size / 1024).toFixed(2)} KB`)
|
||||
expect(stats.size).toBeGreaterThan(0)
|
||||
}
|
||||
|
||||
// Clean up
|
||||
await authService.close()
|
||||
},
|
||||
600000
|
||||
) // 10 minutes timeout for large batch test
|
||||
})
|
||||
|
||||
@@ -5,14 +5,6 @@
|
||||
*/
|
||||
|
||||
import { describe, it, expect, vi, beforeEach, afterEach, type Mock } from 'vitest'
|
||||
import {
|
||||
trackDuration,
|
||||
PerformanceTracker,
|
||||
createPerformanceTracker,
|
||||
DEFAULT_SLOW_THRESHOLD_MS,
|
||||
type TrackDurationOptions
|
||||
} from '../../src/main/services/logger/performance-monitor'
|
||||
import logger from '../../src/main/services/logger/index'
|
||||
|
||||
// Mock the logger to avoid noisy output during tests
|
||||
vi.mock('../../src/main/services/logger', () => ({
|
||||
@@ -26,7 +18,23 @@ vi.mock('../../src/main/services/logger', () => ({
|
||||
}))
|
||||
|
||||
describe('Performance Monitor', () => {
|
||||
beforeEach(() => {
|
||||
let trackDuration: typeof import('../../src/main/services/logger/performance-monitor').trackDuration
|
||||
let PerformanceTracker: typeof import('../../src/main/services/logger/performance-monitor').PerformanceTracker
|
||||
let createPerformanceTracker: typeof import('../../src/main/services/logger/performance-monitor').createPerformanceTracker
|
||||
let DEFAULT_SLOW_THRESHOLD_MS: typeof import('../../src/main/services/logger/performance-monitor').DEFAULT_SLOW_THRESHOLD_MS
|
||||
let logger: typeof import('../../src/main/services/logger').default
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.resetModules()
|
||||
const perfMod = await import('../../src/main/services/logger/performance-monitor')
|
||||
const loggerMod = await import('../../src/main/services/logger/index')
|
||||
|
||||
trackDuration = perfMod.trackDuration
|
||||
PerformanceTracker = perfMod.PerformanceTracker
|
||||
createPerformanceTracker = perfMod.createPerformanceTracker
|
||||
DEFAULT_SLOW_THRESHOLD_MS = perfMod.DEFAULT_SLOW_THRESHOLD_MS
|
||||
logger = loggerMod.default
|
||||
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
@@ -230,7 +238,7 @@ describe('Performance Monitor', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it('should log summary with aggregated metrics', () => {
|
||||
it('should log summary with aggregated metrics', async () => {
|
||||
const tracker = new PerformanceTracker('TestService', 1000)
|
||||
|
||||
tracker.recordDuration(100)
|
||||
@@ -248,7 +256,7 @@ describe('Performance Monitor', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it('should include slow percentage in summary', () => {
|
||||
it('should include slow percentage in summary', async () => {
|
||||
const tracker = new PerformanceTracker('TestService', 50)
|
||||
|
||||
tracker.recordDuration(30) // Normal
|
||||
@@ -261,7 +269,7 @@ describe('Performance Monitor', () => {
|
||||
expect(summaryCall.slowPercentage).toContain('%')
|
||||
})
|
||||
|
||||
it('should reset metrics when reset() is called', () => {
|
||||
it('should reset metrics when reset() is called', async () => {
|
||||
const tracker = new PerformanceTracker('TestService', 1000)
|
||||
|
||||
tracker.recordDuration(100)
|
||||
@@ -275,7 +283,7 @@ describe('Performance Monitor', () => {
|
||||
expect(metrics.slowOperationCount).toBe(0)
|
||||
})
|
||||
|
||||
it('should return zero metrics when no operations tracked', () => {
|
||||
it('should return zero metrics when no operations tracked', async () => {
|
||||
const tracker = new PerformanceTracker('EmptyService')
|
||||
|
||||
const metrics = tracker.getMetrics()
|
||||
@@ -288,7 +296,7 @@ describe('Performance Monitor', () => {
|
||||
expect(metrics.slowOperationCount).toBe(0)
|
||||
})
|
||||
|
||||
it('should use custom logger if provided', () => {
|
||||
it('should use custom logger if provided', async () => {
|
||||
const customLogger = {
|
||||
debug: vi.fn(),
|
||||
info: vi.fn(),
|
||||
@@ -307,7 +315,7 @@ describe('Performance Monitor', () => {
|
||||
})
|
||||
|
||||
describe('createPerformanceTracker', () => {
|
||||
it('should create a tracker with default threshold', () => {
|
||||
it('should create a tracker with default threshold', async () => {
|
||||
const tracker = createPerformanceTracker('MyService')
|
||||
|
||||
expect(tracker).toBeInstanceOf(PerformanceTracker)
|
||||
@@ -315,7 +323,7 @@ describe('Performance Monitor', () => {
|
||||
expect(metrics.count).toBe(0)
|
||||
})
|
||||
|
||||
it('should create a tracker with custom threshold', () => {
|
||||
it('should create a tracker with custom threshold', async () => {
|
||||
const tracker = createPerformanceTracker('FastService', 100)
|
||||
|
||||
tracker.recordDuration(150)
|
||||
|
||||
@@ -689,11 +689,12 @@ export function createMockRepository(options?: {
|
||||
return {
|
||||
find: vi.fn().mockResolvedValue(mockFindResult),
|
||||
findOne: vi.fn().mockResolvedValue(mockFindResult[0] ?? null),
|
||||
create: vi.fn((plainObject?: Record<string, unknown>) => plainObject ?? ({})),
|
||||
create: vi.fn((plainObject?: Record<string, unknown>) => plainObject ?? {}),
|
||||
save: vi.fn().mockImplementation((entity: Record<string, unknown>) => Promise.resolve(entity)),
|
||||
delete: vi.fn().mockResolvedValue({ affected: 1 }),
|
||||
count: vi.fn().mockResolvedValue(mockFindResult.length),
|
||||
createQueryBuilder: vi .fn()
|
||||
createQueryBuilder: vi
|
||||
.fn()
|
||||
.mockImplementation(() => createMockQueryBuilder({ result: mockFindResult }))
|
||||
}
|
||||
}
|
||||
@@ -724,9 +725,12 @@ export function createMockDataSource(
|
||||
destroy: vi.fn().mockResolvedValue(undefined),
|
||||
isInitialized,
|
||||
getRepository: vi.fn().mockReturnValue(mockRepo),
|
||||
create: vi.fn().mockImplementation(
|
||||
(_entityClass: unknown, plainObject?: Record<string, unknown>) => plainObject ?? ({} as Record<string, unknown>)
|
||||
),
|
||||
create: vi
|
||||
.fn()
|
||||
.mockImplementation(
|
||||
(_entityClass: unknown, plainObject?: Record<string, unknown>) =>
|
||||
plainObject ?? ({} as Record<string, unknown>)
|
||||
),
|
||||
save: vi.fn().mockImplementation((entity: Record<string, unknown>) => Promise.resolve(entity)),
|
||||
createQueryBuilder: vi
|
||||
.fn()
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable @typescript-eslint/no-require-imports */
|
||||
const { _electron: electron } = require('playwright')
|
||||
|
||||
;(async () => {
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
|
||||
import { AuditAction, AuditStatus } from '../../src/main/types/audit.types'
|
||||
|
||||
describe('Audit Logger', () => {
|
||||
let auditLoggerModule: typeof import('../../src/main/services/logger/audit-logger')
|
||||
@@ -32,11 +33,11 @@ describe('Audit Logger', () => {
|
||||
const { logAudit, applyAuditConfig } = auditLoggerModule
|
||||
|
||||
applyAuditConfig(30)
|
||||
logAudit('LOGIN', 'user-001', {
|
||||
logAudit(AuditAction.LOGIN, 'user-001', {
|
||||
username: 'alice',
|
||||
computerName: 'PC-001',
|
||||
resource: 'ERP_SYSTEM',
|
||||
status: 'success',
|
||||
status: AuditStatus.SUCCESS,
|
||||
metadata: { sessionId: 'abc' }
|
||||
})
|
||||
|
||||
@@ -60,26 +61,26 @@ describe('Audit Logger', () => {
|
||||
|
||||
applyAuditConfig(30)
|
||||
|
||||
logAudit('EXTRACT', 'user1', {
|
||||
logAudit(AuditAction.EXTRACT, 'user1', {
|
||||
username: 'extractor',
|
||||
computerName: 'PC-001',
|
||||
resource: 'materials',
|
||||
status: 'success'
|
||||
status: AuditStatus.SUCCESS
|
||||
})
|
||||
|
||||
logAudit('DELETE', 'user2', {
|
||||
logAudit(AuditAction.CLEAN, 'user2', {
|
||||
username: 'cleaner',
|
||||
computerName: 'PC-002',
|
||||
resource: 'temp_files',
|
||||
status: 'failure',
|
||||
status: AuditStatus.FAILURE,
|
||||
metadata: { error: 'Permission denied' }
|
||||
})
|
||||
|
||||
logAudit('UPDATE', 'user3', {
|
||||
logAudit(AuditAction.APP_UPDATE, 'user3', {
|
||||
username: 'updater',
|
||||
computerName: 'PC-003',
|
||||
resource: 'config',
|
||||
status: 'partial',
|
||||
status: AuditStatus.PARTIAL,
|
||||
metadata: { updated: 5, failed: 2 }
|
||||
})
|
||||
|
||||
@@ -95,11 +96,11 @@ describe('Audit Logger', () => {
|
||||
|
||||
applyAuditConfig(30)
|
||||
|
||||
logAudit('PING', 'user-no-meta', {
|
||||
logAudit(AuditAction.SYSTEM_ERROR, 'user-no-meta', {
|
||||
username: 'tester',
|
||||
computerName: 'PC-001',
|
||||
resource: 'ERP',
|
||||
status: 'success'
|
||||
status: AuditStatus.SUCCESS
|
||||
})
|
||||
|
||||
const entry = JSON.parse(infoSpy.mock.calls[0][0])
|
||||
@@ -111,11 +112,11 @@ describe('Audit Logger', () => {
|
||||
|
||||
applyAuditConfig(30)
|
||||
|
||||
logAudit('LOGIN_ATTEMPT', 'user-special', {
|
||||
logAudit(AuditAction.LOGIN, 'user-special', {
|
||||
username: 'user.name+test@example.com',
|
||||
computerName: 'DESKTOP-特殊字符-001',
|
||||
resource: 'ERP/子系统',
|
||||
status: 'failure',
|
||||
status: AuditStatus.FAILURE,
|
||||
metadata: { reason: '密码错误', attempt: 3 }
|
||||
})
|
||||
|
||||
|
||||
@@ -1,145 +0,0 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import {
|
||||
CleanerService,
|
||||
createBatches,
|
||||
getMissingOrders,
|
||||
runWithConcurrency
|
||||
} from '../../src/main/services/erp/cleaner'
|
||||
|
||||
describe('Cleaner Service (Unit)', () => {
|
||||
describe('shouldDeleteMaterial', () => {
|
||||
// CleanerService constructor requires ErpAuthService, but shouldDeleteMaterial doesn't use it
|
||||
const cleaner = new CleanerService({} as any)
|
||||
|
||||
it('should skip materials with row number 2000-7999', () => {
|
||||
const testCases = [
|
||||
{ rowNumber: 2000, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 5000, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 7999, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 1999, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 8000, pendingQty: '', materialCode: 'TEST001', expected: true }
|
||||
]
|
||||
|
||||
for (const tc of testCases) {
|
||||
const shouldDelete = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: tc.rowNumber,
|
||||
pendingQty: tc.pendingQty,
|
||||
materialCode: tc.materialCode,
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
expect(shouldDelete).toBe(tc.expected)
|
||||
}
|
||||
})
|
||||
|
||||
it('should skip materials with non-empty pending quantity', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '5',
|
||||
materialCode: 'TEST001',
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
|
||||
expect(result).toBe(false)
|
||||
})
|
||||
|
||||
it('should skip materials not in delete list', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'NOT_IN_LIST',
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
|
||||
expect(result).toBe(false)
|
||||
})
|
||||
|
||||
it('should delete materials with empty pending qty and valid row number', () => {
|
||||
const testCases = [
|
||||
{ rowNumber: 1, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 100, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 1999, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 8000, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 10000, pendingQty: '', materialCode: 'TEST001', expected: true }
|
||||
]
|
||||
|
||||
for (const tc of testCases) {
|
||||
const shouldDelete = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: tc.rowNumber,
|
||||
pendingQty: tc.pendingQty,
|
||||
materialCode: tc.materialCode,
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
expect(shouldDelete).toBe(tc.expected)
|
||||
}
|
||||
})
|
||||
|
||||
it('should handle multiple conditions correctly', () => {
|
||||
// Material in list, valid row, no pending qty = should delete
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'TEST001',
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
).toBe(true)
|
||||
|
||||
// Material in list, protected row, no pending qty = should NOT delete
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 7500,
|
||||
pendingQty: '',
|
||||
materialCode: 'TEST001',
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
).toBe(false)
|
||||
|
||||
// Material in list, valid row, has pending qty = should NOT delete
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '10',
|
||||
materialCode: 'TEST001',
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
).toBe(false)
|
||||
|
||||
// Material NOT in list = should NOT delete
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'OTHER',
|
||||
deleteSet: new Set(['TEST001'])
|
||||
})
|
||||
).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('batch and concurrency helpers', () => {
|
||||
it('should split orders into batches', () => {
|
||||
const batches = createBatches(['A', 'B', 'C', 'D', 'E'], 2)
|
||||
expect(batches).toEqual([['A', 'B'], ['C', 'D'], ['E']])
|
||||
})
|
||||
|
||||
it('should identify missing orders', () => {
|
||||
const missing = getMissingOrders(['SC1', 'SC2', 'SC3'], new Set(['SC1', 'SC3']))
|
||||
expect(missing).toEqual(['SC2'])
|
||||
})
|
||||
|
||||
it('should respect concurrency limit', async () => {
|
||||
const items = [1, 2, 3, 4, 5, 6]
|
||||
let running = 0
|
||||
let peak = 0
|
||||
await runWithConcurrency(items, 2, async () => {
|
||||
running += 1
|
||||
peak = Math.max(peak, running)
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
running -= 1
|
||||
return true
|
||||
})
|
||||
|
||||
expect(peak).toBeLessThanOrEqual(2)
|
||||
})
|
||||
})
|
||||
})
|
||||
141
tests/unit/dialects/mysql-dialect.test.ts
Normal file
141
tests/unit/dialects/mysql-dialect.test.ts
Normal file
@@ -0,0 +1,141 @@
|
||||
/**
|
||||
* Unit tests for MySqlDialect
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { MySqlDialect } from '@services/database/dialects/mysql-dialect'
|
||||
|
||||
describe('MySqlDialect', () => {
|
||||
const dialect = new MySqlDialect()
|
||||
|
||||
describe('dbType', () => {
|
||||
it('should return mysql', () => {
|
||||
expect(dialect.dbType).toBe('mysql')
|
||||
})
|
||||
})
|
||||
|
||||
describe('quoteTableName', () => {
|
||||
it('should join schema and table with underscore', () => {
|
||||
expect(dialect.quoteTableName('dbo', 'Table')).toBe('dbo_Table')
|
||||
})
|
||||
|
||||
it('should handle arbitrary schema and table names', () => {
|
||||
expect(dialect.quoteTableName('my_schema', 'my_table')).toBe('my_schema_my_table')
|
||||
})
|
||||
})
|
||||
|
||||
describe('param', () => {
|
||||
it('should return ? for any index', () => {
|
||||
expect(dialect.param(0)).toBe('?')
|
||||
expect(dialect.param(1)).toBe('?')
|
||||
expect(dialect.param(5)).toBe('?')
|
||||
expect(dialect.param(100)).toBe('?')
|
||||
})
|
||||
})
|
||||
|
||||
describe('params', () => {
|
||||
it('should return comma-separated question marks', () => {
|
||||
expect(dialect.params(1)).toBe('?')
|
||||
expect(dialect.params(3)).toBe('?,?,?')
|
||||
expect(dialect.params(5)).toBe('?,?,?,?,?')
|
||||
})
|
||||
|
||||
it('should return empty string for count 0', () => {
|
||||
expect(dialect.params(0)).toBe('')
|
||||
})
|
||||
})
|
||||
|
||||
describe('currentTimestamp', () => {
|
||||
it('should return NOW()', () => {
|
||||
expect(dialect.currentTimestamp()).toBe('NOW()')
|
||||
})
|
||||
})
|
||||
|
||||
describe('upsert', () => {
|
||||
it('should generate ON DUPLICATE KEY UPDATE SQL', () => {
|
||||
const result = dialect.upsert({
|
||||
table: 'dbo_Table',
|
||||
keyColumns: ['id'],
|
||||
allColumns: ['id', 'name', 'value'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toBe(
|
||||
'INSERT INTO dbo_Table (id, name, value) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE name = VALUES(name), value = VALUES(value)'
|
||||
)
|
||||
expect(result.nextParamIndex).toBe(3)
|
||||
})
|
||||
|
||||
it('should handle composite key columns', () => {
|
||||
const result = dialect.upsert({
|
||||
table: 'dbo_Table',
|
||||
keyColumns: ['id', 'code'],
|
||||
allColumns: ['id', 'code', 'name', 'value'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('ON DUPLICATE KEY UPDATE')
|
||||
expect(result.sql).toContain('name = VALUES(name)')
|
||||
expect(result.sql).toContain('value = VALUES(value)')
|
||||
// key columns should NOT appear in the UPDATE SET clause
|
||||
expect(result.sql).not.toContain('id = VALUES(id)')
|
||||
expect(result.sql).not.toContain('code = VALUES(code)')
|
||||
expect(result.nextParamIndex).toBe(4)
|
||||
})
|
||||
|
||||
it('should advance nextParamIndex from non-zero start', () => {
|
||||
const result = dialect.upsert({
|
||||
table: 'dbo_Table',
|
||||
keyColumns: ['id'],
|
||||
allColumns: ['id', 'name'],
|
||||
startParamIndex: 5
|
||||
})
|
||||
|
||||
expect(result.nextParamIndex).toBe(7)
|
||||
})
|
||||
})
|
||||
|
||||
describe('paginate', () => {
|
||||
it('should append LIMIT and OFFSET with literal values', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM dbo_Table',
|
||||
limit: 10,
|
||||
offset: 20,
|
||||
paramIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toBe('SELECT * FROM dbo_Table LIMIT 10 OFFSET 20')
|
||||
expect(result.nextParamIndex).toBe(0)
|
||||
})
|
||||
|
||||
it('should use 0 as default offset', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM dbo_Table',
|
||||
limit: 50,
|
||||
paramIndex: 3
|
||||
})
|
||||
|
||||
expect(result.sql).toBe('SELECT * FROM dbo_Table LIMIT 50 OFFSET 0')
|
||||
expect(result.nextParamIndex).toBe(3)
|
||||
})
|
||||
|
||||
it('should not change nextParamIndex (no params added)', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM dbo_Table',
|
||||
limit: 100,
|
||||
offset: 50,
|
||||
paramIndex: 10
|
||||
})
|
||||
|
||||
expect(result.nextParamIndex).toBe(10)
|
||||
})
|
||||
})
|
||||
|
||||
describe('maxBatchRows', () => {
|
||||
it('should return 1000 regardless of columns', () => {
|
||||
expect(dialect.maxBatchRows(1)).toBe(1000)
|
||||
expect(dialect.maxBatchRows(10)).toBe(1000)
|
||||
expect(dialect.maxBatchRows(100)).toBe(1000)
|
||||
})
|
||||
})
|
||||
})
|
||||
145
tests/unit/dialects/postgresql-dialect.test.ts
Normal file
145
tests/unit/dialects/postgresql-dialect.test.ts
Normal file
@@ -0,0 +1,145 @@
|
||||
/**
|
||||
* Unit tests for PostgreSqlDialect
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { PostgreSqlDialect } from '@services/database/dialects/postgresql-dialect'
|
||||
|
||||
describe('PostgreSqlDialect', () => {
|
||||
const dialect = new PostgreSqlDialect()
|
||||
|
||||
describe('dbType', () => {
|
||||
it('should return postgresql', () => {
|
||||
expect(dialect.dbType).toBe('postgresql')
|
||||
})
|
||||
})
|
||||
|
||||
describe('quoteTableName', () => {
|
||||
it('should wrap schema and table in double quotes', () => {
|
||||
expect(dialect.quoteTableName('dbo', 'Table')).toBe('"dbo"."Table"')
|
||||
})
|
||||
|
||||
it('should handle arbitrary names', () => {
|
||||
expect(dialect.quoteTableName('my_schema', 'my_table')).toBe('"my_schema"."my_table"')
|
||||
})
|
||||
})
|
||||
|
||||
describe('param', () => {
|
||||
it('should return $N with 1-based index ($1 for param(0))', () => {
|
||||
expect(dialect.param(0)).toBe('$1')
|
||||
expect(dialect.param(1)).toBe('$2')
|
||||
expect(dialect.param(3)).toBe('$4')
|
||||
expect(dialect.param(10)).toBe('$11')
|
||||
})
|
||||
})
|
||||
|
||||
describe('params', () => {
|
||||
it('should return comma-separated $N placeholders (1-based)', () => {
|
||||
expect(dialect.params(1)).toBe('$1')
|
||||
expect(dialect.params(3)).toBe('$1,$2,$3')
|
||||
expect(dialect.params(5)).toBe('$1,$2,$3,$4,$5')
|
||||
})
|
||||
|
||||
it('should return empty string for count 0', () => {
|
||||
expect(dialect.params(0)).toBe('')
|
||||
})
|
||||
})
|
||||
|
||||
describe('currentTimestamp', () => {
|
||||
it('should return CURRENT_TIMESTAMP', () => {
|
||||
expect(dialect.currentTimestamp()).toBe('CURRENT_TIMESTAMP')
|
||||
})
|
||||
})
|
||||
|
||||
describe('upsert', () => {
|
||||
it('should generate ON CONFLICT DO UPDATE SQL', () => {
|
||||
const result = dialect.upsert({
|
||||
table: '"dbo"."Table"',
|
||||
keyColumns: ['id'],
|
||||
allColumns: ['id', 'name', 'value'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('INSERT INTO "dbo"."Table" (id, name, value)')
|
||||
expect(result.sql).toContain('VALUES ($1, $2, $3)')
|
||||
expect(result.sql).toContain('ON CONFLICT ("id")')
|
||||
expect(result.sql).toContain('DO UPDATE SET')
|
||||
expect(result.sql).toContain('"name" = EXCLUDED."name"')
|
||||
expect(result.sql).toContain('"value" = EXCLUDED."value"')
|
||||
// key column should NOT appear in DO UPDATE SET
|
||||
expect(result.sql).not.toContain('"id" = EXCLUDED."id"')
|
||||
expect(result.nextParamIndex).toBe(3)
|
||||
})
|
||||
|
||||
it('should handle composite key columns with all double-quoted', () => {
|
||||
const result = dialect.upsert({
|
||||
table: '"dbo"."Table"',
|
||||
keyColumns: ['id', 'code'],
|
||||
allColumns: ['id', 'code', 'name'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('ON CONFLICT ("id", "code")')
|
||||
expect(result.sql).toContain('"name" = EXCLUDED."name"')
|
||||
expect(result.nextParamIndex).toBe(3)
|
||||
})
|
||||
|
||||
it('should use startParamIndex for parameter numbering', () => {
|
||||
const result = dialect.upsert({
|
||||
table: '"dbo"."Table"',
|
||||
keyColumns: ['id'],
|
||||
allColumns: ['id', 'name'],
|
||||
startParamIndex: 5
|
||||
})
|
||||
|
||||
// startParamIndex=5 means $6, $7 (1-based: index+1)
|
||||
expect(result.sql).toContain('$6')
|
||||
expect(result.sql).toContain('$7')
|
||||
expect(result.nextParamIndex).toBe(7)
|
||||
})
|
||||
})
|
||||
|
||||
describe('paginate', () => {
|
||||
it('should append LIMIT and OFFSET with literal values', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM "dbo"."Table"',
|
||||
limit: 10,
|
||||
offset: 20,
|
||||
paramIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toBe('SELECT * FROM "dbo"."Table" LIMIT 10 OFFSET 20')
|
||||
expect(result.nextParamIndex).toBe(0)
|
||||
})
|
||||
|
||||
it('should use 0 as default offset', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM "dbo"."Table"',
|
||||
limit: 50,
|
||||
paramIndex: 3
|
||||
})
|
||||
|
||||
expect(result.sql).toBe('SELECT * FROM "dbo"."Table" LIMIT 50 OFFSET 0')
|
||||
expect(result.nextParamIndex).toBe(3)
|
||||
})
|
||||
|
||||
it('should not change nextParamIndex (no params added)', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM "dbo"."Table"',
|
||||
limit: 100,
|
||||
offset: 50,
|
||||
paramIndex: 10
|
||||
})
|
||||
|
||||
expect(result.nextParamIndex).toBe(10)
|
||||
})
|
||||
})
|
||||
|
||||
describe('maxBatchRows', () => {
|
||||
it('should return 1000 regardless of columns', () => {
|
||||
expect(dialect.maxBatchRows(1)).toBe(1000)
|
||||
expect(dialect.maxBatchRows(10)).toBe(1000)
|
||||
expect(dialect.maxBatchRows(100)).toBe(1000)
|
||||
})
|
||||
})
|
||||
})
|
||||
164
tests/unit/dialects/sqlserver-dialect.test.ts
Normal file
164
tests/unit/dialects/sqlserver-dialect.test.ts
Normal file
@@ -0,0 +1,164 @@
|
||||
/**
|
||||
* Unit tests for SqlServerDialect
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { SqlServerDialect } from '@services/database/dialects/sqlserver-dialect'
|
||||
|
||||
describe('SqlServerDialect', () => {
|
||||
const dialect = new SqlServerDialect()
|
||||
|
||||
describe('dbType', () => {
|
||||
it('should return sqlserver', () => {
|
||||
expect(dialect.dbType).toBe('sqlserver')
|
||||
})
|
||||
})
|
||||
|
||||
describe('quoteTableName', () => {
|
||||
it('should wrap schema and table in brackets', () => {
|
||||
expect(dialect.quoteTableName('dbo', 'Table')).toBe('[dbo].[Table]')
|
||||
})
|
||||
|
||||
it('should handle arbitrary names', () => {
|
||||
expect(dialect.quoteTableName('my_schema', 'my_table')).toBe('[my_schema].[my_table]')
|
||||
})
|
||||
})
|
||||
|
||||
describe('param', () => {
|
||||
it('should return @pN with 0-based index', () => {
|
||||
expect(dialect.param(0)).toBe('@p0')
|
||||
expect(dialect.param(1)).toBe('@p1')
|
||||
expect(dialect.param(5)).toBe('@p5')
|
||||
})
|
||||
})
|
||||
|
||||
describe('params', () => {
|
||||
it('should return comma-separated @pN placeholders', () => {
|
||||
expect(dialect.params(1)).toBe('@p0')
|
||||
expect(dialect.params(3)).toBe('@p0,@p1,@p2')
|
||||
expect(dialect.params(5)).toBe('@p0,@p1,@p2,@p3,@p4')
|
||||
})
|
||||
|
||||
it('should return empty string for count 0', () => {
|
||||
expect(dialect.params(0)).toBe('')
|
||||
})
|
||||
})
|
||||
|
||||
describe('currentTimestamp', () => {
|
||||
it('should return GETDATE()', () => {
|
||||
expect(dialect.currentTimestamp()).toBe('GETDATE()')
|
||||
})
|
||||
})
|
||||
|
||||
describe('upsert', () => {
|
||||
it('should generate MERGE SQL with single key column', () => {
|
||||
const result = dialect.upsert({
|
||||
table: '[dbo].[Table]',
|
||||
keyColumns: ['id'],
|
||||
allColumns: ['id', 'name', 'value'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
// Should contain MERGE ... USING ... ON ... WHEN MATCHED ... WHEN NOT MATCHED ...
|
||||
expect(result.sql).toContain('MERGE [dbo].[Table] AS target')
|
||||
expect(result.sql).toContain('USING (VALUES (@p0, @p1, @p2)) AS source (id, name, value)')
|
||||
expect(result.sql).toContain('ON target.id = source.id')
|
||||
expect(result.sql).toContain('WHEN MATCHED THEN UPDATE SET')
|
||||
expect(result.sql).toContain('target.name = source.name')
|
||||
expect(result.sql).toContain('target.value = source.value')
|
||||
expect(result.sql).toContain('WHEN NOT MATCHED THEN INSERT (id, name, value)')
|
||||
expect(result.sql).toContain('VALUES (source.id, source.name, source.value)')
|
||||
expect(result.nextParamIndex).toBe(3)
|
||||
})
|
||||
|
||||
it('should handle composite key columns', () => {
|
||||
const result = dialect.upsert({
|
||||
table: '[dbo].[Table]',
|
||||
keyColumns: ['id', 'code'],
|
||||
allColumns: ['id', 'code', 'name'],
|
||||
startParamIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('ON target.id = source.id AND target.code = source.code')
|
||||
// non-key columns in UPDATE SET
|
||||
expect(result.sql).toContain('target.name = source.name')
|
||||
// key columns should NOT be in UPDATE SET
|
||||
expect(result.sql).not.toMatch(/UPDATE SET[\s\S]*target\.id = source\.id/)
|
||||
expect(result.nextParamIndex).toBe(3)
|
||||
})
|
||||
|
||||
it('should use startParamIndex for parameter names', () => {
|
||||
const result = dialect.upsert({
|
||||
table: '[dbo].[Table]',
|
||||
keyColumns: ['id'],
|
||||
allColumns: ['id', 'name'],
|
||||
startParamIndex: 5
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('@p5')
|
||||
expect(result.sql).toContain('@p6')
|
||||
expect(result.nextParamIndex).toBe(7)
|
||||
})
|
||||
})
|
||||
|
||||
describe('paginate', () => {
|
||||
it('should append OFFSET/FETCH with parameterized offset when offset is provided', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM [dbo].[Table] ORDER BY id',
|
||||
limit: 10,
|
||||
offset: 20,
|
||||
paramIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('OFFSET @p0 ROWS')
|
||||
expect(result.sql).toContain('FETCH NEXT @p1 ROWS ONLY')
|
||||
expect(result.nextParamIndex).toBe(2)
|
||||
})
|
||||
|
||||
it('should use literal 0 offset when no offset is provided', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM [dbo].[Table] ORDER BY id',
|
||||
limit: 50,
|
||||
paramIndex: 0
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('OFFSET 0 ROWS')
|
||||
expect(result.sql).toContain('FETCH NEXT @p0 ROWS ONLY')
|
||||
expect(result.nextParamIndex).toBe(1)
|
||||
})
|
||||
|
||||
it('should advance paramIndex from non-zero start with offset', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM [dbo].[Table] ORDER BY id',
|
||||
limit: 10,
|
||||
offset: 100,
|
||||
paramIndex: 5
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('OFFSET @p5 ROWS')
|
||||
expect(result.sql).toContain('FETCH NEXT @p6 ROWS ONLY')
|
||||
expect(result.nextParamIndex).toBe(7)
|
||||
})
|
||||
|
||||
it('should advance paramIndex from non-zero start without offset', () => {
|
||||
const result = dialect.paginate({
|
||||
sql: 'SELECT * FROM [dbo].[Table] ORDER BY id',
|
||||
limit: 10,
|
||||
paramIndex: 3
|
||||
})
|
||||
|
||||
expect(result.sql).toContain('OFFSET 0 ROWS')
|
||||
expect(result.sql).toContain('FETCH NEXT @p3 ROWS ONLY')
|
||||
expect(result.nextParamIndex).toBe(4)
|
||||
})
|
||||
})
|
||||
|
||||
describe('maxBatchRows', () => {
|
||||
it('should return floor(2000 / columnsPerRow)', () => {
|
||||
expect(dialect.maxBatchRows(10)).toBe(200)
|
||||
expect(dialect.maxBatchRows(28)).toBe(71)
|
||||
expect(dialect.maxBatchRows(1)).toBe(2000)
|
||||
expect(dialect.maxBatchRows(100)).toBe(20)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -1,28 +0,0 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { ErpAuthService } from '../../src/main/services/erp/erp-auth'
|
||||
import type { ErpConfig } from '../../src/main/types/erp.types'
|
||||
|
||||
const testConfig: ErpConfig = {
|
||||
url: 'https://test.example.com',
|
||||
username: 'testuser',
|
||||
password: 'testpass'
|
||||
}
|
||||
|
||||
describe('ERP Authentication Service (Unit)', () => {
|
||||
describe('Initial State', () => {
|
||||
it('should report inactive status before login', () => {
|
||||
const service = new ErpAuthService(testConfig)
|
||||
expect(service.isActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('should throw error when getting session before login', () => {
|
||||
const service = new ErpAuthService(testConfig)
|
||||
expect(() => service.getSession()).toThrow('Not logged in. Call login() first.')
|
||||
})
|
||||
|
||||
it('should handle close when no session exists', async () => {
|
||||
const service = new ErpAuthService(testConfig)
|
||||
await expect(service.close()).resolves.toBeUndefined()
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -1,70 +0,0 @@
|
||||
import { describe, it, expect, beforeEach } from 'vitest'
|
||||
import { ExtractorService } from '../../src/main/services/erp/extractor'
|
||||
import { ErpAuthService } from '../../src/main/services/erp/erp-auth'
|
||||
import type { ErpConfig } from '../../src/main/types/erp.types'
|
||||
|
||||
describe('Extractor Service (Unit)', () => {
|
||||
let authService: ErpAuthService
|
||||
let extractor: ExtractorService
|
||||
const mockConfig: ErpConfig = {
|
||||
url: 'https://test.erp.com',
|
||||
username: 'test_user',
|
||||
password: 'test_pass'
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
authService = new ErpAuthService(mockConfig)
|
||||
extractor = new ExtractorService(authService, './test-downloads')
|
||||
})
|
||||
|
||||
describe('Service Initialization', () => {
|
||||
it('should create service instance as ExtractorService', () => {
|
||||
expect(extractor).toBeInstanceOf(ExtractorService)
|
||||
})
|
||||
|
||||
it('should create service with default download directory', () => {
|
||||
const defaultExtractor = new ExtractorService(authService)
|
||||
expect(defaultExtractor).toBeInstanceOf(ExtractorService)
|
||||
})
|
||||
|
||||
it('should create service with custom download directory', () => {
|
||||
const customExtractor = new ExtractorService(authService, './custom-downloads')
|
||||
expect(customExtractor).toBeInstanceOf(ExtractorService)
|
||||
})
|
||||
})
|
||||
|
||||
describe('Error Handling', () => {
|
||||
it('should handle extraction with no auth session', async () => {
|
||||
const result = await extractor.extract({
|
||||
orderNumbers: ['ORDER1']
|
||||
})
|
||||
|
||||
expect(result.errors.length).toBeGreaterThan(0)
|
||||
expect(result.downloadedFiles).toHaveLength(0)
|
||||
})
|
||||
|
||||
it('should include error message when session is missing', async () => {
|
||||
const result = await extractor.extract({
|
||||
orderNumbers: ['ORD-001', 'ORD-002']
|
||||
})
|
||||
|
||||
expect(result.errors).toEqual(
|
||||
expect.arrayContaining([expect.stringContaining('Not logged in')])
|
||||
)
|
||||
})
|
||||
|
||||
it('should return empty result structure even on failure', async () => {
|
||||
const result = await extractor.extract({
|
||||
orderNumbers: ['ORDER1']
|
||||
})
|
||||
|
||||
expect(result).toHaveProperty('downloadedFiles')
|
||||
expect(result).toHaveProperty('mergedFile')
|
||||
expect(result).toHaveProperty('recordCount')
|
||||
expect(result).toHaveProperty('errors')
|
||||
expect(result).toHaveProperty('orderRecordCounts')
|
||||
expect(result.mergedFile).toBeNull()
|
||||
expect(result.recordCount).toBe(0)
|
||||
})
|
||||
})
|
||||
})
|
||||
195
tests/unit/ipc/cleaner-handler.test.ts
Normal file
195
tests/unit/ipc/cleaner-handler.test.ts
Normal file
@@ -0,0 +1,195 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { IPC_CHANNELS } from '../../../src/shared/ipc-channels'
|
||||
|
||||
// Mock logger to prevent real winston initialization and console noise
|
||||
vi.mock('../../../src/main/services/logger', () => ({
|
||||
createLogger: () => ({
|
||||
info: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn(),
|
||||
debug: vi.fn()
|
||||
}),
|
||||
logError: vi.fn()
|
||||
}))
|
||||
|
||||
vi.mock('../../../src/main/services/logger/error-utils', () => ({
|
||||
serializeError: (err: any) => err,
|
||||
sanitizeError: (err: any) => err
|
||||
}))
|
||||
|
||||
// In-memory storage for registered IPC handlers
|
||||
const registeredHandlers: Map<string, (...args: any[]) => any> = new Map()
|
||||
|
||||
// Mock Electron's ipcMain to capture registered handlers
|
||||
vi.mock('electron', () => {
|
||||
return {
|
||||
app: {
|
||||
isPackaged: false,
|
||||
getVersion: () => '1.0.0-test'
|
||||
},
|
||||
ipcMain: {
|
||||
handle: (channel: string, listener: any) => {
|
||||
registeredHandlers.set(channel, listener)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Mock CleanerApplicationService to isolate IPC layer
|
||||
vi.doMock('../../../src/main/services/cleaner/cleaner-application-service', () => {
|
||||
return {
|
||||
CleanerApplicationService: class {
|
||||
async runCleaner(_eventSender: any, input: any) {
|
||||
const count = input?.orderNumbers?.length ?? 0
|
||||
return {
|
||||
ordersProcessed: count,
|
||||
materialsDeleted: count,
|
||||
materialsSkipped: 0,
|
||||
errors: [],
|
||||
details: [],
|
||||
retriedOrders: 0,
|
||||
successfulRetries: 0
|
||||
} as any
|
||||
}
|
||||
async exportResults(_input: any) {
|
||||
return { success: true, filePath: '/tmp/results.txt' } as any
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Load IPC handler module after mocks are in place
|
||||
describe('Cleaner IPC Handler', () => {
|
||||
beforeEach(() => {
|
||||
registeredHandlers.clear()
|
||||
})
|
||||
|
||||
it('should register and handle cleaner:execute (CLEANER_RUN) IPC call', async () => {
|
||||
const mod = await import('../../../src/main/ipc/cleaner-handler')
|
||||
mod.registerCleanerHandlers()
|
||||
|
||||
const handler = registeredHandlers.get(IPC_CHANNELS.CLEANER_RUN)
|
||||
expect(handler).toBeDefined()
|
||||
expect(typeof handler).toBe('function')
|
||||
|
||||
const event: any = { sender: { id: 'renderer-1' } }
|
||||
const input: any = {
|
||||
orderNumbers: ['SC1', 'SC2'],
|
||||
materialCodes: [],
|
||||
dryRun: false,
|
||||
queryBatchSize: 100,
|
||||
processConcurrency: 1,
|
||||
onProgress: vi.fn()
|
||||
}
|
||||
|
||||
const result = await (handler as any)(event, input)
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.data.ordersProcessed).toBe(2)
|
||||
})
|
||||
|
||||
it('should handle cleaner:run with dryRun true', async () => {
|
||||
const mod = await import('../../../src/main/ipc/cleaner-handler')
|
||||
mod.registerCleanerHandlers()
|
||||
|
||||
const handler = registeredHandlers.get(IPC_CHANNELS.CLEANER_RUN)
|
||||
expect(handler).toBeDefined()
|
||||
|
||||
const event: any = { sender: { id: 'renderer-2' } }
|
||||
const input: any = {
|
||||
orderNumbers: ['SC1'],
|
||||
materialCodes: [],
|
||||
dryRun: true,
|
||||
queryBatchSize: 50,
|
||||
processConcurrency: 1,
|
||||
onProgress: vi.fn()
|
||||
}
|
||||
const result = await (handler as any)(event, input)
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.data.ordersProcessed).toBe(1)
|
||||
})
|
||||
|
||||
it('should return { success: false } when runCleaner throws', async () => {
|
||||
vi.resetModules()
|
||||
vi.doMock('../../../src/main/services/cleaner/cleaner-application-service', () => {
|
||||
return {
|
||||
CleanerApplicationService: class {
|
||||
async runCleaner() {
|
||||
throw new Error('boom')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
const mod = await import('../../../src/main/ipc/cleaner-handler')
|
||||
mod.registerCleanerHandlers()
|
||||
|
||||
const handler = registeredHandlers.get(IPC_CHANNELS.CLEANER_RUN)
|
||||
expect(handler).toBeDefined()
|
||||
|
||||
const event: any = { sender: { id: 'renderer-3' } }
|
||||
const input: any = {
|
||||
orderNumbers: ['SC1'],
|
||||
materialCodes: [],
|
||||
dryRun: false,
|
||||
queryBatchSize: 20,
|
||||
processConcurrency: 1,
|
||||
onProgress: vi.fn()
|
||||
}
|
||||
const result = await (handler as any)(event, input)
|
||||
expect(result.success).toBe(false)
|
||||
expect(result.error).toBe('boom')
|
||||
})
|
||||
|
||||
it('should register and handle cleaner:exportResults (CLEANER_EXPORT_RESULTS) IPC call', async () => {
|
||||
vi.resetModules()
|
||||
vi.doMock('../../../src/main/services/cleaner/cleaner-application-service', () => {
|
||||
return {
|
||||
CleanerApplicationService: class {
|
||||
async exportResults(items: any[]) {
|
||||
return {
|
||||
success: true,
|
||||
filePath: '/tmp/exported.xlsx',
|
||||
recordCount: items.length
|
||||
} as any
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
const mod = await import('../../../src/main/ipc/cleaner-handler')
|
||||
mod.registerCleanerHandlers()
|
||||
|
||||
const handler = registeredHandlers.get(IPC_CHANNELS.CLEANER_EXPORT_RESULTS)
|
||||
expect(handler).toBeDefined()
|
||||
expect(typeof handler).toBe('function')
|
||||
|
||||
const event: any = { sender: { id: 'renderer-4' } }
|
||||
const items = [
|
||||
{ materialCode: 'M1', materialName: 'Mat A' },
|
||||
{ materialCode: 'M2', materialName: 'Mat B' }
|
||||
]
|
||||
|
||||
const result = await (handler as any)(event, items)
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.data.recordCount).toBe(2)
|
||||
})
|
||||
|
||||
it('should return { success: false } when exportResults throws', async () => {
|
||||
vi.resetModules()
|
||||
vi.doMock('../../../src/main/services/cleaner/cleaner-application-service', () => {
|
||||
return {
|
||||
CleanerApplicationService: class {
|
||||
async exportResults() {
|
||||
throw new Error('export failed')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
const mod = await import('../../../src/main/ipc/cleaner-handler')
|
||||
mod.registerCleanerHandlers()
|
||||
|
||||
const handler = registeredHandlers.get(IPC_CHANNELS.CLEANER_EXPORT_RESULTS)
|
||||
const event: any = { sender: { id: 'renderer-5' } }
|
||||
const result = await (handler as any)(event, [])
|
||||
expect(result.success).toBe(false)
|
||||
expect(result.error).toBe('export failed')
|
||||
})
|
||||
})
|
||||
@@ -1,11 +1,51 @@
|
||||
/**
|
||||
* Unit tests for MySqlService
|
||||
* These tests do not require a MySQL instance
|
||||
* Covers both unconnected state and connected-path operations using mocked mysql2/promise.
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeEach } from 'vitest'
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { MySqlService } from '@services/database/mysql'
|
||||
|
||||
// ---- Hoisted mock functions ----
|
||||
const {
|
||||
mockCreateConnection,
|
||||
mockPing,
|
||||
mockExecute,
|
||||
mockBeginTransaction,
|
||||
mockCommit,
|
||||
mockRollback,
|
||||
mockEnd
|
||||
} = vi.hoisted(() => ({
|
||||
mockCreateConnection: vi.fn(),
|
||||
mockPing: vi.fn(),
|
||||
mockExecute: vi.fn(),
|
||||
mockBeginTransaction: vi.fn(),
|
||||
mockCommit: vi.fn(),
|
||||
mockRollback: vi.fn(),
|
||||
mockEnd: vi.fn()
|
||||
}))
|
||||
|
||||
// Mock mysql2/promise driver
|
||||
vi.mock('mysql2/promise', () => ({
|
||||
default: {
|
||||
createConnection: mockCreateConnection
|
||||
}
|
||||
}))
|
||||
|
||||
// Mock logger
|
||||
vi.mock('@services/logger', () => ({
|
||||
createLogger: () => ({
|
||||
info: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn(),
|
||||
debug: vi.fn()
|
||||
}),
|
||||
trackDuration: async <T>(fn: () => Promise<T>) => {
|
||||
const result = await fn()
|
||||
return { result }
|
||||
}
|
||||
}))
|
||||
|
||||
const mockConfig = {
|
||||
host: 'localhost',
|
||||
port: 3306,
|
||||
@@ -14,11 +54,30 @@ const mockConfig = {
|
||||
database: 'testdb'
|
||||
}
|
||||
|
||||
function createMockConnection() {
|
||||
return {
|
||||
ping: mockPing,
|
||||
execute: mockExecute,
|
||||
beginTransaction: mockBeginTransaction,
|
||||
commit: mockCommit,
|
||||
rollback: mockRollback,
|
||||
end: mockEnd
|
||||
}
|
||||
}
|
||||
|
||||
describe('MySqlService Unit Tests', () => {
|
||||
let service: MySqlService
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
service = new MySqlService(mockConfig)
|
||||
mockCreateConnection.mockResolvedValue(createMockConnection())
|
||||
mockPing.mockResolvedValue(undefined)
|
||||
mockExecute.mockResolvedValue([[], []])
|
||||
mockBeginTransaction.mockResolvedValue(undefined)
|
||||
mockCommit.mockResolvedValue(undefined)
|
||||
mockRollback.mockResolvedValue(undefined)
|
||||
mockEnd.mockResolvedValue(undefined)
|
||||
})
|
||||
|
||||
describe('constructor', () => {
|
||||
@@ -35,15 +94,33 @@ describe('MySqlService Unit Tests', () => {
|
||||
})
|
||||
|
||||
describe('connect', () => {
|
||||
it('should throw error with invalid credentials', async () => {
|
||||
// This tests error handling without needing a real server
|
||||
const invalidConfig = {
|
||||
...mockConfig,
|
||||
host: 'invalid-host-that-does-not-exist'
|
||||
}
|
||||
const invalidService = new MySqlService(invalidConfig)
|
||||
it('should throw error when connection fails', async () => {
|
||||
mockCreateConnection.mockRejectedValue(new Error('connect ECONNREFUSED'))
|
||||
await expect(service.connect()).rejects.toThrow('Failed to connect to MySQL')
|
||||
})
|
||||
|
||||
await expect(invalidService.connect()).rejects.toThrow('Failed to connect to MySQL')
|
||||
it('should establish connection and ping server', async () => {
|
||||
await service.connect()
|
||||
expect(mockCreateConnection).toHaveBeenCalledWith({
|
||||
host: 'localhost',
|
||||
port: 3306,
|
||||
user: 'test',
|
||||
password: 'test',
|
||||
database: 'testdb'
|
||||
})
|
||||
expect(mockPing).toHaveBeenCalled()
|
||||
expect(service.isConnected()).toBe(true)
|
||||
})
|
||||
|
||||
it('should throw when already connected', async () => {
|
||||
await service.connect()
|
||||
await expect(service.connect()).rejects.toThrow('Already connected to MySQL')
|
||||
})
|
||||
|
||||
it('should throw when ping fails after connection created', async () => {
|
||||
mockPing.mockRejectedValue(new Error('ping failed'))
|
||||
await expect(service.connect()).rejects.toThrow('Failed to connect to MySQL')
|
||||
// Note: source sets connection before ping, so it remains non-null after ping failure
|
||||
})
|
||||
})
|
||||
|
||||
@@ -51,6 +128,54 @@ describe('MySqlService Unit Tests', () => {
|
||||
it('should throw error when not connected', async () => {
|
||||
await expect(service.query('SELECT 1')).rejects.toThrow('Not connected to MySQL')
|
||||
})
|
||||
|
||||
it('should execute SELECT and return rows with columns', async () => {
|
||||
await service.connect()
|
||||
mockExecute.mockResolvedValue([
|
||||
[
|
||||
{ id: 1, name: 'test' },
|
||||
{ id: 2, name: 'foo' }
|
||||
],
|
||||
[{ name: 'id' }, { name: 'name' }]
|
||||
])
|
||||
|
||||
const result = await service.query('SELECT id, name FROM users')
|
||||
|
||||
expect(mockExecute).toHaveBeenCalledWith('SELECT id, name FROM users', undefined)
|
||||
expect(result.rows).toEqual([
|
||||
{ id: 1, name: 'test' },
|
||||
{ id: 2, name: 'foo' }
|
||||
])
|
||||
expect(result.columns).toEqual(['id', 'name'])
|
||||
expect(result.rowCount).toBe(2)
|
||||
})
|
||||
|
||||
it('should execute INSERT/UPDATE and return affected rows', async () => {
|
||||
await service.connect()
|
||||
mockExecute.mockResolvedValue([{ affectedRows: 3, changedRows: 2 }, []])
|
||||
|
||||
const result = await service.query('UPDATE users SET active = ?', [true])
|
||||
|
||||
expect(mockExecute).toHaveBeenCalledWith('UPDATE users SET active = ?', [true])
|
||||
expect(result.rows).toEqual([])
|
||||
expect(result.rowCount).toBe(3)
|
||||
})
|
||||
|
||||
it('should use changedRows when affectedRows is zero', async () => {
|
||||
await service.connect()
|
||||
mockExecute.mockResolvedValue([{ affectedRows: 0, changedRows: 5 }, []])
|
||||
|
||||
const result = await service.query('UPDATE users SET x = 1')
|
||||
|
||||
expect(result.rowCount).toBe(5)
|
||||
})
|
||||
|
||||
it('should wrap query errors with context', async () => {
|
||||
await service.connect()
|
||||
mockExecute.mockRejectedValue(new Error('syntax error'))
|
||||
|
||||
await expect(service.query('INVALID SQL')).rejects.toThrow('MySQL query failed')
|
||||
})
|
||||
})
|
||||
|
||||
describe('transaction', () => {
|
||||
@@ -59,11 +184,56 @@ describe('MySqlService Unit Tests', () => {
|
||||
'Not connected to MySQL'
|
||||
)
|
||||
})
|
||||
|
||||
it('should execute all queries and commit', async () => {
|
||||
await service.connect()
|
||||
|
||||
await service.transaction([
|
||||
{ sql: 'INSERT INTO t VALUES (?)', params: [1] },
|
||||
{ sql: 'UPDATE t SET x = ?' }
|
||||
])
|
||||
|
||||
expect(mockBeginTransaction).toHaveBeenCalled()
|
||||
expect(mockExecute).toHaveBeenCalledTimes(2)
|
||||
expect(mockExecute).toHaveBeenNthCalledWith(1, 'INSERT INTO t VALUES (?)', [1])
|
||||
expect(mockExecute).toHaveBeenNthCalledWith(2, 'UPDATE t SET x = ?', undefined)
|
||||
expect(mockCommit).toHaveBeenCalled()
|
||||
expect(mockRollback).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should rollback on query failure', async () => {
|
||||
await service.connect()
|
||||
mockExecute.mockRejectedValueOnce(new Error('constraint violation'))
|
||||
|
||||
await expect(
|
||||
service.transaction([{ sql: 'INSERT INTO t VALUES (?)', params: [1] }])
|
||||
).rejects.toThrow('MySQL transaction failed')
|
||||
|
||||
expect(mockRollback).toHaveBeenCalled()
|
||||
expect(mockCommit).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('disconnect', () => {
|
||||
it('should resolve when not connected', async () => {
|
||||
await expect(service.disconnect()).resolves.not.toThrow()
|
||||
})
|
||||
|
||||
it('should end connection and reset state', async () => {
|
||||
await service.connect()
|
||||
expect(service.isConnected()).toBe(true)
|
||||
|
||||
await service.disconnect()
|
||||
|
||||
expect(mockEnd).toHaveBeenCalled()
|
||||
expect(service.isConnected()).toBe(false)
|
||||
})
|
||||
|
||||
it('should wrap disconnect errors', async () => {
|
||||
await service.connect()
|
||||
mockEnd.mockRejectedValue(new Error('connection lost'))
|
||||
|
||||
await expect(service.disconnect()).rejects.toThrow('Failed to disconnect from MySQL')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
578
tests/unit/postgresql.test.ts
Normal file
578
tests/unit/postgresql.test.ts
Normal file
@@ -0,0 +1,578 @@
|
||||
/**
|
||||
* Unit tests for PostgreSqlService
|
||||
* Covers both unconnected state and connected-path operations using mocked pg driver.
|
||||
* Also tests the prepareSql pure function (no mocks needed for those).
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { PostgreSqlService, prepareSql } from '@main/services/database/postgresql'
|
||||
|
||||
// ---- Hoisted mock functions ----
|
||||
const { mockPgPool, mockPgClient } = vi.hoisted(() => {
|
||||
const client = {
|
||||
query: vi.fn(),
|
||||
release: vi.fn()
|
||||
}
|
||||
const pool = {
|
||||
connect: vi.fn(() => client),
|
||||
query: vi.fn(),
|
||||
end: vi.fn()
|
||||
}
|
||||
return { mockPgPool: pool, mockPgClient: client }
|
||||
})
|
||||
|
||||
// Mock pg driver (must use regular function because source uses `new Pool(...)`)
|
||||
vi.mock('pg', () => ({
|
||||
Pool: vi.fn(function () {
|
||||
return mockPgPool
|
||||
})
|
||||
}))
|
||||
|
||||
// Mock logger
|
||||
vi.mock('@main/services/logger', () => ({
|
||||
createLogger: () => ({
|
||||
info: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn(),
|
||||
debug: vi.fn()
|
||||
}),
|
||||
trackDuration: async <T>(fn: () => Promise<T>) => {
|
||||
const result = await fn()
|
||||
return { result }
|
||||
}
|
||||
}))
|
||||
|
||||
const mockConfig = {
|
||||
host: 'localhost',
|
||||
port: 5432,
|
||||
user: 'test',
|
||||
password: 'test',
|
||||
database: 'testdb'
|
||||
}
|
||||
|
||||
describe('PostgreSqlService Unit Tests', () => {
|
||||
let service: PostgreSqlService
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
service = new PostgreSqlService(mockConfig)
|
||||
mockPgPool.connect.mockResolvedValue(mockPgClient)
|
||||
mockPgPool.query.mockResolvedValue({ rows: [], fields: [], rowCount: 0 })
|
||||
mockPgPool.end.mockResolvedValue(undefined)
|
||||
mockPgClient.query.mockResolvedValue({ rows: [] })
|
||||
mockPgClient.release.mockReturnValue(undefined)
|
||||
})
|
||||
|
||||
describe('constructor', () => {
|
||||
it('should create service with config', () => {
|
||||
expect(service).toBeDefined()
|
||||
expect(service.isConnected()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('type', () => {
|
||||
it('should return postgresql', () => {
|
||||
expect(service.type).toBe('postgresql')
|
||||
})
|
||||
})
|
||||
|
||||
describe('isConnected', () => {
|
||||
it('should return false when not connected', () => {
|
||||
expect(service.isConnected()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('connect', () => {
|
||||
it('should throw error when pool creation fails', async () => {
|
||||
mockPgPool.connect.mockRejectedValue(new Error('connection refused'))
|
||||
const svc = new PostgreSqlService(mockConfig)
|
||||
await expect(svc.connect()).rejects.toThrow('Failed to connect to PostgreSQL')
|
||||
})
|
||||
|
||||
it('should establish connection and release test client', async () => {
|
||||
await service.connect()
|
||||
expect(mockPgPool.connect).toHaveBeenCalled()
|
||||
expect(mockPgClient.release).toHaveBeenCalled()
|
||||
expect(service.isConnected()).toBe(true)
|
||||
})
|
||||
|
||||
it('should throw when already connected', async () => {
|
||||
await service.connect()
|
||||
await expect(service.connect()).rejects.toThrow('Already connected to PostgreSQL')
|
||||
})
|
||||
|
||||
it('should reset pool to null on connection failure', async () => {
|
||||
mockPgPool.connect.mockRejectedValue(new Error('timeout'))
|
||||
await expect(service.connect()).rejects.toThrow('Failed to connect to PostgreSQL')
|
||||
expect(service.isConnected()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('query', () => {
|
||||
it('should throw error when not connected', async () => {
|
||||
await expect(service.query('SELECT 1')).rejects.toThrow('Not connected to PostgreSQL')
|
||||
})
|
||||
|
||||
it('should execute query and return rows with columns', async () => {
|
||||
await service.connect()
|
||||
mockPgPool.query.mockResolvedValue({
|
||||
rows: [{ ID: 1, Name: 'test' }],
|
||||
fields: [{ name: 'ID' }, { name: 'Name' }],
|
||||
rowCount: 1
|
||||
})
|
||||
|
||||
const result = await service.query('SELECT ID, Name FROM Users')
|
||||
|
||||
expect(result.rows).toEqual([{ ID: 1, Name: 'test' }])
|
||||
expect(result.columns).toEqual(['ID', 'Name'])
|
||||
expect(result.rowCount).toBe(1)
|
||||
})
|
||||
|
||||
it('should pass params through to pool.query', async () => {
|
||||
await service.connect()
|
||||
mockPgPool.query.mockResolvedValue({ rows: [], fields: [], rowCount: 0 })
|
||||
|
||||
await service.query('SELECT * FROM Users WHERE ID = $1', [42])
|
||||
|
||||
expect(mockPgPool.query).toHaveBeenCalledWith(expect.any(String), [42])
|
||||
})
|
||||
|
||||
it('should fallback to rows.length when rowCount is null', async () => {
|
||||
await service.connect()
|
||||
mockPgPool.query.mockResolvedValue({
|
||||
rows: [{ ID: 1 }, { ID: 2 }],
|
||||
fields: [{ name: 'ID' }],
|
||||
rowCount: null
|
||||
})
|
||||
|
||||
const result = await service.query('SELECT ID FROM Users')
|
||||
expect(result.rowCount).toBe(2)
|
||||
})
|
||||
|
||||
it('should wrap query errors with context', async () => {
|
||||
await service.connect()
|
||||
mockPgPool.query.mockRejectedValue(new Error('syntax error'))
|
||||
|
||||
await expect(service.query('INVALID SQL')).rejects.toThrow('PostgreSQL query failed')
|
||||
})
|
||||
})
|
||||
|
||||
describe('transaction', () => {
|
||||
it('should throw error when not connected', async () => {
|
||||
await expect(service.transaction([{ sql: 'SELECT 1' }])).rejects.toThrow(
|
||||
'Not connected to PostgreSQL'
|
||||
)
|
||||
})
|
||||
|
||||
it('should execute all queries within BEGIN/COMMIT and release client', async () => {
|
||||
await service.connect()
|
||||
mockPgClient.query.mockResolvedValue({ rows: [] })
|
||||
|
||||
await service.transaction([{ sql: 'SELECT 1', params: [1] }, { sql: 'SELECT 2' }])
|
||||
|
||||
// BEGIN + 2 queries + COMMIT
|
||||
expect(mockPgClient.query).toHaveBeenCalledTimes(4)
|
||||
expect(mockPgClient.query).toHaveBeenNthCalledWith(1, 'BEGIN')
|
||||
expect(mockPgClient.query).toHaveBeenNthCalledWith(4, 'COMMIT')
|
||||
expect(mockPgClient.release).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should rollback and release client on query failure', async () => {
|
||||
await service.connect()
|
||||
mockPgClient.query
|
||||
.mockResolvedValueOnce({ rows: [] }) // BEGIN
|
||||
.mockRejectedValueOnce(new Error('constraint violation')) // query fails
|
||||
.mockResolvedValueOnce({ rows: [] }) // ROLLBACK
|
||||
|
||||
await expect(service.transaction([{ sql: 'SELECT 1', params: [1] }])).rejects.toThrow(
|
||||
'PostgreSQL transaction failed'
|
||||
)
|
||||
|
||||
expect(mockPgClient.query).toHaveBeenCalledWith('ROLLBACK')
|
||||
expect(mockPgClient.release).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('disconnect', () => {
|
||||
it('should resolve when not connected', async () => {
|
||||
await expect(service.disconnect()).resolves.not.toThrow()
|
||||
})
|
||||
|
||||
it('should end pool and reset state', async () => {
|
||||
await service.connect()
|
||||
expect(service.isConnected()).toBe(true)
|
||||
|
||||
await service.disconnect()
|
||||
|
||||
expect(mockPgPool.end).toHaveBeenCalled()
|
||||
expect(service.isConnected()).toBe(false)
|
||||
})
|
||||
|
||||
it('should wrap disconnect errors', async () => {
|
||||
await service.connect()
|
||||
mockPgPool.end.mockRejectedValue(new Error('pool end failed'))
|
||||
|
||||
await expect(service.disconnect()).rejects.toThrow('Failed to disconnect from PostgreSQL')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('prepareSql', () => {
|
||||
it('should quote unquoted column names in SELECT', () => {
|
||||
const sql = 'SELECT ID, UserName, UserType FROM "dbo"."BIPUsers"'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('SELECT "ID", "UserName", "UserType" FROM "dbo"."BIPUsers"')
|
||||
})
|
||||
|
||||
it('should quote column names in WHERE clause', () => {
|
||||
const sql = 'WHERE UserName = $1 AND Password = $2'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('WHERE "UserName" = $1 AND "Password" = $2')
|
||||
})
|
||||
|
||||
it('should quote column names in INSERT', () => {
|
||||
const sql = 'INSERT INTO "dbo"."BIPUsers" (UserName, Password, UserType) VALUES ($1, $2, $3)'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe(
|
||||
'INSERT INTO "dbo"."BIPUsers" ("UserName", "Password", "UserType") VALUES ($1, $2, $3)'
|
||||
)
|
||||
})
|
||||
|
||||
it('should quote column names in UPDATE SET', () => {
|
||||
const sql = 'UPDATE "dbo"."BIPUsers" SET UserType = $1 WHERE UserName = $2'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('UPDATE "dbo"."BIPUsers" SET "UserType" = $1 WHERE "UserName" = $2')
|
||||
})
|
||||
|
||||
it('should quote column names in DELETE', () => {
|
||||
const sql = 'DELETE FROM "dbo"."BIPUsers" WHERE UserName = $1'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('DELETE FROM "dbo"."BIPUsers" WHERE "UserName" = $1')
|
||||
})
|
||||
|
||||
it('should quote column names in ORDER BY', () => {
|
||||
const sql = 'SELECT UserName FROM "dbo"."BIPUsers" ORDER BY UserName'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('SELECT "UserName" FROM "dbo"."BIPUsers" ORDER BY "UserName"')
|
||||
})
|
||||
|
||||
it('should not quote SQL keywords', () => {
|
||||
const sql = 'SELECT ID FROM "dbo"."BIPUsers" WHERE UserName = $1'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).not.toContain('"SELECT"')
|
||||
expect(result).not.toContain('"FROM"')
|
||||
expect(result).not.toContain('"WHERE"')
|
||||
expect(result).not.toContain('"AND"')
|
||||
})
|
||||
|
||||
it('should not quote already-quoted identifiers', () => {
|
||||
const sql = 'SELECT "ID" FROM "dbo"."BIPUsers"'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('SELECT "ID" FROM "dbo"."BIPUsers"')
|
||||
})
|
||||
|
||||
it('should preserve string literals', () => {
|
||||
const sql = "WHERE Status = 'active'"
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('WHERE "Status" = \'active\'')
|
||||
})
|
||||
|
||||
it('should preserve string literals with escaped quotes', () => {
|
||||
const sql = "WHERE UserName = 'O''Brien'"
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe("WHERE \"UserName\" = 'O''Brien'")
|
||||
})
|
||||
|
||||
it('should preserve $N parameter placeholders', () => {
|
||||
const sql = 'WHERE UserName = $1 AND Password = $2'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('$1')
|
||||
expect(result).toContain('$2')
|
||||
})
|
||||
|
||||
it('should handle COUNT(*) correctly', () => {
|
||||
const sql = 'SELECT COUNT(*) as count FROM "dbo"."BIPUsers" WHERE UserName = $1'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('SELECT COUNT(*) as count FROM "dbo"."BIPUsers" WHERE "UserName" = $1')
|
||||
})
|
||||
|
||||
it('should quote underscore-containing column names', () => {
|
||||
const sql = 'SELECT ERP_URL, ERP_Username, ERP_Password FROM "dbo"."BIPUsers"'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('SELECT "ERP_URL", "ERP_Username", "ERP_Password" FROM "dbo"."BIPUsers"')
|
||||
})
|
||||
|
||||
it('should handle ON CONFLICT DO UPDATE SET with EXCLUDED', () => {
|
||||
const sql =
|
||||
'INSERT INTO "dbo"."Materials" (MaterialCode, ManagerName) VALUES ($1, $2) ON CONFLICT ("MaterialCode") DO UPDATE SET "ManagerName" = EXCLUDED."ManagerName"'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe(
|
||||
'INSERT INTO "dbo"."Materials" ("MaterialCode", "ManagerName") VALUES ($1, $2) ON CONFLICT ("MaterialCode") DO UPDATE SET "ManagerName" = EXCLUDED."ManagerName"'
|
||||
)
|
||||
})
|
||||
|
||||
it('should handle CURRENT_TIMESTAMP without quoting', () => {
|
||||
const sql = 'INSERT INTO t (OperationTime) VALUES (CURRENT_TIMESTAMP)'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('INSERT INTO "t" ("OperationTime") VALUES (CURRENT_TIMESTAMP)')
|
||||
})
|
||||
|
||||
it('should handle LIMIT OFFSET without quoting', () => {
|
||||
const sql = 'SELECT UserName FROM "dbo"."BIPUsers" LIMIT 10 OFFSET 20'
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toBe('SELECT "UserName" FROM "dbo"."BIPUsers" LIMIT 10 OFFSET 20')
|
||||
})
|
||||
|
||||
it('should return empty string for empty input', () => {
|
||||
expect(prepareSql('')).toBe('')
|
||||
})
|
||||
|
||||
it('should handle full BIPUsersDAO authenticate query', () => {
|
||||
const sql = `
|
||||
SELECT ID, UserName, UserType
|
||||
FROM "dbo"."BIPUsers"
|
||||
WHERE UserName = $1 AND Password = $2
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"ID"')
|
||||
expect(result).toContain('"UserName"')
|
||||
expect(result).toContain('"UserType"')
|
||||
expect(result).toContain('"Password"')
|
||||
expect(result).toContain('$1')
|
||||
expect(result).toContain('$2')
|
||||
expect(result).toContain('"dbo"."BIPUsers"')
|
||||
})
|
||||
|
||||
it('should handle full BIPUsersDAO userExists query', () => {
|
||||
const sql = `
|
||||
SELECT COUNT(*) as count
|
||||
FROM "dbo"."BIPUsers"
|
||||
WHERE UserName = $1
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('COUNT(*)')
|
||||
expect(result).toContain('as count')
|
||||
expect(result).toContain('"UserName"')
|
||||
})
|
||||
|
||||
// ==================== Window Functions ====================
|
||||
|
||||
it('should handle ROW_NUMBER() OVER (PARTITION BY ... ORDER BY ...)', () => {
|
||||
const sql = `
|
||||
SELECT UserName, ROW_NUMBER() OVER (PARTITION BY UserType ORDER BY CreatedAt DESC) as rn
|
||||
FROM "dbo"."BIPUsers"
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"UserName"')
|
||||
expect(result).toContain('"UserType"')
|
||||
expect(result).toContain('"CreatedAt"')
|
||||
expect(result).not.toContain('"ROW_NUMBER"')
|
||||
expect(result).not.toContain('"OVER"')
|
||||
expect(result).not.toContain('"PARTITION"')
|
||||
expect(result).not.toContain('"ORDER"')
|
||||
})
|
||||
|
||||
it('should handle RANK() and DENSE_RANK()', () => {
|
||||
const sql = `
|
||||
SELECT MaterialCode, RANK() OVER (ORDER BY Quantity DESC) as rnk, DENSE_RANK() OVER (ORDER BY Quantity DESC) as drnk
|
||||
FROM "dbo"."Materials"
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"MaterialCode"')
|
||||
expect(result).toContain('"Quantity"')
|
||||
expect(result).not.toContain('"RANK"')
|
||||
expect(result).not.toContain('"DENSE_RANK"')
|
||||
})
|
||||
|
||||
it('should handle LAG() and LEAD()', () => {
|
||||
const sql = `
|
||||
SELECT OrderId, LAG(TotalAmount, 1) OVER (ORDER BY OrderDate) as prevAmount, LEAD(TotalAmount, 1) OVER (ORDER BY OrderDate) as nextAmount
|
||||
FROM "dbo"."Orders"
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"OrderId"')
|
||||
expect(result).toContain('"TotalAmount"')
|
||||
expect(result).toContain('"OrderDate"')
|
||||
expect(result).not.toContain('"LAG"')
|
||||
expect(result).not.toContain('"LEAD"')
|
||||
})
|
||||
|
||||
// ==================== CTEs (Common Table Expressions) ====================
|
||||
|
||||
it('should handle WITH clause', () => {
|
||||
const sql = `
|
||||
WITH UserSummary AS (
|
||||
SELECT UserId, COUNT(OrderId) as OrderCount
|
||||
FROM "dbo"."Orders"
|
||||
GROUP BY UserId
|
||||
)
|
||||
SELECT UserName, OrderCount
|
||||
FROM UserSummary
|
||||
JOIN "dbo"."BIPUsers" ON UserSummary.UserId = "dbo"."BIPUsers".ID
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"UserId"')
|
||||
expect(result).toContain('"OrderId"')
|
||||
expect(result).toContain('"UserName"')
|
||||
expect(result).not.toContain('"WITH"')
|
||||
expect(result).not.toContain('"AS"')
|
||||
expect(result).not.toContain('"FROM"')
|
||||
expect(result).not.toContain('"JOIN"')
|
||||
expect(result).not.toContain('"ON"')
|
||||
})
|
||||
|
||||
it('should handle recursive CTE', () => {
|
||||
const sql = `
|
||||
WITH RECURSIVE CategoryTree AS (
|
||||
SELECT CategoryId, ParentCategoryId, CategoryName, 0 as Level
|
||||
FROM "dbo"."Categories"
|
||||
WHERE ParentCategoryId IS NULL
|
||||
UNION ALL
|
||||
SELECT c.CategoryId, c.ParentCategoryId, c.CategoryName, ct.Level + 1
|
||||
FROM "dbo"."Categories" c
|
||||
INNER JOIN CategoryTree ct ON c.ParentCategoryId = ct.CategoryId
|
||||
)
|
||||
SELECT * FROM CategoryTree
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"CategoryId"')
|
||||
expect(result).toContain('"ParentCategoryId"')
|
||||
expect(result).toContain('"CategoryName"')
|
||||
expect(result).not.toContain('"WITH"')
|
||||
expect(result).not.toContain('"RECURSIVE"')
|
||||
expect(result).not.toContain('"UNION"')
|
||||
expect(result).not.toContain('"ALL"')
|
||||
expect(result).not.toContain('"INNER"')
|
||||
expect(result).not.toContain('"JOIN"')
|
||||
})
|
||||
|
||||
// ==================== Advanced Grouping ====================
|
||||
|
||||
it('should handle ROLLUP', () => {
|
||||
const sql = `
|
||||
SELECT DepartmentId, JobTitle, COUNT(*) as EmployeeCount
|
||||
FROM "dbo"."Employees"
|
||||
GROUP BY ROLLUP (DepartmentId, JobTitle)
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"DepartmentId"')
|
||||
expect(result).toContain('"JobTitle"')
|
||||
expect(result).not.toContain('"GROUP"')
|
||||
expect(result).not.toContain('"BY"')
|
||||
expect(result).not.toContain('"ROLLUP"')
|
||||
})
|
||||
|
||||
it('should handle CUBE', () => {
|
||||
const sql = `
|
||||
SELECT Year, Quarter, Region, SUM(SalesAmount) as TotalSales
|
||||
FROM "dbo"."Sales"
|
||||
GROUP BY CUBE (Year, Quarter, Region)
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"Year"')
|
||||
expect(result).toContain('"Quarter"')
|
||||
expect(result).toContain('"Region"')
|
||||
expect(result).toContain('"SalesAmount"')
|
||||
expect(result).not.toContain('"CUBE"')
|
||||
expect(result).not.toContain('"GROUP"')
|
||||
expect(result).not.toContain('"BY"')
|
||||
})
|
||||
|
||||
it('should handle GROUPING SETS', () => {
|
||||
const sql = `
|
||||
SELECT DepartmentId, JobTitle, COUNT(*) as EmployeeCount
|
||||
FROM "dbo"."Employees"
|
||||
GROUP BY GROUPING SETS ((DepartmentId, JobTitle), (DepartmentId), ())
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"DepartmentId"')
|
||||
expect(result).toContain('"JobTitle"')
|
||||
expect(result).not.toContain('"GROUPING"')
|
||||
expect(result).not.toContain('"SETS"')
|
||||
expect(result).not.toContain('"GROUP"')
|
||||
expect(result).not.toContain('"BY"')
|
||||
})
|
||||
|
||||
// ==================== CASE Expressions ====================
|
||||
|
||||
it('should handle simple CASE', () => {
|
||||
const sql = `
|
||||
SELECT UserName, CASE UserType
|
||||
WHEN 'admin' THEN 'Administrator'
|
||||
WHEN 'user' THEN 'Regular User'
|
||||
ELSE 'Guest'
|
||||
END as UserRole
|
||||
FROM "dbo"."BIPUsers"
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"UserName"')
|
||||
expect(result).toContain('"UserType"')
|
||||
expect(result).not.toContain('"CASE"')
|
||||
expect(result).not.toContain('"WHEN"')
|
||||
expect(result).not.toContain('"THEN"')
|
||||
expect(result).not.toContain('"ELSE"')
|
||||
expect(result).not.toContain('"END"')
|
||||
})
|
||||
|
||||
it('should handle searched CASE', () => {
|
||||
const sql = `
|
||||
SELECT OrderId, TotalAmount,
|
||||
CASE
|
||||
WHEN TotalAmount > 10000 THEN 'Large'
|
||||
WHEN TotalAmount > 1000 THEN 'Medium'
|
||||
ELSE 'Small'
|
||||
END as OrderSize
|
||||
FROM "dbo"."Orders"
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"OrderId"')
|
||||
expect(result).toContain('"TotalAmount"')
|
||||
expect(result).not.toContain('"CASE"')
|
||||
expect(result).not.toContain('"WHEN"')
|
||||
expect(result).not.toContain('"THEN"')
|
||||
expect(result).not.toContain('"ELSE"')
|
||||
expect(result).not.toContain('"END"')
|
||||
})
|
||||
|
||||
// ==================== Set Operations ====================
|
||||
|
||||
it('should handle UNION, UNION ALL, INTERSECT, EXCEPT', () => {
|
||||
const sql = `
|
||||
SELECT UserId FROM "dbo"."ActiveUsers"
|
||||
UNION
|
||||
SELECT UserId FROM "dbo"."PremiumUsers"
|
||||
UNION ALL
|
||||
SELECT UserId FROM "dbo"."TrialUsers"
|
||||
INTERSECT
|
||||
SELECT UserId FROM "dbo"."VerifiedUsers"
|
||||
EXCEPT
|
||||
SELECT UserId FROM "dbo"."BannedUsers"
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"UserId"')
|
||||
expect(result).not.toContain('"UNION"')
|
||||
expect(result).not.toContain('"ALL"')
|
||||
expect(result).not.toContain('"INTERSECT"')
|
||||
expect(result).not.toContain('"EXCEPT"')
|
||||
expect(result).not.toContain('"SELECT"')
|
||||
expect(result).not.toContain('"FROM"')
|
||||
})
|
||||
|
||||
// ==================== JSON Operators ====================
|
||||
|
||||
it('should handle -> and ->> operators', () => {
|
||||
const sql = `
|
||||
SELECT UserId, ProfileData->'address'->>'city' as City, ProfileData->'contact'->>'phone' as Phone
|
||||
FROM "dbo"."Users"
|
||||
WHERE ProfileData->'preferences'->>'newsletter' = 'true'
|
||||
`
|
||||
const result = prepareSql(sql)
|
||||
expect(result).toContain('"UserId"')
|
||||
expect(result).toContain('"ProfileData"')
|
||||
expect(result).toContain('->')
|
||||
expect(result).toContain('->>')
|
||||
expect(result).not.toContain('"SELECT"')
|
||||
expect(result).not.toContain('"FROM"')
|
||||
expect(result).not.toContain('"WHERE"')
|
||||
})
|
||||
})
|
||||
@@ -74,16 +74,13 @@ vi.mock('../../src/main/services/database/data-source', () => ({
|
||||
// MaterialsToBeDeletedRepository
|
||||
// ---------------------------------------------------------------------------
|
||||
describe('MaterialsToBeDeletedRepository', () => {
|
||||
let MaterialsToBeDeletedRepository: typeof import(
|
||||
'../../src/main/services/database/repositories/MaterialsToBeDeletedRepository'
|
||||
).MaterialsToBeDeletedRepository
|
||||
let MaterialsToBeDeletedRepository: typeof import('../../src/main/services/database/repositories/MaterialsToBeDeletedRepository').MaterialsToBeDeletedRepository
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks()
|
||||
mockRepo = createMockRepository()
|
||||
const mod = await import(
|
||||
'../../src/main/services/database/repositories/MaterialsToBeDeletedRepository'
|
||||
)
|
||||
const mod =
|
||||
await import('../../src/main/services/database/repositories/MaterialsToBeDeletedRepository')
|
||||
MaterialsToBeDeletedRepository = mod.MaterialsToBeDeletedRepository
|
||||
})
|
||||
|
||||
@@ -384,16 +381,13 @@ describe('MaterialsToBeDeletedRepository', () => {
|
||||
// DiscreteMaterialPlanRepository
|
||||
// ---------------------------------------------------------------------------
|
||||
describe('DiscreteMaterialPlanRepository', () => {
|
||||
let DiscreteMaterialPlanRepository: typeof import(
|
||||
'../../src/main/services/database/repositories/DiscreteMaterialPlanRepository'
|
||||
).DiscreteMaterialPlanRepository
|
||||
let DiscreteMaterialPlanRepository: typeof import('../../src/main/services/database/repositories/DiscreteMaterialPlanRepository').DiscreteMaterialPlanRepository
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks()
|
||||
mockRepo = createMockRepository()
|
||||
const mod = await import(
|
||||
'../../src/main/services/database/repositories/DiscreteMaterialPlanRepository'
|
||||
)
|
||||
const mod =
|
||||
await import('../../src/main/services/database/repositories/DiscreteMaterialPlanRepository')
|
||||
DiscreteMaterialPlanRepository = mod.DiscreteMaterialPlanRepository
|
||||
})
|
||||
|
||||
@@ -430,9 +424,8 @@ describe('DiscreteMaterialPlanRepository', () => {
|
||||
mockRepo = { ...createMockRepository(), query: vi.fn().mockResolvedValue(mockQueryResult) }
|
||||
// Re-import to pick up new mockRepo
|
||||
vi.resetModules()
|
||||
const mod = await import(
|
||||
'../../src/main/services/database/repositories/DiscreteMaterialPlanRepository'
|
||||
)
|
||||
const mod =
|
||||
await import('../../src/main/services/database/repositories/DiscreteMaterialPlanRepository')
|
||||
const freshRepo = new mod.DiscreteMaterialPlanRepository()
|
||||
|
||||
const result = await freshRepo.queryAllDistinctByMaterialCode()
|
||||
@@ -447,9 +440,8 @@ describe('DiscreteMaterialPlanRepository', () => {
|
||||
query: vi.fn().mockRejectedValue(new Error('db fail'))
|
||||
}
|
||||
vi.resetModules()
|
||||
const mod = await import(
|
||||
'../../src/main/services/database/repositories/DiscreteMaterialPlanRepository'
|
||||
)
|
||||
const mod =
|
||||
await import('../../src/main/services/database/repositories/DiscreteMaterialPlanRepository')
|
||||
const freshRepo = new mod.DiscreteMaterialPlanRepository()
|
||||
|
||||
const result = await freshRepo.queryAllDistinctByMaterialCode()
|
||||
@@ -512,9 +504,8 @@ describe('DiscreteMaterialPlanRepository', () => {
|
||||
it('queryBySourceNumbersDistinct: calls repo.query() per batch', async () => {
|
||||
mockRepo = { ...createMockRepository(), query: vi.fn().mockResolvedValue([{ M: 'X' }]) }
|
||||
vi.resetModules()
|
||||
const mod = await import(
|
||||
'../../src/main/services/database/repositories/DiscreteMaterialPlanRepository'
|
||||
)
|
||||
const mod =
|
||||
await import('../../src/main/services/database/repositories/DiscreteMaterialPlanRepository')
|
||||
const repo = new mod.DiscreteMaterialPlanRepository()
|
||||
|
||||
const result = await repo.queryBySourceNumbersDistinct(['S1', 'S2'])
|
||||
@@ -529,9 +520,8 @@ describe('DiscreteMaterialPlanRepository', () => {
|
||||
query: vi.fn().mockRejectedValue(new Error('db fail'))
|
||||
}
|
||||
vi.resetModules()
|
||||
const mod = await import(
|
||||
'../../src/main/services/database/repositories/DiscreteMaterialPlanRepository'
|
||||
)
|
||||
const mod =
|
||||
await import('../../src/main/services/database/repositories/DiscreteMaterialPlanRepository')
|
||||
const repo = new mod.DiscreteMaterialPlanRepository()
|
||||
|
||||
const result = await repo.queryBySourceNumbersDistinct(['S1'])
|
||||
|
||||
290
tests/unit/services/auth/auth-application-service.test.ts
Normal file
290
tests/unit/services/auth/auth-application-service.test.ts
Normal file
@@ -0,0 +1,290 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { UserFactory } from '../../../fixtures/factory'
|
||||
import { AuthApplicationService } from '../../../../src/main/services/auth/auth-application-service'
|
||||
|
||||
// Mock logger to prevent real winston initialization and console noise
|
||||
vi.mock('../../../../src/main/services/logger', () => ({
|
||||
createLogger: () => ({
|
||||
info: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn(),
|
||||
debug: vi.fn()
|
||||
}),
|
||||
setLogLevel: vi.fn(),
|
||||
applyLoggingConfig: vi.fn(),
|
||||
run: (_fn: () => Promise<any>, _ctx?: any) => _fn(),
|
||||
getRequestId: () => undefined,
|
||||
getContext: () => undefined
|
||||
}))
|
||||
|
||||
vi.mock('../../../../src/main/services/logger/request-context', () => ({
|
||||
run: (_fn: () => Promise<any>, _ctx?: any) => _fn(),
|
||||
getRequestId: () => undefined,
|
||||
getContext: () => undefined,
|
||||
withContext: (_fn: () => Promise<any>, _overrides?: any) => _fn()
|
||||
}))
|
||||
|
||||
vi.mock('../../../../src/main/services/logger/audit-logger', () => ({
|
||||
logAudit: vi.fn()
|
||||
}))
|
||||
|
||||
describe('AuthApplicationService', () => {
|
||||
let service: AuthApplicationService
|
||||
let mockSessionManager: any
|
||||
let mockUpdateService: any
|
||||
|
||||
beforeEach(() => {
|
||||
mockSessionManager = {
|
||||
login: vi.fn(),
|
||||
loginByComputerName: vi.fn(),
|
||||
getUserInfo: vi.fn(),
|
||||
isAuthenticated: vi.fn(),
|
||||
logout: vi.fn(),
|
||||
getAllUsers: vi.fn(),
|
||||
switchUser: vi.fn(),
|
||||
isAdmin: vi.fn()
|
||||
}
|
||||
mockUpdateService = {
|
||||
setUserContext: vi.fn()
|
||||
}
|
||||
service = new AuthApplicationService(mockSessionManager, mockUpdateService)
|
||||
})
|
||||
|
||||
describe('login', () => {
|
||||
it('should throw ValidationError when username is empty', async () => {
|
||||
await expect(service.login('', 'password')).rejects.toThrow('请输入用户名和密码')
|
||||
})
|
||||
|
||||
it('should throw ValidationError when password is empty', async () => {
|
||||
await expect(service.login('admin', '')).rejects.toThrow('请输入用户名和密码')
|
||||
})
|
||||
|
||||
it('should log in admin user and set update context', async () => {
|
||||
const user = UserFactory.createAdmin()
|
||||
mockSessionManager.login.mockResolvedValue(true)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
userType: user.userType
|
||||
})
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(true)
|
||||
|
||||
await service.login(user.username, 'password')
|
||||
|
||||
expect(mockSessionManager.login).toHaveBeenCalledWith(user.username, 'password')
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(user.userType)
|
||||
const current = service.getCurrentUser()
|
||||
expect(current.isAuthenticated).toBe(true)
|
||||
expect(current.userInfo?.username).toBe(user.username)
|
||||
})
|
||||
|
||||
it('should log in regular user and set update context', async () => {
|
||||
const user = UserFactory.createUserDefault()
|
||||
mockSessionManager.login.mockResolvedValue(true)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
userType: user.userType
|
||||
})
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(true)
|
||||
|
||||
await service.login(user.username, 'password')
|
||||
|
||||
expect(mockSessionManager.login).toHaveBeenCalledWith(user.username, 'password')
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(user.userType)
|
||||
})
|
||||
|
||||
it('should reject with ValidationError when credentials are invalid', async () => {
|
||||
const user = UserFactory.createAdmin()
|
||||
mockSessionManager.login.mockResolvedValue(false)
|
||||
mockSessionManager.getUserInfo.mockReturnValue(null)
|
||||
|
||||
await expect(service.login(user.username, 'wrong')).rejects.toThrow('用户名或密码错误')
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(null)
|
||||
})
|
||||
|
||||
it('should reject on network error', async () => {
|
||||
const user = UserFactory.createUserDefault()
|
||||
mockSessionManager.login.mockRejectedValue(new Error('Network error'))
|
||||
await expect(service.login(user.username, 'password')).rejects.toThrow('Network error')
|
||||
})
|
||||
})
|
||||
|
||||
describe('silentLogin', () => {
|
||||
it('should succeed when computer name matches a user', async () => {
|
||||
const user = UserFactory.createAdmin()
|
||||
mockSessionManager.loginByComputerName.mockResolvedValue(true)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
userType: user.userType
|
||||
})
|
||||
|
||||
const result = await service.silentLogin()
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.userInfo?.username).toBe(user.username)
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(user.userType)
|
||||
})
|
||||
|
||||
it('should throw ValidationError when no matching user found', async () => {
|
||||
mockSessionManager.loginByComputerName.mockResolvedValue(false)
|
||||
mockSessionManager.getUserInfo.mockReturnValue(null)
|
||||
|
||||
await expect(service.silentLogin()).rejects.toThrow('无感登录失败')
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(null)
|
||||
})
|
||||
|
||||
it('should deduplicate concurrent silentLogin calls', async () => {
|
||||
const user = UserFactory.createUserDefault()
|
||||
let resolveLogin: (value: boolean) => void
|
||||
mockSessionManager.loginByComputerName.mockImplementation(
|
||||
() =>
|
||||
new Promise<boolean>((resolve) => {
|
||||
resolveLogin = resolve
|
||||
})
|
||||
)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
userType: user.userType
|
||||
})
|
||||
|
||||
const promise1 = service.silentLogin()
|
||||
const promise2 = service.silentLogin()
|
||||
|
||||
resolveLogin!(true)
|
||||
|
||||
const [result1, result2] = await Promise.all([promise1, promise2])
|
||||
expect(result1).toBe(result2)
|
||||
expect(mockSessionManager.loginByComputerName).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
})
|
||||
|
||||
describe('logout', () => {
|
||||
it('should log out and clear session', async () => {
|
||||
const user = UserFactory.createAdmin()
|
||||
mockSessionManager.login.mockResolvedValue(true)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
userType: user.userType
|
||||
})
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(true)
|
||||
|
||||
await service.login(user.username, 'password')
|
||||
await service.logout()
|
||||
|
||||
expect(mockSessionManager.logout).toHaveBeenCalled()
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(null)
|
||||
})
|
||||
|
||||
it('should handle logout gracefully when not logged in', async () => {
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(false)
|
||||
mockSessionManager.getUserInfo.mockReturnValue(null)
|
||||
await service.logout()
|
||||
expect(mockSessionManager.logout).toHaveBeenCalled()
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(null)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getCurrentUser', () => {
|
||||
it('should return unauthenticated state before login', () => {
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(false)
|
||||
mockSessionManager.getUserInfo.mockReturnValue(null)
|
||||
const current = service.getCurrentUser()
|
||||
expect(current.isAuthenticated).toBe(false)
|
||||
expect(current.userInfo).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should return authenticated state after login', async () => {
|
||||
const user = UserFactory.createAdmin()
|
||||
mockSessionManager.login.mockResolvedValue(true)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
userType: user.userType
|
||||
})
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(true)
|
||||
|
||||
await service.login(user.username, 'password')
|
||||
const current = service.getCurrentUser()
|
||||
expect(current.isAuthenticated).toBe(true)
|
||||
expect(current.userInfo?.username).toBe(user.username)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getAllUsers', () => {
|
||||
it('should delegate to session manager', async () => {
|
||||
const users = [UserFactory.createAdmin(), UserFactory.createUserDefault()]
|
||||
mockSessionManager.getAllUsers.mockResolvedValue(users)
|
||||
|
||||
const result = await service.getAllUsers()
|
||||
|
||||
expect(mockSessionManager.getAllUsers).toHaveBeenCalled()
|
||||
expect(result).toEqual(users)
|
||||
})
|
||||
})
|
||||
|
||||
describe('switchUser', () => {
|
||||
it('should switch user and update context', async () => {
|
||||
const admin = UserFactory.createAdmin()
|
||||
const targetUser = UserFactory.createUserDefault()
|
||||
mockSessionManager.switchUser.mockReturnValue(true)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: targetUser.id,
|
||||
username: targetUser.username,
|
||||
userType: targetUser.userType
|
||||
})
|
||||
|
||||
const result = await service.switchUser(targetUser)
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.userInfo?.username).toBe(targetUser.username)
|
||||
expect(mockSessionManager.switchUser).toHaveBeenCalledWith(targetUser)
|
||||
expect(mockUpdateService.setUserContext).toHaveBeenCalledWith(targetUser.userType)
|
||||
})
|
||||
|
||||
it('should throw ValidationError when switch fails', async () => {
|
||||
const targetUser = UserFactory.createUserDefault()
|
||||
mockSessionManager.switchUser.mockReturnValue(false)
|
||||
|
||||
await expect(service.switchUser(targetUser)).rejects.toThrow('用户切换失败')
|
||||
})
|
||||
})
|
||||
|
||||
describe('isAdmin', () => {
|
||||
it('should delegate to session manager', () => {
|
||||
mockSessionManager.isAdmin.mockReturnValue(true)
|
||||
expect(service.isAdmin()).toBe(true)
|
||||
|
||||
mockSessionManager.isAdmin.mockReturnValue(false)
|
||||
expect(service.isAdmin()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('authentication state transitions', () => {
|
||||
it('should reflect full lifecycle: unauthenticated → authenticated → expired', async () => {
|
||||
const user = UserFactory.createAdmin()
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(false)
|
||||
mockSessionManager.getUserInfo.mockReturnValue(null)
|
||||
expect(service.getCurrentUser().isAuthenticated).toBe(false)
|
||||
|
||||
mockSessionManager.login.mockResolvedValue(true)
|
||||
mockSessionManager.getUserInfo.mockReturnValue({
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
userType: user.userType
|
||||
})
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(true)
|
||||
await service.login(user.username, 'password')
|
||||
expect(service.getCurrentUser().isAuthenticated).toBe(true)
|
||||
|
||||
// Simulate token expiry
|
||||
mockSessionManager.isAuthenticated.mockReturnValue(false)
|
||||
const current = service.getCurrentUser()
|
||||
expect(current.isAuthenticated).toBe(false)
|
||||
expect(current.userInfo).toBeDefined()
|
||||
})
|
||||
})
|
||||
})
|
||||
333
tests/unit/services/cleaner/cleaner-application-service.test.ts
Normal file
333
tests/unit/services/cleaner/cleaner-application-service.test.ts
Normal file
@@ -0,0 +1,333 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
|
||||
import { CleanerApplicationService } from '../../../../src/main/services/cleaner/cleaner-application-service'
|
||||
import {
|
||||
ValidationError,
|
||||
ErpConnectionError,
|
||||
DatabaseQueryError
|
||||
} from '../../../../src/main/types/errors'
|
||||
|
||||
// Mock ConfigManager to avoid "Configuration not initialized" errors in tests
|
||||
vi.mock('../../../../src/main/services/config/config-manager', () => {
|
||||
return {
|
||||
ConfigManager: {
|
||||
getInstance: () => ({
|
||||
getDatabaseType: () => 'mysql',
|
||||
getConfig: () => ({ database: { activeType: 'mysql' } })
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Mock the OrderResolver to avoid real DB interactions
|
||||
vi.mock('../../../../src/main/services/erp/order-resolver', () => {
|
||||
return {
|
||||
OrderNumberResolver: class {
|
||||
constructor(_dbService: any) {} // eslint-disable-line @typescript-eslint/no-empty-function
|
||||
async resolve(orderNumbers: string[]) {
|
||||
return orderNumbers
|
||||
}
|
||||
getValidOrderNumbers(mappings: string[]) {
|
||||
return mappings
|
||||
}
|
||||
getWarnings(_mappings: any[]) {
|
||||
return []
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Control whether CleanerService.clean should throw
|
||||
let cleanerShouldThrow = false
|
||||
let cleanerError: Error = new Error('cleaner crashed')
|
||||
|
||||
// Capture last input passed to CleanerService.clean for assertions
|
||||
let lastCleanerInput: any = null
|
||||
vi.mock('../../../../src/main/services/erp/cleaner', () => {
|
||||
return {
|
||||
CleanerService: class {
|
||||
constructor(_erpAuth: any) {
|
||||
this.clean = vi.fn(async (input: any) => {
|
||||
if (cleanerShouldThrow) throw cleanerError
|
||||
lastCleanerInput = input
|
||||
const count = input?.orderNumbers?.length ?? 0
|
||||
const isDryRun = input?.dryRun ?? false
|
||||
return {
|
||||
ordersProcessed: count,
|
||||
materialsDeleted: isDryRun ? 0 : count,
|
||||
materialsSkipped: 0,
|
||||
errors: [],
|
||||
details: []
|
||||
} as any
|
||||
})
|
||||
}
|
||||
clean: any
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Capture close calls on ErpAuthService
|
||||
let erpAuthCloseCalled = false
|
||||
vi.mock('../../../../src/main/services/erp/erp-auth', () => {
|
||||
return {
|
||||
ErpAuthService: class {
|
||||
constructor(_config: any) {} // eslint-disable-line @typescript-eslint/no-empty-function
|
||||
async login() {
|
||||
return Promise.resolve(undefined)
|
||||
}
|
||||
async close() {
|
||||
erpAuthCloseCalled = true
|
||||
return Promise.resolve(undefined)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Mock ResultExporter for exportResults tests
|
||||
vi.mock('../../../../src/main/services/excel/result-exporter', () => {
|
||||
return {
|
||||
ResultExporter: class {
|
||||
async exportValidationResults(items: any[]) {
|
||||
return {
|
||||
success: true,
|
||||
filePath: '/tmp/exported.xlsx',
|
||||
recordCount: items.length
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Helper to set up common method mocks for a service instance
|
||||
function setupServiceMocks(service: CleanerApplicationService) {
|
||||
;(service as any).getErpConfig = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ url: 'http://erp', username: 'u', password: 'p' })
|
||||
;(service as any).getDatabaseService = vi.fn().mockResolvedValue({
|
||||
disconnect: vi.fn().mockResolvedValue(undefined)
|
||||
})
|
||||
;(service as any).recordCleanupAudit = vi.fn().mockResolvedValue(undefined)
|
||||
;(service as any).generateAndUploadReport = vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
function makeInput(overrides: Record<string, any> = {}) {
|
||||
return {
|
||||
orderNumbers: ['SC1', 'SC2'],
|
||||
materialCodes: [],
|
||||
dryRun: false,
|
||||
queryBatchSize: 100,
|
||||
processConcurrency: 1,
|
||||
onProgress: vi.fn(),
|
||||
...overrides
|
||||
}
|
||||
}
|
||||
|
||||
describe('CleanerApplicationService', () => {
|
||||
let service: CleanerApplicationService
|
||||
|
||||
beforeEach(() => {
|
||||
service = new CleanerApplicationService()
|
||||
lastCleanerInput = null
|
||||
erpAuthCloseCalled = false
|
||||
cleanerShouldThrow = false
|
||||
cleanerError = new Error('cleaner crashed')
|
||||
setupServiceMocks(service)
|
||||
})
|
||||
|
||||
describe('runCleaner', () => {
|
||||
it('should process orders and return results', async () => {
|
||||
const eventSender: any = { send: vi.fn() }
|
||||
|
||||
const result = await service.runCleaner(eventSender, makeInput())
|
||||
|
||||
expect(result.ordersProcessed).toBe(2)
|
||||
expect(result.materialsDeleted).toBe(2)
|
||||
})
|
||||
|
||||
it('should pass dryRun=true to CleanerService and report zero deletions', async () => {
|
||||
const eventSender: any = { send: vi.fn() }
|
||||
|
||||
const result = await service.runCleaner(eventSender, makeInput({ dryRun: true }))
|
||||
|
||||
expect(result.ordersProcessed).toBe(2)
|
||||
expect(result.materialsDeleted).toBe(0)
|
||||
expect(lastCleanerInput?.dryRun).toBe(true)
|
||||
})
|
||||
|
||||
it('should increase materialsDeleted when dryRun is false vs true', async () => {
|
||||
const eventSender: any = { send: vi.fn() }
|
||||
|
||||
const resDry = await service.runCleaner(
|
||||
eventSender,
|
||||
makeInput({ dryRun: true, orderNumbers: ['SC1', 'SC2', 'SC3'] })
|
||||
)
|
||||
expect(resDry.materialsDeleted).toBe(0)
|
||||
|
||||
const resActual = await service.runCleaner(
|
||||
eventSender,
|
||||
makeInput({ dryRun: false, orderNumbers: ['SC1', 'SC2', 'SC3'] })
|
||||
)
|
||||
expect(resActual.materialsDeleted).toBe(3)
|
||||
expect(lastCleanerInput?.dryRun).toBe(false)
|
||||
})
|
||||
|
||||
it('should handle different order counts independently across invocations', async () => {
|
||||
const eventSender: any = { send: vi.fn() }
|
||||
|
||||
const res1 = await service.runCleaner(
|
||||
eventSender,
|
||||
makeInput({ orderNumbers: ['SC1', 'SC2'] })
|
||||
)
|
||||
expect(res1.ordersProcessed).toBe(2)
|
||||
|
||||
const res2 = await service.runCleaner(eventSender, makeInput({ orderNumbers: ['SC3'] }))
|
||||
expect(res2.ordersProcessed).toBe(1)
|
||||
})
|
||||
|
||||
it('should reject when ERP config fetch fails', async () => {
|
||||
;(service as any).getErpConfig = vi.fn().mockRejectedValue(new Error('ERP config error'))
|
||||
|
||||
await expect(service.runCleaner({ send: vi.fn() } as any, makeInput())).rejects.toThrow(
|
||||
'ERP config error'
|
||||
)
|
||||
})
|
||||
|
||||
it('should reject with DatabaseQueryError when database connection fails', async () => {
|
||||
;(service as any).getErpConfig = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ url: 'u', username: 'x', password: 'p' })
|
||||
;(service as any).getDatabaseService = vi.fn().mockRejectedValue(new Error('DB fail'))
|
||||
|
||||
const { DatabaseQueryError } = await import('../../../../src/main/types/errors')
|
||||
await expect(
|
||||
service.runCleaner({ send: vi.fn() } as any, makeInput())
|
||||
).rejects.toBeInstanceOf(DatabaseQueryError)
|
||||
})
|
||||
|
||||
it('should reject with ValidationError when no valid order numbers are provided', async () => {
|
||||
;(service as any).getErpConfig = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ url: 'u', username: 'x', password: 'p' })
|
||||
;(service as any).getDatabaseService = vi.fn().mockResolvedValue({
|
||||
disconnect: vi.fn().mockResolvedValue(undefined)
|
||||
})
|
||||
|
||||
await expect(
|
||||
service.runCleaner({ send: vi.fn() } as any, makeInput({ orderNumbers: [] }))
|
||||
).rejects.toThrow('没有有效的生产订单号可处理')
|
||||
})
|
||||
|
||||
it('should process orders containing empty strings without crashing', async () => {
|
||||
const eventSender: any = { send: vi.fn() }
|
||||
|
||||
const result = await service.runCleaner(eventSender, makeInput({ orderNumbers: ['', 'SC2'] }))
|
||||
expect(result.ordersProcessed).toBe(2)
|
||||
})
|
||||
|
||||
it('should handle processConcurrency=0 gracefully', async () => {
|
||||
const eventSender: any = { send: vi.fn() }
|
||||
|
||||
const result = await service.runCleaner(
|
||||
eventSender,
|
||||
makeInput({
|
||||
orderNumbers: ['SC1'],
|
||||
processConcurrency: 0
|
||||
})
|
||||
)
|
||||
expect(result.ordersProcessed).toBe(1)
|
||||
})
|
||||
|
||||
it('should close ERP browser on success', async () => {
|
||||
await service.runCleaner({ send: vi.fn() } as any, makeInput())
|
||||
|
||||
expect(erpAuthCloseCalled).toBe(true)
|
||||
})
|
||||
|
||||
it('should close ERP browser even when cleaner throws', async () => {
|
||||
erpAuthCloseCalled = false
|
||||
cleanerShouldThrow = true
|
||||
cleanerError = new Error('cleaner crashed')
|
||||
|
||||
await expect(service.runCleaner({ send: vi.fn() } as any, makeInput())).rejects.toThrow(
|
||||
'cleaner crashed'
|
||||
)
|
||||
|
||||
expect(erpAuthCloseCalled).toBe(true)
|
||||
})
|
||||
|
||||
it('should disconnect database after successful run', async () => {
|
||||
const mockDisconnect = vi.fn().mockResolvedValue(undefined)
|
||||
;(service as any).getErpConfig = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ url: 'u', username: 'x', password: 'p' })
|
||||
;(service as any).getDatabaseService = vi.fn().mockResolvedValue({
|
||||
disconnect: mockDisconnect
|
||||
})
|
||||
;(service as any).recordCleanupAudit = vi.fn().mockResolvedValue(undefined)
|
||||
;(service as any).generateAndUploadReport = vi.fn().mockResolvedValue(undefined)
|
||||
|
||||
await service.runCleaner({ send: vi.fn() } as any, makeInput())
|
||||
|
||||
expect(mockDisconnect).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should disconnect database even when cleaner throws', async () => {
|
||||
const mockDisconnect = vi.fn().mockResolvedValue(undefined)
|
||||
;(service as any).getErpConfig = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ url: 'u', username: 'x', password: 'p' })
|
||||
;(service as any).getDatabaseService = vi.fn().mockResolvedValue({
|
||||
disconnect: mockDisconnect
|
||||
})
|
||||
|
||||
cleanerShouldThrow = true
|
||||
cleanerError = new Error('boom')
|
||||
|
||||
await expect(service.runCleaner({ send: vi.fn() } as any, makeInput())).rejects.toThrow(
|
||||
'boom'
|
||||
)
|
||||
|
||||
expect(mockDisconnect).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('exportResults', () => {
|
||||
it('should export results successfully for non-empty items', async () => {
|
||||
const items = [
|
||||
{
|
||||
materialCode: 'M1',
|
||||
materialName: 'Mat A',
|
||||
specification: '',
|
||||
model: '',
|
||||
managerName: 'Mgr',
|
||||
isMarkedForDeletion: false,
|
||||
isSelected: true
|
||||
},
|
||||
{
|
||||
materialCode: 'M2',
|
||||
materialName: 'Mat B',
|
||||
specification: '',
|
||||
model: '',
|
||||
managerName: 'Mgr',
|
||||
isMarkedForDeletion: true,
|
||||
isSelected: false
|
||||
}
|
||||
]
|
||||
|
||||
const result = await service.exportResults(items as any)
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.filePath).toBeDefined()
|
||||
})
|
||||
|
||||
it('should throw ValidationError when items array is empty', async () => {
|
||||
await expect(service.exportResults([])).rejects.toThrow('没有数据可导出')
|
||||
})
|
||||
|
||||
it('should throw when items is null/undefined', async () => {
|
||||
// Source accesses items.length before null guard, so TypeError is expected
|
||||
await expect(service.exportResults(null as any)).rejects.toThrow()
|
||||
await expect(service.exportResults(undefined as any)).rejects.toThrow()
|
||||
})
|
||||
})
|
||||
})
|
||||
252
tests/unit/services/erp/ErpBrowserManager.test.ts
Normal file
252
tests/unit/services/erp/ErpBrowserManager.test.ts
Normal file
@@ -0,0 +1,252 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { ErpBrowserManager } from '../../../../src/main/services/erp/ErpBrowserManager'
|
||||
import { chromium } from 'playwright'
|
||||
|
||||
// Mock playwright
|
||||
vi.mock('playwright', () => ({
|
||||
chromium: {
|
||||
launch: vi.fn(),
|
||||
connect: vi.fn()
|
||||
}
|
||||
}))
|
||||
|
||||
// Mock logger
|
||||
vi.mock('../../../../src/main/services/logger', () => ({
|
||||
createLogger: vi.fn(() => ({
|
||||
info: vi.fn(),
|
||||
debug: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn()
|
||||
}))
|
||||
}))
|
||||
|
||||
describe('ErpBrowserManager', () => {
|
||||
let mockBrowser: any
|
||||
let mockContext: any
|
||||
let mockPage: any
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
|
||||
// Create fresh mocks for each test to preserve isConnected state
|
||||
mockBrowser = {
|
||||
isConnected: vi.fn().mockReturnValue(true),
|
||||
newContext: vi.fn(),
|
||||
close: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
mockContext = {
|
||||
close: vi.fn().mockResolvedValue(undefined),
|
||||
newPage: vi.fn()
|
||||
}
|
||||
|
||||
mockPage = {
|
||||
goto: vi.fn().mockResolvedValue(undefined),
|
||||
waitForLoadState: vi.fn().mockResolvedValue(undefined),
|
||||
close: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser)
|
||||
mockBrowser.newContext.mockResolvedValue(mockContext)
|
||||
mockContext.newPage.mockResolvedValue(mockPage)
|
||||
})
|
||||
|
||||
describe('launch()', () => {
|
||||
it('should launch browser with config', async () => {
|
||||
const manager = new ErpBrowserManager({ headless: false })
|
||||
const browser = await manager.launch()
|
||||
|
||||
expect(chromium.launch).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
headless: false
|
||||
})
|
||||
)
|
||||
expect(browser).toBeDefined()
|
||||
})
|
||||
|
||||
it('should return existing browser if running', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
|
||||
// First launch creates session
|
||||
const firstBrowser = await manager.launch()
|
||||
|
||||
// Force save session (this simulates what initialize() would do)
|
||||
manager['session'] = {
|
||||
browser: firstBrowser,
|
||||
context: mockContext,
|
||||
page: mockPage
|
||||
}
|
||||
|
||||
// Second launch should return existing browser
|
||||
const secondBrowser = await manager.launch()
|
||||
|
||||
expect(firstBrowser).toBe(secondBrowser)
|
||||
expect(chromium.launch).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it.each([true, false])('should launch with headless=%s', async (headless) => {
|
||||
const manager = new ErpBrowserManager({ headless })
|
||||
await manager.launch()
|
||||
expect(chromium.launch).toHaveBeenCalledWith(expect.objectContaining({ headless }))
|
||||
})
|
||||
})
|
||||
|
||||
describe('initialize()', () => {
|
||||
it('should create browser, context, and page in one call', async () => {
|
||||
const manager = new ErpBrowserManager({ headless: true })
|
||||
const session = await manager.initialize()
|
||||
|
||||
expect(session.browser).toBe(mockBrowser)
|
||||
expect(session.context).toBe(mockContext)
|
||||
expect(session.page).toBe(mockPage)
|
||||
expect(chromium.launch).toHaveBeenCalledTimes(1)
|
||||
expect(mockBrowser.newContext).toHaveBeenCalledTimes(1)
|
||||
expect(mockContext.newPage).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('should return existing session on repeated calls', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
const first = await manager.initialize()
|
||||
const second = await manager.initialize()
|
||||
|
||||
expect(first).toBe(second)
|
||||
expect(chromium.launch).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getSession()', () => {
|
||||
it('should return null when no session', () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
expect(manager.getSession()).toBeNull()
|
||||
})
|
||||
|
||||
it('should return session after initialize', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
const initSession = await manager.initialize()
|
||||
const session = manager.getSession()
|
||||
|
||||
expect(session).toBe(initSession)
|
||||
})
|
||||
})
|
||||
|
||||
describe('isRunning()', () => {
|
||||
it('should return false when no session', () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
expect(manager.isRunning()).toBe(false)
|
||||
})
|
||||
|
||||
it('should return true when browser is connected', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.initialize()
|
||||
expect(manager.isRunning()).toBe(true)
|
||||
})
|
||||
|
||||
it('should return false when browser is disconnected', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.initialize()
|
||||
mockBrowser.isConnected.mockReturnValue(false)
|
||||
expect(manager.isRunning()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('navigate()', () => {
|
||||
it('should call page.goto and waitForLoadState', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.initialize()
|
||||
await manager.navigate('https://example.com')
|
||||
|
||||
expect(mockPage.goto).toHaveBeenCalledWith(
|
||||
'https://example.com',
|
||||
expect.objectContaining({ timeout: 30000 })
|
||||
)
|
||||
expect(mockPage.waitForLoadState).toHaveBeenCalledWith(
|
||||
'domcontentloaded',
|
||||
expect.objectContaining({ timeout: 10000 })
|
||||
)
|
||||
})
|
||||
|
||||
it('should throw when no session', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await expect(manager.navigate('https://example.com')).rejects.toThrow('No page available')
|
||||
})
|
||||
})
|
||||
|
||||
describe('createContext()', () => {
|
||||
it('should create browser context', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
const context = await manager.createContext()
|
||||
|
||||
expect(context).toBeDefined()
|
||||
expect(mockBrowser.newContext).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should use provided browser', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
const customBrowser = {
|
||||
...mockBrowser,
|
||||
newContext: vi.fn().mockResolvedValue(mockContext)
|
||||
}
|
||||
await manager.createContext(customBrowser as any)
|
||||
|
||||
expect(customBrowser.newContext).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should launch browser if not provided', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.createContext()
|
||||
|
||||
expect(chromium.launch).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('createPage()', () => {
|
||||
it('should create page in context', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.launch()
|
||||
const page = await manager.createPage()
|
||||
|
||||
expect(page).toBeDefined()
|
||||
expect(mockContext.newPage).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('close()', () => {
|
||||
it('should close all browser resources', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.launch()
|
||||
const context = await manager.createContext()
|
||||
const page = await manager.createPage()
|
||||
|
||||
// Manually set session since our mocks don't persist internal state
|
||||
manager['session'] = {
|
||||
browser: mockBrowser,
|
||||
context,
|
||||
page
|
||||
}
|
||||
|
||||
await manager.close()
|
||||
|
||||
expect(mockContext.close).toHaveBeenCalled()
|
||||
expect(mockBrowser.close).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should be no-op if no session', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.close()
|
||||
|
||||
expect(mockContext.close).not.toHaveBeenCalled()
|
||||
expect(mockBrowser.close).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should close browser even if context.close fails', async () => {
|
||||
const manager = new ErpBrowserManager()
|
||||
await manager.initialize()
|
||||
mockContext.close.mockRejectedValue(new Error('Context close error'))
|
||||
|
||||
await manager.close()
|
||||
|
||||
expect(mockBrowser.close).toHaveBeenCalled()
|
||||
expect(manager.getSession()).toBeNull()
|
||||
})
|
||||
})
|
||||
})
|
||||
272
tests/unit/services/erp/cleaner.test.ts
Normal file
272
tests/unit/services/erp/cleaner.test.ts
Normal file
@@ -0,0 +1,272 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import {
|
||||
CleanerService,
|
||||
createBatches,
|
||||
getMissingOrders,
|
||||
runWithConcurrency
|
||||
} from '../../../../src/main/services/erp/cleaner'
|
||||
|
||||
// TODO: clean() method tests need integration test setup with full page mock
|
||||
|
||||
describe('CleanerService - Helper Methods', () => {
|
||||
const createCleanerService = (dryRun = false): CleanerService => {
|
||||
return new CleanerService({} as any, { dryRun })
|
||||
}
|
||||
|
||||
describe('shouldDeleteMaterial()', () => {
|
||||
const cleaner = createCleanerService()
|
||||
const deleteSet = new Set(['MAT001', 'MAT002'])
|
||||
|
||||
it('should return true when material matches all deletion criteria', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(result).toBe(true)
|
||||
})
|
||||
|
||||
it('should return false when material is not in delete set', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT999',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(result).toBe(false)
|
||||
})
|
||||
|
||||
it('should return false when row is in protected range (2000-7999)', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 5000,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(result).toBe(false)
|
||||
})
|
||||
|
||||
it('should return false when pendingQty is not empty', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '5',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(result).toBe(false)
|
||||
})
|
||||
|
||||
it('should return false when pendingQty has only whitespace', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: ' ',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(result).toBe(true) // whitespace-only is treated as empty after trim
|
||||
})
|
||||
|
||||
it('should respect boundary row numbers', () => {
|
||||
// Row 1999: can delete
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 1999,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
).toBe(true)
|
||||
|
||||
// Row 2000: protected
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 2000,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
).toBe(false)
|
||||
|
||||
// Row 7999: protected
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 7999,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
).toBe(false)
|
||||
|
||||
// Row 8000: can delete
|
||||
expect(
|
||||
cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 8000,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getSkipReason()', () => {
|
||||
const cleaner = createCleanerService()
|
||||
const deleteSet = new Set(['MAT001'])
|
||||
|
||||
it('should return correct skip reason for protected row', () => {
|
||||
const reason = cleaner.getSkipReason({
|
||||
rowNumber: 3000,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(reason).toBe('行号在 2000-7999 范围内（受保护）')
|
||||
})
|
||||
|
||||
it('should return "unknown reason" when no skip conditions match', () => {
|
||||
const result = cleaner.shouldDeleteMaterial({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
const reason = cleaner.getSkipReason({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(result).toBe(true)
|
||||
expect(reason).toBe('未知原因')
|
||||
})
|
||||
|
||||
it('should return correct reason for material not in delete set', () => {
|
||||
const reason = cleaner.getSkipReason({
|
||||
rowNumber: 100,
|
||||
pendingQty: '',
|
||||
materialCode: 'MAT999',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(reason).toBe('物料不在删除清单中')
|
||||
})
|
||||
|
||||
it('should return correct reason for non-empty pendingQty', () => {
|
||||
const reason = cleaner.getSkipReason({
|
||||
rowNumber: 100,
|
||||
pendingQty: '10',
|
||||
materialCode: 'MAT001',
|
||||
deleteSet
|
||||
})
|
||||
|
||||
expect(reason).toBe('累计待发数量不为空')
|
||||
})
|
||||
})
|
||||
|
||||
describe('createBatches()', () => {
|
||||
it('should split array into correct batch sizes', () => {
|
||||
const items = [1, 2, 3, 4, 5, 6, 7]
|
||||
const batches = createBatches(items, 3)
|
||||
|
||||
expect(batches).toEqual([[1, 2, 3], [4, 5, 6], [7]])
|
||||
})
|
||||
|
||||
it('should handle edge cases (empty array, single item, batchSize larger than array)', () => {
|
||||
expect(createBatches([], 5)).toEqual([])
|
||||
expect(createBatches([1], 5)).toEqual([[1]])
|
||||
expect(createBatches([1, 2], 10)).toEqual([[1, 2]])
|
||||
})
|
||||
|
||||
it('should handle batchSize of 1', () => {
|
||||
const items = [1, 2, 3]
|
||||
const batches = createBatches(items, 1)
|
||||
|
||||
expect(batches).toEqual([[1], [2], [3]])
|
||||
})
|
||||
})
|
||||
|
||||
describe('runWithConcurrency()', () => {
|
||||
it('should limit parallelism to specified concurrency', async () => {
|
||||
const items = [1, 2, 3, 4, 5, 6]
|
||||
let running = 0
|
||||
let peak = 0
|
||||
|
||||
await runWithConcurrency(items, 2, async () => {
|
||||
running += 1
|
||||
peak = Math.max(peak, running)
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
running -= 1
|
||||
return true
|
||||
})
|
||||
|
||||
expect(peak).toBeLessThanOrEqual(2)
|
||||
expect(peak).toBe(2)
|
||||
})
|
||||
|
||||
it('should complete all items successfully', async () => {
|
||||
const items = ['a', 'b', 'c']
|
||||
const results = await runWithConcurrency(items, 2, async (item, index) => {
|
||||
return `${item}-${index}`
|
||||
})
|
||||
|
||||
expect(results).toEqual(['a-0', 'b-1', 'c-2'])
|
||||
expect(results).toHaveLength(items.length)
|
||||
})
|
||||
})
|
||||
|
||||
describe('isDryRun()', () => {
|
||||
it('should return correct dry run mode from constructor options', () => {
|
||||
const dryRunService = createCleanerService(true)
|
||||
const normalService = createCleanerService(false)
|
||||
|
||||
expect(dryRunService.isDryRun()).toBe(true)
|
||||
expect(normalService.isDryRun()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getMissingOrders()', () => {
|
||||
it('should return orders not in processed set', () => {
|
||||
const inputOrders = ['ORD001', 'ORD002', 'ORD003']
|
||||
const processedOrders = new Set(['ORD001', 'ORD003'])
|
||||
|
||||
const missing = getMissingOrders(inputOrders, processedOrders)
|
||||
|
||||
expect(missing).toEqual(['ORD002'])
|
||||
})
|
||||
|
||||
it('should return empty when all orders processed', () => {
|
||||
const inputOrders = ['ORD001', 'ORD002']
|
||||
const processedOrders = new Set(['ORD001', 'ORD002'])
|
||||
|
||||
const missing = getMissingOrders(inputOrders, processedOrders)
|
||||
|
||||
expect(missing).toEqual([])
|
||||
})
|
||||
|
||||
it('should deduplicate input orders', () => {
|
||||
const inputOrders = ['ORD001', 'ORD001', 'ORD002']
|
||||
const processedOrders = new Set(['ORD002'])
|
||||
|
||||
const missing = getMissingOrders(inputOrders, processedOrders)
|
||||
|
||||
expect(missing).toEqual(['ORD001'])
|
||||
})
|
||||
|
||||
it('should return all orders when none processed', () => {
|
||||
const inputOrders = ['ORD001', 'ORD002']
|
||||
const processedOrders = new Set<string>()
|
||||
|
||||
const missing = getMissingOrders(inputOrders, processedOrders)
|
||||
|
||||
expect(missing).toEqual(['ORD001', 'ORD002'])
|
||||
})
|
||||
})
|
||||
})
|
||||
216
tests/unit/services/erp/erp-auth.test.ts
Normal file
216
tests/unit/services/erp/erp-auth.test.ts
Normal file
@@ -0,0 +1,216 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { chromium } from 'playwright'
|
||||
import { ErpAuthService } from '@main/services/erp/erp-auth'
|
||||
import type { ErpConfig } from '@main/types/erp.types'
|
||||
|
||||
// Mock logger
|
||||
vi.mock('@main/services/logger', () => ({
|
||||
createLogger: vi.fn(() => ({
|
||||
info: vi.fn(),
|
||||
debug: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn()
|
||||
}))
|
||||
}))
|
||||
|
||||
// Mock playwright
|
||||
vi.mock('playwright', () => ({
|
||||
chromium: {
|
||||
launch: vi.fn()
|
||||
}
|
||||
}))
|
||||
|
||||
vi.mock('@main/services/erp/erp-error-context', () => ({
|
||||
capturePageContext: vi.fn().mockResolvedValue({})
|
||||
}))
|
||||
|
||||
vi.mock('@main/services/erp/page-diagnostics', () => ({
|
||||
attachPageDiagnostics: vi.fn(),
|
||||
attachContextDiagnostics: vi.fn()
|
||||
}))
|
||||
|
||||
describe('ErpAuthService', () => {
|
||||
let config: ErpConfig
|
||||
let service: ErpAuthService
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
config = {
|
||||
url: 'https://test-erp.com',
|
||||
username: 'testuser',
|
||||
password: 'testpass',
|
||||
headless: true
|
||||
}
|
||||
})
|
||||
|
||||
describe('constructor()', () => {
|
||||
it('should store config', () => {
|
||||
service = new ErpAuthService(config)
|
||||
|
||||
// Verify config is stored by checking isActive returns false (default state)
|
||||
expect(service.isActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('should initialize with null session', () => {
|
||||
service = new ErpAuthService(config)
|
||||
|
||||
expect(service.isActive()).toBe(false)
|
||||
expect(() => service.getSession()).toThrow('Not logged in')
|
||||
})
|
||||
})
|
||||
|
||||
describe('getSession()', () => {
|
||||
beforeEach(() => {
|
||||
service = new ErpAuthService(config)
|
||||
})
|
||||
|
||||
it('should throw error when not logged in', () => {
|
||||
expect(() => service.getSession()).toThrow('Not logged in. Call login() first.')
|
||||
})
|
||||
|
||||
it('should return session when logged in', () => {
|
||||
// Manually set session state (bypassing login for unit test)
|
||||
;(service as any).session = {
|
||||
browser: {},
|
||||
context: {},
|
||||
page: {},
|
||||
mainFrame: {},
|
||||
isLoggedIn: true
|
||||
}
|
||||
|
||||
const session = service.getSession()
|
||||
|
||||
expect(session).toBeDefined()
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('isActive()', () => {
|
||||
beforeEach(() => {
|
||||
service = new ErpAuthService(config)
|
||||
})
|
||||
|
||||
it('should return false when not logged in', () => {
|
||||
expect(service.isActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('should return true when logged in', () => {
|
||||
// Manually set session state (bypassing login for unit test)
|
||||
;(service as any).session = {
|
||||
browser: {},
|
||||
context: {},
|
||||
page: {},
|
||||
mainFrame: {},
|
||||
isLoggedIn: true
|
||||
}
|
||||
|
||||
expect(service.isActive()).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('login()', () => {
|
||||
let mockBrowser: any
|
||||
let mockContext: any
|
||||
let mockPage: any
|
||||
let mockFrame: any
|
||||
|
||||
beforeEach(() => {
|
||||
mockFrame = {
|
||||
locator: vi.fn().mockReturnThis(),
|
||||
getByRole: vi.fn().mockReturnValue({
|
||||
fill: vi.fn().mockResolvedValue(undefined),
|
||||
click: vi.fn().mockResolvedValue(undefined)
|
||||
}),
|
||||
getByText: vi.fn().mockReturnValue({
|
||||
waitFor: vi.fn().mockResolvedValue(undefined),
|
||||
isVisible: vi.fn().mockResolvedValue(false)
|
||||
}),
|
||||
waitFor: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
mockPage = {
|
||||
goto: vi.fn().mockResolvedValue(undefined),
|
||||
waitForLoadState: vi.fn().mockResolvedValue(undefined),
|
||||
waitForSelector: vi.fn().mockResolvedValue(undefined),
|
||||
locator: vi.fn().mockReturnValue({
|
||||
contentFrame: vi.fn().mockResolvedValue(mockFrame)
|
||||
})
|
||||
}
|
||||
|
||||
mockContext = {
|
||||
newPage: vi.fn().mockResolvedValue(mockPage),
|
||||
close: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
mockBrowser = {
|
||||
newContext: vi.fn().mockResolvedValue(mockContext),
|
||||
close: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
})
|
||||
|
||||
it('should create session on successful login', async () => {
|
||||
service = new ErpAuthService(config)
|
||||
|
||||
const session = await service.login()
|
||||
|
||||
expect(chromium.launch).toHaveBeenCalledWith(expect.objectContaining({ headless: true }))
|
||||
expect(mockBrowser.newContext).toHaveBeenCalled()
|
||||
expect(mockContext.newPage).toHaveBeenCalled()
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
expect(session.browser).toBe(mockBrowser)
|
||||
expect(session.context).toBe(mockContext)
|
||||
expect(session.page).toBe(mockPage)
|
||||
expect(session.mainFrame).toBe(mockFrame)
|
||||
})
|
||||
|
||||
it('should reuse existing session if already logged in', async () => {
|
||||
service = new ErpAuthService(config)
|
||||
const firstSession = await service.login()
|
||||
|
||||
// Second call should return same session
|
||||
const secondSession = await service.login()
|
||||
|
||||
expect(secondSession).toBe(firstSession)
|
||||
expect(chromium.launch).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('should throw when forwardFrame contentFrame returns null', async () => {
|
||||
service = new ErpAuthService(config)
|
||||
mockPage.locator = vi.fn().mockReturnValue({
|
||||
contentFrame: vi.fn().mockResolvedValue(null)
|
||||
})
|
||||
|
||||
await expect(service.login()).rejects.toThrow('Failed to access forwardFrame content frame')
|
||||
})
|
||||
})
|
||||
|
||||
describe('close()', () => {
|
||||
beforeEach(() => {
|
||||
service = new ErpAuthService(config)
|
||||
})
|
||||
|
||||
it('should be no-op when not logged in', async () => {
|
||||
// Should not throw when calling close without session
|
||||
await expect(service.close()).resolves.not.toThrow()
|
||||
expect(service.isActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('should clear session when logged in', async () => {
|
||||
// Manually set session state
|
||||
const mockSession = {
|
||||
browser: { close: vi.fn().mockResolvedValue(undefined) },
|
||||
context: { close: vi.fn().mockResolvedValue(undefined) },
|
||||
page: {},
|
||||
mainFrame: {},
|
||||
isLoggedIn: true
|
||||
}
|
||||
;(service as any).session = mockSession
|
||||
|
||||
await service.close()
|
||||
|
||||
expect(service.isActive()).toBe(false)
|
||||
})
|
||||
})
|
||||
})
|
||||
314
tests/unit/services/erp/erp-auth.test.ts.disabled
Normal file
314
tests/unit/services/erp/erp-auth.test.ts.disabled
Normal file
@@ -0,0 +1,314 @@
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
||||
import { ErpAuthService } from '../../../../src/main/services/erp/erp-auth'
|
||||
import type { ErpConfig } from '../../../../src/main/types/erp.types'
|
||||
import { chromium } from 'playwright'
|
||||
|
||||
// Mock playwright
|
||||
vi.mock('playwright', () => ({
|
||||
chromium: {
|
||||
launch: vi.fn(),
|
||||
connect: vi.fn()
|
||||
}
|
||||
}))
|
||||
|
||||
// Mock logger
|
||||
vi.mock('../../../../src/main/services/logger', () => ({
|
||||
createLogger: vi.fn(() => ({
|
||||
info: vi.fn(),
|
||||
debug: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn()
|
||||
}))
|
||||
}))
|
||||
|
||||
// Mock error context capture
|
||||
vi.mock('../../../../src/main/services/erp/erp-error-context', () => ({
|
||||
capturePageContext: vi.fn().mockResolvedValue({})
|
||||
}))
|
||||
|
||||
// Mock page diagnostics
|
||||
vi.mock('../../../../src/main/services/erp/page-diagnostics', () => ({
|
||||
attachPageDiagnostics: vi.fn(),
|
||||
attachContextDiagnostics: vi.fn()
|
||||
}))
|
||||
|
||||
describe('ErpAuthService', () => {
|
||||
const testConfig: ErpConfig = {
|
||||
url: 'https://test-erp.local',
|
||||
username: 'testuser',
|
||||
password: 'testpass'
|
||||
}
|
||||
|
||||
const mockBrowser = {
|
||||
close: vi.fn().mockResolvedValue(undefined),
|
||||
newContext: vi.fn()
|
||||
}
|
||||
|
||||
const mockContext = {
|
||||
close: vi.fn().mockResolvedValue(undefined),
|
||||
newPage: vi.fn()
|
||||
}
|
||||
|
||||
const mockPage = {
|
||||
goto: vi.fn().mockResolvedValue(undefined),
|
||||
waitForLoadState: vi.fn().mockResolvedValue(undefined),
|
||||
waitForSelector: vi.fn().mockResolvedValue(undefined),
|
||||
locator: vi.fn(),
|
||||
close: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
const mockFrame = {
|
||||
locator: vi.fn(),
|
||||
getByRole: vi.fn(),
|
||||
getByText: vi.fn()
|
||||
}
|
||||
|
||||
const mockLocator = {
|
||||
click: vi.fn().mockResolvedValue(undefined),
|
||||
fill: vi.fn().mockResolvedValue(undefined),
|
||||
waitFor: vi.fn().mockResolvedValue(undefined),
|
||||
isVisible: vi.fn().mockResolvedValue(false),
|
||||
contentFrame: vi.fn()
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mockBrowser.newContext.mockResolvedValue(mockContext)
|
||||
mockContext.newPage.mockResolvedValue(mockPage)
|
||||
mockPage.locator.mockImplementation(() => mockLocator)
|
||||
mockLocator.contentFrame.mockResolvedValue(mockFrame)
|
||||
mockFrame.locator.mockImplementation(() => mockLocator)
|
||||
mockFrame.getByRole.mockImplementation(() => mockLocator)
|
||||
mockFrame.getByText.mockImplementation(() => mockLocator)
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
describe('login()', () => {
|
||||
it('should login successfully with valid credentials', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
mockFrame.getByRole.mockImplementation(() => mockLocator)
|
||||
mockFrame.getByText.mockImplementation(() => mockLocator)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
const session = await service.login()
|
||||
|
||||
expect(chromium.launch).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
headless: false,
|
||||
slowMo: 100
|
||||
})
|
||||
)
|
||||
expect(session).toBeDefined()
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
expect(service.isActive()).toBe(true)
|
||||
})
|
||||
|
||||
it('should return existing session if already logged in', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
const firstSession = await service.login()
|
||||
const secondSession = await service.login()
|
||||
|
||||
expect(firstSession).toBe(secondSession)
|
||||
expect(chromium.launch).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('should use headless=true from config when specified', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
|
||||
const headlessConfig: ErpConfig = {
|
||||
...testConfig,
|
||||
headless: true
|
||||
}
|
||||
|
||||
const service = new ErpAuthService(headlessConfig)
|
||||
await service.login()
|
||||
|
||||
expect(chromium.launch).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
headless: true
|
||||
})
|
||||
)
|
||||
})
|
||||
|
||||
it('should throw error when forwardFrame is not accessible', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
mockLocator.contentFrame.mockResolvedValue(null)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
await expect(service.login()).rejects.toThrow('Failed to access forwardFrame content frame')
|
||||
})
|
||||
|
||||
it('should throw error when username input is not found', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
mockFrame.getByRole.mockImplementationOnce(() => ({
|
||||
...mockLocator,
|
||||
fill: vi.fn().mockRejectedValue(new Error('Element not found'))
|
||||
}))
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
await expect(service.login()).rejects.toThrow('Failed to find username input')
|
||||
})
|
||||
|
||||
it('should throw error when password input is not found', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
mockFrame.getByRole
|
||||
.mockImplementationOnce(() => mockLocator) // username succeeds
|
||||
.mockImplementationOnce(() => ({
|
||||
...mockLocator,
|
||||
fill: vi.fn().mockRejectedValue(new Error('Element not found'))
|
||||
}))
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
await expect(service.login()).rejects.toThrow('Failed to find password input')
|
||||
})
|
||||
|
||||
it('should throw error when login button click fails', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
mockFrame.getByRole
|
||||
.mockImplementationOnce(() => mockLocator) // username
|
||||
.mockImplementationOnce(() => mockLocator) // password
|
||||
.mockImplementationOnce(() => ({
|
||||
...mockLocator,
|
||||
click: vi.fn().mockRejectedValue(new Error('Button not found'))
|
||||
}))
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
await expect(service.login()).rejects.toThrow('Failed to click login button')
|
||||
})
|
||||
})
|
||||
|
||||
describe('waitForLoginResult()', () => {
|
||||
it('should detect successful login', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
const successLocator = {
|
||||
waitFor: vi.fn().mockResolvedValue(undefined),
|
||||
isVisible: vi.fn().mockResolvedValue(true)
|
||||
}
|
||||
const errorLocator = {
|
||||
waitFor: vi.fn().mockRejectedValue(new Error('Timeout')),
|
||||
isVisible: vi.fn().mockResolvedValue(false)
|
||||
}
|
||||
mockFrame.locator.mockReturnValueOnce(successLocator).mockReturnValueOnce(errorLocator)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
const session = await service.login()
|
||||
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
})
|
||||
|
||||
it('should detect failed login', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
const successLocator = {
|
||||
waitFor: vi.fn().mockRejectedValue(new Error('Timeout')),
|
||||
isVisible: vi.fn().mockResolvedValue(false)
|
||||
}
|
||||
const errorLocator = {
|
||||
waitFor: vi.fn().mockResolvedValue(undefined),
|
||||
isVisible: vi.fn().mockResolvedValue(true)
|
||||
}
|
||||
mockFrame.locator.mockReturnValueOnce(successLocator).mockReturnValueOnce(errorLocator)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
await expect(service.login()).rejects.toThrow('名称或密码错误')
|
||||
})
|
||||
|
||||
it('should handle force login popup', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
const forceLoginButton = {
|
||||
waitFor: vi.fn().mockResolvedValue(undefined),
|
||||
click: vi.fn().mockResolvedValue(undefined),
|
||||
isVisible: vi.fn().mockResolvedValue(false)
|
||||
}
|
||||
const successLocator = {
|
||||
waitFor: vi.fn().mockResolvedValue(undefined),
|
||||
isVisible: vi.fn().mockResolvedValue(true)
|
||||
}
|
||||
const errorLocator = {
|
||||
waitFor: vi.fn().mockRejectedValue(new Error('Timeout')),
|
||||
isVisible: vi.fn().mockResolvedValue(false)
|
||||
}
|
||||
|
||||
mockFrame.locator
|
||||
.mockReturnValueOnce(forceLoginButton)
|
||||
.mockReturnValueOnce(successLocator)
|
||||
.mockReturnValueOnce(errorLocator)
|
||||
.mockReturnValueOnce(forceLoginButton)
|
||||
.mockReturnValueOnce(successLocator)
|
||||
.mockReturnValueOnce(errorLocator)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
const session = await service.login()
|
||||
|
||||
expect(session.isLoggedIn).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('logout()', () => {
|
||||
it('should close browser and clear session', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
await service.login()
|
||||
await service.close()
|
||||
|
||||
expect(mockContext.close).toHaveBeenCalled()
|
||||
expect(mockBrowser.close).toHaveBeenCalled()
|
||||
expect(service.isActive()).toBe(false)
|
||||
})
|
||||
|
||||
it('should be no-op if not logged in', async () => {
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
await expect(service.close()).resolves.toBeUndefined()
|
||||
expect(mockContext.close).not.toHaveBeenCalled()
|
||||
expect(mockBrowser.close).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('getSession()', () => {
|
||||
it('should return current session', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
const session = await service.login()
|
||||
const retrievedSession = service.getSession()
|
||||
|
||||
expect(retrievedSession).toBe(session)
|
||||
})
|
||||
|
||||
it('should throw error if not logged in', () => {
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
expect(() => service.getSession()).toThrow('Not logged in. Call login() first.')
|
||||
})
|
||||
})
|
||||
|
||||
describe('isActive()', () => {
|
||||
it('should return correct login state', async () => {
|
||||
vi.mocked(chromium.launch).mockResolvedValue(mockBrowser as any)
|
||||
|
||||
const service = new ErpAuthService(testConfig)
|
||||
|
||||
// Before login
|
||||
expect(service.isActive()).toBe(false)
|
||||
|
||||
// After login
|
||||
await service.login()
|
||||
expect(service.isActive()).toBe(true)
|
||||
|
||||
// After logout
|
||||
await service.close()
|
||||
expect(service.isActive()).toBe(false)
|
||||
})
|
||||
})
|
||||
})
|
||||
265
tests/unit/services/erp/extractor-core.test.ts
Normal file
265
tests/unit/services/erp/extractor-core.test.ts
Normal file
@@ -0,0 +1,265 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { ExtractorCore } from '../../../../src/main/services/erp/extractor-core'
|
||||
import type { ErpSession } from '../../../../src/main/types/erp.types'
|
||||
import type { ExtractorCoreInput } from '../../../../src/main/types/extractor.types'
|
||||
|
||||
// Mock playwright
|
||||
vi.mock('playwright', () => ({
|
||||
chromium: {
|
||||
launch: vi.fn(),
|
||||
connect: vi.fn()
|
||||
}
|
||||
}))
|
||||
|
||||
// Mock logger
|
||||
vi.mock('../../../../src/main/services/logger', () => ({
|
||||
createLogger: vi.fn(() => ({
|
||||
info: vi.fn(),
|
||||
debug: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn()
|
||||
}))
|
||||
}))
|
||||
|
||||
describe('ExtractorCore', () => {
|
||||
let extractorCore: ExtractorCore
|
||||
let mockSession: ErpSession
|
||||
let mockPage: any
|
||||
let mockMainFrame: any
|
||||
let mockPopupPage: any
|
||||
let mockWorkFrame: any
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
|
||||
// Create mock session
|
||||
mockWorkFrame = {
|
||||
locator: vi.fn().mockImplementation(() => mockWorkFrame),
|
||||
filter: vi.fn().mockImplementation(() => mockWorkFrame),
|
||||
nth: vi.fn().mockImplementation(() => mockWorkFrame),
|
||||
getByRole: vi.fn().mockReturnThis(),
|
||||
getByText: vi.fn().mockReturnThis(),
|
||||
getByName: vi.fn().mockReturnThis(),
|
||||
fill: vi.fn().mockResolvedValue(undefined),
|
||||
press: vi.fn().mockResolvedValue(undefined),
|
||||
click: vi.fn().mockResolvedValue(undefined),
|
||||
hover: vi.fn().mockResolvedValue(undefined),
|
||||
waitFor: vi.fn().mockResolvedValue(undefined),
|
||||
contentFrame: vi.fn().mockResolvedValue(null)
|
||||
}
|
||||
|
||||
mockPopupPage = {
|
||||
locator: vi.fn().mockReturnThis(),
|
||||
waitForEvent: vi.fn().mockResolvedValue(undefined),
|
||||
contentFrame: vi.fn().mockResolvedValue(null)
|
||||
}
|
||||
|
||||
mockMainFrame = {
|
||||
locator: vi.fn().mockReturnThis(),
|
||||
getByTitle: vi.fn().mockReturnThis(),
|
||||
first: vi.fn().mockReturnThis(),
|
||||
click: vi.fn().mockResolvedValue(undefined),
|
||||
contentFrame: vi.fn().mockResolvedValue(null)
|
||||
}
|
||||
|
||||
mockPage = {
|
||||
waitForEvent: vi.fn().mockResolvedValue(mockPopupPage)
|
||||
}
|
||||
|
||||
mockSession = {
|
||||
page: mockPage,
|
||||
mainFrame: mockMainFrame
|
||||
} as unknown as ErpSession
|
||||
|
||||
extractorCore = new ExtractorCore()
|
||||
})
|
||||
|
||||
describe('waitForLoading()', () => {
|
||||
let mockLoadingLocator: any
|
||||
|
||||
beforeEach(() => {
|
||||
mockLoadingLocator = {
|
||||
waitFor: vi.fn().mockResolvedValue(undefined)
|
||||
}
|
||||
|
||||
// Mock the locator chain: workFrame.locator().filter().nth()
|
||||
mockWorkFrame.locator.mockReturnValue(mockWorkFrame)
|
||||
mockWorkFrame.filter.mockReturnValue(mockWorkFrame)
|
||||
mockWorkFrame.nth.mockReturnValue(mockLoadingLocator)
|
||||
})
|
||||
|
||||
it('should wait for loading to appear and disappear', async () => {
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await extractorCore.waitForLoading(mockWorkFrame)
|
||||
|
||||
expect(mockLoadingLocator.waitFor).toHaveBeenCalledWith({
|
||||
state: 'visible',
|
||||
timeout: 3000
|
||||
})
|
||||
expect(mockLoadingLocator.waitFor).toHaveBeenCalledWith({
|
||||
state: 'hidden',
|
||||
timeout: 0
|
||||
})
|
||||
})
|
||||
|
||||
it('should handle loading that never appears (timeout)', async () => {
|
||||
mockLoadingLocator.waitFor.mockResolvedValueOnce(undefined).mockResolvedValue(undefined)
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await expect(extractorCore.waitForLoading(mockWorkFrame)).resolves.not.toThrow()
|
||||
})
|
||||
|
||||
it('should handle loading that completes quickly', async () => {
|
||||
mockLoadingLocator.waitFor.mockRejectedValueOnce(new Error('Already hidden'))
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await expect(extractorCore.waitForLoading(mockWorkFrame)).resolves.not.toThrow()
|
||||
})
|
||||
|
||||
it('should use correct loading text from locators', async () => {
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await extractorCore.waitForLoading(mockWorkFrame)
|
||||
|
||||
expect(mockWorkFrame.locator).toHaveBeenCalledWith('div')
|
||||
expect(mockWorkFrame.filter).toHaveBeenCalled()
|
||||
expect(mockLoadingLocator.waitFor).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
})
|
||||
|
||||
describe('downloadAllBatches()', () => {
|
||||
it('should process all batches with progress updates', async () => {
|
||||
const orderNumbers = ['ORD001', 'ORD002', 'ORD003', 'ORD004']
|
||||
const batchSize = 2
|
||||
const progressCallback = vi.fn()
|
||||
|
||||
const mockDownloadPath = '/path/to/downloaded/file.xlsx'
|
||||
|
||||
// Mock internal methods to avoid complex iframe/locator mocking
|
||||
vi.spyOn(extractorCore as any, 'navigateToExtractorPage').mockResolvedValue({
|
||||
popupPage: mockPopupPage,
|
||||
workFrame: mockWorkFrame
|
||||
})
|
||||
|
||||
vi.spyOn(extractorCore as any, 'downloadBatch').mockResolvedValue(mockDownloadPath)
|
||||
|
||||
const input: ExtractorCoreInput = {
|
||||
session: mockSession,
|
||||
orderNumbers,
|
||||
downloadDir: '/test/downloads',
|
||||
batchSize,
|
||||
onProgress: progressCallback
|
||||
}
|
||||
|
||||
const result = await extractorCore.downloadAllBatches(input)
|
||||
|
||||
expect(result.downloadedFiles).toEqual([mockDownloadPath, mockDownloadPath])
|
||||
expect(result.errors).toHaveLength(0)
|
||||
expect(progressCallback).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should handle errors in batch download gracefully', async () => {
|
||||
const orderNumbers = ['ORD001', 'ORD002']
|
||||
const batchSize = 1
|
||||
const progressCallback = vi.fn()
|
||||
|
||||
vi.spyOn(extractorCore as any, 'navigateToExtractorPage').mockResolvedValue({
|
||||
popupPage: mockPopupPage,
|
||||
workFrame: mockWorkFrame
|
||||
})
|
||||
|
||||
// First batch succeeds, second fails
|
||||
vi.spyOn(extractorCore as any, 'downloadBatch')
|
||||
.mockResolvedValueOnce('/path/file1.xlsx')
|
||||
.mockRejectedValueOnce(new Error('Network error'))
|
||||
|
||||
const input: ExtractorCoreInput = {
|
||||
session: mockSession,
|
||||
orderNumbers,
|
||||
downloadDir: '/test/downloads',
|
||||
batchSize,
|
||||
onProgress: progressCallback
|
||||
}
|
||||
|
||||
const result = await extractorCore.downloadAllBatches(input)
|
||||
|
||||
expect(result.downloadedFiles).toEqual(['/path/file1.xlsx'])
|
||||
expect(result.errors).toHaveLength(1)
|
||||
expect(result.errors[0]).toContain('Batch 2')
|
||||
expect(result.errors[0]).toContain('Network error')
|
||||
})
|
||||
|
||||
it('should calculate progress correctly', async () => {
|
||||
const orderNumbers = ['ORD001', 'ORD002', 'ORD003', 'ORD004']
|
||||
const batchSize = 2
|
||||
const progressCallback = vi.fn()
|
||||
|
||||
vi.spyOn(extractorCore as any, 'navigateToExtractorPage').mockResolvedValue({
|
||||
popupPage: mockPopupPage,
|
||||
workFrame: mockWorkFrame
|
||||
})
|
||||
|
||||
vi.spyOn(extractorCore as any, 'downloadBatch').mockResolvedValue('/path/file.xlsx')
|
||||
|
||||
const input: ExtractorCoreInput = {
|
||||
session: mockSession,
|
||||
orderNumbers,
|
||||
downloadDir: '/test/downloads',
|
||||
batchSize,
|
||||
onProgress: progressCallback
|
||||
}
|
||||
|
||||
await extractorCore.downloadAllBatches(input)
|
||||
|
||||
// totalPoints = 1 + 2 batches + 2 = 5, progressPerPoint = 20
|
||||
// Batch 1: progress = (1 + 1) * 20 = 40
|
||||
// Batch 2: progress = (1 + 2) * 20 = 60
|
||||
expect(progressCallback).toHaveBeenCalledTimes(2)
|
||||
expect(progressCallback).toHaveBeenNthCalledWith(1, '处理批次 1/2', 40, {
|
||||
phase: 'downloading',
|
||||
currentBatch: 1,
|
||||
totalBatches: 2
|
||||
})
|
||||
expect(progressCallback).toHaveBeenNthCalledWith(2, '处理批次 2/2', 60, {
|
||||
phase: 'downloading',
|
||||
currentBatch: 2,
|
||||
totalBatches: 2
|
||||
})
|
||||
})
|
||||
|
||||
it('should work without progress callback', async () => {
|
||||
const orderNumbers = ['ORD001']
|
||||
const batchSize = 1
|
||||
|
||||
vi.spyOn(extractorCore as any, 'navigateToExtractorPage').mockResolvedValue({
|
||||
popupPage: mockPopupPage,
|
||||
workFrame: mockWorkFrame
|
||||
})
|
||||
|
||||
vi.spyOn(extractorCore as any, 'downloadBatch').mockResolvedValue('/path/file.xlsx')
|
||||
|
||||
const input: ExtractorCoreInput = {
|
||||
session: mockSession,
|
||||
orderNumbers,
|
||||
downloadDir: '/test/downloads',
|
||||
batchSize
|
||||
}
|
||||
|
||||
const result = await extractorCore.downloadAllBatches(input)
|
||||
|
||||
expect(result.downloadedFiles).toHaveLength(1)
|
||||
expect(result.errors).toHaveLength(0)
|
||||
})
|
||||
|
||||
it.todo('TODO: needs integration test setup - should handle complete navigation flow', () => {
|
||||
// Complex test requiring full iframe structure mocking
|
||||
})
|
||||
|
||||
it.todo('TODO: needs integration test setup - should handle download events correctly', () => {
|
||||
// Complex test requiring download event mocking
|
||||
})
|
||||
|
||||
it.todo('TODO: needs integration test setup - should verify locator interactions', () => {
|
||||
// Complex test requiring detailed locator interaction verification
|
||||
})
|
||||
})
|
||||
})
|
||||
359
tests/unit/services/erp/extractor.test.ts
Normal file
359
tests/unit/services/erp/extractor.test.ts
Normal file
@@ -0,0 +1,359 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { ExtractorService } from '../../../../src/main/services/erp/extractor'
|
||||
import { ErpAuthService } from '../../../../src/main/services/erp/erp-auth'
|
||||
import fs from 'fs/promises'
|
||||
import type { ExtractorInput, ImportResult } from '../../../../src/main/types/extractor.types'
|
||||
import type { ExcelParser } from '../../../../src/main/services/excel/excel-parser'
|
||||
import type { DataImportService } from '../../../../src/main/services/database/data-importer'
|
||||
|
||||
// Mock external dependencies
|
||||
vi.mock('fs/promises', () => ({
|
||||
default: {
|
||||
mkdir: vi.fn().mockResolvedValue(undefined),
|
||||
unlink: vi.fn().mockResolvedValue(undefined)
|
||||
},
|
||||
mkdir: vi.fn().mockResolvedValue(undefined),
|
||||
unlink: vi.fn().mockResolvedValue(undefined)
|
||||
}))
|
||||
|
||||
vi.mock('../../../../src/main/services/logger', () => {
|
||||
const mockLogger = {
|
||||
info: vi.fn(),
|
||||
debug: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn()
|
||||
}
|
||||
|
||||
return {
|
||||
default: mockLogger,
|
||||
createLogger: vi.fn(() => mockLogger),
|
||||
withRequestContext: vi.fn(async (fn) => fn()),
|
||||
getRequestId: vi.fn(() => 'test-request-id')
|
||||
}
|
||||
})
|
||||
|
||||
vi.mock('../../../../src/main/services/logger/performance-monitor', () => {
|
||||
return {
|
||||
trackDuration: vi.fn(async (fn) => ({ result: await fn() }))
|
||||
}
|
||||
})
|
||||
|
||||
// Mock ExcelParser - reset in beforeEach
|
||||
let mockExcelParserInstance: any
|
||||
vi.mock('../../../../src/main/services/excel/excel-parser', () => ({
|
||||
ExcelParser: function ExcelParser() {
|
||||
return mockExcelParserInstance
|
||||
}
|
||||
}))
|
||||
|
||||
// Mock DataImportService - reset in beforeEach
|
||||
let mockDataImportInstance: any
|
||||
vi.mock('../../../../src/main/services/database/data-importer', () => ({
|
||||
DataImportService: function DataImportService() {
|
||||
return mockDataImportInstance
|
||||
}
|
||||
}))
|
||||
|
||||
// Mock ExtractorCore - reset in beforeEach
|
||||
let mockExtractorCoreInstance: any
|
||||
vi.mock('../../../../src/main/services/erp/extractor-core', () => ({
|
||||
ExtractorCore: function ExtractorCore() {
|
||||
return mockExtractorCoreInstance
|
||||
}
|
||||
}))
|
||||
|
||||
describe('ExtractorService', () => {
|
||||
let mockAuthService: ErpAuthService
|
||||
let mockSession: any
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
|
||||
mockSession = { cookie: 'test-cookie' }
|
||||
mockAuthService = {
|
||||
getSession: vi.fn(() => mockSession)
|
||||
} as unknown as ErpAuthService
|
||||
|
||||
// Initialize mock instances
|
||||
mockExcelParserInstance = {
|
||||
parse: vi.fn().mockResolvedValue(undefined),
|
||||
_lastOrders: [] as Array<{ orderInfo: any; materials: any[] }>,
|
||||
get lastOrders() {
|
||||
return this._lastOrders
|
||||
},
|
||||
set lastOrders(val) {
|
||||
this._lastOrders = val
|
||||
}
|
||||
}
|
||||
|
||||
// Explicitly reset lastOrders
|
||||
mockExcelParserInstance.lastOrders = []
|
||||
|
||||
mockDataImportInstance = {
|
||||
importFromExcel: vi.fn().mockResolvedValue({
|
||||
success: true,
|
||||
recordsRead: 0,
|
||||
recordsDeleted: 0,
|
||||
recordsImported: 0,
|
||||
uniqueSourceNumbers: 0,
|
||||
errors: []
|
||||
} as ImportResult)
|
||||
}
|
||||
|
||||
const mockDownloadAllBatches = vi.fn().mockResolvedValue({
|
||||
downloadedFiles: [],
|
||||
errors: []
|
||||
})
|
||||
mockExtractorCoreInstance = {
|
||||
downloadAllBatches: mockDownloadAllBatches
|
||||
}
|
||||
})
|
||||
|
||||
// TODO: Complex extract() flow tests need integration test setup
|
||||
|
||||
describe('Constructor', () => {
|
||||
it('should create instance with default download dir', () => {
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
expect(service).toBeInstanceOf(ExtractorService)
|
||||
})
|
||||
|
||||
it('should create instance with custom download dir', () => {
|
||||
const service = new ExtractorService(mockAuthService, './custom-downloads')
|
||||
expect(service).toBeInstanceOf(ExtractorService)
|
||||
})
|
||||
|
||||
it('should ensure download directory exists', async () => {
|
||||
// Clear fs.mkdir mock history before creating instance
|
||||
vi.mocked(fs.mkdir).mockClear()
|
||||
|
||||
// Create instance (constructor calls fs.mkdir asynchronously)
|
||||
new ExtractorService(mockAuthService, './test-downloads')
|
||||
|
||||
// Flush microtask queue so constructor's async mkdir resolves
|
||||
await new Promise((resolve) => setImmediate(resolve))
|
||||
expect(fs.mkdir).toHaveBeenCalledWith('./test-downloads', { recursive: true })
|
||||
})
|
||||
})
|
||||
|
||||
describe('extract() - Basic Behavior', () => {
|
||||
it('should return result object', async () => {
|
||||
const service = new ExtractorService(mockAuthService, './test-downloads')
|
||||
const input: ExtractorInput = { orderNumbers: [] }
|
||||
|
||||
const result = await service.extract(input)
|
||||
|
||||
expect(result).toBeDefined()
|
||||
expect(typeof result).toBe('object')
|
||||
})
|
||||
|
||||
it('should handle empty order numbers', async () => {
|
||||
const service = new ExtractorService(mockAuthService, './test-downloads')
|
||||
|
||||
await expect(service.extract({ orderNumbers: [] })).resolves.toBeDefined()
|
||||
})
|
||||
|
||||
it('should capture errors from ExtractorCore', async () => {
|
||||
mockExtractorCoreInstance.downloadAllBatches.mockResolvedValue({
|
||||
downloadedFiles: [],
|
||||
errors: ['Download failed']
|
||||
})
|
||||
|
||||
const service = new ExtractorService(mockAuthService, './test-downloads')
|
||||
const result = await service.extract({ orderNumbers: ['ORD001'] })
|
||||
|
||||
expect(result.downloadedFiles).toEqual([])
|
||||
expect(result.errors).toContain('Download failed')
|
||||
})
|
||||
|
||||
it('should handle extraction errors gracefully', async () => {
|
||||
mockExtractorCoreInstance.downloadAllBatches.mockRejectedValue(new Error('Network error'))
|
||||
|
||||
const service = new ExtractorService(mockAuthService, './test-downloads')
|
||||
const result = await service.extract({ orderNumbers: ['ORD001'] })
|
||||
|
||||
expect(Array.isArray(result.errors)).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('mergeFiles()', () => {
|
||||
it('should return null when no files to merge', async () => {
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
const result = await service.mergeFiles([], ['ORD001'])
|
||||
|
||||
expect(result.mergedFile).toBeNull()
|
||||
expect(result.recordCount).toBe(0)
|
||||
expect(result.orderRecordCounts).toEqual([])
|
||||
})
|
||||
|
||||
it('should handle single file', async () => {
|
||||
mockExcelParserInstance.lastOrders = [
|
||||
{
|
||||
orderInfo: { productionOrder: 'ORD001' },
|
||||
materials: [{ materialCode: 'MAT001', quantity: 10 }]
|
||||
}
|
||||
]
|
||||
|
||||
const service = new ExtractorService(mockAuthService, './test-downloads')
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
const result = await service.mergeFiles(['./file1.xlsx'], ['ORD001'])
|
||||
|
||||
expect(result.recordCount).toBe(1)
|
||||
expect(result.orderRecordCounts).toEqual([{ orderNumber: 'ORD001', recordCount: 1 }])
|
||||
})
|
||||
|
||||
it('should handle multiple files', async () => {
|
||||
// Mock parse to return different data for each file
|
||||
let callCount = 0
|
||||
mockExcelParserInstance.parse = vi.fn().mockImplementation(() => {
|
||||
callCount++
|
||||
if (callCount === 1) {
|
||||
mockExcelParserInstance._lastOrders = [
|
||||
{
|
||||
orderInfo: { productionOrder: 'ORD001' },
|
||||
materials: [{ materialCode: 'MAT001', quantity: 5 }]
|
||||
}
|
||||
]
|
||||
} else {
|
||||
mockExcelParserInstance._lastOrders = [
|
||||
{
|
||||
orderInfo: { productionOrder: 'ORD002' },
|
||||
materials: [
|
||||
{ materialCode: 'MAT002', quantity: 10 },
|
||||
{ materialCode: 'MAT003', quantity: 15 }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
return Promise.resolve()
|
||||
})
|
||||
|
||||
const service = new ExtractorService(mockAuthService, './test-downloads')
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
const result = await service.mergeFiles(
|
||||
['./file1.xlsx', './file2.xlsx'],
|
||||
['ORD001', 'ORD002']
|
||||
)
|
||||
|
||||
expect(result.recordCount).toBe(3)
|
||||
expect(result.orderRecordCounts).toHaveLength(2)
|
||||
expect(result.orderRecordCounts[0]).toEqual({ orderNumber: 'ORD001', recordCount: 1 })
|
||||
expect(result.orderRecordCounts[1]).toEqual({ orderNumber: 'ORD002', recordCount: 2 })
|
||||
})
|
||||
})
|
||||
|
||||
describe('cleanupTempFiles()', () => {
|
||||
it('should delete all temporary files', async () => {
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
const files = ['./temp1.xlsx', './temp2.xlsx', './temp3.xlsx']
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await service.cleanupTempFiles(files, ['ORD001'])
|
||||
|
||||
expect(fs.unlink).toHaveBeenCalledTimes(3)
|
||||
expect(fs.unlink).toHaveBeenCalledWith('./temp1.xlsx')
|
||||
expect(fs.unlink).toHaveBeenCalledWith('./temp2.xlsx')
|
||||
expect(fs.unlink).toHaveBeenCalledWith('./temp3.xlsx')
|
||||
})
|
||||
|
||||
it('should handle deletion errors gracefully', async () => {
|
||||
vi.mocked(fs.unlink).mockRejectedValue(new Error('File not found'))
|
||||
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
const files = ['./temp1.xlsx', './temp2.xlsx']
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await expect(service.cleanupTempFiles(files, ['ORD001'])).resolves.not.toThrow()
|
||||
|
||||
expect(fs.unlink).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
})
|
||||
|
||||
describe('importToDatabaseWithLogging()', () => {
|
||||
it('should return success result', async () => {
|
||||
mockDataImportInstance.importFromExcel.mockResolvedValue({
|
||||
success: true,
|
||||
recordsRead: 100,
|
||||
recordsDeleted: 50,
|
||||
recordsImported: 50,
|
||||
uniqueSourceNumbers: 5,
|
||||
errors: []
|
||||
})
|
||||
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
const onLog = vi.fn()
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
const result = await service.importToDatabaseWithLogging('./merged.xlsx', onLog)
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.recordsRead).toBe(100)
|
||||
expect(result.recordsImported).toBe(50)
|
||||
expect(onLog).toHaveBeenCalledWith('success', expect.stringContaining('导入完成'))
|
||||
})
|
||||
|
||||
it('should handle import failure', async () => {
|
||||
mockDataImportInstance.importFromExcel.mockRejectedValue(
|
||||
new Error('Database connection failed')
|
||||
)
|
||||
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
const onLog = vi.fn()
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
const result = await service.importToDatabaseWithLogging('./merged.xlsx', onLog)
|
||||
|
||||
expect(result.success).toBe(false)
|
||||
expect(result.errors.some((e) => e.includes('Database connection failed'))).toBe(true)
|
||||
expect(onLog).toHaveBeenCalledWith('error', expect.stringContaining('导入失败'))
|
||||
})
|
||||
|
||||
it('should handle import with errors in result', async () => {
|
||||
mockDataImportInstance.importFromExcel.mockResolvedValue({
|
||||
success: false,
|
||||
recordsRead: 50,
|
||||
recordsDeleted: 0,
|
||||
recordsImported: 0,
|
||||
uniqueSourceNumbers: 0,
|
||||
errors: ['Validation failed', 'Duplicate records']
|
||||
})
|
||||
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
const onLog = vi.fn()
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
const result = await service.importToDatabaseWithLogging('./merged.xlsx', onLog)
|
||||
|
||||
expect(result.success).toBe(false)
|
||||
expect(result.errors).toEqual(['Validation failed', 'Duplicate records'])
|
||||
expect(onLog).toHaveBeenCalledTimes(3)
|
||||
})
|
||||
|
||||
it('should wrap import in trackDuration', async () => {
|
||||
mockDataImportInstance.importFromExcel.mockResolvedValue({
|
||||
success: true,
|
||||
recordsRead: 10,
|
||||
recordsDeleted: 0,
|
||||
recordsImported: 10,
|
||||
uniqueSourceNumbers: 1,
|
||||
errors: []
|
||||
})
|
||||
|
||||
const { trackDuration } =
|
||||
await import('../../../../src/main/services/logger/performance-monitor')
|
||||
const service = new ExtractorService(mockAuthService)
|
||||
const onLog = vi.fn()
|
||||
|
||||
// @ts-ignore - accessing private method for testing
|
||||
await service.importToDatabaseWithLogging('./merged.xlsx', onLog)
|
||||
|
||||
expect(trackDuration).toHaveBeenCalledWith(
|
||||
expect.any(Function),
|
||||
expect.objectContaining({ operationName: 'Database Import' })
|
||||
)
|
||||
})
|
||||
})
|
||||
})
|
||||
363
tests/unit/services/erp/order-resolver.test.ts
Normal file
363
tests/unit/services/erp/order-resolver.test.ts
Normal file
@@ -0,0 +1,363 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { OrderNumberResolver } from '../../../../src/main/services/erp/order-resolver'
|
||||
import type { IDatabaseService } from '../../../../src/main/services/database'
|
||||
|
||||
// Mock logger
|
||||
vi.mock('../../../../src/main/services/logger', () => ({
|
||||
createLogger: vi.fn(() => ({
|
||||
info: vi.fn(),
|
||||
debug: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn()
|
||||
}))
|
||||
}))
|
||||
|
||||
// Mock ConfigManager
|
||||
vi.mock('../../../../src/main/services/config/config-manager', () => ({
|
||||
ConfigManager: {
|
||||
getInstance: vi.fn().mockReturnValue({
|
||||
getConfig: vi.fn().mockReturnValue({
|
||||
orderResolution: {
|
||||
tableName: 'test_table',
|
||||
productionIdField: '总排号',
|
||||
orderNumberField: '生产订单号'
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}))
|
||||
|
||||
describe('OrderNumberResolver', () => {
|
||||
const mockDbService = {
|
||||
type: 'mysql' as const,
|
||||
connect: vi.fn(),
|
||||
disconnect: vi.fn(),
|
||||
isConnected: vi.fn().mockReturnValue(true),
|
||||
query: vi.fn()
|
||||
} as unknown as IDatabaseService
|
||||
|
||||
let resolver: OrderNumberResolver
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
resolver = new OrderNumberResolver(mockDbService)
|
||||
})
|
||||
|
||||
describe('resolve()', () => {
|
||||
it('resolves order numbers to production IDs', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [{ 生产订单号: 'SC70202602120085' }],
|
||||
columns: ['生产订单号'],
|
||||
rowCount: 1
|
||||
})
|
||||
|
||||
const results = await resolver.resolve(['22A1'])
|
||||
|
||||
expect(results).toHaveLength(1)
|
||||
expect(mockDbService.query).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('batches orders correctly', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [
|
||||
{ 总排号: '22A1', 生产订单号: 'SC70202602120085' },
|
||||
{ 总排号: '22A2', 生产订单号: 'SC70202602120086' }
|
||||
],
|
||||
columns: ['总排号', '生产订单号'],
|
||||
rowCount: 2
|
||||
})
|
||||
|
||||
const results = await resolver.resolve(['22A1', '22A2'])
|
||||
|
||||
expect(results).toHaveLength(2)
|
||||
expect(results[0].resolved).toBe(true)
|
||||
expect(results[1].resolved).toBe(true)
|
||||
})
|
||||
|
||||
it('handles missing orders', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [],
|
||||
columns: [],
|
||||
rowCount: 0
|
||||
})
|
||||
|
||||
const results = await resolver.resolve(['22A999'])
|
||||
|
||||
expect(results).toHaveLength(1)
|
||||
expect(results[0].resolved).toBe(false)
|
||||
expect(results[0].error).toBeDefined()
|
||||
})
|
||||
|
||||
it('handles mixed input (productionIds and orderNumbers)', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [{ 总排号: '22A1', 生产订单号: 'SC70202602120085' }],
|
||||
columns: ['总排号', '生产订单号'],
|
||||
rowCount: 1
|
||||
})
|
||||
|
||||
const results = await resolver.resolve(['22A1', 'SC70202602120086'])
|
||||
|
||||
expect(results).toHaveLength(2)
|
||||
expect(results[0].productionId).toBe('22A1')
|
||||
expect(results[0].orderNumber).toBe('SC70202602120085')
|
||||
expect(results[0].resolved).toBe(true)
|
||||
expect(results[1].orderNumber).toBe('SC70202602120086')
|
||||
expect(results[1].resolved).toBe(true)
|
||||
})
|
||||
|
||||
it('handles unrecognized input format', async () => {
|
||||
const results = await resolver.resolve(['INVALID_FORMAT'])
|
||||
|
||||
expect(results).toHaveLength(1)
|
||||
expect(results[0].resolved).toBe(false)
|
||||
expect(results[0].error).toContain('格式不识别')
|
||||
})
|
||||
|
||||
it('deduplicates identical inputs', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [{ 总排号: '22A1', 生产订单号: 'SC70202602120085' }],
|
||||
columns: ['总排号', '生产订单号'],
|
||||
rowCount: 1
|
||||
})
|
||||
|
||||
const results = await resolver.resolve(['22A1', '22A1', '22A1'])
|
||||
|
||||
expect(results).toHaveLength(1) // deduplicated
|
||||
expect(results[0].resolved).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('mapProductionIdToOrderNumber()', () => {
|
||||
it('uses database service for lookup', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [{ 生产订单号: 'SC70202602120085' }],
|
||||
columns: ['生产订单号'],
|
||||
rowCount: 1
|
||||
})
|
||||
|
||||
const result = await resolver.mapProductionIdToOrderNumber('22A1')
|
||||
|
||||
expect(mockDbService.query).toHaveBeenCalled()
|
||||
expect(result).toBe('SC70202602120085')
|
||||
})
|
||||
|
||||
it('queries database for each call (no caching)', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [{ 生产订单号: 'SC70202602120085' }],
|
||||
columns: ['生产订单号'],
|
||||
rowCount: 1
|
||||
})
|
||||
|
||||
// First call
|
||||
const result1 = await resolver.mapProductionIdToOrderNumber('22A1')
|
||||
// Second call with same input
|
||||
const result2 = await resolver.mapProductionIdToOrderNumber('22A1')
|
||||
|
||||
expect(result1).toBe(result2)
|
||||
// Should query twice as there's no explicit caching in this method
|
||||
expect(mockDbService.query).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
})
|
||||
|
||||
describe('mapProductionIdsToOrderNumbers()', () => {
|
||||
it('caching works correctly - batch deduplication', async () => {
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: [{ 总排号: '22A1', 生产订单号: 'SC70202602120085' }],
|
||||
columns: ['总排号', '生产订单号'],
|
||||
rowCount: 1
|
||||
})
|
||||
|
||||
// Should internally deduplicate
|
||||
await resolver.mapProductionIdsToOrderNumbers(['22A1', '22A1', '22A1'])
|
||||
|
||||
// Should be optimized to query unique values only
|
||||
expect(mockDbService.query).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
})
|
||||
|
||||
describe('error handling', () => {
|
||||
it('error handling for database failures', async () => {
|
||||
vi.mocked(mockDbService.query).mockRejectedValue(new Error('Database connection failed'))
|
||||
|
||||
await expect(resolver.mapProductionIdToOrderNumber('22A1')).rejects.toThrow(
|
||||
'Database connection failed'
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getValidOrderNumbers()', () => {
|
||||
it('returns deduplicated order numbers', async () => {
|
||||
const mappings = [
|
||||
{ input: '22A1', resolved: true, orderNumber: 'SC70202602120085' },
|
||||
{ input: 'SC70202602120086', resolved: true, orderNumber: 'SC70202602120086' },
|
||||
{ input: '22A1', resolved: true, orderNumber: 'SC70202602120085' } // Duplicate
|
||||
]
|
||||
|
||||
const validOrderNumbers = resolver.getValidOrderNumbers(mappings as any)
|
||||
|
||||
expect(validOrderNumbers).toHaveLength(2)
|
||||
expect(validOrderNumbers).toEqual(['SC70202602120085', 'SC70202602120086'])
|
||||
})
|
||||
})
|
||||
|
||||
describe('performance', () => {
|
||||
it('performance with large order sets', async () => {
|
||||
const largeInput = Array.from({ length: 100 }, (_, i) => `22A${i}`)
|
||||
|
||||
vi.mocked(mockDbService.query).mockResolvedValue({
|
||||
rows: largeInput.map((prodId, i) => ({
|
||||
总排号: prodId,
|
||||
生产订单号: `SC7020260212${String(i).padStart(5, '0')}`
|
||||
})),
|
||||
columns: ['总排号', '生产订单号'],
|
||||
rowCount: largeInput.length
|
||||
})
|
||||
|
||||
const startTime = Date.now()
|
||||
const results = await resolver.resolve(largeInput)
|
||||
const elapsed = Date.now() - startTime
|
||||
|
||||
expect(results).toHaveLength(largeInput.length)
|
||||
expect(elapsed).toBeLessThan(5000) // Should complete within 5 seconds
|
||||
})
|
||||
})
|
||||
|
||||
describe('isProductionId()', () => {
|
||||
it('should recognize valid production IDs', () => {
|
||||
expect(resolver.isProductionId('22A1')).toBe(true)
|
||||
expect(resolver.isProductionId('26B10617')).toBe(true)
|
||||
expect(resolver.isProductionId('99Z999999')).toBe(true)
|
||||
expect(resolver.isProductionId('00A0')).toBe(true)
|
||||
})
|
||||
|
||||
it('should reject invalid formats', () => {
|
||||
expect(resolver.isProductionId('SC70202602120085')).toBe(false) // order number, not production ID
|
||||
expect(resolver.isProductionId('abc')).toBe(false)
|
||||
expect(resolver.isProductionId('1A')).toBe(false)
|
||||
expect(resolver.isProductionId('22AA1')).toBe(false)
|
||||
expect(resolver.isProductionId('')).toBe(false)
|
||||
expect(resolver.isProductionId('2A1')).toBe(false) // only 1 digit before letter
|
||||
})
|
||||
})
|
||||
|
||||
describe('isOrderNumber()', () => {
|
||||
it('should recognize valid order numbers', () => {
|
||||
expect(resolver.isOrderNumber('SC70202602120085')).toBe(true)
|
||||
})
|
||||
|
||||
it('should reject invalid formats', () => {
|
||||
expect(resolver.isOrderNumber('22A1')).toBe(false) // production ID
|
||||
expect(resolver.isOrderNumber('SC123')).toBe(false) // too short
|
||||
expect(resolver.isOrderNumber('SC702026021200')).toBe(false) // only 13 digits
|
||||
expect(resolver.isOrderNumber('XX70202602120085')).toBe(false) // wrong prefix
|
||||
expect(resolver.isOrderNumber('')).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('recognizeType()', () => {
|
||||
it('should return productionId for production IDs', () => {
|
||||
expect(resolver.recognizeType('22A1')).toBe('productionId')
|
||||
})
|
||||
|
||||
it('should return orderNumber for order numbers', () => {
|
||||
expect(resolver.recognizeType('SC70202602120085')).toBe('orderNumber')
|
||||
})
|
||||
|
||||
it('should return unknown for unrecognized formats', () => {
|
||||
expect(resolver.recognizeType('abc')).toBe('unknown')
|
||||
expect(resolver.recognizeType('')).toBe('unknown')
|
||||
})
|
||||
})
|
||||
|
||||
describe('getWarnings()', () => {
|
||||
it('should return empty array when all mappings resolved', () => {
|
||||
const mappings = [
|
||||
{ input: '22A1', resolved: true, orderNumber: 'SC70202602120085' },
|
||||
{ input: 'SC70202602120086', resolved: true, orderNumber: 'SC70202602120086' }
|
||||
]
|
||||
expect(resolver.getWarnings(mappings as any)).toEqual([])
|
||||
})
|
||||
|
||||
it('should return formatted warnings for failed mappings', () => {
|
||||
const mappings = [
|
||||
{ input: '22A999', resolved: false, error: '未在数据库中找到对应的订单号' },
|
||||
{
|
||||
input: 'abc',
|
||||
resolved: false,
|
||||
error: '格式不识别：既不是有效的生产订单号也不是总排号格式'
|
||||
}
|
||||
]
|
||||
const warnings = resolver.getWarnings(mappings as any)
|
||||
expect(warnings).toHaveLength(2)
|
||||
expect(warnings[0]).toBe('22A999: 未在数据库中找到对应的订单号')
|
||||
expect(warnings[1]).toContain('格式不识别')
|
||||
})
|
||||
})
|
||||
|
||||
describe('getStats()', () => {
|
||||
it('should compute correct stats for mixed results', () => {
|
||||
const mappings = [
|
||||
{ input: 'SC70202602120085', resolved: true, orderNumber: 'SC70202602120085' },
|
||||
{ input: '22A1', resolved: true, productionId: '22A1', orderNumber: 'SC70202602120085' },
|
||||
{ input: '22A999', resolved: false, error: 'not found', productionId: '22A999' },
|
||||
{ input: 'abc', resolved: false, error: 'unknown format' }
|
||||
]
|
||||
const stats = resolver.getStats(mappings as any)
|
||||
expect(stats.totalInputs).toBe(4)
|
||||
expect(stats.validOrderNumbers).toBe(1) // only direct order number input
|
||||
expect(stats.validProductionIds).toBe(1) // only resolved production IDs count
|
||||
expect(stats.resolvedCount).toBe(2)
|
||||
expect(stats.failedCount).toBe(2)
|
||||
expect(stats.unknownFormat).toBe(1) // only 'abc'
|
||||
})
|
||||
|
||||
it('should compute all-success stats', () => {
|
||||
const mappings = [
|
||||
{ input: 'SC70202602120085', resolved: true, orderNumber: 'SC70202602120085' },
|
||||
{ input: '22A1', resolved: true, productionId: '22A1', orderNumber: 'SC70202602120086' }
|
||||
]
|
||||
const stats = resolver.getStats(mappings as any)
|
||||
expect(stats.resolvedCount).toBe(2)
|
||||
expect(stats.failedCount).toBe(0)
|
||||
expect(stats.unknownFormat).toBe(0)
|
||||
})
|
||||
|
||||
it('should compute all-failure stats with unknown formats', () => {
|
||||
const mappings = [
|
||||
{ input: 'abc', resolved: false, error: 'unknown' },
|
||||
{ input: 'xyz', resolved: false, error: 'unknown' }
|
||||
]
|
||||
const stats = resolver.getStats(mappings as any)
|
||||
expect(stats.resolvedCount).toBe(0)
|
||||
expect(stats.failedCount).toBe(2)
|
||||
expect(stats.unknownFormat).toBe(2)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getDeduplicationReport()', () => {
|
||||
it('should report duplicates when inputs exceed unique order numbers', () => {
|
||||
const mappings = [
|
||||
{ input: '22A1', resolved: true, orderNumber: 'SC70202602120085' },
|
||||
{ input: '22A2', resolved: true, orderNumber: 'SC70202602120085' },
|
||||
{ input: '22A3', resolved: true, orderNumber: 'SC70202602120086' }
|
||||
]
|
||||
const report = resolver.getDeduplicationReport(mappings as any)
|
||||
expect(report.inputCount).toBe(3)
|
||||
expect(report.uniqueOrderNumbersCount).toBe(2)
|
||||
expect(report.summary).toContain('重复已合并')
|
||||
expect(report.orderNumberGroups.get('SC70202602120085')).toEqual(['22A1', '22A2'])
|
||||
expect(report.orderNumberGroups.get('SC70202602120086')).toEqual(['22A3'])
|
||||
})
|
||||
|
||||
it('should report no duplicates when all inputs map to unique order numbers', () => {
|
||||
const mappings = [
|
||||
{ input: '22A1', resolved: true, orderNumber: 'SC70202602120085' },
|
||||
{ input: '22A2', resolved: true, orderNumber: 'SC70202602120086' }
|
||||
]
|
||||
const report = resolver.getDeduplicationReport(mappings as any)
|
||||
expect(report.inputCount).toBe(2)
|
||||
expect(report.uniqueOrderNumbersCount).toBe(2)
|
||||
expect(report.summary).not.toContain('重复已合并')
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,389 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { ValidationApplicationService } from '../../../../src/main/services/validation/validation-application-service'
|
||||
import type { ValidationRequest } from '../../../../src/main/types/validation.types'
|
||||
|
||||
// ─── Mock logger to prevent real winston initialization and console noise ───
|
||||
vi.mock('../../../../src/main/services/logger', () => ({
|
||||
createLogger: () => ({
|
||||
info: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn(),
|
||||
debug: vi.fn()
|
||||
}),
|
||||
withRequestContext: (_fn: () => Promise<any>) => _fn(),
|
||||
trackDuration: async <T>(fn: () => Promise<T>) => {
|
||||
const result = await fn()
|
||||
return { result, durationMs: 0, isSlow: false }
|
||||
},
|
||||
getRequestId: () => undefined
|
||||
}))
|
||||
|
||||
// ─── Hoisted mock functions shared between vi.mock() factories and tests ───
|
||||
const {
|
||||
mockQueryAll,
|
||||
mockQueryBySource,
|
||||
mockGetMaterialsByManager,
|
||||
mockGetAllRecords,
|
||||
mockGetAllMaterialCodes,
|
||||
mockGetSourceNumbers,
|
||||
mockReadProductionIds,
|
||||
mockSharedIdsGet,
|
||||
mockDbQuery,
|
||||
mockDbDisconnect,
|
||||
mockCreateDbService
|
||||
} = vi.hoisted(() => ({
|
||||
mockQueryAll: vi.fn(),
|
||||
mockQueryBySource: vi.fn(),
|
||||
mockGetMaterialsByManager: vi.fn(),
|
||||
mockGetAllRecords: vi.fn(),
|
||||
mockGetAllMaterialCodes: vi.fn(),
|
||||
mockGetSourceNumbers: vi.fn(),
|
||||
mockReadProductionIds: vi.fn(),
|
||||
mockSharedIdsGet: vi.fn(),
|
||||
mockDbQuery: vi.fn(),
|
||||
mockDbDisconnect: vi.fn(),
|
||||
mockCreateDbService: vi.fn()
|
||||
}))
|
||||
|
||||
// ─── DiscreteMaterialPlanDAO mock ───
|
||||
vi.mock('../../../../src/main/services/database/discrete-material-plan-dao', () => ({
|
||||
DiscreteMaterialPlanDAO: class {
|
||||
queryAllDistinctByMaterialCode = mockQueryAll
|
||||
queryBySourceNumbersDistinct = mockQueryBySource
|
||||
}
|
||||
}))
|
||||
|
||||
// ─── MaterialsToBeDeletedDAO mock ───
|
||||
vi.mock('../../../../src/main/services/database/materials-to-be-deleted-dao', () => ({
|
||||
MaterialsToBeDeletedDAO: class {
|
||||
getMaterialsByManager = mockGetMaterialsByManager
|
||||
getAllRecords = mockGetAllRecords
|
||||
getAllMaterialCodes = mockGetAllMaterialCodes
|
||||
}
|
||||
}))
|
||||
|
||||
// ─── Production input service mock ───
|
||||
vi.mock('../../../../src/main/services/validation/production-input-service', () => ({
|
||||
getSourceNumbersFromInputs: mockGetSourceNumbers,
|
||||
readProductionIds: mockReadProductionIds
|
||||
}))
|
||||
|
||||
// ─── Shared production IDs store mock ───
|
||||
vi.mock('../../../../src/main/services/validation/shared-production-ids-store', () => ({
|
||||
sharedProductionIdsStore: {
|
||||
get: mockSharedIdsGet
|
||||
}
|
||||
}))
|
||||
|
||||
// ─── Validation database mock ───
|
||||
vi.mock('../../../../src/main/services/validation/validation-database', () => ({
|
||||
createValidationDatabaseService: mockCreateDbService,
|
||||
getValidationTableName: vi.fn().mockImplementation((name: string) => name)
|
||||
}))
|
||||
|
||||
function createDbService() {
|
||||
return {
|
||||
type: 'mysql' as const,
|
||||
query: mockDbQuery,
|
||||
connect: vi.fn().mockResolvedValue(undefined),
|
||||
disconnect: mockDbDisconnect
|
||||
}
|
||||
}
|
||||
|
||||
describe('ValidationApplicationService', () => {
|
||||
let service: ValidationApplicationService
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
|
||||
// DiscreteMaterialPlanDAO defaults
|
||||
mockQueryAll.mockResolvedValue([
|
||||
{ MaterialName: 'MatA', MaterialCode: 'M1', Model: 'Mod', Specification: 'Spec' }
|
||||
])
|
||||
mockQueryBySource.mockResolvedValue([
|
||||
{ MaterialName: 'FilteredMat', MaterialCode: 'MF1', Model: 'FMod', Specification: 'FSpec' }
|
||||
])
|
||||
|
||||
// MaterialsToBeDeletedDAO defaults
|
||||
mockGetMaterialsByManager.mockResolvedValue([{ materialCode: 'M1', managerName: 'Mgr' }])
|
||||
mockGetAllRecords.mockResolvedValue([
|
||||
{ materialCode: 'M1', managerName: 'Mgr' },
|
||||
{ materialCode: 'M2', managerName: 'Other' }
|
||||
])
|
||||
mockGetAllMaterialCodes.mockResolvedValue(new Set(['M1']))
|
||||
|
||||
// Production input defaults
|
||||
mockGetSourceNumbers.mockResolvedValue(['SC001', 'SC002'])
|
||||
mockReadProductionIds.mockReturnValue(['PROD001', 'PROD002'])
|
||||
|
||||
// Shared IDs default: empty
|
||||
mockSharedIdsGet.mockReturnValue([])
|
||||
|
||||
// DB service creation
|
||||
mockCreateDbService.mockImplementation(async () => createDbService())
|
||||
mockDbDisconnect.mockResolvedValue(undefined)
|
||||
|
||||
// DB query dispatches by table name extracted from SQL
|
||||
mockDbQuery.mockImplementation((sql: string) => {
|
||||
const table = sql.match(/FROM\s+(\S+)/i)?.[1] ?? ''
|
||||
if (/MaterialsTypeToBeDeleted/i.test(table))
|
||||
return Promise.resolve({
|
||||
rows: [{ MaterialName: 'MatA', ManagerName: 'Mgr' }],
|
||||
rowCount: 1
|
||||
})
|
||||
if (/MaterialsToBeDeleted/i.test(table))
|
||||
return Promise.resolve({
|
||||
rows: [{ MaterialCode: 'M1', ManagerName: 'Mgr' }],
|
||||
rowCount: 1
|
||||
})
|
||||
if (/DiscreteMaterialPlanData/i.test(table))
|
||||
return Promise.resolve({
|
||||
rows: [{ MaterialName: 'MatA', Specification: 'Spec', Model: 'Mod' }],
|
||||
rowCount: 1
|
||||
})
|
||||
return Promise.resolve({ rows: [], rowCount: 0 })
|
||||
})
|
||||
|
||||
service = new ValidationApplicationService()
|
||||
})
|
||||
|
||||
// ─── validate – database_full mode ───
|
||||
describe('validate – database_full mode', () => {
|
||||
it('should return success with results for admin user', async () => {
|
||||
const req: ValidationRequest = { mode: 'database_full' }
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
expect(res.success).toBe(true)
|
||||
expect(res.results).toBeDefined()
|
||||
expect(res.stats).toBeDefined()
|
||||
expect(res.stats!.totalRecords).toBe(1)
|
||||
})
|
||||
|
||||
it('should return success for regular user', async () => {
|
||||
const req: ValidationRequest = { mode: 'database_full' }
|
||||
const userInfo = { id: 2, username: 'guest', userType: 'User' } as any
|
||||
const res = await service.validate(req, userInfo, 2)
|
||||
expect(res.success).toBe(true)
|
||||
expect(res.results).toBeDefined()
|
||||
})
|
||||
|
||||
it('should return failure when material records are empty', async () => {
|
||||
mockQueryAll.mockResolvedValueOnce([])
|
||||
const req: ValidationRequest = { mode: 'database_full' }
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
expect(res.success).toBe(false)
|
||||
expect(res.error).toContain('未找到物料记录')
|
||||
})
|
||||
|
||||
it('should correctly compute stats for matched and marked records', async () => {
|
||||
mockQueryAll.mockResolvedValueOnce([
|
||||
{ MaterialName: 'MatA', MaterialCode: 'M1', Model: 'Mod', Specification: 'Spec' },
|
||||
{ MaterialName: 'Other', MaterialCode: 'M2', Model: 'Mod', Specification: 'Spec' }
|
||||
])
|
||||
const req: ValidationRequest = { mode: 'database_full' }
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
|
||||
expect(res.success).toBe(true)
|
||||
expect(res.stats!.totalRecords).toBe(2)
|
||||
// M1 is in markedCodes → isMarkedForDeletion=true, managerName='Mgr'
|
||||
const m1Result = res.results!.find((r) => r.materialCode === 'M1')
|
||||
expect(m1Result?.isMarkedForDeletion).toBe(true)
|
||||
expect(m1Result?.managerName).toBe('Mgr')
|
||||
// M2 is NOT in markedCodes and 'Other' doesn't match any type keyword
|
||||
const m2Result = res.results!.find((r) => r.materialCode === 'M2')
|
||||
expect(m2Result?.isMarkedForDeletion).toBe(false)
|
||||
})
|
||||
|
||||
it('should match type keywords when material name contains keyword', async () => {
|
||||
mockQueryAll.mockResolvedValueOnce([
|
||||
{ MaterialName: 'MatA-Extra', MaterialCode: 'MX1', Model: 'Mod', Specification: 'Spec' }
|
||||
])
|
||||
const req: ValidationRequest = { mode: 'database_full' }
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
|
||||
expect(res.success).toBe(true)
|
||||
// 'MatA-Extra' contains 'MatA' which is a type keyword → matched
|
||||
expect(res.results![0].matchedTypeKeyword).toBe('MatA')
|
||||
expect(res.results![0].managerName).toBe('Mgr')
|
||||
})
|
||||
})
|
||||
|
||||
// ─── validate – database_filtered with shared production IDs ───
|
||||
describe('validate – database_filtered with shared IDs', () => {
|
||||
it('should return success when shared IDs resolve to orders', async () => {
|
||||
mockSharedIdsGet.mockReturnValue(['PROD001'])
|
||||
const req: ValidationRequest = { mode: 'database_filtered', useSharedProductionIds: true }
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
|
||||
expect(res.success).toBe(true)
|
||||
expect(res.results).toBeDefined()
|
||||
expect(res.results!.length).toBeGreaterThan(0)
|
||||
})
|
||||
|
||||
it('should return failure when shared IDs are empty', async () => {
|
||||
mockSharedIdsGet.mockReturnValue([])
|
||||
const req: ValidationRequest = { mode: 'database_filtered', useSharedProductionIds: true }
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
|
||||
expect(res.success).toBe(false)
|
||||
expect(res.error).toContain('共享')
|
||||
})
|
||||
|
||||
it('should return failure when shared IDs yield no source numbers', async () => {
|
||||
mockSharedIdsGet.mockReturnValue(['PROD001'])
|
||||
mockGetSourceNumbers.mockResolvedValueOnce([])
|
||||
const req: ValidationRequest = { mode: 'database_filtered', useSharedProductionIds: true }
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
|
||||
expect(res.success).toBe(false)
|
||||
expect(res.error).toContain('共享')
|
||||
})
|
||||
})
|
||||
|
||||
// ─── validate – database_filtered with production ID file ───
|
||||
describe('validate – database_filtered with file', () => {
|
||||
it('should return success when file IDs resolve to orders', async () => {
|
||||
const req: ValidationRequest = {
|
||||
mode: 'database_filtered',
|
||||
productionIdFile: '/tmp/ids.txt'
|
||||
}
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
|
||||
expect(res.success).toBe(true)
|
||||
expect(res.results).toBeDefined()
|
||||
})
|
||||
|
||||
it('should return failure when file IDs yield no source numbers', async () => {
|
||||
mockGetSourceNumbers.mockResolvedValueOnce([])
|
||||
const req: ValidationRequest = {
|
||||
mode: 'database_filtered',
|
||||
productionIdFile: '/tmp/ids.txt'
|
||||
}
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const res = await service.validate(req, userInfo, 1)
|
||||
|
||||
expect(res.success).toBe(false)
|
||||
expect(res.error).toContain('文件')
|
||||
})
|
||||
})
|
||||
|
||||
// ─── getMaterialsByManager ───
|
||||
describe('getMaterialsByManager', () => {
|
||||
it('should return enriched materials for a manager', async () => {
|
||||
const result = await service.getMaterialsByManager('Mgr')
|
||||
|
||||
expect(result).toBeDefined()
|
||||
expect(result.length).toBe(1)
|
||||
expect(result[0].materialCode).toBe('M1')
|
||||
expect(result[0].materialName).toBe('MatA')
|
||||
expect(result[0].isMarked).toBe(true) // M1 is in allMaterialCodesResult
|
||||
})
|
||||
|
||||
it('should return empty array when manager has no materials', async () => {
|
||||
mockGetMaterialsByManager.mockResolvedValueOnce([])
|
||||
|
||||
const result = await service.getMaterialsByManager('Nobody')
|
||||
|
||||
expect(result).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
// ─── getAllMaterials ───
|
||||
describe('getAllMaterials', () => {
|
||||
it('should return all enriched materials', async () => {
|
||||
const result = await service.getAllMaterials()
|
||||
|
||||
expect(result).toBeDefined()
|
||||
expect(result.length).toBe(2)
|
||||
expect(result[0].materialCode).toBe('M1')
|
||||
expect(result[0].isMarked).toBe(true)
|
||||
expect(result[1].materialCode).toBe('M2')
|
||||
expect(result[1].isMarked).toBe(false) // M2 not in allMaterialCodesResult
|
||||
})
|
||||
|
||||
it('should return empty array when no materials exist', async () => {
|
||||
mockGetAllRecords.mockResolvedValueOnce([])
|
||||
|
||||
const result = await service.getAllMaterials()
|
||||
|
||||
expect(result).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
// ─── getCleanerData ───
|
||||
describe('getCleanerData', () => {
|
||||
it('Admin with selected managers should query MaterialsToBeDeleted by ManagerName IN', async () => {
|
||||
mockSharedIdsGet.mockReturnValue(['PROD001'])
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const result = await service.getCleanerData(userInfo, 1, ['Mgr', 'Other'])
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.orderNumbers).toBeDefined()
|
||||
expect(result.orderNumbers!.length).toBeGreaterThan(0)
|
||||
// materialCodes come from MaterialsToBeDeleted query (mock returns M1)
|
||||
expect(result.materialCodes).toBeDefined()
|
||||
expect(result.materialCodes).toContain('M1')
|
||||
})
|
||||
|
||||
it('Admin without selected managers should query DiscreteMaterialPlanData by orderNumbers', async () => {
|
||||
mockSharedIdsGet.mockReturnValue(['PROD001'])
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const result = await service.getCleanerData(userInfo, 1, [])
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.orderNumbers).toBeDefined()
|
||||
// materialCodes come from DiscreteMaterialPlanDAO.queryBySourceNumbersDistinct
|
||||
// mock returns MF1
|
||||
expect(result.materialCodes).toBeDefined()
|
||||
expect(result.materialCodes).toContain('MF1')
|
||||
})
|
||||
|
||||
it('Admin without selected managers and no orderNumbers should return empty material codes', async () => {
|
||||
mockSharedIdsGet.mockReturnValue([])
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
|
||||
const result = await service.getCleanerData(userInfo, 1, [])
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.orderNumbers).toEqual([])
|
||||
expect(result.materialCodes).toEqual([])
|
||||
})
|
||||
|
||||
it('regular user should filter by ManagerName = username', async () => {
|
||||
mockSharedIdsGet.mockReturnValue(['PROD001'])
|
||||
const userInfo = { id: 2, username: 'guest', userType: 'User' } as any
|
||||
|
||||
const result = await service.getCleanerData(userInfo, 1)
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
// materialCodes from MaterialsToBeDeleted WHERE ManagerName = 'guest'
|
||||
// mock returns M1 for any MaterialsToBeDeleted query
|
||||
expect(result.materialCodes).toBeDefined()
|
||||
expect(result.materialCodes).toContain('M1')
|
||||
})
|
||||
|
||||
it('should handle errors gracefully', async () => {
|
||||
mockCreateDbService.mockRejectedValueOnce(new Error('DB down'))
|
||||
|
||||
const userInfo = { id: 1, username: 'admin', userType: 'Admin' } as any
|
||||
const result = await service.getCleanerData(userInfo, 1)
|
||||
|
||||
expect(result.success).toBe(false)
|
||||
expect(result.error).toContain('DB down')
|
||||
})
|
||||
})
|
||||
})
|
||||
158
tests/unit/services/validation/validation-database.test.ts
Normal file
158
tests/unit/services/validation/validation-database.test.ts
Normal file
@@ -0,0 +1,158 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
|
||||
// Capture construction params and connect calls for each DB adapter
|
||||
let lastMysqlOpts: any = null
|
||||
let mysqlConnectCalled = false
|
||||
let lastSqlServerOpts: any = null
|
||||
let sqlServerConnectCalled = false
|
||||
let lastPgOpts: any = null
|
||||
let pgConnectCalled = false
|
||||
|
||||
let currentDbType: string = 'mysql'
|
||||
const currentDbConfig: any = {
|
||||
database: {
|
||||
mysql: { host: 'db', port: 3306, username: 'user', password: 'pass', database: 'erp' },
|
||||
sqlserver: {
|
||||
server: 'srv',
|
||||
port: 1433,
|
||||
username: 'user',
|
||||
password: 'pass',
|
||||
database: 'erp',
|
||||
trustServerCertificate: true
|
||||
},
|
||||
postgresql: {
|
||||
host: 'localhost',
|
||||
port: 5432,
|
||||
username: 'user',
|
||||
password: 'pass',
|
||||
database: 'erp'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// mysql mock
|
||||
vi.doMock('../../../../src/main/services/database/mysql', () => {
|
||||
return {
|
||||
MySqlService: class {
|
||||
constructor(opts: any) {
|
||||
lastMysqlOpts = opts
|
||||
}
|
||||
connect = vi.fn().mockImplementation(function () {
|
||||
mysqlConnectCalled = true
|
||||
return Promise.resolve(undefined)
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// sqlserver mock
|
||||
vi.doMock('../../../../src/main/services/database/sql-server', () => {
|
||||
return {
|
||||
SqlServerService: class {
|
||||
constructor(opts: any) {
|
||||
lastSqlServerOpts = opts
|
||||
}
|
||||
connect = vi.fn().mockImplementation(function () {
|
||||
sqlServerConnectCalled = true
|
||||
return Promise.resolve(undefined)
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// postgresql mock
|
||||
vi.doMock('../../../../src/main/services/database/postgresql', () => {
|
||||
return {
|
||||
PostgreSqlService: class {
|
||||
constructor(opts: any) {
|
||||
lastPgOpts = opts
|
||||
}
|
||||
connect = vi.fn().mockImplementation(function () {
|
||||
pgConnectCalled = true
|
||||
return Promise.resolve(undefined)
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Config mock to drive database type
|
||||
vi.doMock('../../../../src/main/services/config/config-manager', () => {
|
||||
return {
|
||||
ConfigManager: {
|
||||
getInstance: () => ({
|
||||
getDatabaseType: () => currentDbType,
|
||||
getConfig: () => currentDbConfig
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
describe('ValidationDatabaseService', () => {
|
||||
beforeEach(() => {
|
||||
lastMysqlOpts = null
|
||||
mysqlConnectCalled = false
|
||||
lastSqlServerOpts = null
|
||||
sqlServerConnectCalled = false
|
||||
lastPgOpts = null
|
||||
pgConnectCalled = false
|
||||
})
|
||||
|
||||
describe('createValidationDatabaseService', () => {
|
||||
it('creates mysql service with correct config and connects', async () => {
|
||||
currentDbType = 'mysql'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
const svc = await mod.createValidationDatabaseService()
|
||||
expect(svc).toBeDefined()
|
||||
expect(lastMysqlOpts.host).toBe('db')
|
||||
expect(mysqlConnectCalled).toBe(true)
|
||||
})
|
||||
|
||||
it('creates sqlserver service when dbType is sqlserver', async () => {
|
||||
currentDbType = 'sqlserver'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
const svc = await mod.createValidationDatabaseService()
|
||||
expect(lastSqlServerOpts.server).toBe('srv')
|
||||
expect(sqlServerConnectCalled).toBe(true)
|
||||
})
|
||||
|
||||
it('creates postgresql service when dbType is postgresql', async () => {
|
||||
currentDbType = 'postgresql'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
const svc = await mod.createValidationDatabaseService()
|
||||
expect(lastPgOpts.host).toBe('localhost')
|
||||
expect(pgConnectCalled).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('getValidationTableName', () => {
|
||||
it('returns table name unchanged for mysql', async () => {
|
||||
currentDbType = 'mysql'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
expect(mod.getValidationTableName('MaterialsToBeDeleted')).toBe('MaterialsToBeDeleted')
|
||||
})
|
||||
|
||||
it('converts schema_table to [schema].[table] for sqlserver', async () => {
|
||||
currentDbType = 'sqlserver'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
expect(mod.getValidationTableName('dbo_Materials')).toBe('[dbo].[Materials]')
|
||||
})
|
||||
|
||||
it('wraps nameless table in [dbo].[name] for sqlserver', async () => {
|
||||
currentDbType = 'sqlserver'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
expect(mod.getValidationTableName('Materials')).toBe('[dbo].[Materials]')
|
||||
})
|
||||
|
||||
it('converts schema_table to "schema"."table" for postgresql', async () => {
|
||||
currentDbType = 'postgresql'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
expect(mod.getValidationTableName('public_Materials')).toBe('"public"."Materials"')
|
||||
})
|
||||
|
||||
it('wraps nameless table in "public"."name" for postgresql', async () => {
|
||||
currentDbType = 'postgresql'
|
||||
const mod = await import('../../../../src/main/services/validation/validation-database')
|
||||
expect(mod.getValidationTableName('Materials')).toBe('"public"."Materials"')
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -1,11 +1,82 @@
|
||||
/**
|
||||
* Unit tests for SqlServerService
|
||||
* These tests do not require a SQL Server instance
|
||||
* Covers both unconnected state and connected-path operations using mocked mssql driver.
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeEach } from 'vitest'
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
||||
import { SqlServerService } from '@main/services/database/sql-server'
|
||||
|
||||
// ---- Hoisted mock functions ----
|
||||
const {
|
||||
mockPoolConnect,
|
||||
mockPoolClose,
|
||||
mockRequestInput,
|
||||
mockRequestQuery,
|
||||
mockTransactionBegin,
|
||||
mockTransactionCommit,
|
||||
mockTransactionRollback,
|
||||
mockPool,
|
||||
mockRequest,
|
||||
mockTransaction
|
||||
} = vi.hoisted(() => {
|
||||
const request = {
|
||||
input: vi.fn(),
|
||||
query: vi.fn()
|
||||
}
|
||||
const transaction = {
|
||||
begin: vi.fn(),
|
||||
commit: vi.fn(),
|
||||
rollback: vi.fn()
|
||||
}
|
||||
const pool = {
|
||||
connect: vi.fn(),
|
||||
request: vi.fn(() => request),
|
||||
close: vi.fn(),
|
||||
connected: true
|
||||
}
|
||||
return {
|
||||
mockPoolConnect: pool.connect,
|
||||
mockPoolClose: pool.close,
|
||||
mockRequestInput: request.input,
|
||||
mockRequestQuery: request.query,
|
||||
mockTransactionBegin: transaction.begin,
|
||||
mockTransactionCommit: transaction.commit,
|
||||
mockTransactionRollback: transaction.rollback,
|
||||
mockPool: pool,
|
||||
mockRequest: request,
|
||||
mockTransaction: transaction
|
||||
}
|
||||
})
|
||||
|
||||
// Mock mssql driver (must use regular functions because source uses `new`)
|
||||
vi.mock('mssql', () => ({
|
||||
default: {
|
||||
ConnectionPool: vi.fn(function () {
|
||||
return mockPool
|
||||
}),
|
||||
Transaction: vi.fn(function () {
|
||||
return mockTransaction
|
||||
}),
|
||||
Request: vi.fn(function () {
|
||||
return mockRequest
|
||||
})
|
||||
}
|
||||
}))
|
||||
|
||||
// Mock logger
|
||||
vi.mock('@main/services/logger', () => ({
|
||||
createLogger: () => ({
|
||||
info: vi.fn(),
|
||||
warn: vi.fn(),
|
||||
error: vi.fn(),
|
||||
debug: vi.fn()
|
||||
}),
|
||||
trackDuration: async <T>(fn: () => Promise<T>) => {
|
||||
const result = await fn()
|
||||
return { result }
|
||||
}
|
||||
}))
|
||||
|
||||
const mockConfig = {
|
||||
server: 'localhost',
|
||||
port: 1433,
|
||||
@@ -22,6 +93,18 @@ describe('SqlServerService Unit Tests', () => {
|
||||
let service: SqlServerService
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mockPool.connected = true
|
||||
mockPoolConnect.mockResolvedValue(undefined)
|
||||
mockPoolClose.mockResolvedValue(undefined)
|
||||
mockRequestInput.mockReturnThis()
|
||||
mockRequestQuery.mockResolvedValue({
|
||||
recordset: [],
|
||||
rowsAffected: [0]
|
||||
})
|
||||
mockTransactionBegin.mockResolvedValue(undefined)
|
||||
mockTransactionCommit.mockResolvedValue(undefined)
|
||||
mockTransactionRollback.mockResolvedValue(undefined)
|
||||
service = new SqlServerService(mockConfig)
|
||||
})
|
||||
|
||||
@@ -39,15 +122,22 @@ describe('SqlServerService Unit Tests', () => {
|
||||
})
|
||||
|
||||
describe('connect', () => {
|
||||
it('should throw error with invalid credentials', async () => {
|
||||
// This tests error handling without needing a real server
|
||||
const invalidConfig = {
|
||||
...mockConfig,
|
||||
server: 'invalid-host-that-does-not-exist'
|
||||
}
|
||||
const invalidService = new SqlServerService(invalidConfig)
|
||||
it('should throw error when connection fails', async () => {
|
||||
mockPool.connected = false
|
||||
mockPoolConnect.mockRejectedValue(new Error('connection refused'))
|
||||
const svc = new SqlServerService(mockConfig)
|
||||
await expect(svc.connect()).rejects.toThrow('Failed to connect to SQL Server')
|
||||
})
|
||||
|
||||
await expect(invalidService.connect()).rejects.toThrow('Failed to connect to SQL Server')
|
||||
it('should establish connection via pool', async () => {
|
||||
await service.connect()
|
||||
expect(mockPoolConnect).toHaveBeenCalled()
|
||||
expect(service.isConnected()).toBe(true)
|
||||
})
|
||||
|
||||
it('should throw when already connected', async () => {
|
||||
await service.connect()
|
||||
await expect(service.connect()).rejects.toThrow('Already connected to SQL Server')
|
||||
})
|
||||
})
|
||||
|
||||
@@ -55,6 +145,90 @@ describe('SqlServerService Unit Tests', () => {
|
||||
it('should throw error when not connected', async () => {
|
||||
await expect(service.query('SELECT 1')).rejects.toThrow('Not connected to SQL Server')
|
||||
})
|
||||
|
||||
it('should execute SELECT and return rows with columns', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockResolvedValue({
|
||||
recordset: [
|
||||
{ ID: 1, Name: 'test' },
|
||||
{ ID: 2, Name: 'foo' }
|
||||
],
|
||||
rowsAffected: [2]
|
||||
})
|
||||
|
||||
const result = await service.query('SELECT ID, Name FROM Users')
|
||||
|
||||
expect(mockRequestQuery).toHaveBeenCalledWith('SELECT ID, Name FROM Users')
|
||||
expect(result.rows).toEqual([
|
||||
{ ID: 1, Name: 'test' },
|
||||
{ ID: 2, Name: 'foo' }
|
||||
])
|
||||
expect(result.columns).toEqual(['ID', 'Name'])
|
||||
expect(result.rowCount).toBe(2)
|
||||
})
|
||||
|
||||
it('should convert array params to @p0, @p1, ... format', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockResolvedValue({ recordset: [], rowsAffected: [0] })
|
||||
|
||||
await service.query('SELECT * FROM Users WHERE ID = @p0 AND Name = @p1', [42, 'test'])
|
||||
|
||||
expect(mockRequestInput).toHaveBeenCalledWith('p0', 42)
|
||||
expect(mockRequestInput).toHaveBeenCalledWith('p1', 'test')
|
||||
})
|
||||
|
||||
it('should handle INSERT/UPDATE with rowsAffected', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockResolvedValue({
|
||||
recordset: undefined,
|
||||
rowsAffected: [5]
|
||||
})
|
||||
|
||||
const result = await service.query('DELETE FROM Users WHERE Active = 0')
|
||||
|
||||
expect(result.rows).toEqual([])
|
||||
expect(result.columns).toEqual([])
|
||||
expect(result.rowCount).toBe(5)
|
||||
})
|
||||
|
||||
it('should fallback to rows.length when rowsAffected is missing', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockResolvedValue({
|
||||
recordset: [{ ID: 1 }, { ID: 2 }],
|
||||
rowsAffected: undefined
|
||||
})
|
||||
|
||||
const result = await service.query('SELECT ID FROM Users')
|
||||
expect(result.rowCount).toBe(2)
|
||||
})
|
||||
|
||||
it('should wrap query errors with context', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockRejectedValue(new Error('syntax error'))
|
||||
|
||||
await expect(service.query('INVALID SQL')).rejects.toThrow('SQL Server query failed')
|
||||
})
|
||||
})
|
||||
|
||||
describe('queryWithParams', () => {
|
||||
it('should throw error when not connected', async () => {
|
||||
await expect(service.queryWithParams('SELECT @p0', { p0: { value: 1 } })).rejects.toThrow(
|
||||
'Not connected to SQL Server'
|
||||
)
|
||||
})
|
||||
|
||||
it('should add typed params via request.input', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockResolvedValue({ recordset: [{ ID: 1 }], rowsAffected: [1] })
|
||||
|
||||
await service.queryWithParams('SELECT @id', {
|
||||
id: { value: 42 },
|
||||
name: { value: 'test', type: 'NVarChar' as any }
|
||||
})
|
||||
|
||||
expect(mockRequestInput).toHaveBeenCalledWith('id', 42)
|
||||
expect(mockRequestInput).toHaveBeenCalledWith('name', 'NVarChar', 'test')
|
||||
})
|
||||
})
|
||||
|
||||
describe('transaction', () => {
|
||||
@@ -63,11 +237,56 @@ describe('SqlServerService Unit Tests', () => {
|
||||
'Not connected to SQL Server'
|
||||
)
|
||||
})
|
||||
|
||||
it('should execute all queries and commit', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockResolvedValue({ recordset: [], rowsAffected: [1] })
|
||||
|
||||
await service.transaction([
|
||||
{ sql: 'INSERT INTO t VALUES (@p0)', params: [1] },
|
||||
{ sql: 'UPDATE t SET x = 1' }
|
||||
])
|
||||
|
||||
expect(mockTransactionBegin).toHaveBeenCalled()
|
||||
expect(mockRequestQuery).toHaveBeenCalledTimes(2)
|
||||
expect(mockRequestInput).toHaveBeenCalledWith('p0', 1)
|
||||
expect(mockTransactionCommit).toHaveBeenCalled()
|
||||
expect(mockTransactionRollback).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should rollback on query failure', async () => {
|
||||
await service.connect()
|
||||
mockRequestQuery.mockRejectedValue(new Error('constraint violation'))
|
||||
|
||||
await expect(
|
||||
service.transaction([{ sql: 'INSERT INTO t VALUES (@p0)', params: [1] }])
|
||||
).rejects.toThrow('SQL Server transaction failed')
|
||||
|
||||
expect(mockTransactionRollback).toHaveBeenCalled()
|
||||
expect(mockTransactionCommit).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('disconnect', () => {
|
||||
it('should resolve when not connected', async () => {
|
||||
await expect(service.disconnect()).resolves.not.toThrow()
|
||||
})
|
||||
|
||||
it('should close pool and reset state', async () => {
|
||||
await service.connect()
|
||||
expect(service.isConnected()).toBe(true)
|
||||
|
||||
await service.disconnect()
|
||||
|
||||
expect(mockPoolClose).toHaveBeenCalled()
|
||||
expect(service.isConnected()).toBe(false)
|
||||
})
|
||||
|
||||
it('should wrap disconnect errors', async () => {
|
||||
await service.connect()
|
||||
mockPoolClose.mockRejectedValue(new Error('pool close failed'))
|
||||
|
||||
await expect(service.disconnect()).rejects.toThrow('Failed to disconnect from SQL Server')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -6,13 +6,12 @@ export default defineConfig({
|
||||
globals: true,
|
||||
environment: 'node',
|
||||
include: ['tests/**/*.{test,spec}.{ts,tsx}'],
|
||||
exclude: ['node_modules', 'dist', 'out', 'tests/e2e'],
|
||||
exclude: ['node_modules', 'dist', 'out', 'tests/e2e', 'tests/integration'],
|
||||
setupFiles: ['tests/setup.ts'],
|
||||
env: {
|
||||
NODE_ENV: 'test'
|
||||
},
|
||||
// 性能优化配置
|
||||
isolate: false, // 禁用隔离（提升 30-50% 速度）
|
||||
isolate: true,
|
||||
pool: 'threads', // 使用线程池
|
||||
maxWorkers: 4,
|
||||
bail: process.env.CI ? 1 : undefined,
|
||||
|
||||
Reference in New Issue
Block a user