diff --git a/src/main/java/itcollege/team09/entities/AdminAlluvus.java b/src/main/java/itcollege/team09/entities/AdminAlluvus.java index c22032d..1e96bc2 100644 --- a/src/main/java/itcollege/team09/entities/AdminAlluvus.java +++ b/src/main/java/itcollege/team09/entities/AdminAlluvus.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.Date; +import java.util.List; import javax.persistence.Entity; @@ -61,4 +62,16 @@ public Date getKuni() { public void setKuni(Date kuni) { this.kuni = kuni; } + + public static long countAdminAlluvuses() { + return entityManager().createQuery("SELECT COUNT(o) FROM AdminAlluvus o WHERE o.sulgeja IS NULL", Long.class).getSingleResult(); + } + + public static List findAllAdminAlluvuses() { + return entityManager().createQuery("SELECT o FROM AdminAlluvus o WHERE o.sulgeja IS NULL", AdminAlluvus.class).getResultList(); + } + + public static List findAdminAlluvusEntries(int firstResult, int maxResults) { + return entityManager().createQuery("SELECT o FROM AdminAlluvus o WHERE o.sulgeja IS NULL", AdminAlluvus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } } diff --git a/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj index 6a75342..75ce372 100644 --- a/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj @@ -5,25 +5,12 @@ package itcollege.team09.entities; import itcollege.team09.entities.AdminAlluvus; import java.lang.Long; -import java.util.List; privileged aspect AdminAlluvus_Roo_Entity { - public static long AdminAlluvus.countAdminAlluvuses() { - return entityManager().createQuery("SELECT COUNT(o) FROM AdminAlluvus o", Long.class).getSingleResult(); - } - - public static List AdminAlluvus.findAllAdminAlluvuses() { - return entityManager().createQuery("SELECT o FROM AdminAlluvus o", AdminAlluvus.class).getResultList(); - } - public static AdminAlluvus AdminAlluvus.findAdminAlluvus(Long id) { if (id == null) return null; return entityManager().find(AdminAlluvus.class, id); } - public static List AdminAlluvus.findAdminAlluvusEntries(int firstResult, int maxResults) { - return entityManager().createQuery("SELECT o FROM AdminAlluvus o", AdminAlluvus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } - } diff --git a/src/main/java/itcollege/team09/entities/AdminYksus.java b/src/main/java/itcollege/team09/entities/AdminYksus.java index 2d66b58..766cdbc 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksus.java +++ b/src/main/java/itcollege/team09/entities/AdminYksus.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.Date; +import java.util.List; import javax.persistence.Entity; import javax.persistence.OneToMany; @@ -104,4 +105,17 @@ public AdminYksuseLiik getAdminYksuseLiik() { public void setAdminYksuseLiik(AdminYksuseLiik param) { this.adminYksuseLiik = param; } + + public static long countAdminYksuses() { + return entityManager().createQuery("SELECT COUNT(o) FROM AdminYksus o WHERE o.sulgeja IS NULL", Long.class).getSingleResult(); + } + + public static List findAllAdminYksuses() { + return entityManager().createQuery("SELECT o FROM AdminYksus o WHERE o.sulgeja IS NULL", AdminYksus.class).getResultList(); + } + + + public static List findAdminYksusEntries(int firstResult, int maxResults) { + return entityManager().createQuery("SELECT o FROM AdminYksus o WHERE o.sulgeja IS NULL", AdminYksus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } } diff --git a/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj index f9176a1..b1d5474 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj @@ -8,22 +8,10 @@ import java.lang.Long; import java.util.List; privileged aspect AdminYksus_Roo_Entity { - - public static long AdminYksus.countAdminYksuses() { - return entityManager().createQuery("SELECT COUNT(o) FROM AdminYksus o", Long.class).getSingleResult(); - } - - public static List AdminYksus.findAllAdminYksuses() { - return entityManager().createQuery("SELECT o FROM AdminYksus o", AdminYksus.class).getResultList(); - } - + public static AdminYksus AdminYksus.findAdminYksus(Long id) { if (id == null) return null; return entityManager().find(AdminYksus.class, id); } - - public static List AdminYksus.findAdminYksusEntries(int firstResult, int maxResults) { - return entityManager().createQuery("SELECT o FROM AdminYksus o", AdminYksus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } - + } diff --git a/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java b/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java index 4a51b01..92f6e6e 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java +++ b/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.Date; +import java.util.List; import javax.persistence.Entity; import javax.persistence.OneToMany; @@ -94,4 +95,16 @@ public Collection getAdminyksused() { public void setAdminyksused(Collection param) { this.adminyksused = param; } + + public static long countAdminYksuseLiiks() { + return entityManager().createQuery("SELECT COUNT(o) FROM AdminYksuseLiik o WHERE o.sulgeja IS NULL", Long.class).getSingleResult(); + } + + public static List findAllAdminYksuseLiiks() { + return entityManager().createQuery("SELECT o FROM AdminYksuseLiik o WHERE o.sulgeja IS NULL", AdminYksuseLiik.class).getResultList(); + } + + public static List findAdminYksuseLiikEntries(int firstResult, int maxResults) { + return entityManager().createQuery("SELECT o FROM AdminYksuseLiik o WHERE o.sulgeja IS NULL", AdminYksuseLiik.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } } diff --git a/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj index e1c99fb..377bbe8 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj @@ -5,25 +5,12 @@ package itcollege.team09.entities; import itcollege.team09.entities.AdminYksuseLiik; import java.lang.Long; -import java.util.List; privileged aspect AdminYksuseLiik_Roo_Entity { - public static long AdminYksuseLiik.countAdminYksuseLiiks() { - return entityManager().createQuery("SELECT COUNT(o) FROM AdminYksuseLiik o", Long.class).getSingleResult(); - } - - public static List AdminYksuseLiik.findAllAdminYksuseLiiks() { - return entityManager().createQuery("SELECT o FROM AdminYksuseLiik o", AdminYksuseLiik.class).getResultList(); - } - public static AdminYksuseLiik AdminYksuseLiik.findAdminYksuseLiik(Long id) { if (id == null) return null; return entityManager().find(AdminYksuseLiik.class, id); } - public static List AdminYksuseLiik.findAdminYksuseLiikEntries(int firstResult, int maxResults) { - return entityManager().createQuery("SELECT o FROM AdminYksuseLiik o", AdminYksuseLiik.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } - } diff --git a/src/main/java/itcollege/team09/entities/Piirivalve.java b/src/main/java/itcollege/team09/entities/Piirivalve.java index 1536599..c0f2e14 100644 --- a/src/main/java/itcollege/team09/entities/Piirivalve.java +++ b/src/main/java/itcollege/team09/entities/Piirivalve.java @@ -1,6 +1,8 @@ package itcollege.team09.entities; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -68,25 +70,25 @@ 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); + Calendar closedTime = new GregorianCalendar(9999,Calendar.DECEMBER,31, 0,0); + this.suletud = closedTime.getTime(); } @PreUpdate public void recordModified() { this.muutja = GetUser(); this.muudetud = new Date(GetDate()); - } + } - @PreRemove - public void preventRemove() { + @Transactional + public void remove() { this.sulgeja = GetUser(); this.suletud = new Date(GetDate()); - //throw new SecurityException("Removing of bears is prohibited!"); - } + this.persist(); + } private String GetUser() { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); diff --git a/src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj index 36c7de6..adf2576 100644 --- a/src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj +++ b/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(); diff --git a/src/main/java/itcollege/team09/entities/Vaeosa.java b/src/main/java/itcollege/team09/entities/Vaeosa.java index 85aec97..92be886 100644 --- a/src/main/java/itcollege/team09/entities/Vaeosa.java +++ b/src/main/java/itcollege/team09/entities/Vaeosa.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.Date; +import java.util.List; import javax.persistence.Entity; import javax.persistence.ManyToOne; @@ -96,4 +97,16 @@ public Collection getAlamvaeosad() { public void setVaeosaAlluvus_2(Collection param) { this.alamvaeosad = param; } + + public static long countVaeosas() { + return entityManager().createQuery("SELECT COUNT(o) FROM Vaeosa o WHERE o.sulgeja IS NULL", Long.class).getSingleResult(); + } + + public static List findAllVaeosas() { + return entityManager().createQuery("SELECT o FROM Vaeosa o WHERE o.sulgeja IS NULL", Vaeosa.class).getResultList(); + } + + public static List findVaeosaEntries(int firstResult, int maxResults) { + return entityManager().createQuery("SELECT o FROM Vaeosa o WHERE o.sulgeja IS NULL", Vaeosa.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } } diff --git a/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java b/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java index e827310..411326e 100644 --- a/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java +++ b/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.Date; +import java.util.List; import javax.persistence.Entity; import javax.validation.constraints.NotNull; @@ -62,4 +63,16 @@ public Vaeosa getAlamvaeosa() { public void setAlamvaeosa(Vaeosa param) { this.alamvaeosa = param; } + + public static long countVaeosaAlluvuses() { + return entityManager().createQuery("SELECT COUNT(o) FROM VaeosaAlluvus o WHERE o.sulgeja IS NULL", Long.class).getSingleResult(); + } + + public static List findAllVaeosaAlluvuses() { + return entityManager().createQuery("SELECT o FROM VaeosaAlluvus o WHERE o.sulgeja IS NULL", VaeosaAlluvus.class).getResultList(); + } + + public static List findVaeosaAlluvusEntries(int firstResult, int maxResults) { + return entityManager().createQuery("SELECT o FROM VaeosaAlluvus o WHERE o.sulgeja IS NULL", VaeosaAlluvus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } } diff --git a/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj index ae10084..dcaee26 100644 --- a/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj @@ -5,25 +5,12 @@ package itcollege.team09.entities; import itcollege.team09.entities.VaeosaAlluvus; import java.lang.Long; -import java.util.List; privileged aspect VaeosaAlluvus_Roo_Entity { - public static long VaeosaAlluvus.countVaeosaAlluvuses() { - return entityManager().createQuery("SELECT COUNT(o) FROM VaeosaAlluvus o", Long.class).getSingleResult(); - } - - public static List VaeosaAlluvus.findAllVaeosaAlluvuses() { - return entityManager().createQuery("SELECT o FROM VaeosaAlluvus o", VaeosaAlluvus.class).getResultList(); - } - public static VaeosaAlluvus VaeosaAlluvus.findVaeosaAlluvus(Long id) { if (id == null) return null; return entityManager().find(VaeosaAlluvus.class, id); } - public static List VaeosaAlluvus.findVaeosaAlluvusEntries(int firstResult, int maxResults) { - return entityManager().createQuery("SELECT o FROM VaeosaAlluvus o", VaeosaAlluvus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } - } diff --git a/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj index 8db4278..fbe4a7a 100644 --- a/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj @@ -5,25 +5,12 @@ package itcollege.team09.entities; import itcollege.team09.entities.Vaeosa; import java.lang.Long; -import java.util.List; privileged aspect Vaeosa_Roo_Entity { - public static long Vaeosa.countVaeosas() { - return entityManager().createQuery("SELECT COUNT(o) FROM Vaeosa o", Long.class).getSingleResult(); - } - - public static List Vaeosa.findAllVaeosas() { - return entityManager().createQuery("SELECT o FROM Vaeosa o", Vaeosa.class).getResultList(); - } - public static Vaeosa Vaeosa.findVaeosa(Long id) { if (id == null) return null; return entityManager().find(Vaeosa.class, id); } - public static List Vaeosa.findVaeosaEntries(int firstResult, int maxResults) { - return entityManager().createQuery("SELECT o FROM Vaeosa o", Vaeosa.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } - } diff --git a/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java b/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java index e0b98b3..f32bff6 100644 --- a/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java +++ b/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.Date; +import java.util.List; import javax.persistence.Entity; import javax.validation.constraints.NotNull; @@ -62,4 +63,16 @@ public AdminYksuseLiik getAlamyksus() { public void setAlamyksus(AdminYksuseLiik param) { this.alamyksus = param; } + + public static long countVoimalikAlluvuses() { + return entityManager().createQuery("SELECT COUNT(o) FROM VoimalikAlluvus o WHERE o.sulgeja IS NULL", Long.class).getSingleResult(); + } + + public static List findAllVoimalikAlluvuses() { + return entityManager().createQuery("SELECT o FROM VoimalikAlluvus o WHERE o.sulgeja IS NULL", VoimalikAlluvus.class).getResultList(); + } + + public static List findVoimalikAlluvusEntries(int firstResult, int maxResults) { + return entityManager().createQuery("SELECT o FROM VoimalikAlluvus o WHERE o.sulgeja IS NULL", VoimalikAlluvus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } } diff --git a/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj index 51d1ee4..87c1d81 100644 --- a/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj @@ -5,25 +5,12 @@ package itcollege.team09.entities; import itcollege.team09.entities.VoimalikAlluvus; import java.lang.Long; -import java.util.List; privileged aspect VoimalikAlluvus_Roo_Entity { - public static long VoimalikAlluvus.countVoimalikAlluvuses() { - return entityManager().createQuery("SELECT COUNT(o) FROM VoimalikAlluvus o", Long.class).getSingleResult(); - } - - public static List VoimalikAlluvus.findAllVoimalikAlluvuses() { - return entityManager().createQuery("SELECT o FROM VoimalikAlluvus o", VoimalikAlluvus.class).getResultList(); - } - public static VoimalikAlluvus VoimalikAlluvus.findVoimalikAlluvus(Long id) { if (id == null) return null; return entityManager().find(VoimalikAlluvus.class, id); } - public static List VoimalikAlluvus.findVoimalikAlluvusEntries(int firstResult, int maxResults) { - return entityManager().createQuery("SELECT o FROM VoimalikAlluvus o", VoimalikAlluvus.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } - } diff --git a/src/main/java/itcollege/team09/helpers/Helper.java b/src/main/java/itcollege/team09/helpers/Helper.java index b686908..7fdbfc7 100644 --- a/src/main/java/itcollege/team09/helpers/Helper.java +++ b/src/main/java/itcollege/team09/helpers/Helper.java @@ -46,7 +46,7 @@ public static List PuurisOlevadKarud(Long id) { */ public static List getAlluvadVaeosad(Vaeosa v){ TypedQuery q = entityManager().createQuery( - "SELECT o.alamvaeosa FROM VaeosaAlluvus o WHERE o.vaeosa = :vaeosa", Vaeosa.class); + "SELECT o.alamvaeosa FROM VaeosaAlluvus o WHERE o.vaeosa = :vaeosa AND o.sulgeja IS NULL", Vaeosa.class); q.setParameter("vaeosa", v); return q.getResultList(); @@ -54,7 +54,7 @@ public static List getAlluvadVaeosad(Vaeosa v){ public static List getYlemVaeosad(Vaeosa v){ TypedQuery q = entityManager().createQuery( - "SELECT o FROM VaeosaAlluvus o WHERE o.alamvaeosa = :vaeosa", VaeosaAlluvus.class); + "SELECT o FROM VaeosaAlluvus o WHERE o.alamvaeosa = :vaeosa AND o.sulgeja IS NULL", VaeosaAlluvus.class); q.setParameter("vaeosa", v); return q.getResultList(); @@ -65,7 +65,7 @@ public static List getYlemVaeosad(Vaeosa v){ */ public static List getAdminYksuseLiigiAlluvad(AdminYksuseLiik a){ TypedQuery q = entityManager().createQuery( - "SELECT o.alamyksus FROM VoimalikAlluvus o WHERE o.yksuseliik = :adminYksuseLiik", AdminYksuseLiik.class); + "SELECT o.alamyksus FROM VoimalikAlluvus o WHERE o.yksuseliik = :adminYksuseLiik AND o.sulgeja IS NULL", AdminYksuseLiik.class); q.setParameter("adminYksuseLiik", a); return q.getResultList(); @@ -73,7 +73,7 @@ public static List getAdminYksuseLiigiAlluvad(AdminYksuseLiik a public static List getAdminYksuseLiigiYlemad(AdminYksuseLiik a){ TypedQuery q = entityManager().createQuery( - "SELECT o FROM VoimalikAlluvus o WHERE o.alamyksus = :adminYksuseLiik", VoimalikAlluvus.class); + "SELECT o FROM VoimalikAlluvus o WHERE o.alamyksus = :adminYksuseLiik AND o.sulgeja IS NULL", VoimalikAlluvus.class); q.setParameter("adminYksuseLiik", a); return q.getResultList(); @@ -84,7 +84,7 @@ public static List getAdminYksuseLiigiYlemad(AdminYksuseLiik a) */ public static List getAdminYksuseAlluvad(AdminYksus a){ TypedQuery q = entityManager().createQuery( - "SELECT o.alamadminyksus FROM AdminAlluvus o WHERE o.adminyksus = :adminYksus", AdminYksus.class); + "SELECT o.alamadminyksus FROM AdminAlluvus o WHERE o.adminyksus = :adminYksus AND o.sulgeja IS NULL", AdminYksus.class); q.setParameter("adminYksus", a); return q.getResultList();