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:
@@ -28,7 +28,7 @@ export default function createUnderParent(pool) {
|
||||
await tx.begin();
|
||||
|
||||
try {
|
||||
const unitId = await ensureUnit(tx);
|
||||
const unitId = await ensureUnit(tx, languageId, companyId);
|
||||
const sku = await allocateSku(companyId, tx);
|
||||
const slug = slugify(name);
|
||||
|
||||
|
||||
@@ -14,7 +14,13 @@ function shapeArticleDetail(row, categoryIds, photos, eans, prices) {
|
||||
slug: row.slug,
|
||||
unitamount: row.unitamount,
|
||||
weight: row.weight,
|
||||
unit: { si: row.unitSi },
|
||||
unit: {
|
||||
si: row.unitSi,
|
||||
basesi: row.unitBasesi,
|
||||
basesifactor: row.unitBasesifactor,
|
||||
symbol: row.unitSymbol ?? null,
|
||||
name: row.unitName ?? null,
|
||||
},
|
||||
brand: row.brandName
|
||||
? {
|
||||
name: row.brandName,
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
import {
|
||||
UPDATE_UNIT,
|
||||
UPDATE_UNITAMOUNT,
|
||||
UPDATE_UNIT_AND_AMOUNT,
|
||||
} from '../../sql/article.js';
|
||||
import { UPDATE_BY_ARTICLE_AND_LANGUAGE } from '../../sql/articletext.js';
|
||||
import { GET_BY_SI } from '../../sql/unit.js';
|
||||
import request from '../request.js';
|
||||
import queryBySku from './queryBySku.js';
|
||||
import resolveArticleBySku from './resolveArticleBySku.js';
|
||||
@@ -17,37 +23,78 @@ export default function updateBySku(pool) {
|
||||
const resolve = resolveArticleBySku(pool);
|
||||
const load = queryBySku(pool);
|
||||
|
||||
return async (googleAuthId, sku, { name }) => {
|
||||
if (!name?.trim()) {
|
||||
return async (googleAuthId, sku, patch = {}) => {
|
||||
const hasName = Object.prototype.hasOwnProperty.call(patch, 'name');
|
||||
const hasUnitamount = Object.prototype.hasOwnProperty.call(patch, 'unitamount');
|
||||
const hasUnitSi = Object.prototype.hasOwnProperty.call(patch, 'unitSi');
|
||||
|
||||
if (!hasName && !hasUnitamount && !hasUnitSi) {
|
||||
throw new Error('Name required');
|
||||
}
|
||||
|
||||
const { articleId, languageId } = await resolve(googleAuthId, sku);
|
||||
if (hasName && !patch.name?.trim()) {
|
||||
throw new Error('Name required');
|
||||
}
|
||||
|
||||
if (hasUnitamount && (!Number.isFinite(patch.unitamount) || patch.unitamount <= 0)) {
|
||||
throw new Error('Invalid unitamount');
|
||||
}
|
||||
|
||||
const { articleId, languageId, companyId } = await resolve(googleAuthId, sku);
|
||||
|
||||
let unitId;
|
||||
if (hasUnitSi) {
|
||||
if (!patch.unitSi?.trim()) {
|
||||
throw new Error('Unit not found');
|
||||
}
|
||||
const unit = await pool
|
||||
.request()
|
||||
.input('companyId', companyId)
|
||||
.input('si', patch.unitSi.trim())
|
||||
.query(GET_BY_SI);
|
||||
unitId = unit.recordset[0]?.id;
|
||||
if (!unitId) {
|
||||
throw new Error('Unit not found');
|
||||
}
|
||||
}
|
||||
|
||||
const slug = slugify(name);
|
||||
const tx = pool.transaction();
|
||||
await tx.begin();
|
||||
|
||||
try {
|
||||
const update = await request(pool, tx)
|
||||
.input('articleId', articleId)
|
||||
.input('languageId', languageId)
|
||||
.input('name', name.trim())
|
||||
.input('slug', slug)
|
||||
.query(UPDATE_BY_ARTICLE_AND_LANGUAGE);
|
||||
if (hasName) {
|
||||
const slug = slugify(patch.name);
|
||||
const update = await request(pool, tx)
|
||||
.input('articleId', articleId)
|
||||
.input('languageId', languageId)
|
||||
.input('name', patch.name.trim())
|
||||
.input('slug', slug)
|
||||
.query(UPDATE_BY_ARTICLE_AND_LANGUAGE);
|
||||
|
||||
if (!update.rowsAffected[0]) {
|
||||
throw new Error('Article not found');
|
||||
if (!update.rowsAffected[0]) {
|
||||
throw new Error('Article not found');
|
||||
}
|
||||
}
|
||||
|
||||
if (hasUnitSi && hasUnitamount) {
|
||||
await request(pool, tx)
|
||||
.input('articleId', articleId)
|
||||
.input('unitId', unitId)
|
||||
.input('unitamount', patch.unitamount)
|
||||
.query(UPDATE_UNIT_AND_AMOUNT);
|
||||
} else if (hasUnitSi) {
|
||||
await request(pool, tx)
|
||||
.input('articleId', articleId)
|
||||
.input('unitId', unitId)
|
||||
.query(UPDATE_UNIT);
|
||||
} else if (hasUnitamount) {
|
||||
await request(pool, tx)
|
||||
.input('articleId', articleId)
|
||||
.input('unitamount', patch.unitamount)
|
||||
.query(UPDATE_UNITAMOUNT);
|
||||
}
|
||||
|
||||
await tx.commit();
|
||||
|
||||
const article = await load(articleId, languageId);
|
||||
if (!article) {
|
||||
throw new Error('Article not found');
|
||||
}
|
||||
|
||||
return article;
|
||||
} catch (err) {
|
||||
try {
|
||||
await tx.rollback();
|
||||
@@ -56,5 +103,12 @@ export default function updateBySku(pool) {
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
|
||||
const article = await load(articleId, languageId);
|
||||
if (!article) {
|
||||
throw new Error('Article not found');
|
||||
}
|
||||
|
||||
return article;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user