Михайловский Евгений#12
Open
EvgenyMikhailovsky wants to merge 2 commits into
Hidden character warning
The head ref may contain hidden characters: "\u041c\u0438\u0445\u0430\u0439\u043b\u043e\u0432\u0441\u043a\u0438\u0439-\u0415\u0432\u0433\u0435\u043d\u0438\u0439"
Open
Conversation
m-abrosimov
reviewed
Apr 13, 2021
| cards?: Array<ICard>; | ||
| } | ||
|
|
||
| export class BankOffice { |
| public authorize(userId: any, cardId: any, cardPin: any): any { | ||
|
|
||
| public authorize(userId: string, cardId: string, cardPin: string): boolean { | ||
| for (let users of this._users) { |
There was a problem hiding this comment.
this_users - должен быть коллекций, а он одиночный объект, по этому ошибка.
|
|
||
| private changeUserName(newName: any): any { | ||
|
|
||
| private changeUserName(newName: String): boolean { |
| moneyUnits.forEach(x => amount += x.count * Number(x.moneyInfo.denomination)); | ||
| let fromRub = fromCurrency === Currency.RUB; | ||
| let money = fromRub ? (amount - amount % 70) / 70 : Math.floor(amount) * 70; | ||
| return this._moneyRepository.convertMoney(money, fromRub ? Currency.USD : Currency.RUB, moneyUnits); |
| if(!this._bankOffice.authorize(user.id, card.id, cardPin)) return false; | ||
| { | ||
| this._authorizedUser = user; | ||
| this._usersCard = card; |
| let fromRub = fromCurrency === Currency.RUB; | ||
| let money = fromRub ? (amount - amount % 70) / 70 : Math.floor(amount) * 70; | ||
| return this._moneyRepository.convertMoney(money, fromRub ? Currency.USD : Currency.RUB, moneyUnits); | ||
|
|
| } else { | ||
| return this.registerForUserNewCard(argsForChangeFunction); | ||
| } | ||
|
|
| } | ||
| } | ||
| return false; | ||
|
|
| this._repository.forEach(point =>{ | ||
| for (let pin in point) { | ||
|
|
||
| if (point[currency] === currency && counter >= point[count]) { |
There was a problem hiding this comment.
У объекта point Нет поля currency - это не будет работать.
К тому же тут нужно было сделать жадный алгоритм
|
|
||
| public takeMoney(moneyUnits: IMoneyUnit): void { | ||
| this._repository.push(moneyUnits); | ||
| } |
Author
There was a problem hiding this comment.
Посмотрите, я исправил решение
There was a problem hiding this comment.
Метод теперь работает верно 2 бала
|
Теперь за всё задание 7 балов у тебя |
m-abrosimov
reviewed
Apr 15, 2021
|
|
||
| public convertMoneyUnits(fromCurrency: Currency, toCurrency: Currency, moneyUnits: any): any { | ||
|
|
||
| public convertMoneyUnits(fromCurrency: Currency, toCurrency: Currency, moneyUnits: IMoneyUnit[]): IMoneyUnit[] { |
There was a problem hiding this comment.
Этот метод не может возвращать массив купюр к выдаче. Потому что купюра не может быть дробной. Этот метод должен возвращать сумму, которая передаётся в _moneyRepository
| public giveOutUsersMoney(count: number) { | ||
| if (this._authorizedUser) | ||
| { | ||
| this._moneyRepository.giveOutMoney(count, this._card.currency); |
There was a problem hiding this comment.
Добавь уменьшение денег на авторизованной карте. Изменение баланса карты
| else if (option === UserSettingOptions.newCard) | ||
| return this.registerForUserNewCard(argsForChangeFunction); | ||
| } | ||
| } No newline at end of file |
|
|
||
| public isCardTiedToUser(cardId: string): boolean { | ||
| return this._users.filter(x=> x.cards.find(y=> y.id === cardId)).length > 0; | ||
| } |
|
|
||
| public takeMoney(moneyUnits: IMoneyUnit): void { | ||
| this._repository.push(moneyUnits); | ||
| } |
There was a problem hiding this comment.
Метод теперь работает верно 2 бала
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.