Compare commits

...

9 Commits

Author SHA1 Message Date
a.bouhuolia
bb49fcb42b WIP 2023-02-07 23:07:19 +02:00
a.bouhuolia
d47b1165c4 chore: change supported node engine version. 2023-02-07 21:35:21 +02:00
a.bouhuolia
f2e1efcb45 chore(server): prettify files 2023-02-07 20:25:22 +02:00
a.bouhuolia
2e3b2cbf92 chore: add husky for commit message lint 2023-02-07 20:24:44 +02:00
a.bouhuolia
68e61429aa chore: update README.md 2023-02-07 19:30:13 +02:00
a.bouhuolia
646be4bb20 chore: add .gitkeep directory 2023-02-07 19:28:38 +02:00
a.bouhuolia
dfd8b0ca4e chore: remove the bin from the server. 2023-02-07 19:27:57 +02:00
a.bouhuolia
2ab1a5606a chore: update package-lock.json 2023-02-07 01:20:24 +02:00
Ahmed Bouhuolia
c33370d4d2 Merge pull request #75 from bigcapitalhq/lerna
Lerna
2023-02-06 23:39:28 +02:00
21 changed files with 22399 additions and 403 deletions

4
.husky/commit-msg Normal file
View File

@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"
yarn commitlint --edit

2
.husky/pre-commit Normal file
View File

@@ -0,0 +1,2 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

0
bin/.gitkeep Normal file
View File

1
commitlint.config.js Normal file
View File

@@ -0,0 +1 @@
module.exports = { extends: ['@commitlint/config-lerna-scopes'] };

View File

@@ -1,5 +1,6 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useWorkspaces": true,
"version": "0.0.0"
"version": "0.0.0",
"npmClient": "npm"
}

View File

@@ -8,15 +8,27 @@
"dev:webapp": "lerna run dev --scope \"@bigcapital/webapp\"",
"build:webapp": "lerna run dev --scope \"@bigcapital/webapp\"",
"dev:server": "lerna run dev --scope \"@bigcapital/server\"",
"build:server": "lerna run dev --scope \"@bigcapital/server\""
"build:server": "lerna run dev --scope \"@bigcapital/server\"",
"prepare": "husky install"
},
"workspaces": [
"packages/*"
"packages/*",
"shared/*"
],
"devDependencies": {
"lerna": "^6.4.1"
"@commitlint/config-conventional": "^17.4.2",
"@commitlint/config-lerna-scopes": "^17.4.2",
"husky": "^8.0.3",
"lerna": "^6.4.1",
"@commitlint/cli": "^17.4.2"
},
"engines": {
"node": ">=14.20"
}
}
"node": "14.x"
},
"husky": {
"hooks": {
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},
"dependencies": {}
}

View File

@@ -0,0 +1 @@
# @bigcapital/server

View File

@@ -1,203 +0,0 @@
import commander from 'commander';
import color from 'colorette';
import argv from 'getopts'
import config from '../src/config';
import {
initSystemKnex,
getAllSystemTenants,
initTenantKnex,
exit,
success,
log,
} from './utils';
// - bigcapital system:migrate:latest
// - bigcapital system:migrate:rollback
// - bigcapital tenants:migrate:latest
// - bigcapital tenants:migrate:latest --tenant_id=XXX
// - bigcapital tenants:migrate:rollback
// - bigcapital tenants:migrate:rollback --tenant_id=XXX
// - bigcapital tenants:migrate:make
// - bigcapital system:migrate:make
// - bigcapital tenants:list
commander
.command('system:migrate:rollback')
.description('Migrate the system database of the application.')
.action(async () => {
try {
const sysKnex = await initSystemKnex();
const [batchNo, _log] = await sysKnex.migrate.rollback();
if (_log.length === 0) {
success(color.cyan('Already at the base migration'));
}
success(
color.green(
`Batch ${batchNo} rolled back: ${_log.length} migrations`
) + (argv.verbose ? `\n${color.cyan(_log.join('\n'))}` : '')
);
} catch(error) {
exit(error);
}
});
commander
.command('system:migrate:latest')
.description('Rollback latest mgiration of the system database.')
.action(async () => {
try {
const sysKnex = await initSystemKnex();
const [batchNo, log] = await sysKnex.migrate.latest();
if (log.length === 0) {
success(color.cyan('Already up to date'));
}
success(
color.green(`Batch ${batchNo} run: ${log.length} migrations`) +
(argv.verbose ? `\n${color.cyan(log.join('\n'))}` : '')
);
} catch(error) {
exit(error);
}
});
commander
.command('system:migrate:make <name>')
.description('Created a named migration file to the system database.')
.action(async (name) => {
const sysKnex = await initSystemKnex();
sysKnex.migrate.make(name).then((name) => {
success(color.green(`Created Migration: ${name}`));
}).catch(exit)
});
commander
.command('tenants:migrate:make <name>')
.description('Created a name migration file to the tenants databases.')
.action(async (name) => {
const sysKnex = await initTenantKnex();
sysKnex.migrate.make(name).then((name) => {
success(color.green(`Created Migration: ${name}`));
}).catch(exit)
});
commander
.command('tenants:list')
.description('Retrieve a list of all system tenants databases.')
.action(async (cmd) => {
try{
const sysKnex = await initSystemKnex();
const tenants = await getAllSystemTenants(sysKnex);
tenants.forEach((tenant) => {
const dbName = `${config.tenant.db_name_prefix}${tenant.organizationId}`;
console.log(`ID: ${tenant.id} | Organization ID: ${tenant.organizationId} | DB Name: ${dbName}`);
});
} catch(error) { exit(error); };
success('---');
});
commander
.command('tenants:migrate:rollback')
.description('Rollback the last batch of tenants migrations.')
.option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
.action(async (cmd) => {
try {
const sysKnex = await initSystemKnex();
const tenants = await getAllSystemTenants(sysKnex);
const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
}
const migrateOpers = [];
const migrateTenant = async (organizationId) => {
try {
const tenantKnex = await initTenantKnex(organizationId);
const [batchNo, _log] = await tenantKnex.migrate.rollback();
const tenantDb = `${config.tenant.db_name_prefix}${organizationId}`;
if (_log.length === 0) {
log(color.cyan('Already at the base migration'));
}
log(
color.green(
`Tenant: ${tenantDb} > Batch ${batchNo} rolled back: ${_log.length} migrations`
) + (argv.verbose ? `\n${color.cyan(_log.join('\n'))}` : '')
);
log('---------------');
} catch (error) { exit(error); }
};
if (!cmd.tenant_id) {
tenants.forEach((tenant) => {
const oper = migrateTenant(tenant.organizationId);
migrateOpers.push(oper);
});
} else {
const oper = migrateTenant(cmd.tenant_id);
migrateOpers.push(oper);
}
Promise.all(migrateOpers).then(() => {
success('All tenants are rollbacked.');
});
} catch (error) { exit(error); }
});
commander
.command('tenants:migrate:latest')
.description('Migrate all tenants or the given tenant id.')
.option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
.action(async (cmd) => {
try {
const sysKnex = await initSystemKnex();
const tenants = await getAllSystemTenants(sysKnex);
const tenantsOrgsIds = tenants.map(tenant => tenant.organizationId);
if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
}
// Validate the tenant id exist first of all.
const migrateOpers = [];
const migrateTenant = async (organizationId) => {
try {
const tenantKnex = await initTenantKnex(organizationId);
const [batchNo, _log] = await tenantKnex.migrate.latest();
const tenantDb = `${config.tenant.db_name_prefix}${organizationId}`;
if (_log.length === 0) {
log(color.cyan('Already up to date'));
}
log(
color.green(`Tenant ${tenantDb} > Batch ${batchNo} run: ${_log.length} migrations`) +
(argv.verbose ? `\n${color.cyan(log.join('\n'))}` : '')
);
log('-------------------');
} catch (error) {
log(error);
}
}
if (!cmd.tenant_id) {
tenants.forEach((tenant) => {
const oper = migrateTenant(tenant.organizationId);
migrateOpers.push(oper);
});
} else {
const oper = migrateTenant(cmd.tenant_id);
migrateOpers.push(oper);
}
Promise.all(migrateOpers).then(() => {
success('All tenants are migrated.');
});
} catch (error) {
exit(error);
}
});
commander.parse(process.argv);

View File

@@ -1,94 +0,0 @@
import Knex from 'knex';
import { knexSnakeCaseMappers } from 'objection';
import color from 'colorette';
import config from '../src/config';
// import { systemKnexConfig } from '../src/config/knexConfig';
function initSystemKnex() {
return Knex({
client: config.system.db_client,
connection: {
host: config.system.db_host,
user: config.system.db_user,
password: config.system.db_password,
database: config.system.db_name,
charset: 'utf8',
},
migrations: {
directory: config.system.migrations_dir,
},
seeds: {
directory: config.system.seeds_dir,
},
pool: { min: 0, max: 7 },
...knexSnakeCaseMappers({ upperCase: true }),
});
}
function getAllSystemTenants(knex) {
return knex('tenants');
}
function initTenantKnex(organizationId) {
return Knex({
client: config.tenant.db_client,
connection: {
host: config.tenant.db_host,
user: config.tenant.db_user,
password: config.tenant.db_password,
database: `${config.tenant.db_name_prefix}${organizationId}`,
charset: config.tenant.charset,
},
migrations: {
directory: config.tenant.migrations_dir,
},
seeds: {
directory: config.tenant.seeds_dir,
},
pool: { min: 0, max: 5 },
...knexSnakeCaseMappers({ upperCase: true }),
})
}
function exit(text) {
if (text instanceof Error) {
console.error(
color.red(`${text.detail ? `${text.detail}\n` : ''}${text.stack}`)
);
} else {
console.error(color.red(text));
}
process.exit(1);
}
function success(text) {
console.log(text);
process.exit(0);
}
function log(text) {
console.log(text);
}
function getDeepValue(prop, obj) {
if (!Object.keys(obj).length) { return []; }
return Object.entries(obj).reduce((acc, [key, val]) => {
if (key === prop) {
acc.push(val);
} else {
acc.push(Array.isArray(val) ? val.map(getIds).flat() : getIds(val));
}
return acc.flat();
}, []);
}
export {
initTenantKnex,
initSystemKnex,
getAllSystemTenants,
exit,
success,
log,
getDeepValue,
}

View File

@@ -1,5 +1,5 @@
{
"name": "bigcapital-server",
"name": "@bigcapital/server",
"version": "1.7.1",
"description": "",
"main": "src/server.ts",

View File

@@ -6,4 +6,4 @@ class HttpException extends Error {
this.status = status;
this.message = message;
}
}
}

View File

@@ -1,5 +1,3 @@
export default class PaymentInputInvalid {
constructor() {}
}
}

View File

@@ -1,6 +1,5 @@
import ServiceError from './ServiceError';
export default class ServiceErrors {
errors: ServiceError[];
@@ -9,7 +8,8 @@ export default class ServiceErrors {
}
hasType(errorType: string) {
return this.errors
.some((error: ServiceError) => error.errorType === errorType);
return this.errors.some(
(error: ServiceError) => error.errorType === errorType
);
}
}
}

View File

@@ -1,7 +1,3 @@
export default class TenantAlreadyInitialized {
constructor() {
}
}
constructor() {}
}

View File

@@ -1,9 +1,3 @@
export default class TenantAlreadySeeded {
constructor() {
}
}
constructor() {}
}

View File

@@ -1,7 +1,3 @@
export default class TenantDatabaseNotBuilt {
constructor() {
}
}
constructor() {}
}

View File

@@ -1,4 +1,3 @@
export default class VoucherCodeRequired {
constructor() {
this.name = 'VoucherCodeRequired';

View File

@@ -1,68 +1 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
## Available Scripts
In the project directory, you can run:
### `npm start`
Runs the app in the development mode.<br />
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
The page will reload if you make edits.<br />
You will also see any lint errors in the console.
### `npm test`
Launches the test runner in the interactive watch mode.<br />
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
### `npm run build`
Builds the app for production to the `build` folder.<br />
It correctly bundles React in production mode and optimizes the build for the best performance.
The build is minified and the filenames include the hashes.<br />
Your app is ready to be deployed!
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
### `npm run eject`
**Note: this is a one-way operation. Once you `eject`, you cant go back!**
If you arent satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point youre on your own.
You dont have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldnt feel obligated to use this feature. However we understand that this tool wouldnt be useful if you couldnt customize it when you are ready for it.
## Learn More
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
To learn React, check out the [React documentation](https://reactjs.org/).
### Code Splitting
This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
### Analyzing the Bundle Size
This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
### Making a Progressive Web App
This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
### Advanced Configuration
This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
### Deployment
This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
### `npm run build` fails to minify
This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
# @bigcapital/webapp

View File

@@ -1,5 +1,5 @@
{
"name": "@bigcapital/webpack",
"name": "@bigcapital/webapp",
"version": "1.7.1",
"lockfileVersion": 1,
"requires": true,

0
shared/.gitkeep Normal file
View File

22356
yarn.lock Normal file

File diff suppressed because it is too large Load Diff