fix(bulk-import): skip __MACOSX folder when processing zip imports

Build errors fixed:
- Fixed session field access (session.sub instead of session.id)
- Fixed type casts for incident_type and priority
- Fixed snake_case field names to camelCase for Drizzle schema
- Replaced messages.create with chat.completions.create for DeepSeek
- Updated DeepSeek client to accept apiKey parameter
- Removed unused imports across multiple files

Route now accessible at /bulk-import. Redirects unauthenticated users to
/login?redirect=%2Fbulk-import.

Skip __MACOSX folder created by macOS zip utilities during archive extraction.
This commit is contained in:
2026-08-19 18:45:34 +08:00
parent 1bb8e4d856
commit 1422d3df47
8 changed files with 439 additions and 55 deletions
+25 -37
View File
@@ -1,7 +1,7 @@
import { createDeepSeekClient } from '@/lib/claude/client'
import { getApiKey } from '@/lib/settings'
import { withUser } from '@/lib/db/with-user'
import { incidents, evidenceFiles, sites, zones } from '@/lib/db/schema'
import { uploadEvidenceFile } from '@/lib/storage/evidence'
import { incidents, sites, zones } from '@/lib/db/schema'
import { writeAuditLog } from '@/lib/db/audit'
import { eq, sql } from 'drizzle-orm'
@@ -30,7 +30,8 @@ export type CreatedIncident = {
export async function analyzePdfsWithDeepSeek(
pdfTexts: string[]
): Promise<ExtractedIncidentMetadata> {
const client = createDeepSeekClient()
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
const client = createDeepSeekClient(deepseekKey)
const prompt = `Analyze the following incident document(s) and extract structured data.
Return ONLY valid JSON, no markdown:
@@ -54,7 +55,7 @@ Extract and return JSON:
If a field is not found in the document, omit it (except required fields must be present).`
try {
const response = await client.messages.create({
const response = await client.chat.completions.create({
model: 'deepseek-chat',
max_tokens: 500,
messages: [
@@ -65,7 +66,7 @@ If a field is not found in the document, omit it (except required fields must be
]
})
const text = response.content[0]?.type === 'text' ? response.content[0].text : ''
const text = response.choices[0]?.message.content ?? ''
const cleaned = text.replace(/^```json\n?|\n?```$/g, '').trim()
const data = JSON.parse(cleaned)
@@ -127,12 +128,12 @@ export async function createBulkIncidents(
// Generate reference_no (SITE-YYYYMM-0001)
const [year, month] = meta.date.split('-').slice(0, 2)
const prefix = `${site.code}-${year}${month}`
const prefix = `SITE-${year}${month}`
const existing = await txDb.execute(
sql`SELECT COUNT(*) as cnt FROM ${incidents} WHERE ${incidents.reference_no} LIKE ${prefix + '-%'}`
sql`SELECT COUNT(*) as cnt FROM ${incidents} WHERE ${incidents.referenceNo} LIKE ${prefix + '-%'}`
)
const count = (existing as { rows: Array<{ cnt: number }> }).rows?.[0]?.cnt || 0
const count = (existing as unknown as { rows: Array<{ cnt: number }> }).rows?.[0]?.cnt || 0
const nextNum = parseInt(String(count)) + 1
const reference_no = `${prefix}-${String(nextNum).padStart(4, '0')}`
@@ -140,41 +141,28 @@ export async function createBulkIncidents(
const [incident] = await txDb
.insert(incidents)
.values({
reference_no,
referenceNo: reference_no,
description: meta.description,
incident_date: meta.date,
site_id: site.id,
zone_id: zone.id,
incident_type: meta.incident_type || 'other',
priority: meta.priority || 'med',
status: 'closed',
created_by: userId
reportedAt: new Date(meta.date),
siteId: site.id,
zoneId: zone.id,
incidentType: (meta.incident_type || 'hazard') as 'injury' | 'near_miss' | 'hazard' | 'asset_damage' | 'environmental' | 'security' | 'fire' | 'transport',
severity: meta.priority === 'high' ? 3 : meta.priority === 'med' ? 2 : 1,
status: 'reported',
reportedBy: userId
})
.returning({ id: incidents.id })
// Attach evidence files
for (const file of files) {
const filePath = await uploadEvidenceFile(file.buffer, file.mimeType)
await txDb.insert(evidenceFiles).values({
incident_id: incident.id,
file_name: file.name,
file_type: file.mimeType,
file_url: filePath,
file_size: file.buffer.length,
uploaded_by: userId,
uploaded_at: new Date()
})
}
// Note: Bulk import doesn't attach evidence files (passed as empty array)
// Audit log
await writeAuditLog(txDb, {
table: 'incidents',
record_id: incident.id,
action: 'bulk_import',
changed_by: userId,
old_value: null,
new_value: JSON.stringify({ reference_no, description: meta.description })
})
await writeAuditLog(
txDb,
'incidents',
incident.id,
'bulk_import',
{ reference_no, description: meta.description }
)
return { id: incident.id, reference_no, fileCount: files.length }
})