Author: bleny Date: 2013-03-15 16:06:29 +0100 (Fri, 15 Mar 2013) New Revision: 27 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: create entities model Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Article.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/RequestedArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Site.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/SiteError.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StorageMovement.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StoredArticle.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/MagalieUser.java trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Article.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Article.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Article.java 2013-03-15 15:06:29 UTC (rev 27) @@ -0,0 +1,51 @@ +package com.franciaflex.magalie.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class Article { + + @Id + protected String id; + + @ManyToOne + protected Site fixedSite; + + protected String code; + + protected String quantityInKanban; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Site getFixedSite() { + return fixedSite; + } + + public void setFixedSite(Site fixedSite) { + this.fixedSite = fixedSite; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getQuantityInKanban() { + return quantityInKanban; + } + + public void setQuantityInKanban(String quantityInKanban) { + this.quantityInKanban = quantityInKanban; + } +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/MagalieUser.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/MagalieUser.java 2013-03-15 12:34:08 UTC (rev 26) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/MagalieUser.java 2013-03-15 15:06:29 UTC (rev 27) @@ -7,13 +7,47 @@ public class MagalieUser { @Id - protected Long id = 1L; + protected String id; - public Long getId() { + protected String login; + + protected String name; + + protected int accreditationLevel; + + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAccreditationLevel() { + return accreditationLevel; + } + + public void setAccreditationLevel(int accreditationLevel) { + this.accreditationLevel = accreditationLevel; + } + + public boolean isDriverLicenseOwner() { + return accreditationLevel == 9; + } } Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/RequestedArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/RequestedArticle.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/RequestedArticle.java 2013-03-15 15:06:29 UTC (rev 27) @@ -0,0 +1,64 @@ +package com.franciaflex.magalie.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import java.util.Date; + +@Entity +public class RequestedArticle { + + @Id + protected String id; + + @ManyToOne + protected Article article; + + protected String requestList; + + protected Date requestDate; + + protected boolean urgent; + + protected double quantity; + + public String getRequestList() { + return requestList; + } + + public void setRequestList(String requestList) { + this.requestList = requestList; + } + + public Date getRequestDate() { + return requestDate; + } + + public void setRequestDate(Date requestDate) { + this.requestDate = requestDate; + } + + public boolean isUrgent() { + return urgent; + } + + public void setUrgent(boolean urgent) { + this.urgent = urgent; + } + + public Article getArticle() { + return article; + } + + public void setArticle(Article article) { + this.article = article; + } + + public double getQuantity() { + return quantity; + } + + public void setQuantity(double quantity) { + this.quantity = quantity; + } +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Site.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Site.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Site.java 2013-03-15 15:06:29 UTC (rev 27) @@ -0,0 +1,53 @@ +package com.franciaflex.magalie.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; + +@Entity +public class Site { + + @Id + protected String id; + + protected String storeCode; + + protected String locationCode; + + protected int requiredAccreditationLevel; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isDriverLicenseRequired() { + return requiredAccreditationLevel == 9; + } + + public String getStoreCode() { + return storeCode; + } + + public void setStoreCode(String storeCode) { + this.storeCode = storeCode; + } + + public String getLocationCode() { + return locationCode; + } + + public void setLocationCode(String locationCode) { + this.locationCode = locationCode; + } + + public int getRequiredAccreditationLevel() { + return requiredAccreditationLevel; + } + + public void setRequiredAccreditationLevel(int requiredAccreditationLevel) { + this.requiredAccreditationLevel = requiredAccreditationLevel; + } +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/SiteError.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/SiteError.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/SiteError.java 2013-03-15 15:06:29 UTC (rev 27) @@ -0,0 +1,54 @@ +package com.franciaflex.magalie.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import java.util.Date; + +@Entity +public class SiteError { + + @Id + protected String id; + + @OneToOne + protected Site site; + + @ManyToOne + protected MagalieUser magalieUser; + + protected Date reportDate; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Site getSite() { + return site; + } + + public void setSite(Site site) { + this.site = site; + } + + public MagalieUser getMagalieUser() { + return magalieUser; + } + + public void setMagalieUser(MagalieUser magalieUser) { + this.magalieUser = magalieUser; + } + + public Date getReportDate() { + return reportDate; + } + + public void setReportDate(Date reportDate) { + this.reportDate = reportDate; + } +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StorageMovement.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StorageMovement.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StorageMovement.java 2013-03-15 15:06:29 UTC (rev 27) @@ -0,0 +1,88 @@ +package com.franciaflex.magalie.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import java.util.Date; + +@Entity +public class StorageMovement { + + @Id + protected String id; + + @ManyToOne + protected Site site; + + @ManyToOne + protected Article article; + + @ManyToOne + protected MagalieUser magalieUser; + + protected double quantity; + + protected Date orderDate; + + protected Date confirmDate; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Site getSite() { + return site; + } + + public void setSite(Site site) { + this.site = site; + } + + public Article getArticle() { + return article; + } + + public void setArticle(Article article) { + this.article = article; + } + + public MagalieUser getMagalieUser() { + return magalieUser; + } + + public void setMagalieUser(MagalieUser magalieUser) { + this.magalieUser = magalieUser; + } + + public double getQuantity() { + return quantity; + } + + public void setQuantity(double quantity) { + this.quantity = quantity; + } + + public Date getOrderDate() { + return orderDate; + } + + public void setOrderDate(Date orderDate) { + this.orderDate = orderDate; + } + + public Date getConfirmDate() { + return confirmDate; + } + + public void setConfirmDate(Date confirmDate) { + this.confirmDate = confirmDate; + } + + public boolean isConfirmed() { + return confirmDate != null; + } +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StoredArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StoredArticle.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StoredArticle.java 2013-03-15 15:06:29 UTC (rev 27) @@ -0,0 +1,52 @@ +package com.franciaflex.magalie.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class StoredArticle { + + @Id + protected String id; + + @ManyToOne + protected Site site; + + @ManyToOne + protected Article article; + + protected double quantity; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Site getSite() { + return site; + } + + public void setSite(Site site) { + this.site = site; + } + + public Article getArticle() { + return article; + } + + public void setArticle(Article article) { + this.article = article; + } + + public double getQuantity() { + return quantity; + } + + public void setQuantity(double quantity) { + this.quantity = quantity; + } +} Modified: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java =================================================================== --- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-03-15 12:34:08 UTC (rev 26) +++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-03-15 15:06:29 UTC (rev 27) @@ -1,6 +1,12 @@ package com.franciaflex.magalie; +import com.franciaflex.magalie.entity.Article; import com.franciaflex.magalie.entity.MagalieUser; +import com.franciaflex.magalie.entity.RequestedArticle; +import com.franciaflex.magalie.entity.Site; +import com.franciaflex.magalie.entity.SiteError; +import com.franciaflex.magalie.entity.StorageMovement; +import com.franciaflex.magalie.entity.StoredArticle; import org.junit.Ignore; import org.junit.Test; @@ -26,6 +32,12 @@ entityManager.getTransaction().begin(); entityManager.persist(new MagalieUser()); + entityManager.persist(new Article()); + entityManager.persist(new RequestedArticle()); + entityManager.persist(new Site()); + entityManager.persist(new SiteError()); + entityManager.persist(new StorageMovement()); + entityManager.persist(new StoredArticle()); entityManager.getTransaction().commit();