package com.modesteam.urutau.controller.model;

import javax.persistence.Entity;
import javax.persistence.Id;
import javax.validation.constraints.NotNull;

@Entity
public class User {
	@Id
	private String email;
	private String name;
	private String lastName;
	private String login;
	private String password;
	private String passwordVerify;
	private boolean isConfirmed;

	
	public boolean isConfirmed() {
		return isConfirmed;
	}

	public void setConfirmed(boolean isConfirmed) {
		this.isConfirmed = isConfirmed;
	}

	public String getPasswordVerify() {
		return passwordVerify;
	}

	public void setPasswordVerify(String passwordVerify) {
		this.passwordVerify = passwordVerify;
	}

	public String getName() {
		return name;
	}

	public void setName(String name) {
		this.name = name;
	}

	public String getLastName() {
		return lastName;
	}

	public void setLastName(String lastName) {
		this.lastName = lastName;
	}

	public String getLogin() {
		return login;
	}

	public void setLogin(String login) {
		this.login = login;
	}

	public String getPassword() {
		return password;
	}

	public void setPassword(String password) {
		this.password = password;
	}

	public String getEmail() {
		return email;
	}

	public void setEmail(String email) {
		this.email = email;
	}

}

@@ -74,16 +74,57 @@
 Entity;%0A
+import javax.persistence.GeneratedValue;%0A
 import j
@@ -188,16 +188,58 @@
 NotNull;
+%0Aimport javax.validation.constraints.Size;
 %0A%0A@Entit
@@ -264,132 +264,328 @@
 r %7B%0A
+%09%0A
 %09@Id%0A%09
-private String email;%0A%09private String name;%0A%09private String lastName;%0A%09private String login;%0A%09private String password;
+@GeneratedValue%0A%09private Long id;%0A%09private String email;%0A%09@NotNull %0A%09@Size(min=3, max=10)%0A%09private String name;%0A%09@NotNull%0A%09@Size(min=3, max=10)%0A%09private String lastName;%0A%09@NotNull%0A%09@Size(min=6, max=12)%0A%09private String login;%0A%09@NotNull%0A%09@Size(min=6, max=6)%0A%09private String password;%0A%09@NotNull%0A%09@Size(min=6, max=6)
 %0A%09pr
@@ -643,17 +643,16 @@
 firmed;%0A
-%0A
 %09%0A%09publi

Fix merge