@dooer/dooer-test-env 1.3.0 → 1.4.1

package/lib/account.js

@@ -8,7 +8,10 @@
 //   - service_accounts.subscriptions         the same active set Ghost Inspector has on staging
 //   - service_accounts."partnerOrganization" the org placed under partner `dooer` by default
 //   - service_accounts."tosAcceptance"        the current Terms of Service pre-accepted (so sumify doesn't block)
-// It does NOT add customer data (ledger, documents, tasks, …) — the account starts empty.
+//   - service_ledger.fiscal_year              the CURRENT year, + default company information written to
+//     service_accounts."temporalKeyValue"     both the companies columns and temporalKeyValue
+//                                             (disable the whole block with --no-fiscal-year)
+// It does NOT add customer data (documents, verifications, tasks, …) — the account starts empty.
 
 const crypto = require('crypto')
 const { Client } = require('pg')
@@ -19,6 +22,16 @@ const SUBSCRIPTION_TYPES = ['accounting', 'billing', 'salaries', 'sales', 'prebo
 // The partner every new test account is placed under by default (Jimmy 2026-09-01).
 const DEFAULT_PARTNER_DOMAIN = 'dooer'
 
+// Company-information defaults, applied unless --no-fiscal-year (Jimmy 2026-09-03). A brand-new account
+// otherwise has no fiscal year and blank registration fields, so nothing can be booked and HQ's
+// /customers/<org>/information page is empty. Each value is written BOTH as a companies column (what that
+// page edits) AND as a service_accounts."temporalKeyValue" row (the temporal source the platform reads),
+// plus the service_ledger.fiscal_year row itself.
+const currentYearDates = () => {
+  const year = new Date().getFullYear()
+  return { year, start: `${year}-01-01`, end: `${year}-12-31` }
+}
+
 const uuid = () => crypto.randomUUID()
 // A plausible unique 10-digit Swedish org number (556XXXXXXX) — dev placeholder, not a real registration.
 const orgNumber = () => `556${String(crypto.randomInt(0, 1e7)).padStart(7, '0')}`
@@ -44,9 +57,10 @@ async function uniqueSlug(client, name) {
   return `${base}-${crypto.randomBytes(3).toString('hex')}`
 }
 
-async function createAccount({ local, name, ownerUserId, execute = false } = {}) {
+async function createAccount({ local, name, ownerUserId, execute = false, fiscalYear = true } = {}) {
   if (!name) throw new Error('customer new: a name is required')
   if (!ownerUserId) throw new Error('customer new: --owner <userId> is required')
+  const fy = currentYearDates()
 
   const client = new Client({ ...local, ssl: local.ssl === false ? undefined : { rejectUnauthorized: false } })
   await client.connect()
@@ -81,6 +95,7 @@ async function createAccount({ local, name, ownerUserId, execute = false } = {})
       ownerType,
       partner: DEFAULT_PARTNER_DOMAIN,
       subscriptions: SUBSCRIPTION_TYPES,
+      fiscalYear: fiscalYear ? { start: fy.start, end: fy.end } : null,
       warning,
     }
     if (!execute) {
@@ -93,11 +108,29 @@ async function createAccount({ local, name, ownerUserId, execute = false } = {})
     await client.query(
       // Populate a placeholder address: some org endpoints serialize organization.address as a required
       // OBJECT and return null (schema violation, seen in sumify) when all address columns are empty.
+      // The registration/fiscal-year columns are NULL unless the defaults are enabled (--no-fiscal-year).
       `INSERT INTO service_accounts.companies
          (companies_pk, fk_countries_pk, fk_company_types_pk, company_name, short_name, organization_number,
-          api_uuid, language, "timeZone", currency, address, postal_code, city, inserted_at, updated_at)
-       VALUES ($1,'SE','AB',$2,$3,$4,$5,'sv','Europe/Stockholm','SEK','Testgatan 1','11111','Stockholm',now(),now())`,
-      [orgId, name, shortName, orgNumber(), uuid()]
+          api_uuid, language, "timeZone", currency, address, postal_code, city,
+          bookkeeping_start_date, skv_fiscal_year_start, skv_fiscal_year_end,
+          is_registered_for_vat, vat_registration_date, registered_for_f_tax, is_employer,
+          inserted_at, updated_at)
+       VALUES ($1,'SE','AB',$2,$3,$4,$5,'sv','Europe/Stockholm','SEK','Testgatan 1','11111','Stockholm',
+               $6,$7,$8,$9,$10,$11,$12,now(),now())`,
+      [
+        orgId,
+        name,
+        shortName,
+        orgNumber(),
+        uuid(),
+        fiscalYear ? fy.start : null, // bookkeeping_start_date
+        fiscalYear ? fy.start : null, // skv_fiscal_year_start
+        fiscalYear ? fy.end : null, // skv_fiscal_year_end
+        fiscalYear ? true : null, // is_registered_for_vat
+        fiscalYear ? fy.start : null, // vat_registration_date
+        fiscalYear ? true : null, // registered_for_f_tax
+        fiscalYear ? true : null, // is_employer
+      ]
     )
     await client.query(
       `INSERT INTO service_accounts.companies2users
@@ -131,6 +164,34 @@ async function createAccount({ local, name, ownerUserId, execute = false } = {})
       )
     }
     plan.tosAccepted = activeTos.rowCount
+
+    if (fiscalYear) {
+      // The fiscal year itself (service-ledger owns it; HQ's "Räkenskapsår" + all booking depends on it).
+      await client.query(
+        `INSERT INTO service_ledger.fiscal_year (id, company_id, start_date, end_date, created_at, closed)
+         VALUES ($1,$2,$3,$4,now(),false)`,
+        [uuid(), orgId, fy.start, fy.end]
+      )
+      // The temporal source of truth mirroring the columns set above. `fiscalYear` carries the period in
+      // both the value and the row's own start/endDate (matching how ibSync writes it); the registration
+      // flags are open-ended from the start of the year.
+      const tkv = [
+        { key: 'fiscalYear', value: { start: fy.start, end: fy.end }, startDate: fy.start, endDate: fy.end },
+        { key: 'hasVatRegistration', value: true, startDate: fy.start, endDate: null },
+        { key: 'hasCompanyTax', value: true, startDate: fy.start, endDate: null }, // F-skatt
+        { key: 'hasEmployeeRegistration', value: true, startDate: fy.start, endDate: null },
+      ]
+      for (const t of tkv) {
+        await client.query(
+          `INSERT INTO service_accounts."temporalKeyValue"
+             (id, "organizationId", key, value, "startDate", "endDate", "setBySource", "createdAt", "updatedAt")
+           VALUES ($1,$2,$3,$4::jsonb,$5,$6,'user',now(),now())`,
+          [uuid(), orgId, t.key, JSON.stringify(t.value), t.startDate, t.endDate]
+        )
+      }
+      plan.temporalKeys = tkv.map((t) => t.key)
+    }
+
     await client.query('COMMIT')
     return plan
   } catch (e) {

package/lib/command/customer.js

@@ -87,11 +87,23 @@ module.exports = {
           y2
             .positional('name', { type: 'string', describe: 'company name for the new account' })
             .option('owner', { type: 'string', demandOption: true, describe: 'user (users_pk) to set as Owner' })
+            .option('fiscal-year', {
+              type: 'boolean',
+              default: true,
+              describe:
+                'create the current-year fiscal year + default company information (VAT/F-skatt/employer registered, bookkeeping start). --no-fiscal-year leaves all of it blank',
+            })
             .option('port', { type: 'number', default: 55432, describe: 'local Postgres port' })
             .option('execute', { type: 'boolean', default: false, describe: 'actually create (default: dry-run)' }),
         handler: async (argv) => {
           const local = { host: 'localhost', port: argv.port, user: 'dooer', password: 'dooer', database: 'dooer' }
-          const res = await createAccount({ local, name: argv.name, ownerUserId: argv.owner, execute: argv.execute })
+          const res = await createAccount({
+            local,
+            name: argv.name,
+            ownerUserId: argv.owner,
+            execute: argv.execute,
+            fiscalYear: argv.fiscalYear,
+          })
           if (argv.execute) {
             console.log(chalk.green(`\ncreated account "${res.name}"`))
             console.log(`  org id:        ${res.orgId}`)
@@ -100,6 +112,11 @@ module.exports = {
             console.log(`  partner:       ${res.partner}`)
             console.log(`  subscriptions: ${SUBSCRIPTION_TYPES.join(', ')} (active)`)
             console.log(`  TOS:           ${res.tosAccepted} version(s) pre-accepted`)
+            console.log(
+              res.fiscalYear
+                ? `  fiscal year:   ${res.fiscalYear.start} → ${res.fiscalYear.end} (+ VAT/F-skatt/employer registered; ${res.temporalKeys.length} temporal keys)`
+                : `  fiscal year:   none (--no-fiscal-year)`
+            )
           }
           if (res.warning) console.log(chalk.yellow(`\n⚠  ${res.warning}`))
         },

package/lib/command/service.js

@@ -89,7 +89,10 @@ module.exports = {
           if (fs.existsSync(rt.OVERRIDE_FILE))
             ov = yaml.safeLoad(fs.readFileSync(rt.OVERRIDE_FILE, 'utf8')) || { services: {} }
           ov.services = ov.services || {}
-          ov.services[a.name] = { image }
+          // Keep DOOER_SERVICE_VERSION in sync with the tag: the logging library stamps it on every log
+          // line (and the applicationChain), so a bare image bump leaves logs reporting the manifest's
+          // stale version — the same drift deploy-staging.sh exists to prevent.
+          ov.services[a.name] = { image, environment: { DOOER_SERVICE_VERSION: a.tag } }
           rt.ensureRunDir()
           fs.writeFileSync(rt.OVERRIDE_FILE, yaml.safeDump(ov))
           const st = rt.readState()

package/lib/compose/generate.js

@@ -38,6 +38,11 @@ const DEV = {
   sqlPassword: 'dooer',
   minioUser: 'minioadmin',
   minioPassword: 'minioadmin',
+  // Redis MUST have a password locally, like staging (the redis-password secret). service-graphql's
+  // pubsub.js does `password ? createRedisClient(...).then(c => new RedisPubSub(...)) : async () => null`
+  // — with no password it exports a FUNCTION, and `await fn` yields the function itself, so every GraphQL
+  // subscription dies on `pubsubInstance.asyncIterator is not a function`. (Jimmy 2026-09-03.)
+  redisPassword: 'dooer',
 }
 
 // Applied to EVERY dooer service, last, so they win over the manifest values.
@@ -138,7 +143,7 @@ const OMIT = Symbol('omit-env')
 function secretDefault(name) {
   if (name === 'DOOER_SQL_APPLICATION_PASSWORD') return DEV.sqlPassword
   if (name === 'DOOER_SQL_MIGRATION_PASSWORD') return DEV.sqlPassword
-  if (name === 'SECRET_DOOER_REDIS_PASSWORD') return '' // local redis has no auth; empty is the correct value
+  if (name === 'SECRET_DOOER_REDIS_PASSWORD') return DEV.redisPassword // local redis runs with --requirepass
   if (/ACCESS_KEY_ID$/.test(name)) return DEV.minioUser
   if (/SECRET_ACCESS_KEY$/.test(name)) return DEV.minioPassword
   return OMIT
@@ -231,6 +236,8 @@ function infraServices() {
     },
     redis: {
       image: 'redis:7-alpine',
+      // password-protected like staging — see DEV.redisPassword for why it matters (GraphQL subscriptions).
+      command: ['redis-server', '--requirepass', DEV.redisPassword],
       ports: ['6379:6379'],
       restart: 'unless-stopped',
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dooer/dooer-test-env",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Run the whole Dooer backend locally (staging DB minus customers), copy/purge customers between environments, and shred — one CLI.",
   "license": "UNLICENSED",
   "repository": "Dooer/cli-dooer-test-env",