fix: issues in organization build.

This commit is contained in:
Ahmed Bouhuolia
2020-09-05 15:12:38 +02:00
parent 481ca8aa8b
commit 79b7a02f85
10 changed files with 65 additions and 38 deletions

View File

@@ -4,7 +4,6 @@ import Mustache from 'mustache';
import path from 'path';
import { ISystemUser } from '@/interfaces';
import config from '@/../config/config';
import { ISystemUser } from 'src/interfaces';
@Service()
export default class AuthenticationMailMesssages {

View File

@@ -1,13 +1,19 @@
import { Service } from "typedi";
import { Service, Inject } from "typedi";
import { ISystemUser, ITenant } from "@/interfaces";
@Service()
export default class AuthenticationSMSMessages {
@Inject('SMSClient')
smsClient: any;
sendWelcomeMessage() {
const message: string = `Hi ${firstName}, Welcome to Bigcapital, You've joined the new workspace,
if you need any help please don't hesitate to contact us.`
/**
* Sends welcome sms message.
* @param {ITenant} tenant
* @param {ISystemUser} user
*/
sendWelcomeMessage(tenant: ITenant, user: ISystemUser) {
const message: string = `Hi ${user.firstName}, Welcome to Bigcapital, You've joined the new workspace, if you need any help please don't hesitate to contact us.`
return this.smsClient.sendMessage(user.phoneNumber, message);
}
}

View File

@@ -1,11 +1,19 @@
import { Service, Inject, Container } from 'typedi';
import { Tenant } from '@/system/models';
import { Tenant, SystemUser } from '@/system/models';
import TenantsManager from '@/system/TenantsManager';
import { ServiceError } from '@/exceptions';
import { ITenant } from '@/interfaces';
import {
EventDispatcher,
EventDispatcherInterface,
} from '@/decorators/eventDispatcher';
import events from '@/subscribers/events';
@Service()
export default class OrganizationService {
@EventDispatcher()
eventDispatcher: EventDispatcherInterface;
@Inject()
tenantsManager: TenantsManager;
@@ -35,8 +43,18 @@ export default class OrganizationService {
this.logger.info('[tenant_db_build] mark tenant as initialized.', { tenant });
await tenant.$query().update({ initialized: true });
// Retrieve the tenant system user.
const user = await SystemUser.query().findOne('tenant_id', tenant.id);
// Throws `onOrganizationBuild` event.
this.eventDispatcher.dispatch(events.organization.build, { tenant, user });
}
/**
* Throws error in case the given tenant is undefined.
* @param {ITenant} tenant
*/
private throwIfTenantNotExists(tenant: ITenant) {
if (!tenant) {
this.logger.info('[tenant_db_build] organization id not found.');
@@ -44,13 +62,13 @@ export default class OrganizationService {
}
}
/**
* Throws error in case the given tenant is already initialized.
* @param {ITenant} tenant
*/
private throwIfTenantInitizalized(tenant: ITenant) {
if (tenant.initialized) {
throw new ServiceError('tenant_initialized');
}
}
destroy() {
}
}

View File

@@ -11,15 +11,14 @@ export default class EasySMSClient implements SMSClientInterface {
* @param {string} message
*/
send(to: string, message: string) {
console.log(config);
const API_KEY = config.easySMSGateway.api_key;
const params = `action=send-sms&api_key=${API_KEY}=&to=${to}&sms=${message}&unicode=1`;
return new Promise((resolve, reject) => {
axios.get(`https://easysms.devs.ly/sms/api?${params}`)
.then((response) => {
if (response.code === 'ok') { resolve(); }
else { reject(); }
if (response.data.code === 'ok') { resolve(); }
else { reject(response.data); }
})
.catch((error) => { reject(error) });
});