diff --git a/src/main/java/edu/eci/cvds/beans/BasePageBean.java b/src/main/java/edu/eci/cvds/beans/BasePageBean.java deleted file mode 100644 index 526cd25..0000000 --- a/src/main/java/edu/eci/cvds/beans/BasePageBean.java +++ /dev/null @@ -1,4 +0,0 @@ -package edu.eci.cvds.beans; - -public abstract class BasePageBean { -} diff --git a/src/main/java/edu/eci/cvds/beans/LoginBean.java b/src/main/java/edu/eci/cvds/beans/LoginBean.java deleted file mode 100644 index 4815992..0000000 --- a/src/main/java/edu/eci/cvds/beans/LoginBean.java +++ /dev/null @@ -1,4 +0,0 @@ -package edu.eci.cvds.beans; - -public class LoginBean extends BasePageBean { -} diff --git a/src/main/java/edu/eci/cvds/entities/Estado.java b/src/main/java/edu/eci/cvds/entities/Estado.java new file mode 100644 index 0000000..1a15f8e --- /dev/null +++ b/src/main/java/edu/eci/cvds/entities/Estado.java @@ -0,0 +1,5 @@ +package edu.eci.cvds.entities; + +public enum Estado { + ACTIVO, INACTIVO +} diff --git a/src/main/java/edu/eci/cvds/entities/Rol.java b/src/main/java/edu/eci/cvds/entities/Rol.java new file mode 100644 index 0000000..bc9366e --- /dev/null +++ b/src/main/java/edu/eci/cvds/entities/Rol.java @@ -0,0 +1,5 @@ +package edu.eci.cvds.entities; + +public enum Rol { + ADMINISTRADOR, PERSONAL_PMO, PROPONENTE, PUBLICO +} diff --git a/src/main/java/edu/eci/cvds/entities/Usuario.java b/src/main/java/edu/eci/cvds/entities/Usuario.java index 0baa2f8..d2b4456 100644 --- a/src/main/java/edu/eci/cvds/entities/Usuario.java +++ b/src/main/java/edu/eci/cvds/entities/Usuario.java @@ -4,13 +4,17 @@ public class Usuario{ private String nombre; private String correo; private String contraseña; - private String rol; + private Rol rol; + private Estado estado; - private Usuario(String nombre, String correo, String contraseña, String rol){ + public Usuario(){} + + public Usuario(String nombre, String correo, String contraseña, Rol rol, Estado estado){ this.nombre = nombre; this.correo = correo; this.contraseña = contraseña; this.rol = rol; + this.estado = estado; } public void setNombre(String nombre) { @@ -25,7 +29,7 @@ public void setCorreo(String correo) { this.contraseña = contraseña; } - public void setRol(String rol) { + public void setRol(Rol rol) { this.rol = rol; } @@ -41,17 +45,26 @@ public String getCorreo() { return contraseña; } - public String getRol() { + public Rol getRol() { return rol; } + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + @Override public String toString() { return "Usuario{" + "nombre='" + nombre + '\'' + ", correo='" + correo + '\'' + ", contraseña='" + contraseña + '\'' + - ", rol='" + rol + '\'' + + ", rol='" + rol.name() + '\'' + + ", estado='" + estado.name() + '\'' + '}'; } } diff --git a/src/main/resources/mappers/UsuarioMapper.xml b/src/main/resources/mappers/UsuarioMapper.xml index 6fa3cc4..828f522 100644 --- a/src/main/resources/mappers/UsuarioMapper.xml +++ b/src/main/resources/mappers/UsuarioMapper.xml @@ -10,8 +10,8 @@ #{usuario.correo}, #{usuario.contraseña}, #{usuario.nombre}, - #{usuario.rol}, - #{usuario.estado} + #{usuario.rol, typeHandler=org.apache.ibatis.type.EnumOrdinalTypeHandler}, + #{usuario.estado, typeHandler=org.apache.ibatis.type.EnumOrdinalTypeHandler} ) @@ -31,8 +31,8 @@ - - + + diff --git a/src/main/resources/mybatis-config-h2.xml b/src/main/resources/mybatis-config-h2.xml index 1dc38fe..04981cf 100644 --- a/src/main/resources/mybatis-config-h2.xml +++ b/src/main/resources/mybatis-config-h2.xml @@ -8,6 +8,11 @@ + + + + diff --git a/src/main/resources/mybatis-config.xml b/src/main/resources/mybatis-config.xml index 191103d..b4521a0 100644 --- a/src/main/resources/mybatis-config.xml +++ b/src/main/resources/mybatis-config.xml @@ -9,6 +9,11 @@ + + + + diff --git a/src/test/java/LoginTest.java b/src/test/java/LoginTest.java new file mode 100644 index 0000000..0ba0b03 --- /dev/null +++ b/src/test/java/LoginTest.java @@ -0,0 +1,4 @@ +public class LoginTest { + + +} \ No newline at end of file