QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-20 14:50:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-06-04 16:22:07 +02:00
parent a4719fe15b fd915b503f
commit 84dd0fa86b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/src/commands/bigcapital.ts
View File

@@ -71,6 +71,10 @@ function getAllSystemTenants(knex) {
return knex('tenants'); return knex('tenants');
} }
function getAllInitializedSystemTenants(knex) {
return knex('tenants').whereNotNull('initializedAt');
}
// module.exports = { // module.exports = {
// log, // log,
// success, // success,
@@ -183,7 +187,7 @@ commander
.action(async (cmd) => { .action(async (cmd) => {
try { try {
const sysKnex = await initSystemKnex(); const sysKnex = await initSystemKnex();
const tenants = await getAllSystemTenants(sysKnex); const tenants = await getAllInitializedSystemTenants(sysKnex);
const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId); const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) { if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
@@ -220,7 +224,6 @@ commander
const oper = migrateTenant(cmd.tenant_id); const oper = migrateTenant(cmd.tenant_id);
migrateOpers.push(oper); migrateOpers.push(oper);
} }
Promise.all(migrateOpers).then(() => { Promise.all(migrateOpers).then(() => {
success('All tenants are migrated.'); success('All tenants are migrated.');
}); });
@@ -280,4 +283,3 @@ commander
exit(error); exit(error);
} }
}); });