diff --git a/src/task_1/index.ts b/src/task_1/index.ts index 5827d9c..a795d22 100644 --- a/src/task_1/index.ts +++ b/src/task_1/index.ts @@ -31,16 +31,16 @@ export interface IMoneyUnit { } export class MoneyRepository { - private _repository: any; - constructor(initialRepository: any) { + private _repository: Array; + constructor(initialRepository: Array) { this._repository = initialRepository; } - public giveOutMoney(count: any, currency: any): any { - + public giveOutMoney(count: number, currency: Currency): boolean { + return true; } - public takeMoney(moneyUnits: any): any { - + public takeMoney(moneyUnits: Array) { + this._repository = this._repository.concat(moneyUnits); } } \ No newline at end of file diff --git a/src/task_2/index.ts b/src/task_2/index.ts index fe95180..eca77d2 100644 --- a/src/task_2/index.ts +++ b/src/task_2/index.ts @@ -17,7 +17,7 @@ import { Currency } from '../enums'; -interface ICard { +export interface ICard { id: string; balance: number; currency: Currency, @@ -32,23 +32,42 @@ export interface IBankUser { } export class BankOffice { - private _users: any; - private _cards: any; + private _users: Array; + private _cards: Array; - constructor(users: any, cards: any) { + constructor(users: Array, cards: Array) { this._users = users; this._cards = cards; } - public authorize(userId: any, cardId: any, cardPin: any): any { - + public authorize(userId: string, cardId: string, cardPin: string): boolean { + this._users.forEach(user => { + if (userId === user.id) + { + user.cards.forEach(card => { + if (card.id === cardId && card.pin === cardPin) + return true; + }) + } + }); + return false; } - public getCardById(cardId: any): any { - + public getCardById(cardId: string): ICard { + this._cards.forEach(card => { + if (card.id === cardId) + return card; + }) + return null; } - public isCardTiedToUser(cardId: any): any { - + public isCardTiedToUser(cardId: string): boolean { + this._users.forEach(user => { + user.cards.forEach(card => { + if (card.id === cardId) + return true; + }) + }) + return false; } } \ No newline at end of file diff --git a/src/task_3/index.ts b/src/task_3/index.ts index 9020644..2d96df3 100644 --- a/src/task_3/index.ts +++ b/src/task_3/index.ts @@ -18,32 +18,53 @@ */ import { UserSettingOptions } from '../enums'; +import { IBankUser, BankOffice } from '../task_2'; export class UserSettingsModule { - private _bankOffice: any; - private _user: any; + private _bankOffice: BankOffice; + private _user: IBankUser; - public set user(user: any) { + public set user(user: IBankUser) { this._user = user; } - constructor(initialBankOffice: any) { + constructor(initialBankOffice: BankOffice) { this._bankOffice = initialBankOffice; } - private changeUserName(newName: any): any { - + private changeUserName(newName: string): boolean { + if (newName) { + this._user.name = newName; + return true; + } else + return false; } - private changeUserSurname(newSurname: any): any { - + private changeUserSurname(newSurname: string): boolean { + if (newSurname) { + this._user.name = newSurname; + return true; + } else + return false; } - private registerForUserNewCard(newCardId: any): any { - + private registerForUserNewCard(newCardId: string): boolean { + let card = this._bankOffice.getCardById(newCardId); + if (card && !this._bankOffice.isCardTiedToUser(newCardId)) + { + this._user.cards.push(card); + return true; + } + else + return false; } - public changeUserSettings(option: UserSettingOptions, argsForChangeFunction: any): any { - + public changeUserSettings(option: UserSettingOptions, argsForChangeFunction: string): boolean { + if (option === UserSettingOptions.name) + return this.changeUserName(argsForChangeFunction); + else if (option === UserSettingOptions.surname) + return this.changeUserSurname(argsForChangeFunction); + else if (option === UserSettingOptions.newCard) + return this.registerForUserNewCard(argsForChangeFunction); } } \ No newline at end of file diff --git a/src/task_4/index.ts b/src/task_4/index.ts index bdd7528..eeb3b35 100644 --- a/src/task_4/index.ts +++ b/src/task_4/index.ts @@ -16,15 +16,24 @@ */ import { Currency } from '../enums'; +import { IMoneyUnit, MoneyRepository } from '../task_1'; export class CurrencyConverterModule { - private _moneyRepository: any; + private _moneyRepository: MoneyRepository; - constructor(initialMoneyRepository: any) { + constructor(initialMoneyRepository: MoneyRepository) { this._moneyRepository = initialMoneyRepository; } - public convertMoneyUnits(fromCurrency: Currency, toCurrency: Currency, moneyUnits: any): any { - + public convertMoneyUnits(fromCurrency: Currency, toCurrency: Currency, moneyUnits: Array): Array { + let sum: number = 0; + moneyUnits.forEach(unit => { + sum += unit.count * parseInt(unit.moneyInfo.denomination ) + }); + if (sum % 70 === 0 && toCurrency === Currency.USD && fromCurrency === Currency.RUB) + { + this._moneyRepository.giveOutMoney(sum, toCurrency); + } + return null; } } \ No newline at end of file diff --git a/src/task_5/index.ts b/src/task_5/index.ts index 3c99ee2..5004bad 100644 --- a/src/task_5/index.ts +++ b/src/task_5/index.ts @@ -16,8 +16,8 @@ */ import { Currency, UserSettingOptions } from '../enums'; -import { MoneyRepository } from '../task_1'; -import { BankOffice, IBankUser } from '../task_2'; +import { IMoneyUnit, MoneyRepository } from '../task_1'; +import { BankOffice, IBankUser, ICard } from '../task_2'; import { UserSettingsModule } from '../task_3'; import { CurrencyConverterModule } from '../task_4'; @@ -27,31 +27,48 @@ class BankTerminal { private _userSettingsModule: UserSettingsModule; private _currencyConverterModule: CurrencyConverterModule; private _authorizedUser: IBankUser; + private _card: ICard; - constructor(initBankOffice: any, initMoneyRepository: any) { + constructor(initBankOffice: BankOffice, initMoneyRepository: MoneyRepository) { this._moneyRepository = initMoneyRepository; this._bankOffice = initBankOffice; this._userSettingsModule = new UserSettingsModule(initBankOffice); this._currencyConverterModule = new CurrencyConverterModule(initMoneyRepository); } - public authorizeUser(user: any, card: any, cardPin: any): any { - + public authorizeUser(user: IBankUser, card: ICard, cardPin: string) { + if (this._bankOffice.authorize(user.id, card.id, cardPin)) + { + this._authorizedUser = user; + this._card = card; + } } - public takeUsersMoney(moneyUnits: any): any { - + public takeUsersMoney(moneyUnits: Array) { + if (this._authorizedUser) + { + this._moneyRepository.takeMoney(moneyUnits); + } } - public giveOutUsersMoney(count: any): any { - + public giveOutUsersMoney(count: number) { + if (this._authorizedUser) + { + this._moneyRepository.giveOutMoney(count, this._card.currency); + } } - public changeAuthorizedUserSettings(option: UserSettingOptions, argsForChangeFunction: any): any { - + public changeAuthorizedUserSettings(option: UserSettingOptions, argsForChangeFunction: string) { + if (this._authorizedUser) + { + this._userSettingsModule.changeUserSettings(option, argsForChangeFunction); + } } - public convertMoneyUnits(fromCurrency: Currency, toCurrency: Currency, moneyUnits: any): any { - + public convertMoneyUnits(fromCurrency: Currency, toCurrency: Currency, moneyUnits: Array) { + if (this._authorizedUser) + { + this._currencyConverterModule.convertMoneyUnits(fromCurrency, toCurrency, moneyUnits); + } } } \ No newline at end of file