Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public CalculadoraDeComissao(){
this.dataDoCalculo = new Date(Calendar.getInstance().getTimeInMillis());
}


public double calcularComissaoPorVenda(Venda venda, Funcionario funcionario){
double comissao = 0.0;
try {
Expand Down
22 changes: 0 additions & 22 deletions src/main/java/br/com/akato/comissaovenda/EnumPerfil.java

This file was deleted.

13 changes: 7 additions & 6 deletions src/main/java/br/com/akato/comissaovenda/Funcionario.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package br.com.akato.comissaovenda;

import static br.com.akato.comissaovenda.EnumPerfil.CORRETOR;
import static br.com.akato.comissaovenda.EnumPerfil.CORRETORA;
import static br.com.akato.comissaovenda.EnumPerfil.GERENTE;
import static br.com.akato.comissaovenda.Perfil.CORRETOR;
import static br.com.akato.comissaovenda.Perfil.CORRETORA;
import static br.com.akato.comissaovenda.Perfil.GERENTE;

import java.util.HashMap;
import java.util.Map;

public class Funcionario {
private Map<Venda,Double> comissoes;
private EnumPerfil perfil;
private Perfil perfil;


public Funcionario(String perfil){
Expand All @@ -19,8 +19,9 @@ public Funcionario(String perfil){

public Funcionario(){


};
public EnumPerfil getPerfil() {
public Perfil getPerfil() {
return perfil;
}

Expand All @@ -32,7 +33,7 @@ public Double getComissaoPorVenda(Venda venda){
return this.comissoes.get(venda);
}

private EnumPerfil identificaPerfil(String perfil) {
private Perfil identificaPerfil(String perfil) {
if (perfil.equalsIgnoreCase("gerente")) {
return GERENTE;
} else if (perfil.equalsIgnoreCase("corretora")) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/br/com/akato/comissaovenda/Venda.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public double getValorVenda() {
return valorVenda;
}


Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok usar double quando é brincadeira, mas sempre que possível use bigdecimal

public Venda(double valor, String string) {
this.valorVenda = valor;
this.dataVenda = FormataDataVenda(string);
Expand Down
1 change: 1 addition & 0 deletions src/test/java/br/com/akato/comissaovenda/Builder.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class Builder {
Venda venda;
Funcionario funcionario;


Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O que vai acontecer se a tabela mudar várias vezes em um mesmo ano?

public void inicializaObjetos(){
calculadora = new CalculadoraDeComissao();
venda = new Venda();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public void criaCalculadora(){
inicializaObjetos();
}


Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usar herança aqui é meio forçado. Você não poderia apenas fazer uso do builder? Ele seria um componente que você usaria. Ele não precisa ser o seu pai

@Test
public void verificaComissaoDeCorretorComVendaDe2014ComMaisDe60Dias(){
criaVendaComValorEm2014ComMaisDe60Dias();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import org.junit.Test;

import static br.com.akato.comissaovenda.EnumPerfil.*;
import static br.com.akato.comissaovenda.Perfil.*;



Expand All @@ -18,6 +18,7 @@ public void verificaSeCorretorPossuiVendaComissaoCorretaEm2014(){
CORRETOR.comissaoDoAno(2014),funcionario.getPerfil().comissaoDoAno(2014));
}


@Test
public void verificaSeCorretorPossuiVendaComissaoCorretaEm2015(){
criaFuncionarioCorretor();
Expand Down
1 change: 1 addition & 0 deletions src/test/java/br/com/akato/comissaovenda/VendaTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public void verificaSeVendaDoFuncionarioFoiFeitaEm2014(){

}


@Test
public void verificaSeVendaDoFuncionarioFoiFeitaEm2015(){
criaVendaComValorEm2015ComMaisDe60Dias();
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified target/classes/br/com/akato/comissaovenda/Funcionario.class
Binary file not shown.
Binary file modified target/classes/br/com/akato/comissaovenda/Venda.class
Binary file not shown.
Binary file modified target/test-classes/br/com/akato/comissaovenda/Builder.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified target/test-classes/br/com/akato/comissaovenda/VendaTest.class
Binary file not shown.