@dooer/dooer-test-env 1.0.3 → 1.2.0

package/lib/account.js

@@ -7,6 +7,7 @@
 //   - service_accounts.companies2users       the given user linked as role 'Owner'
 //   - 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.
 
 const crypto = require('crypto')
@@ -50,10 +51,20 @@ async function createAccount({ local, name, ownerUserId, execute = false } = {})
   const client = new Client({ ...local, ssl: local.ssl === false ? undefined : { rejectUnauthorized: false } })
   await client.connect()
   try {
-    const owner = await client.query('SELECT users_pk, email FROM service_accounts.users WHERE users_pk=$1', [
-      ownerUserId,
-    ])
+    // user_type is the fk_user_roles_at_dooer_pk column (User model). Only 'customer' users get a
+    // type:'customer' login token; a 'hi'/admin user is blocked from customer-only flows (e.g. accepting
+    // Terms of Service in sumify → "only-owner-can-accept-tos"). Warn if the owner isn't a customer.
+    const owner = await client.query(
+      'SELECT users_pk, email, fk_user_roles_at_dooer_pk AS user_type FROM service_accounts.users WHERE users_pk=$1',
+      [ownerUserId]
+    )
     if (!owner.rowCount) throw new Error(`owner user ${ownerUserId} not found in the local DB (run \`db pull\` first?)`)
+    const ownerType = owner.rows[0].user_type
+    const warning =
+      ownerType === 'customer'
+        ? null
+        : `owner ${ownerUserId} is a '${ownerType}' user, not 'customer' — customer-only flows ` +
+          `(e.g. accepting Terms of Service in sumify) will fail. Use a customer user as the owner.`
 
     const partner = await client.query('SELECT id, name FROM service_accounts.partner WHERE domain=$1', [
       DEFAULT_PARTNER_DOMAIN,
@@ -67,8 +78,10 @@ async function createAccount({ local, name, ownerUserId, execute = false } = {})
       name,
       shortName,
       owner: owner.rows[0].email,
+      ownerType,
       partner: DEFAULT_PARTNER_DOMAIN,
       subscriptions: SUBSCRIPTION_TYPES,
+      warning,
     }
     if (!execute) {
       console.log('DRY-RUN (pass --execute to create):')
@@ -105,6 +118,19 @@ async function createAccount({ local, name, ownerUserId, execute = false } = {})
        VALUES ($1,$2,$3,now(),now())`,
       [uuid(), partner.rows[0].id, orgId]
     )
+    // Pre-accept the current Terms of Service so the account is ready to use (sumify otherwise prompts and
+    // blocks). Accept every active tos (usedFrom passed, not yet ended), acceptedBy the owner.
+    const activeTos = await client.query(
+      'SELECT id FROM service_accounts.tos WHERE "usedFrom" <= now() AND ("usedTo" IS NULL OR "usedTo" > now())'
+    )
+    for (const row of activeTos.rows) {
+      await client.query(
+        `INSERT INTO service_accounts."tosAcceptance" (id, "tosId", "organizationId", "acceptedBy", "createdAt", "updatedAt")
+         VALUES ($1,$2,$3,$4,now(),now())`,
+        [uuid(), row.id, orgId, ownerUserId]
+      )
+    }
+    plan.tosAccepted = activeTos.rowCount
     await client.query('COMMIT')
     return plan
   } catch (e) {

package/lib/command/customer.js

@@ -96,10 +96,12 @@ module.exports = {
             console.log(chalk.green(`\ncreated account "${res.name}"`))
             console.log(`  org id:        ${res.orgId}`)
             console.log(`  short name:    ${res.shortName}`)
-            console.log(`  owner:         ${argv.owner} (${res.owner}) — role Owner`)
+            console.log(`  owner:         ${argv.owner} (${res.owner}) — role Owner, user_type '${res.ownerType}'`)
             console.log(`  partner:       ${res.partner}`)
             console.log(`  subscriptions: ${SUBSCRIPTION_TYPES.join(', ')} (active)`)
+            console.log(`  TOS:           ${res.tosAccepted} version(s) pre-accepted`)
           }
+          if (res.warning) console.log(chalk.yellow(`\n⚠  ${res.warning}`))
         },
       })
       .demandCommand(1, 'Use: customer copy | customer purge | customer new')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dooer/dooer-test-env",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "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",