@things-factory/biz-base 10.1.149 → 10.1.154

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/biz-base",
-  "version": "10.1.149",
+  "version": "10.1.154",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "exports": {
@@ -41,7 +41,7 @@
     "test": "npm run build && node --test tests/*.test.mjs tests/*.test.cjs"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^10.1.149"
+    "@things-factory/auth-base": "^10.1.154"
   },
-  "gitHead": "816f88a9fa6110935a3f71740458db8f7469d2e3"
+  "gitHead": "f28579aa7131cbb282eb8813f8b285d9d29bb525"
 }

package/tests/counterparty-names.test.mjs

@@ -5,7 +5,7 @@ import { createRequire } from 'node:module'
 /* How names point at counterparties - pure rules, moved from Office with the tests that held them there. */
 
 const require = createRequire(import.meta.url)
-const { frequentUnmatched, linkFor, looksLikePersonName, matcherFor, nameClash, nameKey, namesToRegister, normalizeBusinessNumber, partiesFromNames, partyNamed } = require('../dist-server/service/counterparty/counterparty-names.js')
+const { frequentUnmatched, linkFor, looksLikePersonName, matcherFor, nameKey, namesToRegister, normalizeBusinessNumber, numberClash, partiesFromNames, partyNamed } = require('../dist-server/service/counterparty/counterparty-names.js')
 
 test('a counterparty is found by its name or an alias', () => {
   const parties = [{ id: 'a', name: '니어솔루션', aliases: '니어, 제이투-니어' }, { id: 'b', name: '한빛' }]
@@ -31,11 +31,32 @@ test('counterparty names match the way people mean them', () => {
   assert.deepEqual(linkFor({ description: 'x' }, byId, byName), {})
   assert.throws(() => linkFor({ counterparty: { id: 'nope' } }, byId, byName), /not found/)
 
-  assert.deepEqual(nameClash(known, [{ name: '(주)한빛' }]), ['한빛', '(주)한빛'])
-  assert.equal(nameClash(known, [{ id: 'c1', name: '한빛테크' }, { name: '한빛' }]), undefined)
   assert.deepEqual(namesToRegister(['한빛', ' 새회사 ', '(주)새회사', '', null], known), ['새회사'])
 })
 
+test('a business number is one counterparty - a name may be shared', () => {
+  const known = [
+    { id: 'k1', name: '(주)경암 성남', businessNumber: '166-85-01719' },
+    { id: 'k2', name: '(주)경암 성남', businessNumber: '541-85-00963' },
+    { id: 'w', name: '웰스테크' }
+  ]
+  // the same name under another number, or under none, is not refused
+  assert.equal(numberClash(known, [{ name: '(주)경암 성남', businessNumber: '222-22-22222' }]), undefined)
+  assert.equal(numberClash(known, [{ name: '웰스테크' }]), undefined)
+  // a number another counterparty holds is, by registering or by changing to it
+  assert.deepEqual(numberClash(known, [{ name: '경암', businessNumber: '166-85-01719' }]), { number: '166-85-01719', existing: '(주)경암 성남', name: '경암' })
+  assert.deepEqual(numberClash(known, [{ id: 'w', businessNumber: '541-85-00963' }]), { number: '541-85-00963', existing: '(주)경암 성남', name: '웰스테크' })
+  // changing another field of a holder, or deleting the holder first, is not
+  assert.equal(numberClash(known, [{ id: 'k1', name: '경암 성남' }]), undefined)
+  assert.equal(numberClash(known, [{ name: '경암', businessNumber: '166-85-01719' }], ['k1']), undefined)
+})
+
+test('a name two parties go by points at neither', () => {
+  const named = partyNamed([{ id: 'a', name: '(주)경암 성남' }, { id: 'b', name: '경암 성남' }, { id: 'c', name: '한빛', aliases: '빛' }])
+  assert.equal(named('경암성남'), undefined)
+  assert.equal(named('(주)한빛')?.id, 'c')
+})
+
 test('a business registration number is ten digits, stored with dashes', () => {
   assert.equal(normalizeBusinessNumber('1234567890'), '123-45-67890')
   assert.equal(normalizeBusinessNumber('123-45-67890'), '123-45-67890')

package/tests/counterparty.test.mjs

@@ -3,8 +3,8 @@ import assert from 'node:assert/strict'
 import { createRequire } from 'node:module'
 
 /*
- * A domain's own counterparty list (ADR-0122, the counterparty concept map): one domain's list is its own, names that
- * mean the same party are one counterparty, and the module that keeps names links rows once a name is registered.
+ * A domain's own counterparty list (ADR-0122, the counterparty concept map): one domain's list is its own, a business
+ * number is one counterparty and a name may be shared, and the module that keeps names links rows once a name is registered.
  * An in-memory SQLite source; no application database is opened.
  */
 
@@ -42,20 +42,29 @@ test('each domain keeps its own list - the same name may be registered in two do
   assert.equal(mine[0].kind, 'COMPANY', 'the words people write for the kind are taken')
 })
 
-test('names that mean the same party are refused, within one domain', async () => {
-  await assert.rejects(save([{ name: '한빛' }]), { code: 'counterparty-name-clash' })
-  await assert.rejects(save([{ name: '주식회사 한빛' }]), { code: 'counterparty-name-clash' })
+test('a business number is one counterparty in the domain; a name may be shared', async () => {
+  await assert.rejects(save([{ name: '한빛', businessNumber: '123-45-67890' }]), { code: 'counterparty-number-clash' })
+  const [same] = await save([{ name: '주식회사 한빛', businessNumber: '2223344444' }])
+  assert.equal(same.name, '주식회사 한빛', 'another business under the same name')
+  await save([{ id: same.id, cuFlag: '-' }])
   await assert.rejects(save([{ name: ' ' }]), { code: 'counterparty-name-required' })
   await assert.rejects(save([{ name: '새 거래처', businessNumber: '12-34' }]), { code: 'business-number-invalid' })
 })
 
-test('a deleted counterparty frees its name, and another domain cannot change or delete mine', async () => {
-  const [mine] = await db.getRepository(biz.Counterparty).find({ where: { domain: { id: domain.id } } })
+test('a deleted counterparty frees its number, and another domain cannot change or delete mine', async () => {
+  const [mine] = await db.getRepository(biz.Counterparty).find({ where: { domain: { id: domain.id }, businessNumber: '123-45-67890' } })
   await assert.rejects(save([{ id: mine.id, cuFlag: 'M', notes: 'x' }], other), { code: 'counterparty-not-found' })
   await assert.rejects(save([{ id: mine.id, cuFlag: '-' }], other), { code: 'counterparty-not-found' })
   await save([{ id: mine.id, cuFlag: '-' }])
-  const [again] = await save([{ name: '한빛' }])
-  assert.equal(again.name, '한빛')
+  const [again] = await save([{ name: '한빛', businessNumber: '1234567890' }])
+  assert.equal(again.businessNumber, '123-45-67890')
+})
+
+test('the database holds a business number to one live counterparty, whatever writes it', async () => {
+  const repo = db.getRepository(biz.Counterparty)
+  await assert.rejects(repo.save({ domain, name: '다른 이름', businessNumber: '123-45-67890' }), /UNIQUE/)
+  await repo.save({ domain, name: '한빛', businessNumber: null })
+  await repo.save({ domain, name: '한빛', businessNumber: null })
 })
 
 test('a module that keeps names hears every save, in the same transaction', async () => {

package/translations/en.json

@@ -11,7 +11,7 @@
   "field.company": "company",
   "error.no x found": "no {x} found",
   "error.counterparty-name-required": "Give the counterparty a name.",
-  "error.counterparty-name-clash": "'{name}' is the same counterparty as '{existing}'. Edit that one instead.",
+  "error.counterparty-number-clash": "Business number {number} already belongs to '{existing}'. Edit that counterparty instead.",
   "error.counterparty-not-found": "The counterparty was not found. Reload it.",
   "error.counterparty-kind-invalid": "'{text}' is neither a company nor a person.",
   "error.business-number-invalid": "'{text}' is not a business registration number. It has 10 digits."

package/translations/es.json

@@ -11,7 +11,7 @@
   "field.company": "empresa",
   "error.no x found": "no se encontró {x}",
   "error.counterparty-name-required": "Asigne un nombre a la contraparte.",
-  "error.counterparty-name-clash": "'{name}' es la misma contraparte que '{existing}'. Edite esa en su lugar.",
+  "error.counterparty-number-clash": "El número de empresa {number} ya pertenece a '{existing}'. Edite esa contraparte en su lugar.",
   "error.counterparty-not-found": "No se encontró la contraparte. Vuelva a cargarla.",
   "error.counterparty-kind-invalid": "'{text}' no es ni una empresa ni una persona.",
   "error.business-number-invalid": "'{text}' no es un número de registro empresarial. Debe tener 10 dígitos."

package/translations/ja.json

@@ -9,5 +9,6 @@
   "field.postal_code": "郵便番号",
   "field.latlng": "緯度/経度",
   "field.company": "会社",
+  "error.counterparty-number-clash": "事業者番号 {number} はすでに取引先 '{existing}' の番号です。その取引先を編集してください。",
   "error.no x found": "{x}が見つかりません"
 }

package/translations/ko.json

@@ -11,7 +11,7 @@
   "field.company": "회사",
   "error.no x found": "발견된 {x}이(가) 없습니다",
   "error.counterparty-name-required": "거래처 이름을 넣으세요.",
-  "error.counterparty-name-clash": "'{name}'은(는) 이미 있는 거래처 '{existing}'와 같습니다. 그 거래처를 고치세요.",
+  "error.counterparty-number-clash": "사업자번호 {number}은(는) 이미 거래처 '{existing}'의 번호입니다. 그 거래처를 고치세요.",
   "error.counterparty-not-found": "거래처를 찾을 수 없습니다. 다시 불러오세요.",
   "error.counterparty-kind-invalid": "'{text}'은(는) 회사도 개인도 아닙니다.",
   "error.business-number-invalid": "'{text}'은(는) 사업자등록번호가 아닙니다. 사업자등록번호는 숫자 10자리입니다."

package/translations/ms.json

@@ -9,5 +9,6 @@
   "field.postal_code": "poskod",
   "field.latlng": "latitud/longitud",
   "field.company": "syarikat",
+  "error.counterparty-number-clash": "Nombor pendaftaran perniagaan {number} sudah milik '{existing}'. Sunting rakan niaga itu sahaja.",
   "error.no x found": "tiada {x} yang dijumpai"
 }

package/translations/zh.json

@@ -9,5 +9,6 @@
   "field.postal_code": "邮政编码",
   "field.latlng": "纬度/经度",
   "field.company": "公司",
+  "error.counterparty-number-clash": "营业登记号 {number} 已属于往来单位 '{existing}'。请改为编辑该往来单位。",
   "error.no x found": "没有找到{x}"
 }