Add company-scoped unit list/upsert/delete and article unit patches.

Units are isolated per company; article detail exposes full unit shape, and unused units can be deleted safely via FK NO ACTION.
This commit is contained in:
seb
2026-08-01 06:12:24 +02:00
parent 54700a145e
commit 12e83a7ffb
16 changed files with 519 additions and 44 deletions

31
src/store/unit/delete.js Normal file
View File

@@ -0,0 +1,31 @@
import { DELETE_BY_COMPANY_AND_SI } from '../../sql/unit.js';
import resolveCompanyAccess from '../companyuser/resolveCompanyAccess.js';
export default function del(pool) {
const access = resolveCompanyAccess(pool);
return async (googleAuthId, companyId, si) => {
if (!si?.trim()) {
throw new Error('Unit not found');
}
await access(googleAuthId, companyId);
try {
const result = await pool
.request()
.input('companyId', companyId)
.input('si', si.trim())
.query(DELETE_BY_COMPANY_AND_SI);
if (!result.rowsAffected[0]) {
throw new Error('Unit not found');
}
} catch (err) {
if (err.number === 547) {
throw new Error('Unit in use');
}
throw err;
}
};
}

View File

@@ -1,24 +1,49 @@
import { CREATE, GET_BY_SI } from '../../sql/unit.js';
import {
CREATE as CREATE_UNITTEXT,
GET_BY_UNIT_AND_LANGUAGE,
} from '../../sql/unittext.js';
import request from '../request.js';
const DEFAULT_SI = 'pc';
const DEFAULT_SYMBOL = 'pc';
const DEFAULT_NAME = 'Piece';
export default function ensureDefaultUnit(pool) {
return async (tx) => {
return async (tx, languageId, companyId) => {
const existing = await request(pool, tx)
.input('companyId', companyId)
.input('si', DEFAULT_SI)
.query(GET_BY_SI);
if (existing.recordset[0]) {
return existing.recordset[0].id;
let unitId = existing.recordset[0]?.id;
if (!unitId) {
const created = await request(pool, tx)
.input('companyId', companyId)
.input('si', DEFAULT_SI)
.input('basesi', DEFAULT_SI)
.input('basesifactor', 1)
.query(CREATE);
unitId = created.recordset[0].id;
}
const created = await request(pool, tx)
.input('si', DEFAULT_SI)
.input('basesi', DEFAULT_SI)
.input('basesifactor', 1)
.query(CREATE);
if (languageId != null) {
const text = await request(pool, tx)
.input('unitId', unitId)
.input('languageId', languageId)
.query(GET_BY_UNIT_AND_LANGUAGE);
return created.recordset[0].id;
if (!text.recordset[0]) {
await request(pool, tx)
.input('unitId', unitId)
.input('languageId', languageId)
.input('symbol', DEFAULT_SYMBOL)
.input('name', DEFAULT_NAME)
.query(CREATE_UNITTEXT);
}
}
return unitId;
};
}

19
src/store/unit/list.js Normal file
View File

@@ -0,0 +1,19 @@
import { LIST_BY_COMPANY } from '../../sql/unit.js';
import resolveCompanyAccess from '../companyuser/resolveCompanyAccess.js';
import shapeUnit from './shapeUnit.js';
export default function list(pool) {
const access = resolveCompanyAccess(pool);
return async (googleAuthId, companyId) => {
const { languageId } = await access(googleAuthId, companyId);
const result = await pool
.request()
.input('companyId', companyId)
.input('languageId', languageId)
.query(LIST_BY_COMPANY);
return result.recordset.map(shapeUnit);
};
}

View File

@@ -0,0 +1,11 @@
function shapeUnit(row) {
return {
si: row.si,
basesi: row.basesi,
basesifactor: row.basesifactor,
symbol: row.symbol ?? null,
name: row.name ?? null,
};
}
export default shapeUnit;

115
src/store/unit/upsert.js Normal file
View File

@@ -0,0 +1,115 @@
import {
CREATE as CREATE_UNIT,
GET_BY_SI,
GET_FULL_BY_SI,
UPDATE_BY_SI,
} from '../../sql/unit.js';
import {
CREATE as CREATE_UNITTEXT,
GET_BY_UNIT_AND_LANGUAGE,
UPDATE_BY_UNIT_AND_LANGUAGE,
} from '../../sql/unittext.js';
import resolveCompanyAccess from '../companyuser/resolveCompanyAccess.js';
import request from '../request.js';
import shapeUnit from './shapeUnit.js';
function validateUnit({ si, basesi, basesifactor, symbol, name }) {
if (!si?.trim() || !basesi?.trim() || !symbol?.trim() || !name?.trim()) {
throw new Error('Invalid unit');
}
if (!Number.isFinite(basesifactor) || basesifactor <= 0) {
throw new Error('Invalid unit');
}
return {
si: si.trim(),
basesi: basesi.trim(),
basesifactor,
symbol: symbol.trim(),
name: name.trim(),
};
}
export default function upsert(pool) {
const access = resolveCompanyAccess(pool);
return async (googleAuthId, companyId, input) => {
const unit = validateUnit(input);
const { languageId } = await access(googleAuthId, companyId);
const tx = pool.transaction();
await tx.begin();
try {
const existing = await request(pool, tx)
.input('companyId', companyId)
.input('si', unit.si)
.query(GET_BY_SI);
let unitId = existing.recordset[0]?.id;
if (!unitId) {
const created = await request(pool, tx)
.input('companyId', companyId)
.input('si', unit.si)
.input('basesi', unit.basesi)
.input('basesifactor', unit.basesifactor)
.query(CREATE_UNIT);
unitId = created.recordset[0].id;
await request(pool, tx)
.input('unitId', unitId)
.input('languageId', languageId)
.input('symbol', unit.symbol)
.input('name', unit.name)
.query(CREATE_UNITTEXT);
} else {
await request(pool, tx)
.input('companyId', companyId)
.input('si', unit.si)
.input('basesi', unit.basesi)
.input('basesifactor', unit.basesifactor)
.query(UPDATE_BY_SI);
const text = await request(pool, tx)
.input('unitId', unitId)
.input('languageId', languageId)
.query(GET_BY_UNIT_AND_LANGUAGE);
if (text.recordset[0]) {
await request(pool, tx)
.input('unitId', unitId)
.input('languageId', languageId)
.input('symbol', unit.symbol)
.input('name', unit.name)
.query(UPDATE_BY_UNIT_AND_LANGUAGE);
} else {
await request(pool, tx)
.input('unitId', unitId)
.input('languageId', languageId)
.input('symbol', unit.symbol)
.input('name', unit.name)
.query(CREATE_UNITTEXT);
}
}
await tx.commit();
} catch (err) {
try {
await tx.rollback();
} catch {
// ignore
}
throw err;
}
const result = await pool
.request()
.input('companyId', companyId)
.input('si', unit.si)
.input('languageId', languageId)
.query(GET_FULL_BY_SI);
return shapeUnit(result.recordset[0]);
};
}