Franciaflex-magalie-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- 438 discussions
27 Mar '13
Author: bleny
Date: 2013-03-27 14:11:24 +0100 (Wed, 27 Mar 2013)
New Revision: 47
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2223 implements login screen with two select box and logout
Added:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp
trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp
Removed:
trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp
Modified:
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java
trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,11 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.Site;
+
+import java.util.List;
+
+public interface SiteDao extends Dao<Site> {
+
+ List<String> getAllStoreCodes();
+
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,27 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.SiteDao;
+import com.franciaflex.magalie.persistence.entity.Site;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+public class SiteJpaDao extends AbstractJpaDao<Site> implements SiteDao {
+
+ public SiteJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<Site> getEntityClass() {
+ return Site.class;
+ }
+
+ @Override
+ public List<String> getAllStoreCodes() {
+ Query query = entityManager.createQuery("select distinct s.storeCode from Site s order by s.storeCode");
+ List<String> resultList = query.getResultList();
+ return resultList;
+ }
+}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-27 10:31:14 UTC (rev 46)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -5,6 +5,7 @@
import com.franciaflex.magalie.persistence.dao.ArticleDao;
import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
+import com.franciaflex.magalie.persistence.dao.SiteDao;
import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
@@ -13,6 +14,7 @@
import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.RequestedArticleJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.SiteErrorJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.SiteJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementOrderJpaDao;
import com.franciaflex.magalie.persistence.dao.jpa.StoredArticleJpaDao;
@@ -116,4 +118,9 @@
public StorageMovementOrderDao getStorageMovementOrderDao() {
return new StorageMovementOrderJpaDao(entityManager);
}
+
+ @Override
+ public SiteDao getSiteDao() {
+ return new SiteJpaDao(entityManager);
+ }
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-27 10:31:14 UTC (rev 46)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -27,6 +27,7 @@
import com.franciaflex.magalie.persistence.dao.ArticleDao;
import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
+import com.franciaflex.magalie.persistence.dao.SiteDao;
import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
@@ -58,4 +59,7 @@
SiteErrorDao getSiteErrorDao();
StorageMovementOrderDao getStorageMovementOrderDao();
+
+ SiteDao getSiteDao();
+
}
Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,25 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.dao.SiteDao;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+
+import java.util.List;
+
+public class StoreService implements MagalieService {
+
+ protected MagalieServiceContext serviceContext;
+
+ @Override
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public List<String> getAllStoreCodes() {
+
+ SiteDao dao = serviceContext.getSiteDao();
+
+ return dao.getAllStoreCodes();
+
+ }
+}
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-03-27 10:31:14 UTC (rev 46)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -18,6 +18,8 @@
protected MagalieUser magalieUser;
+ protected String storeCode;
+
public MagalieUser getMagalieUser() {
return magalieUser;
}
@@ -25,4 +27,12 @@
public void setMagalieUser(MagalieUser magalieUser) {
this.magalieUser = magalieUser;
}
+
+ public void setStoreCode(String storeCode) {
+ this.storeCode = storeCode;
+ }
+
+ public String getStoreCode() {
+ return storeCode;
+ }
}
Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java (rev 0)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,37 @@
+package com.franciaflex.magalie.web.action;
+
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.web.MagalieActionSupport;
+import com.franciaflex.magalie.web.MagalieSession;
+
+public class ChooseActivityAction extends MagalieActionSupport {
+
+ protected MagalieSession session;
+
+ protected MagalieUser magalieUser;
+
+ protected String storeCode;
+
+ public void setSession(MagalieSession session) {
+ this.session = session;
+ }
+
+ @Override
+ public String execute() throws Exception {
+
+ magalieUser = session.getMagalieUser();
+
+ storeCode = session.getStoreCode();
+
+ return SUCCESS;
+
+ }
+
+ public MagalieUser getMagalieUser() {
+ return magalieUser;
+ }
+
+ public String getStoreCode() {
+ return storeCode;
+ }
+}
Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java (rev 0)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,12 @@
+package com.franciaflex.magalie.web.action;
+
+
+import com.franciaflex.magalie.web.MagalieActionSupport;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+
+@Results({
+ @Result(name="success", type="redirectAction", params = { "actionName", "login!input" })
+})
+public class IndexAction extends MagalieActionSupport {
+}
Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java (rev 0)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,91 @@
+package com.franciaflex.magalie.web.action;
+
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.services.service.MagalieUsersService;
+import com.franciaflex.magalie.services.service.StoreService;
+import com.franciaflex.magalie.web.MagalieActionSupport;
+import com.franciaflex.magalie.web.MagalieSession;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+
+import java.util.List;
+
+@Results({
+ @Result(name="success", type="redirectAction", params = { "actionName", "choose-activity" })
+})
+public class LoginAction extends MagalieActionSupport {
+
+ protected MagalieUsersService magalieUsersService;
+
+ protected StoreService storeService;
+
+ protected List<MagalieUser> allMagalieUsers;
+
+ protected List<String> allStoreCodes;
+
+ protected MagalieSession session;
+
+ protected String login;
+
+ protected String storeCode;
+
+ public void setMagalieUsersService(MagalieUsersService magalieUsersService) {
+ this.magalieUsersService = magalieUsersService;
+ }
+
+ public void setStoreService(StoreService storeService) {
+ this.storeService = storeService;
+ }
+
+ public void setSession(MagalieSession session) {
+ this.session = session;
+ }
+
+ public void setLogin(String login) {
+ this.login = login;
+ }
+
+ public void setStoreCode(String storeCode) {
+ this.storeCode = storeCode;
+ }
+
+ @Override
+ public String input() {
+
+ allMagalieUsers = magalieUsersService.getAllMagalieUsers();
+
+ allStoreCodes = storeService.getAllStoreCodes();
+
+ return INPUT;
+
+ }
+
+ public String getLogin() {
+ return login;
+ }
+
+ public String getStoreCode() {
+ return storeCode;
+ }
+
+ public List<MagalieUser> getAllMagalieUsers() {
+ return allMagalieUsers;
+ }
+
+ public List<String> getAllStoreCodes() {
+ return allStoreCodes;
+ }
+
+ @Override
+ public String execute() {
+
+ MagalieUser magalieUser = magalieUsersService.getMagalieUser(login);
+
+ session.setMagalieUser(magalieUser);
+
+ session.setStoreCode(storeCode);
+
+ return SUCCESS;
+
+ }
+}
Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java (rev 0)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,29 @@
+package com.franciaflex.magalie.web.action;
+
+import com.franciaflex.magalie.web.MagalieActionSupport;
+import com.franciaflex.magalie.web.MagalieSession;
+import org.apache.struts2.convention.annotation.Result;
+import org.apache.struts2.convention.annotation.Results;
+
+@Results({
+ @Result(name="success", type="redirectAction", params = { "actionName", "login!input" })
+})
+public class LogoutAction extends MagalieActionSupport {
+
+ protected MagalieSession session;
+
+ public void setSession(MagalieSession session) {
+ this.session = session;
+ }
+
+ @Override
+ public String execute() {
+
+ session.setMagalieUser(null);
+
+ session.setStoreCode(null);
+
+ return SUCCESS;
+
+ }
+}
Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp (rev 0)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,45 @@
+<%--
+ #%L
+ MagaLiE :: UI
+ $Id:$
+ $HeadURL:$
+ %%
+ Copyright (C) 2013 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ --%>
+
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %>
+<%@ taglib prefix="sj" uri="/struts-jquery-tags" %>
+
+<s:url namespace="/" action="withdraw-item!input" id="withdrawItemUrl"/>
+<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/>
+<s:url namespace="/" action="logout" id="logoutUrl"/>
+
+<header>
+ <dl class="dl-horizontal">
+ <dt>Identifiant</dt>
+ <dd><s:property value="magalieUser.name" /> (<s:property value="magalieUser.login" />)</dd>
+ <dt>Magasin</dt>
+ <dd><s:property value="storeCode" /></dd>
+ </dl>
+</header>
+
+<s:a href="%{withdrawItemUrl}" cssClass="btn btn-block">Traiter listes à servir</s:a>
+<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block">Traiter kanbans</s:a>
+<s:a href="" cssClass="btn btn-block">Traiter les réceptions fournisseurs</s:a>
+<s:a href="%{logoutUrl}" cssClass="btn btn-block">Déconnexion</s:a>
Deleted: trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp 2013-03-27 10:31:14 UTC (rev 46)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp 2013-03-27 13:11:24 UTC (rev 47)
@@ -1,43 +0,0 @@
-<%--
- #%L
- MagaLiE :: UI
- $Id:$
- $HeadURL:$
- %%
- Copyright (C) 2013 CodeLutin
- %%
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- #L%
- --%>
-
-<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %>
-<%@ taglib prefix="sj" uri="/struts-jquery-tags" %>
-
-<s:url namespace="/" action="withdraw-item!input" id="withdrawItemUrl"/>
-<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/>
-
-<header>
- <dl class="dl-horizontal">
- <dt>Identifiant</dt>
- <dd>bre</dd>
- <dt>Magasin</dt>
- <dd>U01</dd>
- </dl>
-</header>
-
-<s:a href="%{withdrawItemUrl}" cssClass="btn btn-block">Traiter listes à servir</s:a>
-<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block">Traiter kanbans</s:a>
-<s:a href="" cssClass="btn btn-block">Traiter les réceptions fournisseurs</s:a>
Copied: trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp (from rev 39, trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp)
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp (rev 0)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-03-27 13:11:24 UTC (rev 47)
@@ -0,0 +1,27 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<head>
+ <title>Connexion</title>
+</head>
+
+<s:form cssClass="form-horizontal">
+
+ <s:select label="Utilisateur"
+ key="login"
+ list="allMagalieUsers"
+ listKey="login"
+ listValue="name"
+ required="true"
+ />
+
+ <s:select label="Magasin"
+ key="storeCode"
+ list="allStoreCodes"
+ required="true"
+ />
+
+ <div class="btn-group">
+ <s:submit value="S'identifier" cssClass="btn btn-primary btn-small" />
+ </div>
+</s:form>
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml 2013-03-27 10:31:14 UTC (rev 46)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml 2013-03-27 13:11:24 UTC (rev 47)
@@ -26,9 +26,6 @@
<pattern>/js/*</pattern>
<pattern>/images/*</pattern>
<pattern>/config-browser/*</pattern>
- <pattern>/login*</pattern>
- <pattern>/recoverPassword*</pattern>
- <pattern>/register*</pattern>
</excludes>
<decorator name="layout" page="layout.jsp">
1
0
r46 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 27 Mar '13
by bleny＠users.forge.codelutin.com 27 Mar '13
27 Mar '13
Author: bleny
Date: 2013-03-27 11:31:14 +0100 (Wed, 27 Mar 2013)
New Revision: 46
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
make storage movement order keep storage movement in order in db
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-27 10:18:04 UTC (rev 45)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-27 10:31:14 UTC (rev 46)
@@ -25,6 +25,7 @@
import com.franciaflex.magalie.persistence.StorageMovements;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -33,6 +34,8 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import java.util.List;
import java.util.Set;
@Entity
@@ -52,20 +55,21 @@
}
@OneToMany(cascade = CascadeType.ALL)
- protected Set<StorageMovement> storageMovements;
+ @OrderColumn
+ protected List<StorageMovement> storageMovements;
- public Set<StorageMovement> getStorageMovements() {
+ public List<StorageMovement> getStorageMovements() {
return storageMovements;
}
- public void setStorageMovements(Set<StorageMovement> storageMovements) {
+ public void setStorageMovements(List<StorageMovement> storageMovements) {
this.storageMovements = storageMovements;
}
/**
* @deprecated use {@link #getStorageMovements()}
*/
- public Set<StorageMovement> getSites() {
+ public List<StorageMovement> getSites() {
return storageMovements;
}
@@ -95,7 +99,7 @@
public void addStorageMovement(StorageMovement storageMovement) {
if (storageMovements == null) {
- storageMovements = Sets.newLinkedHashSet();
+ storageMovements = Lists.newLinkedList();
}
storageMovements.add(storageMovement);
}
1
0
r45 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/test/resources
by bleny＠users.forge.codelutin.com 27 Mar '13
by bleny＠users.forge.codelutin.com 27 Mar '13
27 Mar '13
Author: bleny
Date: 2013-03-27 11:18:04 +0100 (Wed, 27 Mar 2013)
New Revision: 45
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
support multiple fixed sites for article
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java
trunk/magalie-services/src/test/resources/fixtures.yaml
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-03-26 16:39:09 UTC (rev 44)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-03-27 10:18:04 UTC (rev 45)
@@ -11,6 +11,7 @@
import java.util.Collection;
import java.util.Comparator;
+import java.util.Set;
public class StoredArticles {
@@ -23,10 +24,13 @@
}
@Override
- public int compare(StoredArticle o1, StoredArticle o2) {
- if (o1.getSite().equals(article.getFixedSite())) {
+ public int compare(StoredArticle storedArticle1, StoredArticle storedArticle2) {
+ Set<Site> fixedSites = article.getFixedSites();
+ boolean storedArticle1isInFixedSite = fixedSites.contains(storedArticle1.getSite());
+ boolean storedArticle2isInFixedSite = fixedSites.contains(storedArticle2.getSite());
+ if (storedArticle1isInFixedSite && ! storedArticle2isInFixedSite) {
return -1;
- } else if (o2.getSite().equals(article.getFixedSite())) {
+ } else if ( ! storedArticle1isInFixedSite && storedArticle2isInFixedSite) {
return +1;
}
return 0;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-03-26 16:39:09 UTC (rev 44)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-03-27 10:18:04 UTC (rev 45)
@@ -2,7 +2,8 @@
import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import javax.persistence.ManyToMany;
+import java.util.Set;
@Entity
public class Article extends AbstractEntity {
@@ -10,8 +11,8 @@
@Id
protected String id;
- @ManyToOne
- protected Site fixedSite;
+ @ManyToMany
+ protected Set<Site> fixedSites;
protected String description;
@@ -30,12 +31,12 @@
this.id = id;
}
- public Site getFixedSite() {
- return fixedSite;
+ public Set<Site> getFixedSites() {
+ return fixedSites;
}
- public void setFixedSite(Site fixedSite) {
- this.fixedSite = fixedSite;
+ public void setFixedSites(Set<Site> fixedSites) {
+ this.fixedSites = fixedSites;
}
public String getCode() {
Modified: trunk/magalie-services/src/test/resources/fixtures.yaml
===================================================================
--- trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-26 16:39:09 UTC (rev 44)
+++ trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-27 10:18:04 UTC (rev 45)
@@ -77,7 +77,8 @@
article1:
&article1 !article
id: article1
- fixedSite: *site1
+ fixedSites:
+ - *site1
code: 111111111
quantityInKanban: 10
unit: kg
@@ -94,7 +95,8 @@
article3:
&article3 !article
id: article3
- fixedSite: *site2
+ fixedSites:
+ - *site2
code: 333333333
quantityInKanban: 50
unit: g
1
0
r44 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 26 Mar '13
by bleny＠users.forge.codelutin.com 26 Mar '13
26 Mar '13
Author: bleny
Date: 2013-03-26 17:39:09 +0100 (Tue, 26 Mar 2013)
New Revision: 44
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
remove extra site if already present in order?\195?\169
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-03-26 16:13:29 UTC (rev 43)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-03-26 16:39:09 UTC (rev 44)
@@ -1,6 +1,7 @@
package com.franciaflex.magalie.persistence;
import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Site;
import com.franciaflex.magalie.persistence.entity.StorageMovement;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -16,6 +17,14 @@
}
}
+ protected static class GetSiteFunction implements Function<StorageMovement, Site> {
+
+ @Override
+ public Site apply(StorageMovement storageMovement) {
+ return storageMovement.getSite();
+ }
+ }
+
protected static class StorageMovementIsConfirmedPredicate implements Predicate<StorageMovement> {
@Override
@@ -28,6 +37,10 @@
return new GetArticleFunction();
}
+ public static Function<StorageMovement, Site> getSiteFunction() {
+ return new GetSiteFunction();
+ }
+
public static Predicate<StorageMovement> storageMovementIsConfirmed() {
return new StorageMovementIsConfirmedPredicate();
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-26 16:13:29 UTC (rev 43)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-26 16:39:09 UTC (rev 44)
@@ -62,6 +62,9 @@
this.storageMovements = storageMovements;
}
+ /**
+ * @deprecated use {@link #getStorageMovements()}
+ */
public Set<StorageMovement> getSites() {
return storageMovements;
}
@@ -97,6 +100,18 @@
storageMovements.add(storageMovement);
}
+ // TODO brendan 26/03/13 rename to getSites
+ public Set<Site> getSites2() {
+ Set<Site> sites =
+ Sets.newHashSet(
+ Iterables.transform(
+ getStorageMovements(),
+ StorageMovements.getSiteFunction()
+ )
+ );
+ return sites;
+ }
+
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-26 16:13:29 UTC (rev 43)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-26 16:39:09 UTC (rev 44)
@@ -141,20 +141,27 @@
Article article = storageMovementOrder.getArticle();
+ Set<Site> sitesInOrder = storageMovementOrder.getSites2();
+
List<StoredArticle> storedArticles = getStoredArticles(article);
for (StoredArticle storedArticle : storedArticles) {
- StorageMovement newStorageMovement = new StorageMovement();
+ Site site = storedArticle.getSite();
- newStorageMovement.setArticle(article);
+ if ( ! sitesInOrder.contains(site)) {
- newStorageMovement.setSite(storedArticle.getSite());
+ StorageMovement newStorageMovement = new StorageMovement();
- newStorageMovement.setQuantity(0.);
+ newStorageMovement.setArticle(article);
- storageMovementTask.addExtraStorageMovement(newStorageMovement);
+ newStorageMovement.setSite(site);
+ newStorageMovement.setQuantity(0.);
+
+ storageMovementTask.addExtraStorageMovement(newStorageMovement);
+
+ }
}
return storageMovementTask;
1
0
r43 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 26 Mar '13
by bleny＠users.forge.codelutin.com 26 Mar '13
26 Mar '13
Author: bleny
Date: 2013-03-26 17:13:29 +0100 (Tue, 26 Mar 2013)
New Revision: 43
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2163, make screen fulfilkanban screen works
Modified:
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-26 16:12:17 UTC (rev 42)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-26 16:13:29 UTC (rev 43)
@@ -39,7 +39,7 @@
this.serviceContext = serviceContext;
}
- public StorageMovementTask withdrawArticle(MagalieUser magalieUser, Article article, double requestedQuantity) throws UnavailableArticleException, RequiredDriverLicenceException {
+ public StorageMovementOrder bookArticle(MagalieUser magalieUser, Article article, double requestedQuantity) throws UnavailableArticleException, RequiredDriverLicenceException {
Preconditions.checkNotNull(magalieUser);
@@ -84,8 +84,6 @@
StorageMovementOrder storageMovementOrder = new StorageMovementOrder();
- StorageMovementTask storageMovementTask = new StorageMovementTask(storageMovementOrder);
-
double quantity = 0;
Date orderDate = serviceContext.getNow();
@@ -117,10 +115,6 @@
storageMovementOrder.addStorageMovement(newStorageMovement);
- } else {
-
- storageMovementTask.addExtraStorageMovement(newStorageMovement);
-
}
}
@@ -129,6 +123,40 @@
dao.persist(storageMovementOrder);
+ return storageMovementOrder;
+
+ }
+
+ public StorageMovementTask getStorageMovementTask(String storageMovementOrderId) {
+
+ StorageMovementOrderDao dao = serviceContext.getStorageMovementOrderDao();
+
+ StorageMovementOrder storageMovementOrder = dao.findById(storageMovementOrderId);
+
+ Preconditions.checkArgument(
+ storageMovementOrder != null,
+ "no storage movement order with id " + storageMovementOrderId);
+
+ StorageMovementTask storageMovementTask = new StorageMovementTask(storageMovementOrder);
+
+ Article article = storageMovementOrder.getArticle();
+
+ List<StoredArticle> storedArticles = getStoredArticles(article);
+
+ for (StoredArticle storedArticle : storedArticles) {
+
+ StorageMovement newStorageMovement = new StorageMovement();
+
+ newStorageMovement.setArticle(article);
+
+ newStorageMovement.setSite(storedArticle.getSite());
+
+ newStorageMovement.setQuantity(0.);
+
+ storageMovementTask.addExtraStorageMovement(newStorageMovement);
+
+ }
+
return storageMovementTask;
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-03-26 16:12:17 UTC (rev 42)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-03-26 16:13:29 UTC (rev 43)
@@ -2,9 +2,9 @@
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
-import com.franciaflex.magalie.services.StorageMovementTask;
import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
import com.franciaflex.magalie.services.exception.UnavailableArticleException;
@@ -22,7 +22,7 @@
this.serviceContext = serviceContext;
}
- public StorageMovementTask fulfilKanbanTask(
+ public StorageMovementOrder fulfilKanbanTask(
String articleBarcode,
MagalieUser magalieUser) throws InvalidMagalieBarcodeException,
UnavailableArticleException,
@@ -42,14 +42,13 @@
ArticleStorageService articleStorageService =
serviceContext.newService(ArticleStorageService.class);
-
- StorageMovementTask storageMovementTask =
- articleStorageService.withdrawArticle(
+ StorageMovementOrder storageMovementOrder =
+ articleStorageService.bookArticle(
magalieUser,
article,
quantityInKanban);
- return storageMovementTask;
+ return storageMovementOrder;
}
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java 2013-03-26 16:12:17 UTC (rev 42)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java 2013-03-26 16:13:29 UTC (rev 43)
@@ -27,9 +27,9 @@
import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
-import com.franciaflex.magalie.services.StorageMovementTask;
import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
import com.franciaflex.magalie.services.exception.UnavailableArticleException;
@@ -41,7 +41,7 @@
this.serviceContext = serviceContext;
}
- public StorageMovementTask getWithdrawTask() throws RequiredDriverLicenceException, UnavailableArticleException {
+ public StorageMovementOrder getWithdrawTask() throws RequiredDriverLicenceException, UnavailableArticleException {
ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class);
@@ -53,14 +53,14 @@
Article article1 = articleDao.findById("article1");
- StorageMovementTask storageMovementTask =
- articleStorageService.withdrawArticle(
+ StorageMovementOrder storageMovementOrder =
+ articleStorageService.bookArticle(
alexandre,
article1,
40.
);
- return storageMovementTask;
+ return storageMovementOrder;
}
}
Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-26 16:12:17 UTC (rev 42)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-26 16:13:29 UTC (rev 43)
@@ -1,11 +1,11 @@
package com.franciaflex.magalie.services.service;
-import com.franciaflex.magalie.services.AbstractMagalieServiceTest;
import com.franciaflex.magalie.persistence.entity.Article;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.persistence.entity.Site;
import com.franciaflex.magalie.persistence.entity.StorageMovement;
-import com.franciaflex.magalie.services.StorageMovementTask;
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
+import com.franciaflex.magalie.services.AbstractMagalieServiceTest;
import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
import com.franciaflex.magalie.services.exception.UnavailableArticleException;
import com.google.common.collect.Iterables;
@@ -38,12 +38,12 @@
MagalieUser basile = fixture("basile");
Article article = fixture("article1");
- StorageMovementTask storageMovementTask;
+ StorageMovementOrder storageMovementOrder;
try {
- storageMovementTask = service.withdrawArticle(basile, article, 100.);
+ storageMovementOrder = service.bookArticle(basile, article, 100.);
if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
+ log.debug("storageMovementOrder = " + storageMovementOrder);
}
Assert.fail();
} catch (UnavailableArticleException e) {
@@ -59,12 +59,12 @@
MagalieUser basile = fixture("basile");
Article article = fixture("article1");
- StorageMovementTask storageMovementTask;
+ StorageMovementOrder storageMovementOrder;
try {
- storageMovementTask = service.withdrawArticle(basile, article, 70.);
+ storageMovementOrder = service.bookArticle(basile, article, 70.);
if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
+ log.debug("storageMovementOrder = " + storageMovementOrder);
}
Assert.fail();
} catch (RequiredDriverLicenceException e) {
@@ -80,12 +80,12 @@
MagalieUser basile = fixture("basile");
Article article = fixture("article1");
- StorageMovementTask storageMovementTask = null;
+ StorageMovementOrder storageMovementOrder = null;
try {
- storageMovementTask = service.withdrawArticle(basile, article, 50.);
+ storageMovementOrder = service.bookArticle(basile, article, 50.);
if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
+ log.debug("storageMovementOrder = " + storageMovementOrder);
}
} catch (RequiredDriverLicenceException e) {
if (log.isDebugEnabled()) {
@@ -99,7 +99,7 @@
Assert.fail();
}
- Assert.assertEquals(1, storageMovementTask.getSites().size());
+ Assert.assertEquals(1, storageMovementOrder.getSites().size());
}
@Test
@@ -107,12 +107,12 @@
MagalieUser alexandre = fixture("alexandre");
Article article = fixture("article1");
- StorageMovementTask storageMovementTask = null;
+ StorageMovementOrder storageMovementOrder = null;
try {
- storageMovementTask = service.withdrawArticle(alexandre, article, 50.);
+ storageMovementOrder = service.bookArticle(alexandre, article, 50.);
if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
+ log.debug("storageMovementOrder = " + storageMovementOrder);
}
} catch (RequiredDriverLicenceException e) {
if (log.isDebugEnabled()) {
@@ -126,10 +126,10 @@
Assert.fail();
}
- Assert.assertEquals(2, storageMovementTask.getSites().size());
- StorageMovement site1 = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertEquals(2, storageMovementOrder.getSites().size());
+ StorageMovement site1 = Iterables.get(storageMovementOrder.getSites(), 0, null);
Assert.assertEquals(-20., site1.getQuantity(), DELTA);
- StorageMovement site2 = Iterables.get(storageMovementTask.getSites(), 1, null);
+ StorageMovement site2 = Iterables.get(storageMovementOrder.getSites(), 1, null);
Assert.assertEquals(-30., site2.getQuantity(), DELTA);
}
@@ -141,18 +141,18 @@
Article article = fixture("article1");
- StorageMovementTask storageMovementTask = null;
+ StorageMovementOrder storageMovementOrder = null;
try {
- storageMovementTask = service.withdrawArticle(alexandre, article, 30.);
+ storageMovementOrder = service.bookArticle(alexandre, article, 30.);
if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
+ log.debug("storageMovementOrder = " + storageMovementOrder);
}
- Assert.assertEquals(2, storageMovementTask.getSites().size());
- StorageMovement storageMovement1 = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertEquals(2, storageMovementOrder.getSites().size());
+ StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getSites(), 0, null);
Assert.assertEquals(-20., storageMovement1.getQuantity(), DELTA);
Assert.assertEquals("B2", storageMovement1.getSite().getLocationCode());
- StorageMovement storageMovement2 = Iterables.get(storageMovementTask.getSites(), 1, null);
+ StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getSites(), 1, null);
Assert.assertEquals(-10., storageMovement2.getQuantity(), DELTA);
Assert.assertEquals("A1", storageMovement2.getSite().getLocationCode());
} catch (RequiredDriverLicenceException e) {
@@ -168,12 +168,12 @@
}
try {
- storageMovementTask = service.withdrawArticle(cathy, article, 30.);
+ storageMovementOrder = service.bookArticle(cathy, article, 30.);
if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
+ log.debug("storageMovementOrder = " + storageMovementOrder);
}
- Assert.assertEquals(1, storageMovementTask.getSites().size());
- StorageMovement storageMovement = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertEquals(1, storageMovementOrder.getSites().size());
+ StorageMovement storageMovement = Iterables.get(storageMovementOrder.getSites(), 0, null);
Assert.assertEquals(-30., storageMovement.getQuantity(), DELTA);
Assert.assertEquals("A1", storageMovement.getSite().getLocationCode());
} catch (RequiredDriverLicenceException e) {
@@ -203,12 +203,12 @@
siteErrorsService.reportError(site2, alexandre);
try {
- StorageMovementTask storageMovementTask = service.withdrawArticle(cathy, article, 30.);
+ StorageMovementOrder storageMovementOrder = service.bookArticle(cathy, article, 30.);
if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
+ log.debug("storageMovementOrder = " + storageMovementOrder);
}
- Assert.assertEquals(1, storageMovementTask.getSites().size());
- StorageMovement storageMovement = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertEquals(1, storageMovementOrder.getSites().size());
+ StorageMovement storageMovement = Iterables.get(storageMovementOrder.getSites(), 0, null);
Assert.assertNotEquals(
"site2 must not be returned because it was reported in error",
site2.getId(),
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-03-26 16:12:17 UTC (rev 42)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-03-26 16:13:29 UTC (rev 43)
@@ -1,11 +1,11 @@
package com.franciaflex.magalie.web.action;
import com.franciaflex.magalie.persistence.entity.MagalieUser;
-import com.franciaflex.magalie.services.service.FulfilKanbanService;
-import com.franciaflex.magalie.services.StorageMovementTask;
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
import com.franciaflex.magalie.services.exception.UnavailableArticleException;
+import com.franciaflex.magalie.services.service.FulfilKanbanService;
import com.franciaflex.magalie.web.MagalieActionSupport;
import com.franciaflex.magalie.web.MagalieSession;
import org.apache.commons.logging.Log;
@@ -15,7 +15,7 @@
@Results({
- @Result(name="success", type="redirect", location="/", params = { "" , "" })
+ @Result(name="success", type="redirectAction", params = { "actionName", "withdraw-item!input", "storageMovementOrderId", "${storageMovementOrderId}" })
})
public class FulfilKanbanAction extends MagalieActionSupport {
@@ -27,7 +27,7 @@
protected String articleBarcode;
- protected StorageMovementTask storageMovementTask;
+ protected StorageMovementOrder storageMovementOrder;
public void setArticleBarcode(String articleBarcode) {
this.articleBarcode = articleBarcode;
@@ -37,6 +37,10 @@
this.service = service;
}
+ public void setSession(MagalieSession session) {
+ this.session = session;
+ }
+
@Override
public String execute() {
@@ -48,7 +52,7 @@
try {
- storageMovementTask = service.fulfilKanbanTask(articleBarcode, magalieUser);
+ storageMovementOrder = service.fulfilKanbanTask(articleBarcode, magalieUser);
} catch (InvalidMagalieBarcodeException e) {
@@ -74,8 +78,7 @@
}
- public StorageMovementTask getStorageMovementTask() {
- return storageMovementTask;
+ public String getStorageMovementOrderId() {
+ return storageMovementOrder.getId();
}
-
}
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-03-26 16:12:17 UTC (rev 42)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-03-26 16:13:29 UTC (rev 43)
@@ -23,11 +23,12 @@
* #L%
*/
-import com.franciaflex.magalie.services.service.RequestedItemService;
import com.franciaflex.magalie.services.StorageMovementTask;
import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
import com.franciaflex.magalie.services.exception.UnavailableArticleException;
+import com.franciaflex.magalie.services.service.ArticleStorageService;
import com.franciaflex.magalie.web.MagalieActionSupport;
+import com.google.common.base.Preconditions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.json.JSONException;
@@ -37,20 +38,29 @@
private static final Log log = LogFactory.getLog(WithdrawItemAction.class);
- protected RequestedItemService service;
+ protected ArticleStorageService service;
+ protected String storageMovementOrderId;
+
protected StorageMovementTask storageMovementTask;
- public void setService(RequestedItemService service) {
+ public void setService(ArticleStorageService service) {
this.service = service;
}
- public void setModel(String model) {
+ public void setStorageMovementOrderId(String storageMovementOrderId) {
+ this.storageMovementOrderId = storageMovementOrderId;
+ }
- if (log.isErrorEnabled()) {
- log.error("should deserialize" + model);
- }
+ @Override
+ public String input() throws RequiredDriverLicenceException, UnavailableArticleException {
+ Preconditions.checkNotNull(storageMovementOrderId);
+
+ storageMovementTask = service.getStorageMovementTask(storageMovementOrderId);
+
+ return INPUT;
+
}
public StorageMovementTask getStorageMovementTask() {
@@ -65,13 +75,15 @@
}
- @Override
- public String input() throws RequiredDriverLicenceException, UnavailableArticleException {
- storageMovementTask = service.getWithdrawTask();
- return INPUT;
+ public void setModel(String model) {
+
+ if (log.isErrorEnabled()) {
+ log.error("should deserialize" + model);
+ }
+
}
}
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-03-26 16:12:17 UTC (rev 42)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-03-26 16:13:29 UTC (rev 43)
@@ -5,10 +5,10 @@
<title>Traitement des kanbans</title>
</head>
-<form class="form-horizontal">
+<s:form cssClass="form-horizontal">
<s:textfield name="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-small" />
<div class="btn-group">
<s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" />
</div>
-</form>
\ No newline at end of file
+</s:form>
\ No newline at end of file
1
0
r42 - trunk/magalie-web/src/main/webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com 26 Mar '13
by bleny＠users.forge.codelutin.com 26 Mar '13
26 Mar '13
Author: bleny
Date: 2013-03-26 17:12:17 +0100 (Tue, 26 Mar 2013)
New Revision: 42
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
add action errors in layout
Modified:
trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-03-26 16:11:45 UTC (rev 41)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-03-26 16:12:17 UTC (rev 42)
@@ -40,6 +40,11 @@
</head>
<body>
<div id="container">
+
+ <s:actionerror theme="bootstrap"/>
+ <s:actionmessage theme="bootstrap"/>
+ <s:fielderror theme="bootstrap"/>
+
<decorator:body />
</div>
</body>
1
0
r41 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa
by bleny＠users.forge.codelutin.com 26 Mar '13
by bleny＠users.forge.codelutin.com 26 Mar '13
26 Mar '13
Author: bleny
Date: 2013-03-26 17:11:45 +0100 (Tue, 26 Mar 2013)
New Revision: 41
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
fix dao implementations
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java 2013-03-26 16:11:45 UTC (rev 41)
@@ -20,7 +20,7 @@
@Override
public Article findByCode(String articleCode) {
- Query query = entityManager.createQuery("from article a where a.code = :code");
+ Query query = entityManager.createQuery("from Article a where a.code = :code");
query.setParameter("code", articleCode);
Article article = (Article)
Iterables.getOnlyElement(
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java 2013-03-26 16:11:45 UTC (rev 41)
@@ -21,7 +21,7 @@
@Override
public MagalieUser findByLogin(String login) {
- Query query = entityManager.createQuery("from magalieUser mu where mu.login = login");
+ Query query = entityManager.createQuery("from MagalieUser mu where mu.login = :login");
query.setParameter("login", login);
List<MagalieUser> resultList = query.getResultList();
MagalieUser onlyElement = Iterables.getOnlyElement(resultList, null);
1
0
26 Mar '13
Author: bleny
Date: 2013-03-26 11:18:13 +0100 (Tue, 26 Mar 2013)
New Revision: 40
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
renaming packages and some classes
Added:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteErrorJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java
Removed:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/JpaUtil.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/Sites.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StoredArticles.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaMagalieUserDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaRequestedArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaStoredArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractJpaEntity.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/FulfilKanbanService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieBarcodeService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/RequestedItemService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/WithdrawArticleFromSiteTask.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/AbstractMagalieServiceTest.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/JpaEntityManagerRule.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/MagalieFixtures.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/ArticleStorageServiceTest.java
trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/RequestedItemServiceTest.java
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/SiteError.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/RequiredDriverLicenceException.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/UnavailableArticleException.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java
trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/JpaUtil.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/JpaUtil.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/JpaUtil.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,73 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hibernate.cfg.Environment;
-import org.hibernate.ejb.AvailableSettings;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import java.io.File;
-import java.util.Collections;
-import java.util.Map;
-
-public class JpaUtil {
-
- private static final Log log = LogFactory.getLog(JpaUtil.class);
-
- private JpaUtil() {}
-
- protected static final ImmutableMap<String, String> JPA_H2_CONFIG =
- ImmutableMap.of(
- AvailableSettings.JDBC_DRIVER, org.h2.Driver.class.getName(),
- AvailableSettings.JDBC_USER, "sa",
- AvailableSettings.JDBC_PASSWORD, "",
- Environment.DIALECT, org.hibernate.dialect.H2Dialect.class.getName(),
- Environment.HBM2DDL_AUTO, "create"
- );
-
- public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context) {
-
- EntityManagerFactory tempEntityManagerFactory =
- createTempEntityManagerFactory(
- persistenceUnitName,
- context, Collections.<String, String>emptyMap());
-
- return tempEntityManagerFactory;
-
- }
-
- public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context, Map<String, String> jpaParameters) {
-
- Map<String, String> allJpaParameters = Maps.newHashMap();
-
- allJpaParameters.putAll(jpaParameters);
-
- allJpaParameters.putAll(JPA_H2_CONFIG);
-
- File tempDirFile = SystemUtils.getJavaIoTmpDir();
-
- File databaseFile = new File(tempDirFile, context);
-
- String h2dataPath = databaseFile.getAbsolutePath() + File.separator + "h2data";
-
- String jdbcUrl = "jdbc:h2:file:" + h2dataPath;
-
- allJpaParameters.put(AvailableSettings.JDBC_URL, jdbcUrl);
-
- if (log.isTraceEnabled()) {
- log.trace("will store H2 data in " + h2dataPath);
- log.trace("jdbc url is\n" + jdbcUrl);
- log.trace("allJpaParameters = " + allJpaParameters);
- }
-
- EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory(persistenceUnitName, allJpaParameters);
-
- return entityManagerFactory;
-
- }
-
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,41 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.google.common.collect.Maps;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.config.ApplicationConfig;
-import org.nuiton.util.config.ArgumentsParserException;
-
-import java.util.Map;
-import java.util.Properties;
-
-public class MagalieApplicationConfig {
-
- private static final Log log = LogFactory.getLog(MagalieApplicationConfig.class);
-
- protected ApplicationConfig applicationConfig;
-
- public MagalieApplicationConfig() {
- applicationConfig = new ApplicationConfig();
- applicationConfig.loadDefaultOptions(MagalieConfigOption.values());
- applicationConfig.setConfigFileName("magalie.properties");
- try {
- applicationConfig.parse();
- } catch (ArgumentsParserException e) {
- throw new MagalieTechnicalException(e);
- }
- if (log.isDebugEnabled()) {
- log.debug("parsed options in config file" + applicationConfig.getOptions());
- }
- }
-
- public Map<String, String> getJpaParameters() {
- Map<String, String> jpaParameters = Maps.newHashMap();
- Properties hibernateProperties = applicationConfig.getOptionStartsWith("hibernate");
- jpaParameters.putAll((Map) hibernateProperties);
- Properties jpaProperties = applicationConfig.getOptionStartsWith("javax.persistence");
- jpaParameters.putAll((Map) jpaProperties);
- return jpaParameters;
- }
-
-}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,41 @@
+package com.franciaflex.magalie;
+
+import com.google.common.collect.Maps;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.util.config.ApplicationConfig;
+import org.nuiton.util.config.ArgumentsParserException;
+
+import java.util.Map;
+import java.util.Properties;
+
+public class MagalieApplicationConfig {
+
+ private static final Log log = LogFactory.getLog(MagalieApplicationConfig.class);
+
+ protected ApplicationConfig applicationConfig;
+
+ public MagalieApplicationConfig() {
+ applicationConfig = new ApplicationConfig();
+ applicationConfig.loadDefaultOptions(MagalieConfigOption.values());
+ applicationConfig.setConfigFileName("magalie.properties");
+ try {
+ applicationConfig.parse();
+ } catch (ArgumentsParserException e) {
+ throw new MagalieTechnicalException(e);
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("parsed options in config file" + applicationConfig.getOptions());
+ }
+ }
+
+ public Map<String, String> getJpaParameters() {
+ Map<String, String> jpaParameters = Maps.newHashMap();
+ Properties hibernateProperties = applicationConfig.getOptionStartsWith("hibernate");
+ jpaParameters.putAll((Map) hibernateProperties);
+ Properties jpaProperties = applicationConfig.getOptionStartsWith("javax.persistence");
+ jpaParameters.putAll((Map) jpaProperties);
+ return jpaParameters;
+ }
+
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,90 +0,0 @@
-package com.franciaflex.magalie;
-
-import org.nuiton.util.config.ConfigOptionDef;
-
-/**
- * @author bleny
- */
-public enum MagalieConfigOption implements ConfigOptionDef {
-
- SMTP_HOST(
- "smtp.host",
- "Nom d'hôte du serveur SMTP",
- "", String.class),
-
- SMTP_PORT(
- "smtp.port",
- "Le port du serveur SMTP",
- "25", Integer.class),
-
- SMTP_FROM(
- "smtp.from",
- "L'adresse d'expéditeur pour les mails de notifications",
- "", String.class),
-
- DEV_MODE(
- "devMode",
- "Mode développement, court-circuite l'envoi de mail",
- "true", Boolean.class),
-
- ;
-
- protected final String key;
- protected final String description;
- protected final Class<?> type;
- protected String defaultValue;
-
- private MagalieConfigOption(String key, String description,
- String defaultValue, Class<?> type) {
- this.key = key;
- this.description = description;
- this.defaultValue = defaultValue;
- this.type = type;
- }
-
- @Override
- public String getKey() {
- return key;
- }
-
- @Override
- public Class<?> getType() {
- return type;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public String getDefaultValue() {
- return defaultValue;
- }
-
- @Override
- public boolean isTransient() {
- return false;
- }
-
- @Override
- public boolean isFinal() {
- return false;
- }
-
- @Override
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- @Override
- public void setTransient(boolean isTransient) {
- // Nothing to do
- }
-
- @Override
- public void setFinal(boolean isFinal) {
- // Nothing to do
- }
-
-}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,90 @@
+package com.franciaflex.magalie;
+
+import org.nuiton.util.config.ConfigOptionDef;
+
+/**
+ * @author bleny
+ */
+public enum MagalieConfigOption implements ConfigOptionDef {
+
+ SMTP_HOST(
+ "smtp.host",
+ "Nom d'hôte du serveur SMTP",
+ "", String.class),
+
+ SMTP_PORT(
+ "smtp.port",
+ "Le port du serveur SMTP",
+ "25", Integer.class),
+
+ SMTP_FROM(
+ "smtp.from",
+ "L'adresse d'expéditeur pour les mails de notifications",
+ "", String.class),
+
+ DEV_MODE(
+ "devMode",
+ "Mode développement, court-circuite l'envoi de mail",
+ "true", Boolean.class),
+
+ ;
+
+ protected final String key;
+ protected final String description;
+ protected final Class<?> type;
+ protected String defaultValue;
+
+ private MagalieConfigOption(String key, String description,
+ String defaultValue, Class<?> type) {
+ this.key = key;
+ this.description = description;
+ this.defaultValue = defaultValue;
+ this.type = type;
+ }
+
+ @Override
+ public String getKey() {
+ return key;
+ }
+
+ @Override
+ public Class<?> getType() {
+ return type;
+ }
+
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @Override
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+
+ @Override
+ public boolean isTransient() {
+ return false;
+ }
+
+ @Override
+ public boolean isFinal() {
+ return false;
+ }
+
+ @Override
+ public void setDefaultValue(String defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+
+ @Override
+ public void setTransient(boolean isTransient) {
+ // Nothing to do
+ }
+
+ @Override
+ public void setFinal(boolean isFinal) {
+ // Nothing to do
+ }
+
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,19 +0,0 @@
-package com.franciaflex.magalie;
-
-public class MagalieTechnicalException extends RuntimeException {
-
- public MagalieTechnicalException() {
- }
-
- public MagalieTechnicalException(String message) {
- super(message);
- }
-
- public MagalieTechnicalException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public MagalieTechnicalException(Throwable cause) {
- super(cause);
- }
-}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,19 @@
+package com.franciaflex.magalie;
+
+public class MagalieTechnicalException extends RuntimeException {
+
+ public MagalieTechnicalException() {
+ }
+
+ public MagalieTechnicalException(String message) {
+ super(message);
+ }
+
+ public MagalieTechnicalException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public MagalieTechnicalException(Throwable cause) {
+ super(cause);
+ }
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/Sites.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/Sites.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/Sites.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,69 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.entity.Site;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
-import java.util.Collection;
-import java.util.Comparator;
-
-public class Sites {
-
- protected static class SiteRequireDriverLicensePredicate implements Predicate<Site> {
-
- @Override
- public boolean apply(Site site) {
- return site.isDriverLicenseRequired();
- }
- }
-
- protected static class AccessibleSitePredicate implements Predicate<Site> {
-
- protected MagalieUser magalieUser;
-
- public AccessibleSitePredicate(MagalieUser magalieUser) {
- this.magalieUser = magalieUser;
- }
-
- @Override
- public boolean apply(Site site) {
- boolean isSiteAccessible = magalieUser.isDriverLicenseOwner()
- || ! site.isDriverLicenseRequired();
- return isSiteAccessible;
- }
-
- }
-
- protected static class SiteRequiringDriverLicenseFirstComparator implements Comparator<Site> {
-
- @Override
- public int compare(Site site1, Site site2) {
- boolean site1RequireDriverLicense = siteRequireDriverLicensePredicate().apply(site1);
- boolean site2RequireDriverLicense = siteRequireDriverLicensePredicate().apply(site2);
- if (site1RequireDriverLicense && ! site2RequireDriverLicense) {
- return -1;
- } else if ( ! site1RequireDriverLicense && site2RequireDriverLicense) {
- return +1;
- } else {
- return 0;
- }
- }
- }
-
- public static Predicate<Site> accessibleSitePredicate(MagalieUser magalieUser) {
- return new AccessibleSitePredicate(magalieUser);
- }
-
- public static Predicate<Site> siteRequireDriverLicensePredicate() {
- return new SiteRequireDriverLicensePredicate();
- }
-
- public static Comparator<Site> siteRequiringDriverLicenseFirstComparator() {
- return new SiteRequiringDriverLicenseFirstComparator();
- }
-
- public static Predicate<Site> siteIsNotReportedInError(Collection<Site> allSitesInError) {
- return Predicates.not(Predicates.in(allSitesInError));
- }
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,38 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.StorageMovement;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
-public class StorageMovements {
-
- protected static class GetArticleFunction implements Function<StorageMovement, Article> {
-
- @Override
- public Article apply(StorageMovement storageMovement) {
- return storageMovement.getArticle();
- }
- }
-
- protected static class StorageMovementIsConfirmedPredicate implements Predicate<StorageMovement> {
-
- @Override
- public boolean apply(StorageMovement storageMovement) {
- return storageMovement.isConfirmed();
- }
- }
-
- public static Function<StorageMovement, Article> getArticleFunction() {
- return new GetArticleFunction();
- }
-
- public static Predicate<StorageMovement> storageMovementIsConfirmed() {
- return new StorageMovementIsConfirmedPredicate();
- }
-
- public static Predicate<StorageMovement> storageMovementIsNotConfirmed() {
- return Predicates.not(storageMovementIsConfirmed());
- }
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StoredArticles.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StoredArticles.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StoredArticles.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,125 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.entity.Site;
-import com.franciaflex.magalie.entity.StoredArticle;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Ordering;
-
-import java.util.Collection;
-import java.util.Comparator;
-
-public class StoredArticles {
-
- protected static class FixedSiteForArticleFirst implements Comparator<StoredArticle> {
-
- protected Article article;
-
- public FixedSiteForArticleFirst(Article article) {
- this.article = article;
- }
-
- @Override
- public int compare(StoredArticle o1, StoredArticle o2) {
- if (o1.getSite().equals(article.getFixedSite())) {
- return -1;
- } else if (o2.getSite().equals(article.getFixedSite())) {
- return +1;
- }
- return 0;
- }
-
- }
-
- protected static class SiteWithHighestQuantityFirst implements Comparator<StoredArticle> {
-
- @Override
- public int compare(StoredArticle o1, StoredArticle o2) {
- return Double.compare(o1.getQuantity(), o2.getQuantity());
- }
-
- }
-
- protected static class AccessibleSiteFirst implements Comparator<StoredArticle> {
-
- protected Predicate<StoredArticle> articleStoredInAccessibleSitePredicate;
-
- public AccessibleSiteFirst(MagalieUser magalieUser) {
- articleStoredInAccessibleSitePredicate =
- articleStoredInAccessibleSitePredicate(magalieUser);
- }
-
- @Override
- public int compare(StoredArticle o1, StoredArticle o2) {
- boolean isSite1Accessible = articleStoredInAccessibleSitePredicate.apply(o1);
- boolean isSite2Accessible = articleStoredInAccessibleSitePredicate.apply(o2);
- if (isSite1Accessible && ! isSite2Accessible) {
- return -1;
- } else if ( ! isSite1Accessible && isSite2Accessible) {
- return 1;
- } else {
- return 0;
- }
- }
-
- }
-
- protected static class GetSiteFunction implements Function<StoredArticle, Site> {
-
- @Override
- public Site apply(StoredArticle storedArticle) {
- return storedArticle.getSite();
- }
- }
-
- protected static class ArticleStoredInSitesRequiringDriverLicenseFirstComparator implements Comparator<StoredArticle> {
-
- @Override
- public int compare(StoredArticle o1, StoredArticle o2) {
- return Sites.siteRequiringDriverLicenseFirstComparator().compare(o1.getSite(), o2.getSite());
- }
- }
-
- public static Comparator<StoredArticle> siteWithHighestQuantityFirst() {
- return new SiteWithHighestQuantityFirst();
- }
-
- public static Comparator<StoredArticle> siteWithLowestQuantityFirstComparator() {
- return Ordering.from(new SiteWithHighestQuantityFirst()).reverse();
- }
-
-
- public static Comparator<StoredArticle> accessibleSiteFirstComparator(MagalieUser magalieUser) {
- return new AccessibleSiteFirst(magalieUser);
- }
-
- public static Comparator<StoredArticle> fixedSiteForArticleFirstComparator(Article article) {
- return new FixedSiteForArticleFirst(article);
- }
-
- public static Comparator<StoredArticle> fixedSiteForArticleLastComparator(Article article) {
- return Ordering.from(new FixedSiteForArticleFirst(article)).reverse();
- }
-
- public static Function<StoredArticle, Site> getSiteFunction() {
- return new GetSiteFunction();
- }
-
- public static Predicate<StoredArticle> articleStoredInAccessibleSitePredicate(MagalieUser magalieUser) {
- Predicate<StoredArticle> predicate = Predicates.compose(
- Sites.accessibleSitePredicate(magalieUser),
- getSiteFunction());
- return predicate;
- }
-
- public static Comparator<StoredArticle> articleStoredInSitesRequiringDriverLicenseFirstComparator() {
- return new ArticleStoredInSitesRequiringDriverLicenseFirstComparator();
- }
-
- public static Predicate<StoredArticle> articleNotStoredInSiteReportedInError(Collection<Site> allSitesInError) {
- return Predicates.compose(Sites.siteIsNotReportedInError(allSitesInError), getSiteFunction());
- }
-}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java (from rev 34, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/JpaUtil.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaUtil.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,73 @@
+package com.franciaflex.magalie.persistence;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.cfg.Environment;
+import org.hibernate.ejb.AvailableSettings;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import java.io.File;
+import java.util.Collections;
+import java.util.Map;
+
+public class JpaUtil {
+
+ private static final Log log = LogFactory.getLog(JpaUtil.class);
+
+ private JpaUtil() {}
+
+ protected static final ImmutableMap<String, String> JPA_H2_CONFIG =
+ ImmutableMap.of(
+ AvailableSettings.JDBC_DRIVER, org.h2.Driver.class.getName(),
+ AvailableSettings.JDBC_USER, "sa",
+ AvailableSettings.JDBC_PASSWORD, "",
+ Environment.DIALECT, org.hibernate.dialect.H2Dialect.class.getName(),
+ Environment.HBM2DDL_AUTO, "create"
+ );
+
+ public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context) {
+
+ EntityManagerFactory tempEntityManagerFactory =
+ createTempEntityManagerFactory(
+ persistenceUnitName,
+ context, Collections.<String, String>emptyMap());
+
+ return tempEntityManagerFactory;
+
+ }
+
+ public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context, Map<String, String> jpaParameters) {
+
+ Map<String, String> allJpaParameters = Maps.newHashMap();
+
+ allJpaParameters.putAll(jpaParameters);
+
+ allJpaParameters.putAll(JPA_H2_CONFIG);
+
+ File tempDirFile = SystemUtils.getJavaIoTmpDir();
+
+ File databaseFile = new File(tempDirFile, context);
+
+ String h2dataPath = databaseFile.getAbsolutePath() + File.separator + "h2data";
+
+ String jdbcUrl = "jdbc:h2:file:" + h2dataPath;
+
+ allJpaParameters.put(AvailableSettings.JDBC_URL, jdbcUrl);
+
+ if (log.isTraceEnabled()) {
+ log.trace("will store H2 data in " + h2dataPath);
+ log.trace("jdbc url is\n" + jdbcUrl);
+ log.trace("allJpaParameters = " + allJpaParameters);
+ }
+
+ EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory(persistenceUnitName, allJpaParameters);
+
+ return entityManagerFactory;
+
+ }
+
+}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java (from rev 34, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/Sites.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,69 @@
+package com.franciaflex.magalie.persistence;
+
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+
+import java.util.Collection;
+import java.util.Comparator;
+
+public class Sites {
+
+ protected static class SiteRequireDriverLicensePredicate implements Predicate<Site> {
+
+ @Override
+ public boolean apply(Site site) {
+ return site.isDriverLicenseRequired();
+ }
+ }
+
+ protected static class AccessibleSitePredicate implements Predicate<Site> {
+
+ protected MagalieUser magalieUser;
+
+ public AccessibleSitePredicate(MagalieUser magalieUser) {
+ this.magalieUser = magalieUser;
+ }
+
+ @Override
+ public boolean apply(Site site) {
+ boolean isSiteAccessible = magalieUser.isDriverLicenseOwner()
+ || ! site.isDriverLicenseRequired();
+ return isSiteAccessible;
+ }
+
+ }
+
+ protected static class SiteRequiringDriverLicenseFirstComparator implements Comparator<Site> {
+
+ @Override
+ public int compare(Site site1, Site site2) {
+ boolean site1RequireDriverLicense = siteRequireDriverLicensePredicate().apply(site1);
+ boolean site2RequireDriverLicense = siteRequireDriverLicensePredicate().apply(site2);
+ if (site1RequireDriverLicense && ! site2RequireDriverLicense) {
+ return -1;
+ } else if ( ! site1RequireDriverLicense && site2RequireDriverLicense) {
+ return +1;
+ } else {
+ return 0;
+ }
+ }
+ }
+
+ public static Predicate<Site> accessibleSitePredicate(MagalieUser magalieUser) {
+ return new AccessibleSitePredicate(magalieUser);
+ }
+
+ public static Predicate<Site> siteRequireDriverLicensePredicate() {
+ return new SiteRequireDriverLicensePredicate();
+ }
+
+ public static Comparator<Site> siteRequiringDriverLicenseFirstComparator() {
+ return new SiteRequiringDriverLicenseFirstComparator();
+ }
+
+ public static Predicate<Site> siteIsNotReportedInError(Collection<Site> allSitesInError) {
+ return Predicates.not(Predicates.in(allSitesInError));
+ }
+}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java (from rev 38, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,38 @@
+package com.franciaflex.magalie.persistence;
+
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+
+public class StorageMovements {
+
+ protected static class GetArticleFunction implements Function<StorageMovement, Article> {
+
+ @Override
+ public Article apply(StorageMovement storageMovement) {
+ return storageMovement.getArticle();
+ }
+ }
+
+ protected static class StorageMovementIsConfirmedPredicate implements Predicate<StorageMovement> {
+
+ @Override
+ public boolean apply(StorageMovement storageMovement) {
+ return storageMovement.isConfirmed();
+ }
+ }
+
+ public static Function<StorageMovement, Article> getArticleFunction() {
+ return new GetArticleFunction();
+ }
+
+ public static Predicate<StorageMovement> storageMovementIsConfirmed() {
+ return new StorageMovementIsConfirmedPredicate();
+ }
+
+ public static Predicate<StorageMovement> storageMovementIsNotConfirmed() {
+ return Predicates.not(storageMovementIsConfirmed());
+ }
+}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java (from rev 34, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StoredArticles.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,125 @@
+package com.franciaflex.magalie.persistence;
+
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Ordering;
+
+import java.util.Collection;
+import java.util.Comparator;
+
+public class StoredArticles {
+
+ protected static class FixedSiteForArticleFirst implements Comparator<StoredArticle> {
+
+ protected Article article;
+
+ public FixedSiteForArticleFirst(Article article) {
+ this.article = article;
+ }
+
+ @Override
+ public int compare(StoredArticle o1, StoredArticle o2) {
+ if (o1.getSite().equals(article.getFixedSite())) {
+ return -1;
+ } else if (o2.getSite().equals(article.getFixedSite())) {
+ return +1;
+ }
+ return 0;
+ }
+
+ }
+
+ protected static class SiteWithHighestQuantityFirst implements Comparator<StoredArticle> {
+
+ @Override
+ public int compare(StoredArticle o1, StoredArticle o2) {
+ return Double.compare(o1.getQuantity(), o2.getQuantity());
+ }
+
+ }
+
+ protected static class AccessibleSiteFirst implements Comparator<StoredArticle> {
+
+ protected Predicate<StoredArticle> articleStoredInAccessibleSitePredicate;
+
+ public AccessibleSiteFirst(MagalieUser magalieUser) {
+ articleStoredInAccessibleSitePredicate =
+ articleStoredInAccessibleSitePredicate(magalieUser);
+ }
+
+ @Override
+ public int compare(StoredArticle o1, StoredArticle o2) {
+ boolean isSite1Accessible = articleStoredInAccessibleSitePredicate.apply(o1);
+ boolean isSite2Accessible = articleStoredInAccessibleSitePredicate.apply(o2);
+ if (isSite1Accessible && ! isSite2Accessible) {
+ return -1;
+ } else if ( ! isSite1Accessible && isSite2Accessible) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+
+ }
+
+ protected static class GetSiteFunction implements Function<StoredArticle, Site> {
+
+ @Override
+ public Site apply(StoredArticle storedArticle) {
+ return storedArticle.getSite();
+ }
+ }
+
+ protected static class ArticleStoredInSitesRequiringDriverLicenseFirstComparator implements Comparator<StoredArticle> {
+
+ @Override
+ public int compare(StoredArticle o1, StoredArticle o2) {
+ return Sites.siteRequiringDriverLicenseFirstComparator().compare(o1.getSite(), o2.getSite());
+ }
+ }
+
+ public static Comparator<StoredArticle> siteWithHighestQuantityFirst() {
+ return new SiteWithHighestQuantityFirst();
+ }
+
+ public static Comparator<StoredArticle> siteWithLowestQuantityFirstComparator() {
+ return Ordering.from(new SiteWithHighestQuantityFirst()).reverse();
+ }
+
+
+ public static Comparator<StoredArticle> accessibleSiteFirstComparator(MagalieUser magalieUser) {
+ return new AccessibleSiteFirst(magalieUser);
+ }
+
+ public static Comparator<StoredArticle> fixedSiteForArticleFirstComparator(Article article) {
+ return new FixedSiteForArticleFirst(article);
+ }
+
+ public static Comparator<StoredArticle> fixedSiteForArticleLastComparator(Article article) {
+ return Ordering.from(new FixedSiteForArticleFirst(article)).reverse();
+ }
+
+ public static Function<StoredArticle, Site> getSiteFunction() {
+ return new GetSiteFunction();
+ }
+
+ public static Predicate<StoredArticle> articleStoredInAccessibleSitePredicate(MagalieUser magalieUser) {
+ Predicate<StoredArticle> predicate = Predicates.compose(
+ Sites.accessibleSitePredicate(magalieUser),
+ getSiteFunction());
+ return predicate;
+ }
+
+ public static Comparator<StoredArticle> articleStoredInSitesRequiringDriverLicenseFirstComparator() {
+ return new ArticleStoredInSitesRequiringDriverLicenseFirstComparator();
+ }
+
+ public static Predicate<StoredArticle> articleNotStoredInSiteReportedInError(Collection<Site> allSitesInError) {
+ return Predicates.compose(Sites.siteIsNotReportedInError(allSitesInError), getSiteFunction());
+ }
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/ArticleDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,10 +0,0 @@
-package com.franciaflex.magalie.dao;
-
-import com.franciaflex.magalie.entity.Article;
-
-/**
- * @author bleny
- */
-public interface ArticleDao extends Dao<Article> {
-
-}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java (from rev 36, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/ArticleDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,12 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.Article;
+
+/**
+ * @author bleny
+ */
+public interface ArticleDao extends Dao<Article> {
+
+ Article findByCode(String articleCode);
+
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/Dao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,18 +0,0 @@
-package com.franciaflex.magalie.dao;
-
-import com.franciaflex.magalie.entity.AbstractJpaEntity;
-
-public interface Dao<E extends AbstractJpaEntity> {
-
- E findById(String id);
-
- void persist(E entity);
-
- E merge(E entity);
-
- void remove(E entity);
-
- boolean contains(E entity);
-
- void commit();
-}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java (from rev 32, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/Dao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/Dao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,17 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.AbstractEntity;
+
+public interface Dao<E extends AbstractEntity> {
+
+ E findById(String id);
+
+ void persist(E entity);
+
+ E merge(E entity);
+
+ void remove(E entity);
+
+ boolean contains(E entity);
+
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/MagalieUserDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,10 +0,0 @@
-package com.franciaflex.magalie.dao;
-
-import com.franciaflex.magalie.entity.MagalieUser;
-
-/**
- * @author bleny
- */
-public interface MagalieUserDao extends Dao<MagalieUser> {
-
-}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java (from rev 37, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/MagalieUserDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,16 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+
+import java.util.List;
+
+/**
+ * @author bleny
+ */
+public interface MagalieUserDao extends Dao<MagalieUser> {
+
+ MagalieUser findByLogin(String login);
+
+ List<MagalieUser> findAll();
+
+}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/RequestedArticleDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,6 +1,6 @@
-package com.franciaflex.magalie.dao;
+package com.franciaflex.magalie.persistence.dao;
-import com.franciaflex.magalie.entity.RequestedArticle;
+import com.franciaflex.magalie.persistence.entity.RequestedArticle;
/**
* @author bleny
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java (from rev 39, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,19 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.franciaflex.magalie.persistence.entity.SiteError;
+
+import java.util.List;
+
+/**
+ * @author bleny
+ */
+public interface SiteErrorDao extends Dao<SiteError> {
+
+ SiteError findBySite(Site site);
+
+ List<Site> getAllSitesInError();
+
+ List<SiteError> findAll();
+
+}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java (from rev 38, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/StorageMovementDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,17 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+
+import java.util.List;
+
+/**
+ * @author bleny
+ */
+public interface StorageMovementDao extends Dao<StorageMovement> {
+
+ List<StorageMovement> findAllByArticle(Article article);
+
+ List<StorageMovement> findAll();
+
+}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java (from rev 36, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/StorageMovementOrderDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,7 @@
+package com.franciaflex.magalie.persistence.dao;
+
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
+
+public interface StorageMovementOrderDao extends Dao<StorageMovementOrder> {
+
+}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/StoredArticleDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,10 +1,9 @@
-package com.franciaflex.magalie.dao;
+package com.franciaflex.magalie.persistence.dao;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.StoredArticle;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
import java.util.List;
-import java.util.Set;
public interface StoredArticleDao extends Dao<StoredArticle> {
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/AbstractJpaDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,48 +0,0 @@
-package com.franciaflex.magalie.dao.jpa;
-
-import com.franciaflex.magalie.dao.Dao;
-import com.franciaflex.magalie.entity.AbstractJpaEntity;
-
-import javax.persistence.EntityManager;
-
-public abstract class AbstractJpaDao<E extends AbstractJpaEntity> implements Dao<E> {
-
- protected EntityManager entityManager;
-
- public AbstractJpaDao(EntityManager entityManager) {
- this.entityManager = entityManager;
- }
-
- protected abstract Class<E> getEntityClass();
-
- @Override
- public E findById(String id) {
- E entity = entityManager.find(getEntityClass(), id);
- return entity;
- }
-
- @Override
- public void persist(E entity) {
- entityManager.persist(entity);
- }
-
- @Override
- public E merge(E entity) {
- return entityManager.merge(entity);
- }
-
- @Override
- public void remove(E entity) {
- entityManager.remove(entity);
- }
-
- @Override
- public boolean contains(E entity) {
- return entityManager.contains(entity);
- }
-
- @Override
- public void commit() {
- entityManager.getTransaction().commit();
- }
-}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java (from rev 34, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/AbstractJpaDao.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,48 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.Dao;
+import com.franciaflex.magalie.persistence.entity.AbstractEntity;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+
+public abstract class AbstractJpaDao<E extends AbstractEntity> implements Dao<E> {
+
+ protected EntityManager entityManager;
+
+ public AbstractJpaDao(EntityManager entityManager) {
+ this.entityManager = entityManager;
+ }
+
+ protected abstract Class<E> getEntityClass();
+
+ @Override
+ public E findById(String id) {
+ E entity = entityManager.find(getEntityClass(), id);
+ return entity;
+ }
+
+ @Override
+ public void persist(E entity) {
+ EntityTransaction transaction = entityManager.getTransaction();
+ transaction.begin();
+ entityManager.persist(entity);
+ transaction.commit();
+ }
+
+ @Override
+ public E merge(E entity) {
+ return entityManager.merge(entity);
+ }
+
+ @Override
+ public void remove(E entity) {
+ entityManager.remove(entity);
+ }
+
+ @Override
+ public boolean contains(E entity) {
+ return entityManager.contains(entity);
+ }
+
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/ArticleJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,32 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.ArticleDao;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.google.common.collect.Iterables;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+public class ArticleJpaDao extends AbstractJpaDao<Article> implements ArticleDao {
+
+ public ArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<Article> getEntityClass() {
+ return Article.class;
+ }
+
+ @Override
+ public Article findByCode(String articleCode) {
+ Query query = entityManager.createQuery("from article a where a.code = :code");
+ query.setParameter("code", articleCode);
+ Article article = (Article)
+ Iterables.getOnlyElement(
+ query.getResultList(),
+ null
+ );
+ return article;
+ }
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaArticleDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaArticleDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,18 +0,0 @@
-package com.franciaflex.magalie.dao.jpa;
-
-import com.franciaflex.magalie.dao.ArticleDao;
-import com.franciaflex.magalie.entity.Article;
-
-import javax.persistence.EntityManager;
-
-public class JpaArticleDao extends AbstractJpaDao<Article> implements ArticleDao {
-
- public JpaArticleDao(EntityManager entityManager) {
- super(entityManager);
- }
-
- @Override
- protected Class<Article> getEntityClass() {
- return Article.class;
- }
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaMagalieUserDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaMagalieUserDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaMagalieUserDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,18 +0,0 @@
-package com.franciaflex.magalie.dao.jpa;
-
-import com.franciaflex.magalie.dao.MagalieUserDao;
-import com.franciaflex.magalie.entity.MagalieUser;
-
-import javax.persistence.EntityManager;
-
-public class JpaMagalieUserDao extends AbstractJpaDao<MagalieUser> implements MagalieUserDao {
-
- public JpaMagalieUserDao(EntityManager entityManager) {
- super(entityManager);
- }
-
- @Override
- protected Class<MagalieUser> getEntityClass() {
- return MagalieUser.class;
- }
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaRequestedArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaRequestedArticleDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaRequestedArticleDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,18 +0,0 @@
-package com.franciaflex.magalie.dao.jpa;
-
-import com.franciaflex.magalie.dao.RequestedArticleDao;
-import com.franciaflex.magalie.entity.RequestedArticle;
-
-import javax.persistence.EntityManager;
-
-public class JpaRequestedArticleDao extends AbstractJpaDao<RequestedArticle> implements RequestedArticleDao {
-
- public JpaRequestedArticleDao(EntityManager entityManager) {
- super(entityManager);
- }
-
- @Override
- protected Class<RequestedArticle> getEntityClass() {
- return RequestedArticle.class;
- }
-}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaStoredArticleDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaStoredArticleDao.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/JpaStoredArticleDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,29 +0,0 @@
-package com.franciaflex.magalie.dao.jpa;
-
-import com.franciaflex.magalie.dao.StoredArticleDao;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.StoredArticle;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.util.List;
-
-public class JpaStoredArticleDao extends AbstractJpaDao<StoredArticle> implements StoredArticleDao {
-
- public JpaStoredArticleDao(EntityManager entityManager) {
- super(entityManager);
- }
-
- @Override
- protected Class<StoredArticle> getEntityClass() {
- return StoredArticle.class;
- }
-
- @Override
- public List<StoredArticle> findAllForArticle(Article article) {
- Query query = entityManager.createQuery("from StoredArticle sa where sa.article = :article");
- query.setParameter("article", article);
- List resultList = query.getResultList();
- return resultList;
- }
-}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,37 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.google.common.collect.Iterables;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+public class MagalieUserJpaDao extends AbstractJpaDao<MagalieUser> implements MagalieUserDao {
+
+ public MagalieUserJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<MagalieUser> getEntityClass() {
+ return MagalieUser.class;
+ }
+
+ @Override
+ public MagalieUser findByLogin(String login) {
+ Query query = entityManager.createQuery("from magalieUser mu where mu.login = login");
+ query.setParameter("login", login);
+ List<MagalieUser> resultList = query.getResultList();
+ MagalieUser onlyElement = Iterables.getOnlyElement(resultList, null);
+ return onlyElement;
+ }
+
+ @Override
+ public List<MagalieUser> findAll() {
+ Query query = entityManager.createQuery("from MagalieUser mu order by mu.login");
+ List<MagalieUser> resultList = query.getResultList();
+ return resultList;
+ }
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,18 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
+import com.franciaflex.magalie.persistence.entity.RequestedArticle;
+
+import javax.persistence.EntityManager;
+
+public class RequestedArticleJpaDao extends AbstractJpaDao<RequestedArticle> implements RequestedArticleDao {
+
+ public RequestedArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<RequestedArticle> getEntityClass() {
+ return RequestedArticle.class;
+ }
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteErrorJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteErrorJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteErrorJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,47 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.franciaflex.magalie.persistence.entity.SiteError;
+import com.google.common.collect.Iterables;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+public class SiteErrorJpaDao extends AbstractJpaDao<SiteError> implements SiteErrorDao {
+
+ public SiteErrorJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<SiteError> getEntityClass() {
+ return SiteError.class;
+ }
+
+ @Override
+ public SiteError findBySite(Site site) {
+ Query query = entityManager.createQuery("from SiteError se where se.site = :site");
+ query.setParameter("site", site);
+ SiteError siteError = (SiteError)
+ Iterables.getOnlyElement(
+ query.getResultList(),
+ null);
+ return siteError;
+ }
+
+ @Override
+ public List<Site> getAllSitesInError() {
+ Query query = entityManager.createQuery("select se.site from SiteError se");
+ List<Site> allSitesInError = query.getResultList();
+ return allSitesInError;
+ }
+
+ @Override
+ public List<SiteError> findAll() {
+ Query query = entityManager.createQuery("from SiteError se order by se.reportDate");
+ List<SiteError> all = query.getResultList();
+ return all;
+ }
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,34 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+public class StorageMovementJpaDao extends AbstractJpaDao<StorageMovement> implements StorageMovementDao {
+
+ public StorageMovementJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<StorageMovement> getEntityClass() {
+ return StorageMovement.class;
+ }
+
+ @Override
+ public List<StorageMovement> findAllByArticle(Article article) {
+ Query query = entityManager.createQuery("from StorageMovement sm where sm.article = :article");
+ query.setParameter("article", article);
+ return query.getResultList();
+ }
+
+ @Override
+ public List<StorageMovement> findAll() {
+ Query query = entityManager.createQuery("from StorageMovement sm order by sm.orderDate");
+ return query.getResultList();
+ }
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,19 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
+
+import javax.persistence.EntityManager;
+
+public class StorageMovementOrderJpaDao extends AbstractJpaDao<StorageMovementOrder> implements StorageMovementOrderDao {
+
+ public StorageMovementOrderJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<StorageMovementOrder> getEntityClass() {
+ return StorageMovementOrder.class;
+ }
+
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,32 @@
+package com.franciaflex.magalie.persistence.dao.jpa;
+
+import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+
+public class StoredArticleJpaDao extends AbstractJpaDao<StoredArticle> implements StoredArticleDao {
+
+ public StoredArticleJpaDao(EntityManager entityManager) {
+ super(entityManager);
+ }
+
+ @Override
+ protected Class<StoredArticle> getEntityClass() {
+ return StoredArticle.class;
+ }
+
+ @Override
+ public List<StoredArticle> findAllForArticle(Article article) {
+ Query query = entityManager.createQuery("from StoredArticle sa where sa.article = :article");
+ query.setParameter("article", article);
+ List<StoredArticle> resultList = query.getResultList();
+ for (StoredArticle storedArticle : resultList) {
+ entityManager.detach(storedArticle);
+ }
+ return resultList;
+ }
+}
Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,30 @@
+package com.franciaflex.magalie.persistence.entity;
+
+import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public abstract class AbstractEntity {
+
+ public abstract String getId();
+
+ @Override
+ public boolean equals(Object o) {
+ String id = getId();
+ if (this == o) return true;
+ if (!(o instanceof AbstractEntity)) return false;
+ AbstractEntity that = (AbstractEntity) o;
+ if (id == null && that.getId() == null) return false;
+ if (!id.equals(that.getId())) return false;
+ return Objects.equal(id, that.getId());
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(getId());
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+}
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractJpaEntity.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/AbstractJpaEntity.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractJpaEntity.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,29 +0,0 @@
-package com.franciaflex.magalie.entity;
-
-import com.google.common.base.Objects;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-public abstract class AbstractJpaEntity {
-
- public abstract String getId();
-
- @Override
- public boolean equals(Object o) {
- String id = getId();
- if (this == o) return true;
- if (!(o instanceof AbstractJpaEntity)) return false;
- AbstractJpaEntity that = (AbstractJpaEntity) o;
- if (!id.equals(that.getId())) return false;
- return Objects.equal(id, that.getId());
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(getId());
- }
-
- @Override
- public String toString() {
- return ToStringBuilder.reflectionToString(this);
- }
-}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Article.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,11 +1,11 @@
-package com.franciaflex.magalie.entity;
+package com.franciaflex.magalie.persistence.entity;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
@Entity
-public class Article extends AbstractJpaEntity {
+public class Article extends AbstractEntity {
@Id
protected String id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/MagalieUser.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,10 +1,10 @@
-package com.franciaflex.magalie.entity;
+package com.franciaflex.magalie.persistence.entity;
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
-public class MagalieUser extends AbstractJpaEntity {
+public class MagalieUser extends AbstractEntity {
@Id
protected String id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/RequestedArticle.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,4 +1,4 @@
-package com.franciaflex.magalie.entity;
+package com.franciaflex.magalie.persistence.entity;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -6,7 +6,7 @@
import java.util.Date;
@Entity
-public class RequestedArticle extends AbstractJpaEntity {
+public class RequestedArticle extends AbstractEntity {
@Id
protected String id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/Site.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,4 +1,4 @@
-package com.franciaflex.magalie.entity;
+package com.franciaflex.magalie.persistence.entity;
import com.google.common.base.Joiner;
@@ -6,7 +6,7 @@
import javax.persistence.Id;
@Entity
-public class Site extends AbstractJpaEntity {
+public class Site extends AbstractEntity {
@Id
protected String id;
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/SiteError.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/SiteError.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/SiteError.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,4 +1,4 @@
-package com.franciaflex.magalie.entity;
+package com.franciaflex.magalie.persistence.entity;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -8,7 +8,7 @@
import java.util.Date;
@Entity
-public class SiteError extends AbstractJpaEntity {
+public class SiteError extends AbstractEntity {
@Id
@GeneratedValue
Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StorageMovement.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,91 +0,0 @@
-package com.franciaflex.magalie.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import java.util.Date;
-
-@Entity
-public class StorageMovement extends AbstractJpaEntity {
-
- @Id
- @GeneratedValue
- protected String id;
-
- @ManyToOne
- protected Site site;
-
- @ManyToOne
- protected Article article;
-
- @ManyToOne
- protected MagalieUser magalieUser;
-
- protected double quantity;
-
- protected Date orderDate;
-
- protected Date confirmDate;
-
- @Override
- 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;
- }
-}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java (from rev 36, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StorageMovement.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,111 @@
+package com.franciaflex.magalie.persistence.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import java.util.Date;
+
+@Entity
+public class StorageMovement extends AbstractEntity {
+
+ @Id
+ @GeneratedValue
+ protected String id;
+
+ @ManyToOne
+ protected Site site;
+
+ @ManyToOne
+ protected Article article;
+
+ @ManyToOne
+ protected MagalieUser magalieUser;
+
+ protected double quantity;
+
+ protected Date orderDate;
+
+ protected Date confirmDate;
+
+ @Override
+ 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;
+ }
+
+ public String getSiteId() {
+ return getSite().getId();
+ }
+
+ public boolean isDriverLicenseRequired() {
+ return getSite().isDriverLicenseRequired();
+ }
+
+ public String getStoreCode() {
+ return getSite().getStoreCode();
+ }
+
+ public String getLocationCode() {
+ return getSite().getLocationCode();
+ }
+
+ public String getSiteBarcode() {
+ return getSite().getBarcode();
+ }
+}
Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java (from rev 36, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StorageMovementOrder.java)
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java (rev 0)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,104 @@
+package com.franciaflex.magalie.persistence.entity;
+
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+import com.franciaflex.magalie.persistence.StorageMovements;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.Set;
+
+@Entity
+public class StorageMovementOrder extends AbstractEntity {
+
+ @Id
+ @GeneratedValue
+ protected String id;
+
+ @Override
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @OneToMany(cascade = CascadeType.ALL)
+ protected Set<StorageMovement> storageMovements;
+
+ public Set<StorageMovement> getStorageMovements() {
+ return storageMovements;
+ }
+
+ public void setStorageMovements(Set<StorageMovement> storageMovements) {
+ this.storageMovements = storageMovements;
+ }
+
+ public Set<StorageMovement> getSites() {
+ return storageMovements;
+ }
+
+ protected Set<Article> getArticles() {
+ Set<Article> articles =
+ Sets.newHashSet(
+ Iterables.transform(
+ getStorageMovements(),
+ StorageMovements.getArticleFunction()
+ )
+ );
+ return articles;
+ }
+
+ public Article getArticle() {
+ Article onlyElement = Iterables.getOnlyElement(getArticles());
+ return onlyElement;
+ }
+
+ public double getQuantity() {
+ double quantity = 0.;
+ for (StorageMovement storageMovement : storageMovements) {
+ quantity += storageMovement.getQuantity();
+ }
+ return quantity;
+ }
+
+ public void addStorageMovement(StorageMovement storageMovement) {
+ if (storageMovements == null) {
+ storageMovements = Sets.newLinkedHashSet();
+ }
+ storageMovements.add(storageMovement);
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/entity/StoredArticle.java 2013-03-21 13:55:30 UTC (rev 31)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,11 +1,11 @@
-package com.franciaflex.magalie.entity;
+package com.franciaflex.magalie.persistence.entity;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
@Entity
-public class StoredArticle extends AbstractJpaEntity {
+public class StoredArticle extends AbstractEntity {
@Id
protected String id;
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,228 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.StoredArticles;
-import com.franciaflex.magalie.dao.StorageMovementDao;
-import com.franciaflex.magalie.dao.StorageMovementOrderDao;
-import com.franciaflex.magalie.dao.StoredArticleDao;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.entity.Site;
-import com.franciaflex.magalie.entity.StorageMovement;
-import com.franciaflex.magalie.entity.StorageMovementOrder;
-import com.franciaflex.magalie.entity.StoredArticle;
-import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
-import com.franciaflex.magalie.services.exception.UnavailableArticleException;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Sets;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-public class ArticleStorageService implements MagalieService {
-
- private static final Log log = LogFactory.getLog(ArticleStorageService.class);
-
- protected MagalieServiceContext serviceContext;
-
- public void setServiceContext(MagalieServiceContext serviceContext) {
- this.serviceContext = serviceContext;
- }
-
- public StorageMovementTask withdrawArticle(MagalieUser magalieUser, Article article, double requestedQuantity) throws UnavailableArticleException, RequiredDriverLicenceException {
-
- Preconditions.checkNotNull(magalieUser);
-
- Preconditions.checkNotNull(article);
-
- Preconditions.checkArgument(requestedQuantity > 0.);
-
- double availableQuantity = getAvailableQuantity(article);
- UnavailableArticleException.throwIfRequestMoreThanAvailable(requestedQuantity, availableQuantity, article);
-
- double accessibleQuantity = getAccessibleQuantity(article, magalieUser);
- RequiredDriverLicenceException.throwIfRequestMoreThanAccessible(requestedQuantity, accessibleQuantity, magalieUser, article);
-
- if (log.isInfoEnabled()) {
- log.info("will process article request"
- + ": requested = " + requestedQuantity
- + ", accessible " + accessibleQuantity
- + ", available " + availableQuantity);
- }
-
- List<StoredArticle> storedArticles = getStoredArticles(article);
-
- Ordering<StoredArticle> storedArticlesOrdering =
- Ordering.compound(
- Lists.newArrayList(
- StoredArticles.fixedSiteForArticleLastComparator(article),
- StoredArticles.siteWithLowestQuantityFirstComparator(),
- StoredArticles.articleStoredInSitesRequiringDriverLicenseFirstComparator()
- )
- );
-
- Set<StoredArticle> sortedStoredArticles =
- Sets.newTreeSet(storedArticlesOrdering);
-
- Iterables.addAll(
- sortedStoredArticles,
- Iterables.filter(
- storedArticles,
- StoredArticles.articleStoredInAccessibleSitePredicate(magalieUser)
- )
- );
-
- StorageMovementOrder storageMovementOrder = new StorageMovementOrder();
-
- StorageMovementTask storageMovementTask = new StorageMovementTask(storageMovementOrder);
-
- double quantity = 0;
-
- Date orderDate = serviceContext.getNow();
-
- for (StoredArticle storedArticle : sortedStoredArticles) {
-
- double quantityLeft = requestedQuantity - quantity;
-
- double quantityInSite = storedArticle.getQuantity();
-
- double quantityWithdrawn = Math.min(quantityLeft, quantityInSite);
-
- quantity += quantityWithdrawn;
-
- StorageMovement newStorageMovement = new StorageMovement();
-
- newStorageMovement.setArticle(article);
-
- newStorageMovement.setOrderDate(orderDate);
-
- newStorageMovement.setMagalieUser(magalieUser);
-
- newStorageMovement.setSite(storedArticle.getSite());
-
- // we remove from the stock so negative number
- newStorageMovement.setQuantity( -1. * quantityWithdrawn);
-
- if (quantityWithdrawn > 0.) {
-
- storageMovementOrder.addStorageMovement(newStorageMovement);
-
- } else {
-
- storageMovementTask.addExtraStorageMovement(newStorageMovement);
-
- }
-
- }
-
- StorageMovementOrderDao dao = serviceContext.getStorageMovementOrderDao();
-
- dao.persist(storageMovementOrder);
-
- return storageMovementTask;
-
- }
-
- protected List<StoredArticle> getStoredArticles(Article article) {
-
- StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao();
-
- List<StoredArticle> storedArticles = storedArticleDao.findAllForArticle(article);
-
- // consider storage movements and compute actually available quantities
-
- StorageMovementDao storageMovementDao = serviceContext.getStorageMovementDao();
-
- List<StorageMovement> storageMovements = storageMovementDao.findAllByArticle(article);
-
- ImmutableMap<Site, StoredArticle> storedArticlesBySite =
- Maps.uniqueIndex(
- storedArticles,
- StoredArticles.getSiteFunction()
- );
-
- for (StorageMovement storageMovement : storageMovements) {
-
- Site site = storageMovement.getSite();
-
- StoredArticle storedArticle = storedArticlesBySite.get(site);
-
- double actualQuantity = storedArticle.getQuantity() + storageMovement.getQuantity();
-
- if (actualQuantity > 0.) {
-
- storedArticle.setQuantity(actualQuantity);
-
- } else {
-
- // site is empty, do not include it as a site where you can take an article
- storedArticles.remove(storedArticle);
-
- }
-
- }
-
- // exclude storageMovements reported in error
-
- SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class);
-
- List<Site> allSitesInError = siteErrorsService.getAllSitesInError();
-
- storedArticles =
- Lists.newArrayList(
- Iterables.filter(
- storedArticles,
- StoredArticles.articleNotStoredInSiteReportedInError(allSitesInError)
- )
- );
-
- return storedArticles;
-
- }
-
- protected double getAvailableQuantity(Article article) {
-
- List<StoredArticle> storedArticles = getStoredArticles(article);
-
- double availableQuantity = 0.;
-
- for (StoredArticle storedArticle : storedArticles) {
-
- availableQuantity += storedArticle.getQuantity();
-
- }
-
- return availableQuantity;
-
- }
-
- protected double getAccessibleQuantity(Article article, MagalieUser magalieUser) {
-
- List<StoredArticle> storedArticles = getStoredArticles(article);
-
- Iterable<StoredArticle> accessibleStoredArticles =
- Iterables.filter(
- storedArticles,
- StoredArticles.articleStoredInAccessibleSitePredicate(magalieUser)
- );
-
- double accessibleQuantity = 0.;
-
- for (StoredArticle storedArticle : accessibleStoredArticles) {
-
- accessibleQuantity += storedArticle.getQuantity();
-
- }
-
- return accessibleQuantity;
-
- }
-
-}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -2,20 +2,20 @@
import com.franciaflex.magalie.MagalieApplicationConfig;
import com.franciaflex.magalie.MagalieTechnicalException;
-import com.franciaflex.magalie.dao.ArticleDao;
-import com.franciaflex.magalie.dao.MagalieUserDao;
-import com.franciaflex.magalie.dao.RequestedArticleDao;
-import com.franciaflex.magalie.dao.SiteErrorDao;
-import com.franciaflex.magalie.dao.StorageMovementDao;
-import com.franciaflex.magalie.dao.StorageMovementOrderDao;
-import com.franciaflex.magalie.dao.StoredArticleDao;
-import com.franciaflex.magalie.dao.jpa.JpaArticleDao;
-import com.franciaflex.magalie.dao.jpa.JpaMagalieUserDao;
-import com.franciaflex.magalie.dao.jpa.JpaRequestedArticleDao;
-import com.franciaflex.magalie.dao.jpa.JpaSiteErrorDao;
-import com.franciaflex.magalie.dao.jpa.JpaStorageMovementDao;
-import com.franciaflex.magalie.dao.jpa.JpaStorageMovementOrderDao;
-import com.franciaflex.magalie.dao.jpa.JpaStoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.ArticleDao;
+import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
+import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
+import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.jpa.ArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.RequestedArticleJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.SiteErrorJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementOrderJpaDao;
+import com.franciaflex.magalie.persistence.dao.jpa.StoredArticleJpaDao;
import javax.persistence.EntityManager;
import java.lang.reflect.Constructor;
@@ -84,36 +84,36 @@
@Override
public MagalieUserDao getMagalieUserDao() {
- return new JpaMagalieUserDao(entityManager);
+ return new MagalieUserJpaDao(entityManager);
}
@Override
public StoredArticleDao getStoredArticleDao() {
- return new JpaStoredArticleDao(entityManager);
+ return new StoredArticleJpaDao(entityManager);
}
@Override
public RequestedArticleDao getRequestedArticleDao() {
- return new JpaRequestedArticleDao(entityManager);
+ return new RequestedArticleJpaDao(entityManager);
}
@Override
public ArticleDao getArticleDao() {
- return new JpaArticleDao(entityManager);
+ return new ArticleJpaDao(entityManager);
}
@Override
public StorageMovementDao getStorageMovementDao() {
- return new JpaStorageMovementDao(entityManager);
+ return new StorageMovementJpaDao(entityManager);
}
@Override
public SiteErrorDao getSiteErrorDao() {
- return new JpaSiteErrorDao(entityManager);
+ return new SiteErrorJpaDao(entityManager);
}
@Override
public StorageMovementOrderDao getStorageMovementOrderDao() {
- return new JpaStorageMovementOrderDao(entityManager);
+ return new StorageMovementOrderJpaDao(entityManager);
}
}
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/FulfilKanbanService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/FulfilKanbanService.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/FulfilKanbanService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,52 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
-import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
-import com.franciaflex.magalie.services.exception.UnavailableArticleException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class FulfilKanbanService implements MagalieService {
-
- private static final Log log = LogFactory.getLog(FulfilKanbanService.class);
-
- protected MagalieServiceContext serviceContext;
-
- @Override
- public void setServiceContext(MagalieServiceContext serviceContext) {
- this.serviceContext = serviceContext;
- }
-
- public StorageMovementTask fulfilKanbanTask(
- String articleBarcode,
- MagalieUser magalieUser) throws InvalidMagalieBarcodeException,
- UnavailableArticleException,
- RequiredDriverLicenceException {
-
- if (log.isInfoEnabled()) {
- log.info(magalieUser + " requested fulfil kanban with barcode " + articleBarcode);
- }
-
- MagalieBarcodeService magalieBarcodeService =
- serviceContext.newService(MagalieBarcodeService.class);
-
- Article article = magalieBarcodeService.getArticle(articleBarcode);
-
- double quantityInKanban = article.getQuantityInKanban();
-
- ArticleStorageService articleStorageService =
- serviceContext.newService(ArticleStorageService.class);
-
-
- StorageMovementTask storageMovementTask =
- articleStorageService.withdrawArticle(
- magalieUser,
- article,
- quantityInKanban);
-
- return storageMovementTask;
-
- }
-}
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieBarcodeService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieBarcodeService.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieBarcodeService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,59 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.dao.ArticleDao;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-
-public class MagalieBarcodeService implements MagalieService {
-
- protected MagalieServiceContext serviceContext;
-
- protected static final String BARCODE_ELEMENTS_SEPARATOR = "_";
-
- protected static final String ARTICLE_BARCODE_PREFIX = "ART";
-
- @Override
- public void setServiceContext(MagalieServiceContext serviceContext) {
- this.serviceContext = serviceContext;
- }
-
- public Article getArticle(String articleBarcode) throws InvalidMagalieBarcodeException {
-
- Iterable<String> split = Splitter.on(BARCODE_ELEMENTS_SEPARATOR).split(articleBarcode);
-
- if (Iterables.size(split) != 2) {
-
- throw new InvalidMagalieBarcodeException("Unexpected barcode format, 2 parts expected");
-
- }
-
- String prefix = Iterables.get(split, 0);
-
- if ( ! ARTICLE_BARCODE_PREFIX.equals(prefix)) {
-
- throw new InvalidMagalieBarcodeException(
- "not an article barcode. expected prefix '"
- + ARTICLE_BARCODE_PREFIX + ", '" + prefix + "' found.");
-
- }
-
- String articleCode = Iterables.get(split, 1);
-
- ArticleDao articleDao = serviceContext.getArticleDao();
-
- Article article = articleDao.findByCode(articleCode);
-
- if (article == null) {
-
- throw new InvalidMagalieBarcodeException(
- "no article with code " + articleCode);
-
- }
-
- return article;
-
- }
-
-}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,9 +1,9 @@
package com.franciaflex.magalie.services;
-import com.franciaflex.magalie.StorageMovements;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.entity.SiteError;
-import com.franciaflex.magalie.entity.StorageMovement;
+import com.franciaflex.magalie.persistence.StorageMovements;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.SiteError;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -24,13 +24,13 @@
*/
import com.franciaflex.magalie.MagalieApplicationConfig;
-import com.franciaflex.magalie.dao.ArticleDao;
-import com.franciaflex.magalie.dao.MagalieUserDao;
-import com.franciaflex.magalie.dao.RequestedArticleDao;
-import com.franciaflex.magalie.dao.SiteErrorDao;
-import com.franciaflex.magalie.dao.StorageMovementDao;
-import com.franciaflex.magalie.dao.StorageMovementOrderDao;
-import com.franciaflex.magalie.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.dao.ArticleDao;
+import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
+import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
+import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
import java.util.Date;
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,39 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.dao.MagalieUserDao;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.google.common.base.Preconditions;
-
-import java.util.List;
-
-public class MagalieUsersService implements MagalieService {
-
- protected MagalieServiceContext serviceContext;
-
- @Override
- public void setServiceContext(MagalieServiceContext serviceContext) {
- this.serviceContext = serviceContext;
- }
-
- public MagalieUser getMagalieUser(String login) {
-
- MagalieUserDao dao = serviceContext.getMagalieUserDao();
-
- MagalieUser magalieUser = dao.findByLogin(login);
-
- Preconditions.checkArgument(magalieUser != null, "there is no user with login '" + login + "'");
-
- return magalieUser;
-
- }
-
- public List<MagalieUser> getAllMagalieUsers() {
-
- MagalieUserDao dao = serviceContext.getMagalieUserDao();
-
- List<MagalieUser> allMagalieUsers = dao.findAll();
-
- return allMagalieUsers;
-
- }
-}
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,50 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.dao.StorageMovementDao;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.entity.SiteError;
-import com.franciaflex.magalie.entity.StorageMovement;
-
-import java.util.Date;
-import java.util.List;
-
-public class ReportService implements MagalieService {
-
- protected MagalieServiceContext serviceContext;
-
- @Override
- public void setServiceContext(MagalieServiceContext serviceContext) {
- this.serviceContext = serviceContext;
- }
-
- public MagalieReport getReport() {
-
- MagalieReport magalieReport = new MagalieReport();
-
- Date now = serviceContext.getNow();
-
- magalieReport.setReportDate(now);
-
- MagalieUsersService magalieUsersService = serviceContext.newService(MagalieUsersService.class);
-
- List<MagalieUser> allMagalieUsers = magalieUsersService.getAllMagalieUsers();
-
- magalieReport.setAllMagalieUsers(allMagalieUsers);
-
- StorageMovementDao storageMovementDao = serviceContext.getStorageMovementDao();
-
- List<StorageMovement> allStorageMovements = storageMovementDao.findAll();
-
- magalieReport.setAllStorageMovements(allStorageMovements);
-
- SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class);
-
- List<SiteError> allSitesInError = siteErrorsService.getAllSiteErrors();
-
- magalieReport.setAllSiteErrors(allSitesInError);
-
- return magalieReport;
-
- }
-
-}
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/RequestedItemService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/RequestedItemService.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/RequestedItemService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,63 +0,0 @@
-package com.franciaflex.magalie.services;
-
-/*
- * #%L
- * MagaLiE :: Services
- * $Id:$
- * $HeadURL:$
- * %%
- * Copyright (C) 2013 CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-import com.franciaflex.magalie.dao.ArticleDao;
-import com.franciaflex.magalie.dao.MagalieUserDao;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
-import com.franciaflex.magalie.services.exception.UnavailableArticleException;
-
-public class RequestedItemService implements MagalieService {
-
- protected MagalieServiceContext serviceContext;
-
- public void setServiceContext(MagalieServiceContext serviceContext) {
- this.serviceContext = serviceContext;
- }
-
- public StorageMovementTask getWithdrawTask() throws RequiredDriverLicenceException, UnavailableArticleException {
-
- ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class);
-
- ArticleDao articleDao = serviceContext.getArticleDao();
-
- MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao();
-
- MagalieUser alexandre = magalieUserDao.findById("magalie_user_alexandre");
-
- Article article1 = articleDao.findById("article1");
-
- StorageMovementTask storageMovementTask =
- articleStorageService.withdrawArticle(
- alexandre,
- article1,
- 40.
- );
-
- return storageMovementTask;
-
- }
-}
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,73 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.dao.SiteErrorDao;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.entity.Site;
-import com.franciaflex.magalie.entity.SiteError;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.Date;
-import java.util.List;
-
-public class SiteErrorsService implements MagalieService {
-
- private static final Log log = LogFactory.getLog(SiteErrorsService.class);
-
- protected MagalieServiceContext serviceContext;
-
- @Override
- public void setServiceContext(MagalieServiceContext serviceContext) {
- this.serviceContext = serviceContext;
- }
-
- public void reportError(Site site, MagalieUser magalieUser) {
-
- SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
-
- SiteError existingSiteError = siteErrorDao.findBySite(site);
-
- if (existingSiteError == null) {
-
- SiteError newSiteError = new SiteError();
-
- newSiteError.setMagalieUser(magalieUser);
-
- newSiteError.setSite(site);
-
- Date reportDate = serviceContext.getNow();
-
- newSiteError.setReportDate(reportDate);
-
- siteErrorDao.persist(newSiteError);
-
- } else {
-
- if (log.isInfoEnabled()) {
- log.info("error on site " + site + " already reported, nothing saved");
- }
-
- }
-
- }
-
- public List<Site> getAllSitesInError() {
-
- SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
-
- List<Site> allSitesInError = siteErrorDao.getAllSitesInError();
-
- return allSitesInError;
-
- }
-
- public List<SiteError> getAllSiteErrors() {
-
- SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
-
- List<SiteError> allSiteErrors = siteErrorDao.findAll();
-
- return allSiteErrors;
-
- }
-}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,8 +1,8 @@
package com.franciaflex.magalie.services;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.StorageMovement;
-import com.franciaflex.magalie.entity.StorageMovementOrder;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/WithdrawArticleFromSiteTask.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/WithdrawArticleFromSiteTask.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/WithdrawArticleFromSiteTask.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,27 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.entity.StoredArticle;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-public class WithdrawArticleFromSiteTask {
-
- protected StoredArticle storedArticle;
-
- protected double quantity;
-
- public WithdrawArticleFromSiteTask(StoredArticle storedArticle, double quantity) {
- this.storedArticle = storedArticle;
- this.quantity = quantity;
- }
-
- public double getQuantity() {
- return quantity;
- }
-
-
-
- @Override
- public String toString() {
- return ToStringBuilder.reflectionToString(this);
- }
-}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/RequiredDriverLicenceException.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/RequiredDriverLicenceException.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/RequiredDriverLicenceException.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,7 +1,7 @@
package com.franciaflex.magalie.services.exception;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
public class RequiredDriverLicenceException extends MagalieException {
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/UnavailableArticleException.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/UnavailableArticleException.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/UnavailableArticleException.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,6 +1,6 @@
package com.franciaflex.magalie.services.exception;
-import com.franciaflex.magalie.entity.Article;
+import com.franciaflex.magalie.persistence.entity.Article;
public class UnavailableArticleException extends MagalieException {
Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java (from rev 37, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java)
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,231 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.StoredArticles;
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
+import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+import com.franciaflex.magalie.persistence.entity.StorageMovementOrder;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+import com.franciaflex.magalie.services.StorageMovementTask;
+import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
+import com.franciaflex.magalie.services.exception.UnavailableArticleException;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.Sets;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+public class ArticleStorageService implements MagalieService {
+
+ private static final Log log = LogFactory.getLog(ArticleStorageService.class);
+
+ protected MagalieServiceContext serviceContext;
+
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public StorageMovementTask withdrawArticle(MagalieUser magalieUser, Article article, double requestedQuantity) throws UnavailableArticleException, RequiredDriverLicenceException {
+
+ Preconditions.checkNotNull(magalieUser);
+
+ Preconditions.checkNotNull(article);
+
+ Preconditions.checkArgument(requestedQuantity > 0.);
+
+ double availableQuantity = getAvailableQuantity(article);
+ UnavailableArticleException.throwIfRequestMoreThanAvailable(requestedQuantity, availableQuantity, article);
+
+ double accessibleQuantity = getAccessibleQuantity(article, magalieUser);
+ RequiredDriverLicenceException.throwIfRequestMoreThanAccessible(requestedQuantity, accessibleQuantity, magalieUser, article);
+
+ if (log.isInfoEnabled()) {
+ log.info("will process article request"
+ + ": requested = " + requestedQuantity
+ + ", accessible " + accessibleQuantity
+ + ", available " + availableQuantity);
+ }
+
+ List<StoredArticle> storedArticles = getStoredArticles(article);
+
+ Ordering<StoredArticle> storedArticlesOrdering =
+ Ordering.compound(
+ Lists.newArrayList(
+ StoredArticles.fixedSiteForArticleLastComparator(article),
+ StoredArticles.siteWithLowestQuantityFirstComparator(),
+ StoredArticles.articleStoredInSitesRequiringDriverLicenseFirstComparator()
+ )
+ );
+
+ Set<StoredArticle> sortedStoredArticles =
+ Sets.newTreeSet(storedArticlesOrdering);
+
+ Iterables.addAll(
+ sortedStoredArticles,
+ Iterables.filter(
+ storedArticles,
+ StoredArticles.articleStoredInAccessibleSitePredicate(magalieUser)
+ )
+ );
+
+ StorageMovementOrder storageMovementOrder = new StorageMovementOrder();
+
+ StorageMovementTask storageMovementTask = new StorageMovementTask(storageMovementOrder);
+
+ double quantity = 0;
+
+ Date orderDate = serviceContext.getNow();
+
+ for (StoredArticle storedArticle : sortedStoredArticles) {
+
+ double quantityLeft = requestedQuantity - quantity;
+
+ double quantityInSite = storedArticle.getQuantity();
+
+ double quantityWithdrawn = Math.min(quantityLeft, quantityInSite);
+
+ quantity += quantityWithdrawn;
+
+ StorageMovement newStorageMovement = new StorageMovement();
+
+ newStorageMovement.setArticle(article);
+
+ newStorageMovement.setOrderDate(orderDate);
+
+ newStorageMovement.setMagalieUser(magalieUser);
+
+ newStorageMovement.setSite(storedArticle.getSite());
+
+ // we remove from the stock so negative number
+ newStorageMovement.setQuantity( -1. * quantityWithdrawn);
+
+ if (quantityWithdrawn > 0.) {
+
+ storageMovementOrder.addStorageMovement(newStorageMovement);
+
+ } else {
+
+ storageMovementTask.addExtraStorageMovement(newStorageMovement);
+
+ }
+
+ }
+
+ StorageMovementOrderDao dao = serviceContext.getStorageMovementOrderDao();
+
+ dao.persist(storageMovementOrder);
+
+ return storageMovementTask;
+
+ }
+
+ protected List<StoredArticle> getStoredArticles(Article article) {
+
+ StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao();
+
+ List<StoredArticle> storedArticles = storedArticleDao.findAllForArticle(article);
+
+ // consider storage movements and compute actually available quantities
+
+ StorageMovementDao storageMovementDao = serviceContext.getStorageMovementDao();
+
+ List<StorageMovement> storageMovements = storageMovementDao.findAllByArticle(article);
+
+ ImmutableMap<Site, StoredArticle> storedArticlesBySite =
+ Maps.uniqueIndex(
+ storedArticles,
+ StoredArticles.getSiteFunction()
+ );
+
+ for (StorageMovement storageMovement : storageMovements) {
+
+ Site site = storageMovement.getSite();
+
+ StoredArticle storedArticle = storedArticlesBySite.get(site);
+
+ double actualQuantity = storedArticle.getQuantity() + storageMovement.getQuantity();
+
+ if (actualQuantity > 0.) {
+
+ storedArticle.setQuantity(actualQuantity);
+
+ } else {
+
+ // site is empty, do not include it as a site where you can take an article
+ storedArticles.remove(storedArticle);
+
+ }
+
+ }
+
+ // exclude storageMovements reported in error
+
+ SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class);
+
+ List<Site> allSitesInError = siteErrorsService.getAllSitesInError();
+
+ storedArticles =
+ Lists.newArrayList(
+ Iterables.filter(
+ storedArticles,
+ StoredArticles.articleNotStoredInSiteReportedInError(allSitesInError)
+ )
+ );
+
+ return storedArticles;
+
+ }
+
+ protected double getAvailableQuantity(Article article) {
+
+ List<StoredArticle> storedArticles = getStoredArticles(article);
+
+ double availableQuantity = 0.;
+
+ for (StoredArticle storedArticle : storedArticles) {
+
+ availableQuantity += storedArticle.getQuantity();
+
+ }
+
+ return availableQuantity;
+
+ }
+
+ protected double getAccessibleQuantity(Article article, MagalieUser magalieUser) {
+
+ List<StoredArticle> storedArticles = getStoredArticles(article);
+
+ Iterable<StoredArticle> accessibleStoredArticles =
+ Iterables.filter(
+ storedArticles,
+ StoredArticles.articleStoredInAccessibleSitePredicate(magalieUser)
+ );
+
+ double accessibleQuantity = 0.;
+
+ for (StoredArticle storedArticle : accessibleStoredArticles) {
+
+ accessibleQuantity += storedArticle.getQuantity();
+
+ }
+
+ return accessibleQuantity;
+
+ }
+
+}
Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java (from rev 36, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/FulfilKanbanService.java)
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,55 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+import com.franciaflex.magalie.services.StorageMovementTask;
+import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
+import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
+import com.franciaflex.magalie.services.exception.UnavailableArticleException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class FulfilKanbanService implements MagalieService {
+
+ private static final Log log = LogFactory.getLog(FulfilKanbanService.class);
+
+ protected MagalieServiceContext serviceContext;
+
+ @Override
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public StorageMovementTask fulfilKanbanTask(
+ String articleBarcode,
+ MagalieUser magalieUser) throws InvalidMagalieBarcodeException,
+ UnavailableArticleException,
+ RequiredDriverLicenceException {
+
+ if (log.isInfoEnabled()) {
+ log.info(magalieUser + " requested fulfil kanban with barcode " + articleBarcode);
+ }
+
+ MagalieBarcodeService magalieBarcodeService =
+ serviceContext.newService(MagalieBarcodeService.class);
+
+ Article article = magalieBarcodeService.getArticle(articleBarcode);
+
+ double quantityInKanban = article.getQuantityInKanban();
+
+ ArticleStorageService articleStorageService =
+ serviceContext.newService(ArticleStorageService.class);
+
+
+ StorageMovementTask storageMovementTask =
+ articleStorageService.withdrawArticle(
+ magalieUser,
+ article,
+ quantityInKanban);
+
+ return storageMovementTask;
+
+ }
+}
Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java (from rev 36, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieBarcodeService.java)
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,61 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.dao.ArticleDao;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+
+public class MagalieBarcodeService implements MagalieService {
+
+ protected MagalieServiceContext serviceContext;
+
+ protected static final String BARCODE_ELEMENTS_SEPARATOR = "_";
+
+ protected static final String ARTICLE_BARCODE_PREFIX = "ART";
+
+ @Override
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public Article getArticle(String articleBarcode) throws InvalidMagalieBarcodeException {
+
+ Iterable<String> split = Splitter.on(BARCODE_ELEMENTS_SEPARATOR).split(articleBarcode);
+
+ if (Iterables.size(split) != 2) {
+
+ throw new InvalidMagalieBarcodeException("Unexpected barcode format, 2 parts expected");
+
+ }
+
+ String prefix = Iterables.get(split, 0);
+
+ if ( ! ARTICLE_BARCODE_PREFIX.equals(prefix)) {
+
+ throw new InvalidMagalieBarcodeException(
+ "not an article barcode. expected prefix '"
+ + ARTICLE_BARCODE_PREFIX + ", '" + prefix + "' found.");
+
+ }
+
+ String articleCode = Iterables.get(split, 1);
+
+ ArticleDao articleDao = serviceContext.getArticleDao();
+
+ Article article = articleDao.findByCode(articleCode);
+
+ if (article == null) {
+
+ throw new InvalidMagalieBarcodeException(
+ "no article with code " + articleCode);
+
+ }
+
+ return article;
+
+ }
+
+}
Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java (from rev 37, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java)
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,41 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+import com.google.common.base.Preconditions;
+
+import java.util.List;
+
+public class MagalieUsersService implements MagalieService {
+
+ protected MagalieServiceContext serviceContext;
+
+ @Override
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public MagalieUser getMagalieUser(String login) {
+
+ MagalieUserDao dao = serviceContext.getMagalieUserDao();
+
+ MagalieUser magalieUser = dao.findByLogin(login);
+
+ Preconditions.checkArgument(magalieUser != null, "there is no user with login '" + login + "'");
+
+ return magalieUser;
+
+ }
+
+ public List<MagalieUser> getAllMagalieUsers() {
+
+ MagalieUserDao dao = serviceContext.getMagalieUserDao();
+
+ List<MagalieUser> allMagalieUsers = dao.findAll();
+
+ return allMagalieUsers;
+
+ }
+}
Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java (from rev 39, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java)
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,53 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.SiteError;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+import com.franciaflex.magalie.services.MagalieReport;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+
+import java.util.Date;
+import java.util.List;
+
+public class ReportService implements MagalieService {
+
+ protected MagalieServiceContext serviceContext;
+
+ @Override
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public MagalieReport getReport() {
+
+ MagalieReport magalieReport = new MagalieReport();
+
+ Date now = serviceContext.getNow();
+
+ magalieReport.setReportDate(now);
+
+ MagalieUsersService magalieUsersService = serviceContext.newService(MagalieUsersService.class);
+
+ List<MagalieUser> allMagalieUsers = magalieUsersService.getAllMagalieUsers();
+
+ magalieReport.setAllMagalieUsers(allMagalieUsers);
+
+ StorageMovementDao storageMovementDao = serviceContext.getStorageMovementDao();
+
+ List<StorageMovement> allStorageMovements = storageMovementDao.findAll();
+
+ magalieReport.setAllStorageMovements(allStorageMovements);
+
+ SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class);
+
+ List<SiteError> allSitesInError = siteErrorsService.getAllSiteErrors();
+
+ magalieReport.setAllSiteErrors(allSitesInError);
+
+ return magalieReport;
+
+ }
+
+}
Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java (from rev 36, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/RequestedItemService.java)
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedItemService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,66 @@
+package com.franciaflex.magalie.services.service;
+
+/*
+ * #%L
+ * MagaLiE :: Services
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+import com.franciaflex.magalie.persistence.dao.ArticleDao;
+import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+import com.franciaflex.magalie.services.StorageMovementTask;
+import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
+import com.franciaflex.magalie.services.exception.UnavailableArticleException;
+
+public class RequestedItemService implements MagalieService {
+
+ protected MagalieServiceContext serviceContext;
+
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public StorageMovementTask getWithdrawTask() throws RequiredDriverLicenceException, UnavailableArticleException {
+
+ ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class);
+
+ ArticleDao articleDao = serviceContext.getArticleDao();
+
+ MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao();
+
+ MagalieUser alexandre = magalieUserDao.findById("magalie_user_alexandre");
+
+ Article article1 = articleDao.findById("article1");
+
+ StorageMovementTask storageMovementTask =
+ articleStorageService.withdrawArticle(
+ alexandre,
+ article1,
+ 40.
+ );
+
+ return storageMovementTask;
+
+ }
+}
Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java (from rev 39, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java)
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java (rev 0)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,75 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.franciaflex.magalie.persistence.entity.SiteError;
+import com.franciaflex.magalie.services.MagalieService;
+import com.franciaflex.magalie.services.MagalieServiceContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.Date;
+import java.util.List;
+
+public class SiteErrorsService implements MagalieService {
+
+ private static final Log log = LogFactory.getLog(SiteErrorsService.class);
+
+ protected MagalieServiceContext serviceContext;
+
+ @Override
+ public void setServiceContext(MagalieServiceContext serviceContext) {
+ this.serviceContext = serviceContext;
+ }
+
+ public void reportError(Site site, MagalieUser magalieUser) {
+
+ SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
+
+ SiteError existingSiteError = siteErrorDao.findBySite(site);
+
+ if (existingSiteError == null) {
+
+ SiteError newSiteError = new SiteError();
+
+ newSiteError.setMagalieUser(magalieUser);
+
+ newSiteError.setSite(site);
+
+ Date reportDate = serviceContext.getNow();
+
+ newSiteError.setReportDate(reportDate);
+
+ siteErrorDao.persist(newSiteError);
+
+ } else {
+
+ if (log.isInfoEnabled()) {
+ log.info("error on site " + site + " already reported, nothing saved");
+ }
+
+ }
+
+ }
+
+ public List<Site> getAllSitesInError() {
+
+ SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
+
+ List<Site> allSitesInError = siteErrorDao.getAllSitesInError();
+
+ return allSitesInError;
+
+ }
+
+ public List<SiteError> getAllSiteErrors() {
+
+ SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
+
+ List<SiteError> allSiteErrors = siteErrorDao.findAll();
+
+ return allSiteErrors;
+
+ }
+}
Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/AbstractMagalieServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/AbstractMagalieServiceTest.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/AbstractMagalieServiceTest.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,118 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.franciaflex.magalie.entity.AbstractJpaEntity;
-import com.franciaflex.magalie.services.MagalieService;
-import com.franciaflex.magalie.services.MagalieServiceContext;
-import com.google.common.collect.Lists;
-import org.junit.Rule;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public abstract class AbstractMagalieServiceTest {
-
- protected static final double DELTA = 0.0001;
-
- protected static MagalieFixtures fixtures;
-
- protected static MagalieApplicationConfig magalieApplicationConfig;
-
- protected JpaEntityManagerRule jpaEntityManagerRule;
-
- protected FakeMagalieServiceContext serviceContext;
-
- protected static MagalieApplicationConfig getMagalieApplicationConfig() {
-
- if (magalieApplicationConfig == null) {
-
- magalieApplicationConfig = new MagalieApplicationConfig();
-
- }
-
- return magalieApplicationConfig;
-
- }
-
- public static MagalieFixtures getFixtures() {
-
- if (fixtures == null) {
-
- fixtures = new MagalieFixtures("fixtures");
-
- }
-
- return fixtures;
- }
-
- protected static <E> E fixture(String id) {
-
- return getFixtures().fixture(id);
-
- }
-
- protected MagalieServiceContext getServiceContext() {
-
- if (serviceContext == null) {
-
- FakeMagalieServiceContext serviceContext = new FakeMagalieServiceContext();
-
- serviceContext.setMagalieApplicationConfig(getMagalieApplicationConfig());
-
- EntityManager entityManager = getJpaEntityManagerRule().getEntityManager();
-
- serviceContext.setEntityManager(entityManager);
-
- MagalieFixtures fixtures = getFixtures();
-
- List<AbstractJpaEntity> toPersist = Lists.newArrayList();
-
- toPersist.addAll(fixtures.<Collection<? extends AbstractJpaEntity>>fixture("users"));
- toPersist.addAll(fixtures.<Collection<? extends AbstractJpaEntity>>fixture("sites"));
- toPersist.addAll(fixtures.<Collection<? extends AbstractJpaEntity>>fixture("articles"));
- toPersist.addAll(fixtures.<Collection<? extends AbstractJpaEntity>>fixture("storedArticles"));
-
- EntityTransaction transaction = entityManager.getTransaction();
-
- transaction.begin();
-
- for (AbstractJpaEntity entity : toPersist) {
-
- entityManager.persist(entity);
-
- }
-
- transaction.commit();
-
- this.serviceContext = serviceContext;
-
- }
-
- return serviceContext;
-
- }
-
- protected <E extends MagalieService> E newService(Class<E> serviceClass) {
-
- return getServiceContext().newService(serviceClass);
-
- }
-
- @Rule
- public JpaEntityManagerRule getJpaEntityManagerRule() {
-
- if (jpaEntityManagerRule == null) {
-
- Map<String, String> jpaParameters = getMagalieApplicationConfig().getJpaParameters();
-
- jpaEntityManagerRule = new JpaEntityManagerRule("magaliePersistenceUnit", jpaParameters);
-
- }
-
- return jpaEntityManagerRule;
-
- }
-
-}
Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,29 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.franciaflex.magalie.services.DefaultMagalieServiceContext;
-import com.google.common.base.Preconditions;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.Date;
-
-public class FakeMagalieServiceContext extends DefaultMagalieServiceContext {
-
- private static final Log log = LogFactory.getLog(FakeMagalieServiceContext.class);
-
- protected Date date;
-
- @Override
- public Date getNow() {
- Preconditions.checkState(date != null, "you must provide a date before running service test");
- if (log.isTraceEnabled()) {
- log.trace("injecting fake date in service: " + date);
- }
- return date;
- }
-
- public void setDate(Date date) {
- this.date = date;
- }
-
-}
Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/JpaEntityManagerRule.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/JpaEntityManagerRule.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/JpaEntityManagerRule.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,98 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import java.util.Date;
-import java.util.Map;
-
-public class JpaEntityManagerRule implements TestRule {
-
- private static final Log log = LogFactory.getLog(JpaEntityManagerRule.class);
-
- protected String persistenceUnitName;
-
- protected String timestamp = String.valueOf(new Date().getTime());
-
- protected EntityManager entityManager;
-
- protected boolean open = false;
-
- protected Map<String, String> jpaParameters;
-
- public JpaEntityManagerRule(String persistenceUnitName, Map<String, String> jpaParameters) {
- this.persistenceUnitName = persistenceUnitName;
- this.jpaParameters = jpaParameters;
- }
-
- @Override
- public Statement apply(final Statement base, Description description) {
-
- final String testClassName = description.getClassName();
-
- final String testMethodName = description.getMethodName();
-
- if (log.isDebugEnabled()) {
- log.debug("will create entityManager for test class " + testClassName + " and method " + testMethodName);
- }
-
- return new Statement() {
- @Override
- public void evaluate() throws Throwable {
- createEntityManager(testClassName, testMethodName);
- try {
- base.evaluate();
- } finally {
- closeEntityManager();
- }
- }
- };
- }
-
- protected void createEntityManager(String testClassName, String testMethodName) {
-
- String context = Joiner.on('_').join(testClassName, testMethodName, timestamp);
-
- EntityManagerFactory entityManagerFactory = JpaUtil.createTempEntityManagerFactory(persistenceUnitName, context, jpaParameters);
-
- entityManager = entityManagerFactory.createEntityManager();
-
- if (log.isDebugEnabled()) {
- log.debug("created entityManager " + entityManager);
- }
-
- open = true;
-
- }
-
- public EntityManager getEntityManager() {
-
- Preconditions.checkState(open);
-
- return entityManager;
-
- }
-
- /**
- * Override to tear down your specific external resource.
- */
- protected void closeEntityManager() {
-
- if (log.isDebugEnabled()) {
- log.debug("close entityManager " + entityManager);
- }
-
- open = false;
-
- entityManager.close();
-
- }
-
-}
Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/MagalieFixtures.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/MagalieFixtures.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/MagalieFixtures.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,46 +0,0 @@
-package com.franciaflex.magalie;
-
-import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
-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.StoredArticle;
-import org.apache.commons.io.Charsets;
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-public class MagalieFixtures {
-
- protected Map<String, Object> fixtures;
-
- public MagalieFixtures(String fixturesName) {
- String yamlPath = "/" + fixturesName + ".yaml";
- InputStream inputStream = MagalieFixtures.class.getResourceAsStream(yamlPath);
- String yaml;
- try {
- yaml = IOUtils.toString(inputStream, Charsets.UTF_8);
- } catch (IOException e) {
- throw new IllegalArgumentException(fixturesName + " is not a valid fixtures set name", e);
- }
- YamlReader reader = new YamlReader(yaml);
- reader.getConfig().setClassTag("article", Article.class);
- reader.getConfig().setClassTag("stored-article", StoredArticle.class);
- reader.getConfig().setClassTag("user", MagalieUser.class);
- reader.getConfig().setClassTag("requested-article", RequestedArticle.class);
- reader.getConfig().setClassTag("site", Site.class);
- try {
- fixtures = (Map<String, Object>) reader.read();
- } catch (YamlException e) {
- throw new MagalieTechnicalException("unable to read yaml file", e);
- }
- }
-
- public <E> E fixture(String id) {
- return (E) fixtures.get(id);
- }
-}
Copied: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java (from rev 32, trunk/magalie-services/src/test/java/com/franciaflex/magalie/AbstractMagalieServiceTest.java)
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java (rev 0)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,117 @@
+package com.franciaflex.magalie.services;
+
+import com.franciaflex.magalie.MagalieApplicationConfig;
+import com.franciaflex.magalie.persistence.entity.AbstractEntity;
+import com.google.common.collect.Lists;
+import org.junit.Rule;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public abstract class AbstractMagalieServiceTest {
+
+ protected static final double DELTA = 0.0001;
+
+ protected static MagalieFixtures fixtures;
+
+ protected static MagalieApplicationConfig magalieApplicationConfig;
+
+ protected JpaEntityManagerRule jpaEntityManagerRule;
+
+ protected FakeMagalieServiceContext serviceContext;
+
+ protected static MagalieApplicationConfig getMagalieApplicationConfig() {
+
+ if (magalieApplicationConfig == null) {
+
+ magalieApplicationConfig = new MagalieApplicationConfig();
+
+ }
+
+ return magalieApplicationConfig;
+
+ }
+
+ public static MagalieFixtures getFixtures() {
+
+ if (fixtures == null) {
+
+ fixtures = new MagalieFixtures("fixtures");
+
+ }
+
+ return fixtures;
+ }
+
+ protected static <E> E fixture(String id) {
+
+ return getFixtures().fixture(id);
+
+ }
+
+ protected MagalieServiceContext getServiceContext() {
+
+ if (serviceContext == null) {
+
+ FakeMagalieServiceContext serviceContext = new FakeMagalieServiceContext();
+
+ serviceContext.setMagalieApplicationConfig(getMagalieApplicationConfig());
+
+ EntityManager entityManager = getJpaEntityManagerRule().getEntityManager();
+
+ serviceContext.setEntityManager(entityManager);
+
+ MagalieFixtures fixtures = getFixtures();
+
+ List<AbstractEntity> toPersist = Lists.newArrayList();
+
+ toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("users"));
+ toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("sites"));
+ toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("articles"));
+ toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("storedArticles"));
+
+ EntityTransaction transaction = entityManager.getTransaction();
+
+ transaction.begin();
+
+ for (AbstractEntity entity : toPersist) {
+
+ entityManager.persist(entity);
+
+ }
+
+ transaction.commit();
+
+ this.serviceContext = serviceContext;
+
+ }
+
+ return serviceContext;
+
+ }
+
+ protected <E extends MagalieService> E newService(Class<E> serviceClass) {
+
+ return getServiceContext().newService(serviceClass);
+
+ }
+
+ @Rule
+ public JpaEntityManagerRule getJpaEntityManagerRule() {
+
+ if (jpaEntityManagerRule == null) {
+
+ Map<String, String> jpaParameters = getMagalieApplicationConfig().getJpaParameters();
+
+ jpaEntityManagerRule = new JpaEntityManagerRule("magaliePersistenceUnit", jpaParameters);
+
+ }
+
+ return jpaEntityManagerRule;
+
+ }
+
+}
Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/ArticleStorageServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/ArticleStorageServiceTest.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/ArticleStorageServiceTest.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,229 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.AbstractMagalieServiceTest;
-import com.franciaflex.magalie.entity.Article;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.entity.Site;
-import com.franciaflex.magalie.entity.StorageMovement;
-import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
-import com.franciaflex.magalie.services.exception.UnavailableArticleException;
-import com.google.common.collect.Iterables;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.text.ParseException;
-import java.util.Date;
-
-public class ArticleStorageServiceTest extends AbstractMagalieServiceTest {
-
- private static final Log log = LogFactory.getLog(ArticleStorageServiceTest.class);
-
- protected ArticleStorageService service;
-
- @Before
- public void setUp() throws ParseException {
-
- service = newService(ArticleStorageService.class);
-
- serviceContext.setDate(new Date(1363948427576l));
-
- }
-
- @Test
- public void testThrowUnavailableArticle() throws Exception {
-
- MagalieUser basile = fixture("basile");
- Article article = fixture("article1");
- StorageMovementTask storageMovementTask;
-
- try {
- storageMovementTask = service.withdrawArticle(basile, article, 100.);
- if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
- }
- Assert.fail();
- } catch (UnavailableArticleException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.assertEquals(70., e.getAvailableQuantity(), DELTA);
- }
- }
-
- @Test
- public void testThrowRequiredDriverLicenceException() throws Exception {
-
- MagalieUser basile = fixture("basile");
- Article article = fixture("article1");
- StorageMovementTask storageMovementTask;
-
- try {
- storageMovementTask = service.withdrawArticle(basile, article, 70.);
- if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
- }
- Assert.fail();
- } catch (RequiredDriverLicenceException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.assertEquals(50., e.getAccessibleQuantity(), DELTA);
- }
- }
-
- @Test
- public void testWithdrawArticleWithoutDriverLicense() throws Exception {
-
- MagalieUser basile = fixture("basile");
- Article article = fixture("article1");
- StorageMovementTask storageMovementTask = null;
-
- try {
- storageMovementTask = service.withdrawArticle(basile, article, 50.);
- if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
- }
- } catch (RequiredDriverLicenceException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- } catch (UnavailableArticleException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- }
-
- Assert.assertEquals(1, storageMovementTask.getSites().size());
- }
-
- @Test
- public void testWithdrawArticleWithDriverLicense() throws Exception {
-
- MagalieUser alexandre = fixture("alexandre");
- Article article = fixture("article1");
- StorageMovementTask storageMovementTask = null;
-
- try {
- storageMovementTask = service.withdrawArticle(alexandre, article, 50.);
- if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
- }
- } catch (RequiredDriverLicenceException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- } catch (UnavailableArticleException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- }
-
- Assert.assertEquals(2, storageMovementTask.getSites().size());
- StorageMovement site1 = Iterables.get(storageMovementTask.getSites(), 0, null);
- Assert.assertEquals(-20., site1.getQuantity(), DELTA);
- StorageMovement site2 = Iterables.get(storageMovementTask.getSites(), 1, null);
- Assert.assertEquals(-30., site2.getQuantity(), DELTA);
- }
-
- @Test
- public void testWithdrawArticleConsiderAlreadyRemovedItem() throws Exception {
-
- MagalieUser alexandre = fixture("alexandre");
- MagalieUser cathy = fixture("cathy");
-
- Article article = fixture("article1");
-
- StorageMovementTask storageMovementTask = null;
-
- try {
- storageMovementTask = service.withdrawArticle(alexandre, article, 30.);
- if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
- }
- Assert.assertEquals(2, storageMovementTask.getSites().size());
- StorageMovement storageMovement1 = Iterables.get(storageMovementTask.getSites(), 0, null);
- Assert.assertEquals(-20., storageMovement1.getQuantity(), DELTA);
- Assert.assertEquals("B2", storageMovement1.getSite().getLocationCode());
- StorageMovement storageMovement2 = Iterables.get(storageMovementTask.getSites(), 1, null);
- Assert.assertEquals(-10., storageMovement2.getQuantity(), DELTA);
- Assert.assertEquals("A1", storageMovement2.getSite().getLocationCode());
- } catch (RequiredDriverLicenceException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- } catch (UnavailableArticleException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- }
-
- try {
- storageMovementTask = service.withdrawArticle(cathy, article, 30.);
- if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
- }
- Assert.assertEquals(1, storageMovementTask.getSites().size());
- StorageMovement storageMovement = Iterables.get(storageMovementTask.getSites(), 0, null);
- Assert.assertEquals(-30., storageMovement.getQuantity(), DELTA);
- Assert.assertEquals("A1", storageMovement.getSite().getLocationCode());
- } catch (RequiredDriverLicenceException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- } catch (UnavailableArticleException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- }
- }
-
- @Test
- public void testWithdrawArticleConsiderSitesInError() throws Exception {
-
- MagalieUser alexandre = fixture("alexandre");
- MagalieUser cathy = fixture("cathy");
-
- Article article = fixture("article1");
-
- // report site 2 in error
- Site site2 = fixture("site2");
- SiteErrorsService siteErrorsService = newService(SiteErrorsService.class);
- siteErrorsService.reportError(site2, alexandre);
-
- try {
- StorageMovementTask storageMovementTask = service.withdrawArticle(cathy, article, 30.);
- if (log.isDebugEnabled()) {
- log.debug("storageMovementTask = " + storageMovementTask);
- }
- Assert.assertEquals(1, storageMovementTask.getSites().size());
- StorageMovement storageMovement = Iterables.get(storageMovementTask.getSites(), 0, null);
- Assert.assertNotEquals(
- "site2 must not be returned because it was reported in error",
- site2.getId(),
- storageMovement.getSite().getId());
- } catch (RequiredDriverLicenceException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- } catch (UnavailableArticleException e) {
- if (log.isDebugEnabled()) {
- log.debug("exception raised = " + e);
- }
- Assert.fail();
- }
- }
-
-
-}
Copied: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java (from rev 37, trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java)
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java (rev 0)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/FakeMagalieServiceContext.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,28 @@
+package com.franciaflex.magalie.services;
+
+import com.google.common.base.Preconditions;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.Date;
+
+public class FakeMagalieServiceContext extends DefaultMagalieServiceContext {
+
+ private static final Log log = LogFactory.getLog(FakeMagalieServiceContext.class);
+
+ protected Date date;
+
+ @Override
+ public Date getNow() {
+ Preconditions.checkState(date != null, "you must provide a date before running service test");
+ if (log.isTraceEnabled()) {
+ log.trace("injecting fake date in service: " + date);
+ }
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+}
Copied: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java (from rev 32, trunk/magalie-services/src/test/java/com/franciaflex/magalie/JpaEntityManagerRule.java)
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java (rev 0)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/JpaEntityManagerRule.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,99 @@
+package com.franciaflex.magalie.services;
+
+import com.franciaflex.magalie.persistence.JpaUtil;
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import java.util.Date;
+import java.util.Map;
+
+public class JpaEntityManagerRule implements TestRule {
+
+ private static final Log log = LogFactory.getLog(JpaEntityManagerRule.class);
+
+ protected String persistenceUnitName;
+
+ protected String timestamp = String.valueOf(new Date().getTime());
+
+ protected EntityManager entityManager;
+
+ protected boolean open = false;
+
+ protected Map<String, String> jpaParameters;
+
+ public JpaEntityManagerRule(String persistenceUnitName, Map<String, String> jpaParameters) {
+ this.persistenceUnitName = persistenceUnitName;
+ this.jpaParameters = jpaParameters;
+ }
+
+ @Override
+ public Statement apply(final Statement base, Description description) {
+
+ final String testClassName = description.getClassName();
+
+ final String testMethodName = description.getMethodName();
+
+ if (log.isDebugEnabled()) {
+ log.debug("will create entityManager for test class " + testClassName + " and method " + testMethodName);
+ }
+
+ return new Statement() {
+ @Override
+ public void evaluate() throws Throwable {
+ createEntityManager(testClassName, testMethodName);
+ try {
+ base.evaluate();
+ } finally {
+ closeEntityManager();
+ }
+ }
+ };
+ }
+
+ protected void createEntityManager(String testClassName, String testMethodName) {
+
+ String context = Joiner.on('_').join(testClassName, testMethodName, timestamp);
+
+ EntityManagerFactory entityManagerFactory = JpaUtil.createTempEntityManagerFactory(persistenceUnitName, context, jpaParameters);
+
+ entityManager = entityManagerFactory.createEntityManager();
+
+ if (log.isDebugEnabled()) {
+ log.debug("created entityManager " + entityManager);
+ }
+
+ open = true;
+
+ }
+
+ public EntityManager getEntityManager() {
+
+ Preconditions.checkState(open);
+
+ return entityManager;
+
+ }
+
+ /**
+ * Override to tear down your specific external resource.
+ */
+ protected void closeEntityManager() {
+
+ if (log.isDebugEnabled()) {
+ log.debug("close entityManager " + entityManager);
+ }
+
+ open = false;
+
+ entityManager.close();
+
+ }
+
+}
Copied: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java (from rev 31, trunk/magalie-services/src/test/java/com/franciaflex/magalie/MagalieFixtures.java)
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java (rev 0)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,47 @@
+package com.franciaflex.magalie.services;
+
+import com.esotericsoftware.yamlbeans.YamlException;
+import com.esotericsoftware.yamlbeans.YamlReader;
+import com.franciaflex.magalie.MagalieTechnicalException;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.RequestedArticle;
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.franciaflex.magalie.persistence.entity.StoredArticle;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+public class MagalieFixtures {
+
+ protected Map<String, Object> fixtures;
+
+ public MagalieFixtures(String fixturesName) {
+ String yamlPath = "/" + fixturesName + ".yaml";
+ InputStream inputStream = MagalieFixtures.class.getResourceAsStream(yamlPath);
+ String yaml;
+ try {
+ yaml = IOUtils.toString(inputStream, Charsets.UTF_8);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(fixturesName + " is not a valid fixtures set name", e);
+ }
+ YamlReader reader = new YamlReader(yaml);
+ reader.getConfig().setClassTag("article", Article.class);
+ reader.getConfig().setClassTag("stored-article", StoredArticle.class);
+ reader.getConfig().setClassTag("user", MagalieUser.class);
+ reader.getConfig().setClassTag("requested-article", RequestedArticle.class);
+ reader.getConfig().setClassTag("site", Site.class);
+ try {
+ fixtures = (Map<String, Object>) reader.read();
+ } catch (YamlException e) {
+ throw new MagalieTechnicalException("unable to read yaml file", e);
+ }
+ }
+
+ public <E> E fixture(String id) {
+ return (E) fixtures.get(id);
+ }
+}
Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/RequestedItemServiceTest.java
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/RequestedItemServiceTest.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/RequestedItemServiceTest.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,32 +0,0 @@
-package com.franciaflex.magalie.services;
-
-import com.franciaflex.magalie.AbstractMagalieServiceTest;
-import com.google.common.collect.Sets;
-import org.junit.Test;
-
-import java.util.Comparator;
-import java.util.Set;
-
-public class RequestedItemServiceTest extends AbstractMagalieServiceTest {
-
- @Test
- public void testGetWithdrawTask() throws Exception {
-
- getServiceContext();
-
- Set<Double> doubles = Sets.newTreeSet(new Comparator<Double>() {
- @Override
- public int compare(Double o1, Double o2) {
- return Double.compare(o1, o2);
- }
- });
-
- doubles.add(3.);
- doubles.add(2.);
- doubles.add(4.);
- doubles.add(1.);
- doubles.add(7.);
-
- System.out.println(doubles);
- }
-}
Copied: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java (from rev 36, trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/ArticleStorageServiceTest.java)
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java (rev 0)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,230 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.services.AbstractMagalieServiceTest;
+import com.franciaflex.magalie.persistence.entity.Article;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.Site;
+import com.franciaflex.magalie.persistence.entity.StorageMovement;
+import com.franciaflex.magalie.services.StorageMovementTask;
+import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
+import com.franciaflex.magalie.services.exception.UnavailableArticleException;
+import com.google.common.collect.Iterables;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.text.ParseException;
+import java.util.Date;
+
+public class ArticleStorageServiceTest extends AbstractMagalieServiceTest {
+
+ private static final Log log = LogFactory.getLog(ArticleStorageServiceTest.class);
+
+ protected ArticleStorageService service;
+
+ @Before
+ public void setUp() throws ParseException {
+
+ service = newService(ArticleStorageService.class);
+
+ serviceContext.setDate(new Date(1363948427576l));
+
+ }
+
+ @Test
+ public void testThrowUnavailableArticle() throws Exception {
+
+ MagalieUser basile = fixture("basile");
+ Article article = fixture("article1");
+ StorageMovementTask storageMovementTask;
+
+ try {
+ storageMovementTask = service.withdrawArticle(basile, article, 100.);
+ if (log.isDebugEnabled()) {
+ log.debug("storageMovementTask = " + storageMovementTask);
+ }
+ Assert.fail();
+ } catch (UnavailableArticleException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.assertEquals(70., e.getAvailableQuantity(), DELTA);
+ }
+ }
+
+ @Test
+ public void testThrowRequiredDriverLicenceException() throws Exception {
+
+ MagalieUser basile = fixture("basile");
+ Article article = fixture("article1");
+ StorageMovementTask storageMovementTask;
+
+ try {
+ storageMovementTask = service.withdrawArticle(basile, article, 70.);
+ if (log.isDebugEnabled()) {
+ log.debug("storageMovementTask = " + storageMovementTask);
+ }
+ Assert.fail();
+ } catch (RequiredDriverLicenceException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.assertEquals(50., e.getAccessibleQuantity(), DELTA);
+ }
+ }
+
+ @Test
+ public void testWithdrawArticleWithoutDriverLicense() throws Exception {
+
+ MagalieUser basile = fixture("basile");
+ Article article = fixture("article1");
+ StorageMovementTask storageMovementTask = null;
+
+ try {
+ storageMovementTask = service.withdrawArticle(basile, article, 50.);
+ if (log.isDebugEnabled()) {
+ log.debug("storageMovementTask = " + storageMovementTask);
+ }
+ } catch (RequiredDriverLicenceException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ } catch (UnavailableArticleException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ }
+
+ Assert.assertEquals(1, storageMovementTask.getSites().size());
+ }
+
+ @Test
+ public void testWithdrawArticleWithDriverLicense() throws Exception {
+
+ MagalieUser alexandre = fixture("alexandre");
+ Article article = fixture("article1");
+ StorageMovementTask storageMovementTask = null;
+
+ try {
+ storageMovementTask = service.withdrawArticle(alexandre, article, 50.);
+ if (log.isDebugEnabled()) {
+ log.debug("storageMovementTask = " + storageMovementTask);
+ }
+ } catch (RequiredDriverLicenceException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ } catch (UnavailableArticleException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ }
+
+ Assert.assertEquals(2, storageMovementTask.getSites().size());
+ StorageMovement site1 = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertEquals(-20., site1.getQuantity(), DELTA);
+ StorageMovement site2 = Iterables.get(storageMovementTask.getSites(), 1, null);
+ Assert.assertEquals(-30., site2.getQuantity(), DELTA);
+ }
+
+ @Test
+ public void testWithdrawArticleConsiderAlreadyRemovedItem() throws Exception {
+
+ MagalieUser alexandre = fixture("alexandre");
+ MagalieUser cathy = fixture("cathy");
+
+ Article article = fixture("article1");
+
+ StorageMovementTask storageMovementTask = null;
+
+ try {
+ storageMovementTask = service.withdrawArticle(alexandre, article, 30.);
+ if (log.isDebugEnabled()) {
+ log.debug("storageMovementTask = " + storageMovementTask);
+ }
+ Assert.assertEquals(2, storageMovementTask.getSites().size());
+ StorageMovement storageMovement1 = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertEquals(-20., storageMovement1.getQuantity(), DELTA);
+ Assert.assertEquals("B2", storageMovement1.getSite().getLocationCode());
+ StorageMovement storageMovement2 = Iterables.get(storageMovementTask.getSites(), 1, null);
+ Assert.assertEquals(-10., storageMovement2.getQuantity(), DELTA);
+ Assert.assertEquals("A1", storageMovement2.getSite().getLocationCode());
+ } catch (RequiredDriverLicenceException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ } catch (UnavailableArticleException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ }
+
+ try {
+ storageMovementTask = service.withdrawArticle(cathy, article, 30.);
+ if (log.isDebugEnabled()) {
+ log.debug("storageMovementTask = " + storageMovementTask);
+ }
+ Assert.assertEquals(1, storageMovementTask.getSites().size());
+ StorageMovement storageMovement = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertEquals(-30., storageMovement.getQuantity(), DELTA);
+ Assert.assertEquals("A1", storageMovement.getSite().getLocationCode());
+ } catch (RequiredDriverLicenceException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ } catch (UnavailableArticleException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testWithdrawArticleConsiderSitesInError() throws Exception {
+
+ MagalieUser alexandre = fixture("alexandre");
+ MagalieUser cathy = fixture("cathy");
+
+ Article article = fixture("article1");
+
+ // report site 2 in error
+ Site site2 = fixture("site2");
+ SiteErrorsService siteErrorsService = newService(SiteErrorsService.class);
+ siteErrorsService.reportError(site2, alexandre);
+
+ try {
+ StorageMovementTask storageMovementTask = service.withdrawArticle(cathy, article, 30.);
+ if (log.isDebugEnabled()) {
+ log.debug("storageMovementTask = " + storageMovementTask);
+ }
+ Assert.assertEquals(1, storageMovementTask.getSites().size());
+ StorageMovement storageMovement = Iterables.get(storageMovementTask.getSites(), 0, null);
+ Assert.assertNotEquals(
+ "site2 must not be returned because it was reported in error",
+ site2.getId(),
+ storageMovement.getSite().getId());
+ } catch (RequiredDriverLicenceException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ } catch (UnavailableArticleException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("exception raised = " + e);
+ }
+ Assert.fail();
+ }
+ }
+
+
+}
Copied: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java (from rev 36, trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/RequestedItemServiceTest.java)
===================================================================
--- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java (rev 0)
+++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedItemServiceTest.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -0,0 +1,32 @@
+package com.franciaflex.magalie.services.service;
+
+import com.franciaflex.magalie.services.AbstractMagalieServiceTest;
+import com.google.common.collect.Sets;
+import org.junit.Test;
+
+import java.util.Comparator;
+import java.util.Set;
+
+public class RequestedItemServiceTest extends AbstractMagalieServiceTest {
+
+ @Test
+ public void testGetWithdrawTask() throws Exception {
+
+ getServiceContext();
+
+ Set<Double> doubles = Sets.newTreeSet(new Comparator<Double>() {
+ @Override
+ public int compare(Double o1, Double o2) {
+ return Double.compare(o1, o2);
+ }
+ });
+
+ doubles.add(3.);
+ doubles.add(2.);
+ doubles.add(4.);
+ doubles.add(1.);
+ doubles.add(7.);
+
+ System.out.println(doubles);
+ }
+}
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -24,11 +24,11 @@
*/
import com.franciaflex.magalie.MagalieApplicationConfig;
-import com.franciaflex.magalie.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
import com.franciaflex.magalie.services.DefaultMagalieServiceContext;
import com.franciaflex.magalie.services.MagalieService;
import com.franciaflex.magalie.services.MagalieServiceContext;
-import com.franciaflex.magalie.services.MagalieUsersService;
+import com.franciaflex.magalie.services.service.MagalieUsersService;
import com.google.common.base.Preconditions;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,6 +1,6 @@
package com.franciaflex.magalie.web;
-import com.franciaflex.magalie.entity.MagalieUser;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
import java.io.Serializable;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,7 +1,7 @@
package com.franciaflex.magalie.web.action;
-import com.franciaflex.magalie.entity.MagalieUser;
-import com.franciaflex.magalie.services.FulfilKanbanService;
+import com.franciaflex.magalie.persistence.entity.MagalieUser;
+import com.franciaflex.magalie.services.service.FulfilKanbanService;
import com.franciaflex.magalie.services.StorageMovementTask;
import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException;
import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -1,7 +1,7 @@
package com.franciaflex.magalie.web.action;
import com.franciaflex.magalie.services.MagalieReport;
-import com.franciaflex.magalie.services.ReportService;
+import com.franciaflex.magalie.services.service.ReportService;
import com.franciaflex.magalie.web.MagalieActionSupport;
public class ReportAction extends MagalieActionSupport {
Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java
===================================================================
--- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-03-25 17:06:46 UTC (rev 39)
+++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-03-26 10:18:13 UTC (rev 40)
@@ -23,7 +23,7 @@
* #L%
*/
-import com.franciaflex.magalie.services.RequestedItemService;
+import com.franciaflex.magalie.services.service.RequestedItemService;
import com.franciaflex.magalie.services.StorageMovementTask;
import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException;
import com.franciaflex.magalie.services.exception.UnavailableArticleException;
1
0
r39 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/dao magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa magalie-services/src/main/java/com/franciaflex/magalie/services magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 25 Mar '13
by bleny＠users.forge.codelutin.com 25 Mar '13
25 Mar '13
Author: bleny
Date: 2013-03-25 18:06:46 +0100 (Mon, 25 Mar 2013)
New Revision: 39
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2204: show sites in error
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java 2013-03-25 15:47:59 UTC (rev 38)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java 2013-03-25 17:06:46 UTC (rev 39)
@@ -14,4 +14,6 @@
List<Site> getAllSitesInError();
+ List<SiteError> findAll();
+
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java 2013-03-25 15:47:59 UTC (rev 38)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java 2013-03-25 17:06:46 UTC (rev 39)
@@ -37,4 +37,11 @@
List<Site> allSitesInError = query.getResultList();
return allSitesInError;
}
+
+ @Override
+ public List<SiteError> findAll() {
+ Query query = entityManager.createQuery("from SiteError se order by se.reportDate");
+ List<SiteError> all = query.getResultList();
+ return all;
+ }
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-25 15:47:59 UTC (rev 38)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-25 17:06:46 UTC (rev 39)
@@ -2,6 +2,7 @@
import com.franciaflex.magalie.StorageMovements;
import com.franciaflex.magalie.entity.MagalieUser;
+import com.franciaflex.magalie.entity.SiteError;
import com.franciaflex.magalie.entity.StorageMovement;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -17,6 +18,8 @@
protected List<StorageMovement> allStorageMovements;
+ protected List<SiteError> allSiteErrors;
+
public void setReportDate(Date reportDate) {
this.reportDate = reportDate;
}
@@ -58,4 +61,12 @@
);
return confirmedStorageMovements;
}
+
+ public List<SiteError> getAllSiteErrors() {
+ return allSiteErrors;
+ }
+
+ public void setAllSiteErrors(List<SiteError> allSiteErrors) {
+ this.allSiteErrors = allSiteErrors;
+ }
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 15:47:59 UTC (rev 38)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 17:06:46 UTC (rev 39)
@@ -2,6 +2,7 @@
import com.franciaflex.magalie.dao.StorageMovementDao;
import com.franciaflex.magalie.entity.MagalieUser;
+import com.franciaflex.magalie.entity.SiteError;
import com.franciaflex.magalie.entity.StorageMovement;
import java.util.Date;
@@ -36,6 +37,12 @@
magalieReport.setAllStorageMovements(allStorageMovements);
+ SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class);
+
+ List<SiteError> allSitesInError = siteErrorsService.getAllSiteErrors();
+
+ magalieReport.setAllSiteErrors(allSitesInError);
+
return magalieReport;
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java 2013-03-25 15:47:59 UTC (rev 38)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java 2013-03-25 17:06:46 UTC (rev 39)
@@ -60,4 +60,14 @@
return allSitesInError;
}
+
+ public List<SiteError> getAllSiteErrors() {
+
+ SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
+
+ List<SiteError> allSiteErrors = siteErrorDao.findAll();
+
+ return allSiteErrors;
+
+ }
}
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-25 15:47:59 UTC (rev 38)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-25 17:06:46 UTC (rev 39)
@@ -138,6 +138,55 @@
</section>
<section>
+ <h2>Emplacements en erreur</h2>
+
+ <table class="table">
+ <thead>
+ <tr>
+ <th>
+ Id
+ </th>
+ <th>
+ Magasin
+ </th>
+ <th>
+ Emplacement
+ </th>
+ <th>
+ Rapporteur
+ </th>
+ <th>
+ Date
+ </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <s:iterator value="report.allSiteErrors">
+ <tr>
+ <td>
+ <s:property value="id" />
+ </td>
+ <td>
+ <s:property value="site.storeCode" />
+ </td>
+ <td>
+ <s:property value="site.locationCode" />
+ </td>
+ <td>
+ <s:property value="magalieUser.name" />
+ </td>
+ <td>
+ <s:property value="reportDate" />
+ </td>
+ </tr>
+ </s:iterator>
+ </tbody>
+
+ </table>
+</section>
+
+<section>
<h2>Utilisateurs connus</h2>
<table class="table">
1
0
r38 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie magalie-persistence/src/main/java/com/franciaflex/magalie/dao magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa magalie-services/src/main/java/com/franciaflex/magalie/services magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 25 Mar '13
by bleny＠users.forge.codelutin.com 25 Mar '13
25 Mar '13
Author: bleny
Date: 2013-03-25 16:47:59 +0100 (Mon, 25 Mar 2013)
New Revision: 38
Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision…
Log:
refs #2204: show storage movements
Modified:
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/StorageMovementDao.java
trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaStorageMovementDao.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java
trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java 2013-03-25 15:13:20 UTC (rev 37)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/StorageMovements.java 2013-03-25 15:47:59 UTC (rev 38)
@@ -3,6 +3,8 @@
import com.franciaflex.magalie.entity.Article;
import com.franciaflex.magalie.entity.StorageMovement;
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
public class StorageMovements {
@@ -14,7 +16,23 @@
}
}
+ protected static class StorageMovementIsConfirmedPredicate implements Predicate<StorageMovement> {
+
+ @Override
+ public boolean apply(StorageMovement storageMovement) {
+ return storageMovement.isConfirmed();
+ }
+ }
+
public static Function<StorageMovement, Article> getArticleFunction() {
return new GetArticleFunction();
}
+
+ public static Predicate<StorageMovement> storageMovementIsConfirmed() {
+ return new StorageMovementIsConfirmedPredicate();
+ }
+
+ public static Predicate<StorageMovement> storageMovementIsNotConfirmed() {
+ return Predicates.not(storageMovementIsConfirmed());
+ }
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/StorageMovementDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/StorageMovementDao.java 2013-03-25 15:13:20 UTC (rev 37)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/StorageMovementDao.java 2013-03-25 15:47:59 UTC (rev 38)
@@ -12,4 +12,6 @@
List<StorageMovement> findAllByArticle(Article article);
+ List<StorageMovement> findAll();
+
}
Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaStorageMovementDao.java
===================================================================
--- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaStorageMovementDao.java 2013-03-25 15:13:20 UTC (rev 37)
+++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaStorageMovementDao.java 2013-03-25 15:47:59 UTC (rev 38)
@@ -26,4 +26,9 @@
return query.getResultList();
}
+ @Override
+ public List<StorageMovement> findAll() {
+ Query query = entityManager.createQuery("from StorageMovement sm order by sm.orderDate");
+ return query.getResultList();
+ }
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-25 15:13:20 UTC (rev 37)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-25 15:47:59 UTC (rev 38)
@@ -1,6 +1,10 @@
package com.franciaflex.magalie.services;
+import com.franciaflex.magalie.StorageMovements;
import com.franciaflex.magalie.entity.MagalieUser;
+import com.franciaflex.magalie.entity.StorageMovement;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
import java.util.Date;
import java.util.List;
@@ -8,12 +12,19 @@
public class MagalieReport {
protected Date reportDate;
- private List<MagalieUser> allMagalieUsers;
+ protected List<MagalieUser> allMagalieUsers;
+
+ protected List<StorageMovement> allStorageMovements;
+
public void setReportDate(Date reportDate) {
this.reportDate = reportDate;
}
+ public Date getReportDate() {
+ return reportDate;
+ }
+
public void setAllMagalieUsers(List<MagalieUser> allMagalieUsers) {
this.allMagalieUsers = allMagalieUsers;
}
@@ -21,4 +32,30 @@
public List<MagalieUser> getAllMagalieUsers() {
return allMagalieUsers;
}
+
+ public void setAllStorageMovements(List<StorageMovement> allStorageMovements) {
+ this.allStorageMovements = allStorageMovements;
+ }
+
+ public List<StorageMovement> getConfirmedStorageMovements() {
+ ImmutableList<StorageMovement> confirmedStorageMovements =
+ ImmutableList.copyOf(
+ Iterables.filter(
+ allStorageMovements,
+ StorageMovements.storageMovementIsConfirmed()
+ )
+ );
+ return confirmedStorageMovements;
+ }
+
+ public List<StorageMovement> getNotConfirmedStorageMovements() {
+ ImmutableList<StorageMovement> confirmedStorageMovements =
+ ImmutableList.copyOf(
+ Iterables.filter(
+ allStorageMovements,
+ StorageMovements.storageMovementIsNotConfirmed()
+ )
+ );
+ return confirmedStorageMovements;
+ }
}
Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 15:13:20 UTC (rev 37)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 15:47:59 UTC (rev 38)
@@ -1,6 +1,8 @@
package com.franciaflex.magalie.services;
+import com.franciaflex.magalie.dao.StorageMovementDao;
import com.franciaflex.magalie.entity.MagalieUser;
+import com.franciaflex.magalie.entity.StorageMovement;
import java.util.Date;
import java.util.List;
@@ -28,6 +30,12 @@
magalieReport.setAllMagalieUsers(allMagalieUsers);
+ StorageMovementDao storageMovementDao = serviceContext.getStorageMovementDao();
+
+ List<StorageMovement> allStorageMovements = storageMovementDao.findAll();
+
+ magalieReport.setAllStorageMovements(allStorageMovements);
+
return magalieReport;
}
Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp
===================================================================
--- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-25 15:13:20 UTC (rev 37)
+++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-25 15:47:59 UTC (rev 38)
@@ -7,7 +7,137 @@
<h1>Rapport MagaLiE</h1>
+<p>
+ <s:property value="report.reportDate" />
+</p>
+
<section>
+ <h2>Mouvements de stocks prévus (non confirmés)</h2>
+
+ <table class="table">
+ <thead>
+ <tr>
+ <th>
+ Id
+ </th>
+ <th>
+ Magasin
+ </th>
+ <th>
+ Emplacement
+ </th>
+ <th>
+ Article
+ </th>
+ <th>
+ Quantité
+ </th>
+ <th>
+ Utilisateur
+ </th>
+ <th>
+ Date ordre
+ </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <s:iterator value="report.notConfirmedStorageMovements">
+ <tr>
+ <td>
+ <s:property value="id" />
+ </td>
+ <td>
+ <s:property value="site.storeCode" />
+ </td>
+ <td>
+ <s:property value="site.locationCode" />
+ </td>
+ <td>
+ <s:property value="article.code" />
+ </td>
+ <td>
+ <s:property value="quantity" /> <s:property value="article.unit" />
+ </td>
+ <td>
+ <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a>
+ </td>
+ <td>
+ <s:property value="orderDate" />
+ </td>
+ </tr>
+ </s:iterator>
+ </tbody>
+ </table>
+</section>
+
+<section>
+ <h2>Mouvements de stocks confirmés</h2>
+
+ <table class="table">
+ <thead>
+ <tr>
+ <th>
+ Id
+ </th>
+ <th>
+ Magasin
+ </th>
+ <th>
+ Emplacement
+ </th>
+ <th>
+ Article
+ </th>
+ <th>
+ Quantité
+ </th>
+ <th>
+ Utilisateur
+ </th>
+ <th>
+ Date ordre
+ </th>
+ <th>
+ Date confirmation
+ </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <s:iterator value="report.confirmedStorageMovements">
+ <tr>
+ <td>
+ <s:property value="id" />
+ </td>
+ <td>
+ <s:property value="site.storeCode" />
+ </td>
+ <td>
+ <s:property value="site.locationCode" />
+ </td>
+ <td>
+ <s:property value="article.code" />
+ </td>
+ <td>
+ <s:property value="quantity" /> <s:property value="article.unit" />
+ </td>
+ <td>
+ <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a>
+ </td>
+ <td>
+ <s:property value="orderDate" />
+ </td>
+ <td>
+ <s:property value="confirmDate" />
+ </td>
+ </tr>
+ </s:iterator>
+ </tbody>
+ </table>
+</section>
+
+<section>
<h2>Utilisateurs connus</h2>
<table class="table">
@@ -29,10 +159,10 @@
</thead>
<tbody>
- <s:iterator value="report.allMagalieUsers" var="magalieUser">
+ <s:iterator value="report.allMagalieUsers">
<tr>
<td>
- <s:property value="id" />
+ <a name="<s:property value="id" />"><s:property value="id" /></a>
</td>
<td>
<s:property value="login" />
1
0