desafio-diobank

app.ts

@@ -1,9 +1,29 @@
 import { CompanyAccount } from './class/CompanyAccount'
 import { PeopleAccount } from './class/PeopleAccount'
+import { SpecialAccount } from './class/SpecialAccount'
 
-const peopleAccount: PeopleAccount = new PeopleAccount(1, 'Nath', 10)
-console.log(peopleAccount)
-peopleAccount.deposit()
-const companyAccount: CompanyAccount = new CompanyAccount('DIO', 20)
-companyAccount.deposit()
-console.log(companyAccount)
+
+// Alterar valor do saldo conforme depósito
+const peopleAccount : PeopleAccount = new PeopleAccount(1, "Thalita Costa", 1234)
+
+peopleAccount.deposit(50)
+peopleAccount.deposit(100)
+
+
+// Apenas contas ativas e com saldo maior que o solicitado no saque podem realizar saques
+
+peopleAccount.withdraw(20)
+peopleAccount.withdraw(500)
+
+// Acrescente o valor do empréstimo ao saldo atual
+
+const companyAccount : CompanyAccount = new CompanyAccount("Thalita", 1235)
+
+companyAccount.deposit(500)
+companyAccount.getLoan(1200)
+
+// Esta conta terá um método de depósito, que acresce 10 a mais ao valor informado para depósito
+
+const specialAccount: SpecialAccount = new SpecialAccount("Thalita", 1236)
+specialAccount.getBalance()
+specialAccount.deposit(200)

class/CompanyAccount.ts

@@ -6,7 +6,13 @@ export class CompanyAccount extends DioAccount {
     super(name, accountNumber)
   }
 
-  getLoan = (): void => {
-    console.log('Voce pegou um empréstimo')
+  getLoan = (loan: number): void => {
+    if(this.validateStatus()){
+      let balance = this.getBalance()
+      balance += loan
+      console.log("Você realizou um empréstimo de R$ " + loan + " e agora seu saldo atual é de R$ " + balance)
+    } else {
+      console.log("Sua conta está inativa.")
+    }
   }
 }

class/DioAccount.ts

@@ -1,42 +1,46 @@
 export abstract class DioAccount {
-  private name: string
+  private readonly name: string
   private readonly accountNumber: number
-  balance: number = 0
+  private balance: number = 0
   private status: boolean = true
 
   constructor(name: string, accountNumber: number){
     this.name = name
     this.accountNumber = accountNumber
   }
 
-  setName = (name: string): void => {
-    this.name = name
-    console.log('Nome alterado com sucesso!')
-  }
-
   getName = (): string => {
     return this.name
   }
 
-  deposit = (): void => {
+  deposit = (deposit: number): void => {
     if(this.validateStatus()){
-      console.log('Voce depositou')
+      this.balance += deposit
+      console.log("Seu saldo atual é de " + this.balance)
     }
   }
 
-  withdraw = (): void => {
-    console.log('Voce sacou')
+  withdraw = (withdraw: number): void => {
+    if(this.validateStatus() && this.balance > withdraw){
+      this.balance -= withdraw
+      console.log("Você sacou o valor de R$ " + withdraw + "\nAgora seu saldo é de R$ " + this.balance)
+    } else if (!this.validateStatus()) {
+      console.log("Sua conta está inativa.")
+    } else {
+      console.log("O valor de saque deve ser menor que o valor atual de saldo em sua conta")
+    }
   }
 
-  getBalance = (): void => {
-    console.log(this.balance)
+  getBalance = (): number => {
+    return this.balance
   }
 
-  private validateStatus = (): boolean => {
+  validateStatus = (): boolean => {
     if (this.status) {
       return this.status
     }
 
     throw new Error('Conta inválida')
   }
 }
+

class/PeopleAccount.ts

@@ -1,7 +1,7 @@
 import { DioAccount } from "./DioAccount"
 
 export class PeopleAccount extends DioAccount {
-  doc_id: number
+  private doc_id: number
 
   constructor(doc_id: number, name: string, accountNumber: number){
     super(name, accountNumber)

class/SpecialAccount.ts

@@ -0,0 +1,14 @@
+import { DioAccount } from "./DioAccount"
+
+export class SpecialAccount extends DioAccount {
+
+  constructor(name: string, accountNumber: number){
+    super(name, accountNumber)
+  }
+
+  deposit = (deposit: number): void => {
+    let balance = this.getBalance()
+    balance += deposit + 10
+    console.log("Você depositou R$ " + deposit + " em sua conta especial e agora seu saldo é de R$ " + balance)
+  }
+}