@things-factory/figure-service 10.1.179 → 10.1.180

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-service",
-  "version": "10.1.179",
+  "version": "10.1.180",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -38,5 +38,5 @@
     "jszip": "^3.10.1",
     "koa-router": "^7.4.0"
   },
-  "gitHead": "4c8263b08e06b2b15f11dc0575c61a280a0d9e27"
+  "gitHead": "2549e50c0790c05a75781d133f5d975cff3b02f9"
 }

package/server/service/figure/figure-mutation.ts

@@ -398,7 +398,7 @@ export class FigureMutation {
 
     /* A release promises boards the full name {namespace}/{type}: it goes out only under a namespace the domain owns and has active. */
     const namespace = namespaceOf(figure)
-    await assertReleasableNamespace(tx, domain, namespace)
+    await assertReleasableNamespace(tx, domain, namespace, user)
     assertReleasableCategory(figure.category, figure.type)
 
     /*

package/server/service/figure/figure-namespace-db.test.ts

@@ -293,3 +293,23 @@ describe('the figure package', () => {
     await expect(ask(['CONVEYOR@1'])).rejects.toMatchObject({ code: 'figure-ref-malformed' })
   })
 })
+
+/*
+ * A domain whose figures were made before namespaces were rows (the setting days): it owns no namespace row, and its
+ * figures carry its subdomain. Releasing one is the first need of a namespace, so the subdomain becomes its first, as
+ * creating a figure does -- seen on :3300 after 10.1.179, where the system domain owned none.
+ */
+describe('a domain that owns no namespace row yet', () => {
+  it('releases a figure carrying its subdomain, and the subdomain becomes its default', async () => {
+    const { domain, context } = await domainWith(null)
+    const figure = await dataSource!.getRepository(Figure).save({ namespace: domain.subdomain, type: 'older', name: 'older', source: releasable(), state: 'draft', version: 0, domain })
+    await expect(new FigureMutation().releaseFigure(figure.id, 'first', context)).resolves.toMatchObject({ version: 1 })
+    expect((await resolver().figureNamespaces(context)).map((n: any) => [n.name, n.isDefault])).toEqual([[domain.subdomain, true]])
+  })
+
+  it('a figure carrying another namespace than its subdomain is still refused by name', async () => {
+    const { domain, context } = await domainWith(null)
+    const figure = await dataSource!.getRepository(Figure).save({ namespace: unique('elsewhere'), type: 'stray', name: 'stray', source: releasable(), state: 'draft', version: 0, domain })
+    await expect(new FigureMutation().releaseFigure(figure.id, 'first', context)).rejects.toMatchObject({ code: 'figure-namespace-not-owned' })
+  })
+})

package/server/service/figure/figure-namespace.ts

@@ -42,8 +42,15 @@ export async function namespaceForNewFigure(tx: EntityManager, domain: Domain, c
   return fallback.name!
 }
 
-/** A release promises boards `{namespace}/{type}`: it goes out only under a namespace the domain owns and has active. */
-export async function assertReleasableNamespace(tx: EntityManager, domain: Domain, namespace: string): Promise<void> {
+/**
+ * A release promises boards `{namespace}/{type}`: it goes out only under a namespace the domain owns and has active. A
+ * domain that owns none yet -- its figures were made before namespaces were rows -- gets its subdomain as its first,
+ * as creating a figure does; a figure carrying another namespace is still refused by name.
+ */
+export async function assertReleasableNamespace(tx: EntityManager, domain: Domain, namespace: string, user?: Actor): Promise<void> {
+  if ((await tx.getRepository(FigureNamespace).count({ where: { domain: { id: domain.id } } })) === 0) {
+    await firstNamespace(tx, domain, user)
+  }
   await activeOwn(tx, domain, namespace)
 }