Muutsin surrogaataja korrektseks, eemaldasin kustutamisvõimaluse

src/main/java/itcollege/team09/entities/Piirivalve.java

@@ -1,5 +1,6 @@
 package itcollege.team09.entities;
 
+import java.util.Calendar;
 import java.util.Date;
 
 import javax.persistence.GeneratedValue;
@@ -59,7 +60,20 @@ public void setKommentaar(String kommentaar) {
 		this.kommentaar = kommentaar;
 	}	
 
-
+	public static final Calendar surrogate;
+
+	static {
+		surrogate = Calendar.getInstance();
+
+		surrogate.set(Calendar.YEAR, 9999);
+		surrogate.set(Calendar.MONTH, Calendar.DECEMBER);
+		surrogate.set(Calendar.DATE, 31);
+
+		surrogate.set(Calendar.HOUR_OF_DAY, 0);
+		surrogate.set(Calendar.MINUTE, 0);
+		surrogate.set(Calendar.SECOND, 0);
+		surrogate.set(Calendar.MILLISECOND, 0);
+	}
 
 	@PrePersist	
 	public void recordCreated() {	
@@ -68,24 +82,78 @@ public void recordCreated() {
 
 		this.avaja = user;
 		this.muutja = user;
-		this.sulgeja = user;
 
 		this.avatud = new Date(date);
 		this.muudetud = new Date(date);
-		this.suletud = new Date(9999999999999L);		
+
+		if (suletud == null) {
+			suletud = surrogate.getTime();
+		} else {
+			sulgeja = GetUser();
+		}
 	}
-	
+
 	@PreUpdate	
 	public void recordModified() {	
 		this.muutja = GetUser();
 		this.muudetud = new Date(GetDate());	
 	}	
 
 	@PreRemove	
-	public void preventRemove() {	
-		this.sulgeja = GetUser();
-		this.suletud = new Date(GetDate());
-		//throw new SecurityException("Removing of bears is prohibited!");	
+	public void preventRemove() {
+		if(suletud != null)
+			throw new SecurityException("Seda objekti ei saa enam muuta!");
+	}
+
+	public void close() {
+		Authentication auth = SecurityContextHolder.getContext()
+				.getAuthentication();
+
+		suletud = new Date();
+		sulgeja = auth.getName();
+	}
+
+	@Transactional
+	public void remove() {
+		close();
+
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+
+		entityManager.persist(this);
+	}
+
+	@Transactional
+	public Piirivalve merge() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+
+		if (id != null && !entityManager.contains(this)) {
+			Piirivalve oldEntity = entityManager.find(getClass(), id);
+			oldEntity.close();
+
+			if (avatud == null) {
+				avatud = oldEntity.avatud;
+				avaja  = oldEntity.avaja;
+			}
+
+			suletud = null;
+			sulgeja = null;
+
+			clearId();
+			persist();
+
+			return this;
+		}
+
+		Piirivalve merged = entityManager.merge(this);
+		entityManager.flush();
+		return merged;
+	}
+
+	public void clearId()
+	{
+		this.id = null;
 	}
 
 	private String GetUser() {

src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj

@@ -36,17 +36,6 @@ privileged aspect Piirivalve_Roo_Entity {
         this.entityManager.persist(this);
     }
 
-    @Transactional
-    public void Piirivalve.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Piirivalve attached = Piirivalve.findPiirivalve(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-
     @Transactional
     public void Piirivalve.flush() {
         if (this.entityManager == null) this.entityManager = entityManager();
@@ -59,14 +48,6 @@ privileged aspect Piirivalve_Roo_Entity {
         this.entityManager.clear();
     }
 
-    @Transactional
-    public Piirivalve Piirivalve.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Piirivalve merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-
     public static final EntityManager Piirivalve.entityManager() {
         EntityManager em = new Piirivalve() {
         }.entityManager;