From 4b34902b92998493f46500b3fecd7a1bcf0bf583 Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 19 Oct 2026 23:56:56 +0200 Subject: [PATCH] u --- API.company.md | 10 +++------- API.md | 2 +- README.md | 13 ++++++------- generate-api-doc.js | 2 +- src/providers/mssql/schema.js | 1 - src/providers/sqlite3/schema.js | 2 +- src/store/company/create.js | 9 +-------- src/store/company/update.js | 13 ++----------- 8 files changed, 15 insertions(+), 37 deletions(-) diff --git a/API.company.md b/API.company.md index 26619c0..422529b 100644 --- a/API.company.md +++ b/API.company.md @@ -44,7 +44,7 @@ Creates a new company together with its root category, POS customer group, defau | --- | --- | --- | | `input` | `object` | The company creation input. | | `input.iso639` | `string` | The ISO 639 language code for the company. | -| `input.name` | `string` | The company name (must be unique). | +| `input.name` | `string` | The company name. | | `input.taxrate` | `number` | The standard tax rate in percent. | | `input.reducedtaxrate` | `number` | The reduced tax rate in percent. | | `input.googleAuthId` | `number` | The id of the Google auth user to link. | @@ -54,10 +54,6 @@ Creates a new company together with its root category, POS customer group, defau `Promise<{id: number, rootCategoryId: number, languageId: number, taxrateId: number, reducedtaxrateId: number, taxfreerateId: number, posCustomerGroupId: number}>` — The created company ids. -**Throws** - -`Error` — If the company name is already taken. - **Example** ```js @@ -208,7 +204,7 @@ Updates an existing company's name, language and tax rates. | `id` | `number` | The id of the company to update. | | `input` | `object` | The update input. | | `input.iso639` | `string` | The ISO 639 language code. | -| `input.name` | `string` | The new company name (must be unique). | +| `input.name` | `string` | The new company name. | | `input.taxrate` | `number` | The standard tax rate in percent. | | `input.reducedtaxrate` | `number` | The reduced tax rate in percent. | | `[tx]` | `object` | Optional transaction to run within. | @@ -219,7 +215,7 @@ Updates an existing company's name, language and tax rates. **Throws** -`Error` — If the company is not found or the name is taken. +`Error` — If the company is not found. **Example** diff --git a/API.md b/API.md index 36b3018..7eeee06 100644 --- a/API.md +++ b/API.md @@ -31,7 +31,7 @@ The store is exposed as a `LibDashStore` instance (see `src/index.js`). Each met - **categorypic**: `id PK, category_id->category, pic_id->pic, sort:i=0, UQ(category_id, pic_id), UQ(category_id, sort)` - **categoryproperty**: `id PK, category_id->category, property_id->propertyname, value:txt, sort:i=0` - **categorytext**: `id PK, category_id->category, language_id->language, name:s(255), slug:s(255), seo?:txt, desc?:txt, UQ(category_id, language_id)` -- **company**: `id PK, name:s(255) UQ, root_category_id?->category, default_language_id?->language, taxrate?->tax, reducedtaxrate?->tax, taxfreerate?->tax, poscustomergroup_id->customergroup` +- **company**: `id PK, name:s(255), root_category_id?->category, default_language_id?->language, taxrate?->tax, reducedtaxrate?->tax, taxfreerate?->tax, poscustomergroup_id->customergroup` - **companyhistory**: `id PK, company_id->company, companyuser_id?->companyuser, date:dt, text:txt` - **companysetting**: `id PK, company_id->company, key:s(255), value:txt, frontend:b=0, writeonly:b=0, UQ(company_id, key)` - **companyuser**: `id PK, google_auth_id->google_auth, company_id->company, UQ(google_auth_id, company_id)` diff --git a/README.md b/README.md index 501b61f..e708342 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,11 @@ Company-scoped methods take **no** `companyId` argument: they use `google_auth.s For `POST /api/company`: -1. Fails if `name` is taken (`Company name not available`) -2. Ensures language by `iso639` (get or create) -3. Ensures tax rows for `taxrate`, `reducedtaxrate`, and `0` → `taxfreerateId` -4. Creates root category (`parentId = null`) -5. Creates POS `customergroup` (name `POS`), then inserts company with `poscustomergroup_id` (**NOT NULL**), then links the group via `customergroup.company_id` -6. Links creator as `companyuser` (`googleAuthId` → `company_id`) +1. Ensures language by `iso639` (get or create) +2. Ensures tax rows for `taxrate`, `reducedtaxrate`, and `0` → `taxfreerateId` +3. Creates root category (`parentId = null`) +4. Creates POS `customergroup` (name `POS`), then inserts company with `poscustomergroup_id` (**NOT NULL**), then links the group via `customergroup.company_id` +5. Links creator as `companyuser` (`googleAuthId` → `company_id`) `company.poscustomergroup_id` is required (POS pricing in `getTreeForCompany` / category articles). Circular FK with `customergroup.company_id`: the group is inserted first with `company_id` null, then linked after the company row exists. @@ -59,7 +58,7 @@ Returns only companies where `googleAuthId` has a `companyuser` row. For `PATCH /api/company/:id`: -1. Fails if company missing / name taken by another company +1. Fails if company missing 2. Ensures lang + tax rates 3. Updates `name`, `default_language_id`, `taxrate`, `reducedtaxrate` (`taxfreerateId` / root category unchanged) diff --git a/generate-api-doc.js b/generate-api-doc.js index 2d86d38..9d70803 100644 --- a/generate-api-doc.js +++ b/generate-api-doc.js @@ -347,7 +347,7 @@ const SCHEMA_TABLES = [ ['categorypic', 'id PK, category_id->category, pic_id->pic, sort:i=0, UQ(category_id, pic_id), UQ(category_id, sort)'], ['categoryproperty', 'id PK, category_id->category, property_id->propertyname, value:txt, sort:i=0'], ['categorytext', 'id PK, category_id->category, language_id->language, name:s(255), slug:s(255), seo?:txt, desc?:txt, UQ(category_id, language_id)'], - ['company', 'id PK, name:s(255) UQ, root_category_id?->category, default_language_id?->language, taxrate?->tax, reducedtaxrate?->tax, taxfreerate?->tax, poscustomergroup_id->customergroup'], + ['company', 'id PK, name:s(255), root_category_id?->category, default_language_id?->language, taxrate?->tax, reducedtaxrate?->tax, taxfreerate?->tax, poscustomergroup_id->customergroup'], ['companyhistory', 'id PK, company_id->company, companyuser_id?->companyuser, date:dt, text:txt'], ['companysetting', 'id PK, company_id->company, key:s(255), value:txt, frontend:b=0, writeonly:b=0, UQ(company_id, key)'], ['companyuser', 'id PK, google_auth_id->google_auth, company_id->company, UQ(google_auth_id, company_id)'], diff --git a/src/providers/mssql/schema.js b/src/providers/mssql/schema.js index 8c2d47e..9d3f217 100644 --- a/src/providers/mssql/schema.js +++ b/src/providers/mssql/schema.js @@ -118,7 +118,6 @@ BEGIN reducedtaxrate INT NULL, taxfreerate INT NULL, poscustomergroup_id INT NOT NULL, - CONSTRAINT UQ_company_name UNIQUE (name), CONSTRAINT FK_company_root_category FOREIGN KEY (root_category_id) REFERENCES category(id) ON DELETE SET NULL, CONSTRAINT FK_company_default_language FOREIGN KEY (default_language_id) REFERENCES language(id) ON DELETE SET NULL, CONSTRAINT FK_company_taxrate FOREIGN KEY (taxrate) REFERENCES tax(id) ON DELETE NO ACTION, diff --git a/src/providers/sqlite3/schema.js b/src/providers/sqlite3/schema.js index 3ac8755..cb22e83 100644 --- a/src/providers/sqlite3/schema.js +++ b/src/providers/sqlite3/schema.js @@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS pic ( export const INIT_COMPANY = ` CREATE TABLE IF NOT EXISTS company ( id INTEGER PRIMARY KEY AUTOINCREMENT, - name TEXT NOT NULL COLLATE NOCASE UNIQUE, + name TEXT NOT NULL COLLATE NOCASE, root_category_id INTEGER, default_language_id INTEGER, taxrate INTEGER, diff --git a/src/store/company/create.js b/src/store/company/create.js index 1b829ec..e804ae3 100644 --- a/src/store/company/create.js +++ b/src/store/company/create.js @@ -13,13 +13,11 @@ import { } from '../../providers/sqlite3/queries/customergroup.js'; import { ADD as MSSQL_ADD_COMPANYUSER } from '../../providers/mssql/queries/companyuser.js'; import { ADD as SQLITE_ADD_COMPANYUSER } from '../../providers/sqlite3/queries/companyuser.js'; -import getByName from './getByName.js'; import langEnsure from '../lang/ensure.js'; import taxEnsure from '../tax/ensure.js'; import makeRunner from '../runner.js'; export default function create(provider) { - const nameTaken = getByName(provider); const ensureLang = langEnsure(provider); const ensureTax = taxEnsure(provider); @@ -36,13 +34,12 @@ export default function create(provider) { * * @param {object} input - The company creation input. * @param {string} input.iso639 - The ISO 639 language code for the company. - * @param {string} input.name - The company name (must be unique). + * @param {string} input.name - The company name. * @param {number} input.taxrate - The standard tax rate in percent. * @param {number} input.reducedtaxrate - The reduced tax rate in percent. * @param {number} input.googleAuthId - The id of the Google auth user to link. * @param {object} [tx] - Optional transaction to run within. * @returns {Promise<{id: number, rootCategoryId: number, languageId: number, taxrateId: number, reducedtaxrateId: number, taxfreerateId: number, posCustomerGroupId: number}>} The created company ids. - * @throws {Error} If the company name is already taken. * * @example * const company = await store.company.create({ @@ -56,10 +53,6 @@ export default function create(provider) { */ return async ({ iso639, name, taxrate, reducedtaxrate, googleAuthId }, tx) => { const runCreate = async (runner) => { - const existing = await nameTaken(name, runner); - if (existing) { - throw new Error('Company name not available'); - } const languageId = await ensureLang(iso639, runner); const taxrateId = await ensureTax(taxrate, runner); diff --git a/src/store/company/update.js b/src/store/company/update.js index 78cf4fb..055a0cf 100644 --- a/src/store/company/update.js +++ b/src/store/company/update.js @@ -1,14 +1,12 @@ import { UPDATE as MSSQL_UPDATE } from '../../providers/mssql/queries/company.js'; import { UPDATE as SQLITE_UPDATE } from '../../providers/sqlite3/queries/company.js'; import getById from './getById.js'; -import getByName from './getByName.js'; import langEnsure from '../lang/ensure.js'; import taxEnsure from '../tax/ensure.js'; import makeRunner from '../runner.js'; export default function update(provider) { const byId = getById(provider); - const byName = getByName(provider); const ensureLang = langEnsure(provider); const ensureTax = taxEnsure(provider); const isSqlite = provider?.dialect === 'sqlite3'; @@ -20,12 +18,12 @@ export default function update(provider) { * @param {number} id - The id of the company to update. * @param {object} input - The update input. * @param {string} input.iso639 - The ISO 639 language code. - * @param {string} input.name - The new company name (must be unique). + * @param {string} input.name - The new company name. * @param {number} input.taxrate - The standard tax rate in percent. * @param {number} input.reducedtaxrate - The reduced tax rate in percent. * @param {object} [tx] - Optional transaction to run within. * @returns {Promise<{id: number, rootCategoryId: number, languageId: number, taxrateId: number, reducedtaxrateId: number, taxfreerateId: number}>} The updated company ids. - * @throws {Error} If the company is not found or the name is taken. + * @throws {Error} If the company is not found. * * @example * const result = await store.company.update(1, { iso639: 'de', name: 'Acme', taxrate: 19, reducedtaxrate: 7 }); @@ -38,13 +36,6 @@ export default function update(provider) { throw new Error('Company not found'); } - if (name !== company.name) { - const taken = await byName(name, runner); - if (taken) { - throw new Error('Company name not available'); - } - } - const languageId = await ensureLang(iso639, runner); const taxrateId = await ensureTax(taxrate, runner); const reducedtaxrateId = await ensureTax(reducedtaxrate, runner);