Author: bleny Date: 2013-04-11 21:44:51 +0200 (Thu, 11 Apr 2013) New Revision: 87 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: rename site to location Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java Removed: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.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/jpa/SiteErrorJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.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-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.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/jpa/StoredArticleJpaDao.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/StorageMovement.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.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/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.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/ReportService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/main/resources/fixtures2.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-11 19:44:51 UTC (rev 87) @@ -5,8 +5,8 @@ import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao; 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.LocationDao; +import com.franciaflex.magalie.persistence.dao.LocationErrorDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; import com.franciaflex.magalie.persistence.dao.StoreDao; @@ -14,10 +14,10 @@ import com.franciaflex.magalie.persistence.dao.jpa.ArticleJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.BuildingJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.DeliveredRequestedArticleJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.LocationErrorJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.LocationJpaDao; 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.StoreJpaDao; @@ -66,8 +66,8 @@ } @Override - public SiteErrorDao getSiteErrorDao() { - return new SiteErrorJpaDao(entityManager); + public LocationErrorDao getLocationErrorDao() { + return new LocationErrorJpaDao(entityManager); } @Override @@ -76,8 +76,8 @@ } @Override - public SiteDao getSiteDao() { - return new SiteJpaDao(entityManager); + public LocationDao getLocationDao() { + return new LocationJpaDao(entityManager); } @Override Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java (from rev 83, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java) =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,73 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.Location; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; + +import java.util.Collection; +import java.util.Comparator; + +public class Locations { + + protected static class LocationRequireDriverLicensePredicate implements Predicate<Location> { + + @Override + public boolean apply(Location location) { + return location.isDriverLicenseRequired(); + } + } + + protected static class AccessibleLocationPredicate implements Predicate<Location> { + + protected MagalieUser magalieUser; + + public AccessibleLocationPredicate(MagalieUser magalieUser) { + this.magalieUser = magalieUser; + } + + @Override + public boolean apply(Location location) { + boolean isLocationAccessible = magalieUser.isDriverLicenseOwner() + || ! location.isDriverLicenseRequired(); + return isLocationAccessible; + } + + } + + protected static class LocationRequiringDriverLicenseFirstComparator implements Comparator<Location> { + + @Override + public int compare(Location location1, Location location2) { + boolean location1RequireDriverLicense = locationRequireDriverLicensePredicate().apply(location1); + boolean location2RequireDriverLicense = locationRequireDriverLicensePredicate().apply(location2); + if (location1RequireDriverLicense && ! location2RequireDriverLicense) { + return -1; + } else if ( ! location1RequireDriverLicense && location2RequireDriverLicense) { + return +1; + } else { + return 0; + } + } + } + + public static Predicate<Location> accessibleLocationPredicate(MagalieUser magalieUser) { + return new AccessibleLocationPredicate(magalieUser); + } + + public static Predicate<Location> inaccessibleLocationPredicate(MagalieUser magalieUser) { + return Predicates.not(accessibleLocationPredicate(magalieUser)); + } + + public static Predicate<Location> locationRequireDriverLicensePredicate() { + return new LocationRequireDriverLicensePredicate(); + } + + public static Comparator<Location> locationRequiringDriverLicenseFirstComparator() { + return new LocationRequiringDriverLicenseFirstComparator(); + } + + public static Predicate<Location> locationIsNotReportedInError(Collection<Location> allLocationsInError) { + return Predicates.not(Predicates.in(allLocationsInError)); + } +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-11 19:44:51 UTC (rev 87) @@ -5,8 +5,8 @@ import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao; 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.LocationDao; +import com.franciaflex.magalie.persistence.dao.LocationErrorDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; import com.franciaflex.magalie.persistence.dao.StoreDao; @@ -33,11 +33,11 @@ StorageMovementDao getStorageMovementDao(); - SiteErrorDao getSiteErrorDao(); + LocationErrorDao getLocationErrorDao(); StorageMovementOrderDao getStorageMovementOrderDao(); - SiteDao getSiteDao(); + LocationDao getLocationDao(); DeliveredRequestedArticleDao getDeliveredRequestedArticleDao(); Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Sites.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,73 +0,0 @@ -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> inaccessibleSitePredicate(MagalieUser magalieUser) { - return Predicates.not(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)); - } -} 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,7 +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.Location; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -17,11 +17,11 @@ } } - protected static class GetOriginSiteFunction implements Function<StorageMovement, Site> { + protected static class GetOriginFunction implements Function<StorageMovement, Location> { @Override - public Site apply(StorageMovement storageMovement) { - return storageMovement.getOriginSite(); + public Location apply(StorageMovement storageMovement) { + return storageMovement.getOriginLocation(); } } @@ -37,8 +37,8 @@ return new GetArticleFunction(); } - public static Function<StorageMovement, Site> getOriginSiteFunction() { - return new GetOriginSiteFunction(); + public static Function<StorageMovement, Location> getOriginFunction() { + return new GetOriginFunction(); } public static Predicate<StorageMovement> storageMovementIsConfirmed() { 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-04-11 19:44:51 UTC (rev 87) @@ -2,7 +2,7 @@ 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.Location; import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -15,24 +15,24 @@ public class StoredArticles { - protected static class FixedSiteForArticleFirst implements Comparator<StoredArticle> { + protected static class FixedLocationForArticleFirst implements Comparator<StoredArticle> { protected Article article; - public FixedSiteForArticleFirst(Article article) { + public FixedLocationForArticleFirst(Article article) { this.article = article; } @Override public int compare(StoredArticle x, StoredArticle y) { - boolean xIsInFixedSite = article.isFixedSite(x.getSite()); - boolean yIsInFixedSite = article.isFixedSite(y.getSite()); - return BooleanComparator.getTrueFirstComparator().compare(xIsInFixedSite, yIsInFixedSite); + boolean xIsInFixedLocation = article.isFixedLocation(x.getLocation()); + boolean yIsInFixedLocation = article.isFixedLocation(y.getLocation()); + return BooleanComparator.getTrueFirstComparator().compare(xIsInFixedLocation, yIsInFixedLocation); } } - protected static class SiteWithHighestQuantityFirst implements Comparator<StoredArticle> { + protected static class LocationWithHighestQuantityFirst implements Comparator<StoredArticle> { @Override public int compare(StoredArticle o1, StoredArticle o2) { @@ -41,22 +41,22 @@ } - protected static class AccessibleSiteFirst implements Comparator<StoredArticle> { + protected static class AccessibleLocationFirst implements Comparator<StoredArticle> { - protected Predicate<StoredArticle> articleStoredInAccessibleSitePredicate; + protected Predicate<StoredArticle> articleStoredInAccessibleLocationPredicate; - public AccessibleSiteFirst(MagalieUser magalieUser) { - articleStoredInAccessibleSitePredicate = - articleStoredInAccessibleSitePredicate(magalieUser); + public AccessibleLocationFirst(MagalieUser magalieUser) { + articleStoredInAccessibleLocationPredicate = + articleStoredInAccessibleLocationPredicate(magalieUser); } @Override public int compare(StoredArticle o1, StoredArticle o2) { - boolean isSite1Accessible = articleStoredInAccessibleSitePredicate.apply(o1); - boolean isSite2Accessible = articleStoredInAccessibleSitePredicate.apply(o2); - if (isSite1Accessible && ! isSite2Accessible) { + boolean isLocation1Accessible = articleStoredInAccessibleLocationPredicate.apply(o1); + boolean isLocation2Accessible = articleStoredInAccessibleLocationPredicate.apply(o2); + if (isLocation1Accessible && ! isLocation2Accessible) { return -1; - } else if ( ! isSite1Accessible && isSite2Accessible) { + } else if ( ! isLocation1Accessible && isLocation2Accessible) { return 1; } else { return 0; @@ -65,59 +65,59 @@ } - protected static class GetSiteFunction implements Function<StoredArticle, Site> { + protected static class GetLocationFunction implements Function<StoredArticle, Location> { @Override - public Site apply(StoredArticle storedArticle) { - return storedArticle.getSite(); + public Location apply(StoredArticle storedArticle) { + return storedArticle.getLocation(); } } - protected static class ArticleStoredInSitesRequiringDriverLicenseFirstComparator implements Comparator<StoredArticle> { + protected static class ArticleStoredInLocationsRequiringDriverLicenseFirstComparator implements Comparator<StoredArticle> { @Override public int compare(StoredArticle o1, StoredArticle o2) { - return Sites.siteRequiringDriverLicenseFirstComparator().compare(o1.getSite(), o2.getSite()); + return Locations.locationRequiringDriverLicenseFirstComparator().compare(o1.getLocation(), o2.getLocation()); } } - public static Comparator<StoredArticle> siteWithHighestQuantityFirst() { - return new SiteWithHighestQuantityFirst(); + public static Comparator<StoredArticle> locationWithHighestQuantityFirst() { + return new LocationWithHighestQuantityFirst(); } - public static Comparator<StoredArticle> siteWithLowestQuantityFirstComparator() { - return Ordering.from(new SiteWithHighestQuantityFirst()).reverse(); + public static Comparator<StoredArticle> locationWithLowestQuantityFirstComparator() { + return Ordering.from(new LocationWithHighestQuantityFirst()).reverse(); } - public static Comparator<StoredArticle> accessibleSiteFirstComparator(MagalieUser magalieUser) { - return new AccessibleSiteFirst(magalieUser); + public static Comparator<StoredArticle> accessibleLocationFirstComparator(MagalieUser magalieUser) { + return new AccessibleLocationFirst(magalieUser); } - public static Comparator<StoredArticle> fixedSiteForArticleFirstComparator(Article article) { - return new FixedSiteForArticleFirst(article); + public static Comparator<StoredArticle> fixedLocationForArticleFirstComparator(Article article) { + return new FixedLocationForArticleFirst(article); } - public static Comparator<StoredArticle> fixedSiteForArticleLastComparator(Article article) { - return Ordering.from(new FixedSiteForArticleFirst(article)).reverse(); + public static Comparator<StoredArticle> fixedLocationForArticleLastComparator(Article article) { + return Ordering.from(new FixedLocationForArticleFirst(article)).reverse(); } - public static Function<StoredArticle, Site> getSiteFunction() { - return new GetSiteFunction(); + public static Function<StoredArticle, Location> getLocationFunction() { + return new GetLocationFunction(); } - public static Predicate<StoredArticle> articleStoredInAccessibleSitePredicate(MagalieUser magalieUser) { + public static Predicate<StoredArticle> articleStoredInAccessibleLocationPredicate(MagalieUser magalieUser) { Predicate<StoredArticle> predicate = Predicates.compose( - Sites.accessibleSitePredicate(magalieUser), - getSiteFunction()); + Locations.accessibleLocationPredicate(magalieUser), + getLocationFunction()); return predicate; } - public static Comparator<StoredArticle> articleStoredInSitesRequiringDriverLicenseFirstComparator() { - return new ArticleStoredInSitesRequiringDriverLicenseFirstComparator(); + public static Comparator<StoredArticle> articleStoredInLocationsRequiringDriverLicenseFirstComparator() { + return new ArticleStoredInLocationsRequiringDriverLicenseFirstComparator(); } - public static Predicate<StoredArticle> articleNotStoredInSiteReportedInError(Collection<Site> allSitesInError) { - return Predicates.compose(Sites.siteIsNotReportedInError(allSitesInError), getSiteFunction()); + public static Predicate<StoredArticle> articleNotStoredInLocationReportedInError(Collection<Location> allLocationsInError) { + return Predicates.compose(Locations.locationIsNotReportedInError(allLocationsInError), getLocationFunction()); } } Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java (from rev 83, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java) =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,11 @@ +package com.franciaflex.magalie.persistence.dao; + +import com.franciaflex.magalie.persistence.entity.Location; + +import java.util.List; + +public interface LocationDao extends Dao<Location> { + + List<String> getAllStoreCodes(); + +} Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java (from rev 83, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java) =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,19 @@ +package com.franciaflex.magalie.persistence.dao; + +import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.persistence.entity.LocationError; + +import java.util.List; + +/** + * @author bleny + */ +public interface LocationErrorDao extends Dao<LocationError> { + + LocationError findByLocation(Location location); + + List<Location> getAllLocationsInError(); + + List<LocationError> findAll(); + +} Deleted: 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 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,11 +0,0 @@ -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(); - -} Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteErrorDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,19 +0,0 @@ -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/jpa/LocationErrorJpaDao.java (from rev 83, 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/LocationErrorJpaDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,47 @@ +package com.franciaflex.magalie.persistence.dao.jpa; + +import com.franciaflex.magalie.persistence.dao.LocationErrorDao; +import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.persistence.entity.LocationError; +import com.google.common.collect.Iterables; + +import javax.persistence.EntityManager; +import javax.persistence.Query; +import java.util.List; + +public class LocationErrorJpaDao extends AbstractJpaDao<LocationError> implements LocationErrorDao { + + public LocationErrorJpaDao(EntityManager entityManager) { + super(entityManager); + } + + @Override + protected Class<LocationError> getEntityClass() { + return LocationError.class; + } + + @Override + public LocationError findByLocation(Location location) { + Query query = entityManager.createQuery("from LocationError se where se.location = :location"); + query.setParameter("location", location); + LocationError locationError = (LocationError) + Iterables.getOnlyElement( + query.getResultList(), + null); + return locationError; + } + + @Override + public List<Location> getAllLocationsInError() { + Query query = entityManager.createQuery("select se.location from LocationError se"); + List<Location> allLocationsInError = query.getResultList(); + return allLocationsInError; + } + + @Override + public List<LocationError> findAll() { + Query query = entityManager.createQuery("from LocationError se order by se.reportDate"); + List<LocationError> all = query.getResultList(); + return all; + } +} Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java (from rev 83, 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/LocationJpaDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,27 @@ +package com.franciaflex.magalie.persistence.dao.jpa; + +import com.franciaflex.magalie.persistence.dao.LocationDao; +import com.franciaflex.magalie.persistence.entity.Location; + +import javax.persistence.EntityManager; +import javax.persistence.Query; +import java.util.List; + +public class LocationJpaDao extends AbstractJpaDao<Location> implements LocationDao { + + public LocationJpaDao(EntityManager entityManager) { + super(entityManager); + } + + @Override + protected Class<Location> getEntityClass() { + return Location.class; + } + + @Override + public List<String> getAllStoreCodes() { + Query query = entityManager.createQuery("select distinct s.storeCode from Location s order by s.storeCode"); + List<String> resultList = query.getResultList(); + return resultList; + } +} Deleted: 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 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteErrorJpaDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,47 +0,0 @@ -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; - } -} Deleted: 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 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,27 +0,0 @@ -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-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 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-11 19:44:51 UTC (rev 87) @@ -22,7 +22,7 @@ @Override public List<StoredArticle> findAllForArticleInBuilding(Article article, Building building) { - Query query = entityManager.createQuery("from StoredArticle sa where sa.article = :article and sa.site.store.building = :building"); + Query query = entityManager.createQuery("from StoredArticle sa where sa.article = :article and sa.location.store.building = :building"); query.setParameter("article", article); query.setParameter("building", building); List<StoredArticle> resultList = query.getResultList(); 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-04-11 19:44:51 UTC (rev 87) @@ -12,7 +12,7 @@ protected String id; @ManyToMany - protected Set<Site> fixedSites; + protected Set<Location> fixedLocations; protected String description; @@ -31,12 +31,12 @@ this.id = id; } - public Set<Site> getFixedSites() { - return fixedSites; + public Set<Location> getFixedLocations() { + return fixedLocations; } - public void setFixedSites(Set<Site> fixedSites) { - this.fixedSites = fixedSites; + public void setFixedLocations(Set<Location> fixedLocations) { + this.fixedLocations = fixedLocations; } public String getCode() { @@ -71,12 +71,12 @@ this.description = description; } - public boolean isFixedSite(Site site) { - boolean isFixedSite = false; - Set<Site> fixedSites = getFixedSites(); - if (fixedSites != null) { - isFixedSite = fixedSites.contains(site); + public boolean isFixedLocation(Location location) { + boolean isFixedLocation = false; + Set<Location> fixedLocations = getFixedLocations(); + if (fixedLocations != null) { + isFixedLocation = fixedLocations.contains(location); } - return isFixedSite; + return isFixedLocation; } } Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java (from rev 83, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java) =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,65 @@ +package com.franciaflex.magalie.persistence.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class Location extends AbstractEntity { + + @Id + protected String id; + + @ManyToOne + protected Store store; + + protected String locationCode; + + protected int requiredAccreditationLevel; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Store getStore() { + return store; + } + + public void setStore(Store store) { + this.store = store; + } + + public String getLocationCode() { + return locationCode; + } + + public void setLocationCode(String locationCode) { + this.locationCode = locationCode; + } + + public int getRequiredAccreditationLevel() { + return requiredAccreditationLevel; + } + + public void setRequiredAccreditationLevel(int requiredAccreditationLevel) { + this.requiredAccreditationLevel = requiredAccreditationLevel; + } + + public String getBarcode() { + String barcode = getStoreCode() + getLocationCode(); + return barcode; + } + + public boolean isDriverLicenseRequired() { + return requiredAccreditationLevel == 9; + } + + public String getStoreCode() { + return getStore().getName(); + } +} Copied: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java (from rev 83, trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/SiteError.java) =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,57 @@ +package com.franciaflex.magalie.persistence.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import java.util.Date; + +@Entity +public class LocationError extends AbstractEntity { + + @Id + @GeneratedValue + protected String id; + + @OneToOne + protected Location location; + + @ManyToOne + protected MagalieUser magalieUser; + + protected Date reportDate; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Location getLocation() { + return location; + } + + public void setLocation(Location location) { + this.location = location; + } + + public MagalieUser getMagalieUser() { + return magalieUser; + } + + public void setMagalieUser(MagalieUser magalieUser) { + this.magalieUser = magalieUser; + } + + public Date getReportDate() { + return reportDate; + } + + public void setReportDate(Date reportDate) { + this.reportDate = reportDate; + } +} Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,65 +0,0 @@ -package com.franciaflex.magalie.persistence.entity; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -@Entity -public class Site extends AbstractEntity { - - @Id - protected String id; - - @ManyToOne - protected Store store; - - protected String locationCode; - - protected int requiredAccreditationLevel; - - @Override - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Store getStore() { - return store; - } - - public void setStore(Store store) { - this.store = store; - } - - public String getLocationCode() { - return locationCode; - } - - public void setLocationCode(String locationCode) { - this.locationCode = locationCode; - } - - public int getRequiredAccreditationLevel() { - return requiredAccreditationLevel; - } - - public void setRequiredAccreditationLevel(int requiredAccreditationLevel) { - this.requiredAccreditationLevel = requiredAccreditationLevel; - } - - public String getBarcode() { - String barcode = getStoreCode() + getLocationCode(); - return barcode; - } - - public boolean isDriverLicenseRequired() { - return requiredAccreditationLevel == 9; - } - - public String getStoreCode() { - return getStore().getName(); - } -} Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/SiteError.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/SiteError.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/SiteError.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,57 +0,0 @@ -package com.franciaflex.magalie.persistence.entity; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import java.util.Date; - -@Entity -public class SiteError extends AbstractEntity { - - @Id - @GeneratedValue - protected String id; - - @OneToOne - protected Site site; - - @ManyToOne - protected MagalieUser magalieUser; - - protected Date reportDate; - - @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 MagalieUser getMagalieUser() { - return magalieUser; - } - - public void setMagalieUser(MagalieUser magalieUser) { - this.magalieUser = magalieUser; - } - - public Date getReportDate() { - return reportDate; - } - - public void setReportDate(Date reportDate) { - this.reportDate = reportDate; - } -} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-04-11 19:44:51 UTC (rev 87) @@ -16,10 +16,10 @@ protected String id; @ManyToOne - protected Site originSite; + protected Location originLocation; @ManyToOne - protected Site destinationSite; + protected Location destinationLocation; @ManyToOne protected Article article; @@ -44,20 +44,20 @@ this.id = id; } - public Site getOriginSite() { - return originSite; + public Location getOriginLocation() { + return originLocation; } - public void setOriginSite(Site originSite) { - this.originSite = originSite; + public void setOriginLocation(Location originLocation) { + this.originLocation = originLocation; } - public Site getDestinationSite() { - return destinationSite; + public Location getDestinationLocation() { + return destinationLocation; } - public void setDestinationSite(Site destinationSite) { - this.destinationSite = destinationSite; + public void setDestinationLocation(Location destinationLocation) { + this.destinationLocation = destinationLocation; } public Article getArticle() { 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-04-11 19:44:51 UTC (rev 87) @@ -99,24 +99,24 @@ storageMovements.add(storageMovement); } - public Set<Site> getSites() { - Set<Site> sites = + public Set<Location> getLocations() { + Set<Location> locations = Sets.newHashSet( Iterables.transform( getStorageMovements(), - StorageMovements.getOriginSiteFunction() + StorageMovements.getOriginFunction() ) ); - return sites; + return locations; } - public StorageMovement findStorageMovementBySiteId(String siteId) { + public StorageMovement findStorageMovementByLocationId(String locationId) { StorageMovement storageMovement = Iterables.find( getStorageMovements(), Predicates.compose( - Entities.entityHasId(siteId), - StorageMovements.getOriginSiteFunction() + Entities.entityHasId(locationId), + StorageMovements.getOriginFunction() ), null ); Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-04-11 19:44:51 UTC (rev 87) @@ -14,7 +14,7 @@ protected Article article; @ManyToOne - protected Site site; + protected Location location; protected double quantity; @@ -27,12 +27,12 @@ this.id = id; } - public Site getSite() { - return site; + public Location getLocation() { + return location; } - public void setSite(Site site) { - this.site = site; + public void setLocation(Location location) { + this.location = location; } public Article getArticle() { Modified: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java =================================================================== --- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-04-11 19:44:51 UTC (rev 87) @@ -26,17 +26,17 @@ //// entityManager.persist(new MagalieUser()); //// entityManager.persist(new Article()); //// entityManager.persist(new StoredArticle()); -//// entityManager.persist(new Site()); +//// entityManager.persist(new Location()); //// entityManager.persist(new RequestedArticle()); // -//// entityManager.persist(new SiteError()); +//// entityManager.persist(new LocationError()); //// entityManager.persist(new StorageMovement()); // -// List<Site> storageMovements = fixtures.fixture("storageMovements"); +// List<Location> storageMovements = fixtures.fixture("storageMovements"); // -// for (Site site : storageMovements) { +// for (Location location : storageMovements) { // -// entityManager.persist(site); +// entityManager.persist(location); // // } // Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-11 19:44:51 UTC (rev 87) @@ -7,7 +7,7 @@ import com.franciaflex.magalie.persistence.entity.Building; 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.Location; import com.franciaflex.magalie.persistence.entity.Store; import com.franciaflex.magalie.persistence.entity.StoredArticle; import org.apache.commons.io.Charsets; @@ -37,7 +37,7 @@ 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); + reader.getConfig().setClassTag("location", Location.class); try { fixtures = (Map<String, Object>) reader.read(); } catch (YamlException e) { 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,8 +1,8 @@ package com.franciaflex.magalie.services; import com.franciaflex.magalie.persistence.StorageMovements; +import com.franciaflex.magalie.persistence.entity.LocationError; 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; @@ -18,7 +18,7 @@ protected List<StorageMovement> allStorageMovements; - protected List<SiteError> allSiteErrors; + protected List<LocationError> allLocationErrors; public void setReportDate(Date reportDate) { this.reportDate = reportDate; @@ -62,11 +62,11 @@ return confirmedStorageMovements; } - public List<SiteError> getAllSiteErrors() { - return allSiteErrors; + public List<LocationError> getAllLocationErrors() { + return allLocationErrors; } - public void setAllSiteErrors(List<SiteError> allSiteErrors) { - this.allSiteErrors = allSiteErrors; + public void setAllLocationErrors(List<LocationError> allLocationErrors) { + this.allLocationErrors = allLocationErrors; } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java 2013-04-11 19:44:51 UTC (rev 87) @@ -7,9 +7,9 @@ protected String storageMovementOrderId; - protected Map<String, Double> sitesIdsToActualQuantities; + protected Map<String, Double> locationsIdsToActualQuantities; - protected Set<String> siteInErrorIds; + protected Set<String> locationInErrorIds; public String getStorageMovementOrderId() { return storageMovementOrderId; @@ -19,19 +19,19 @@ this.storageMovementOrderId = storageMovementOrderId; } - public Map<String, Double> getSitesIdsToActualQuantities() { - return sitesIdsToActualQuantities; + public Map<String, Double> getLocationsIdsToActualQuantities() { + return locationsIdsToActualQuantities; } - public void setSitesIdsToActualQuantities(Map<String, Double> sitesIdsToActualQuantities) { - this.sitesIdsToActualQuantities = sitesIdsToActualQuantities; + public void setLocationsIdsToActualQuantities(Map<String, Double> locationsIdsToActualQuantities) { + this.locationsIdsToActualQuantities = locationsIdsToActualQuantities; } - public Set<String> getSiteInErrorIds() { - return siteInErrorIds; + public Set<String> getLocationInErrorIds() { + return locationInErrorIds; } - public void setSiteInErrorIds(Set<String> siteInErrorIds) { - this.siteInErrorIds = siteInErrorIds; + public void setLocationInErrorIds(Set<String> locationInErrorIds) { + this.locationInErrorIds = locationInErrorIds; } } 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-04-11 19:44:51 UTC (rev 87) @@ -32,13 +32,13 @@ public List<StorageMovement> getStorageMovements() { - List<StorageMovement> sites = Lists.newLinkedList(); + List<StorageMovement> storageMovements = Lists.newLinkedList(); - sites.addAll(storageMovementOrder.getStorageMovements()); + storageMovements.addAll(storageMovementOrder.getStorageMovements()); - sites.addAll(extraStorageMovements); + storageMovements.addAll(extraStorageMovements); - return sites; + return storageMovements; } 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/RequiredDriverLicenceException.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,9 +1,9 @@ package com.franciaflex.magalie.services.exception; -import com.franciaflex.magalie.persistence.Sites; +import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.franciaflex.magalie.persistence.entity.Site; import com.google.common.base.Predicate; public class RequiredDriverLicenceException extends MagalieException { @@ -12,7 +12,7 @@ protected MagalieUser magalieUser; - protected Site site; + protected Location location; protected RequiredDriverLicenceException(String message) { super(message); @@ -26,15 +26,15 @@ return magalieUser; } - public Site getSite() { - return site; + public Location getLocation() { + return location; } - public static void throwIfUserCannotAccessSite(MagalieUser magalieUser, Site site, Article article) throws RequiredDriverLicenceException { + public static void throwIfUserCannotAccessLocation(MagalieUser magalieUser, Location location, Article article) throws RequiredDriverLicenceException { - Predicate<Site> isSiteInaccessiblePredicate = Sites.inaccessibleSitePredicate(magalieUser); + Predicate<Location> isLocationInaccessiblePredicate = Locations.inaccessibleLocationPredicate(magalieUser); - if (isSiteInaccessiblePredicate.apply(site)) { + if (isLocationInaccessiblePredicate.apply(location)) { String message = "requested article " + article + " can not be retrieved since user " + magalieUser @@ -44,7 +44,7 @@ newException.magalieUser = magalieUser; - newException.site = site; + newException.location = location; newException.article = article; 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-11 19:44:51 UTC (rev 87) @@ -2,14 +2,14 @@ import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.StoredArticles; -import com.franciaflex.magalie.persistence.dao.SiteDao; +import com.franciaflex.magalie.persistence.dao.LocationDao; 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.Building; +import com.franciaflex.magalie.persistence.entity.Location; 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; @@ -51,23 +51,23 @@ } public StorageMovementOrder bookArticleWithBestEffortPolicy( - MagalieUser magalieUser, Building building, Article article, double requestedQuantity, Site destinationSite) + MagalieUser magalieUser, Building building, Article article, double requestedQuantity, Location destinationLocation) throws RequiredDriverLicenceException, UnavailableArticleException { - return bookArticle(magalieUser, building, article ,requestedQuantity, destinationSite, true); + return bookArticle(magalieUser, building, article ,requestedQuantity, destinationLocation, true); } public StorageMovementOrder bookArticle( - MagalieUser magalieUser, Building building, Article article, double requestedQuantity, Site destinationSite) + MagalieUser magalieUser, Building building, Article article, double requestedQuantity, Location destinationLocation) throws UnavailableArticleException, RequiredDriverLicenceException { - return bookArticle(magalieUser, building, article ,requestedQuantity, destinationSite, false); + return bookArticle(magalieUser, building, article ,requestedQuantity, destinationLocation, false); } protected StorageMovementOrder bookArticle( - MagalieUser magalieUser, Building building, Article article, double requestedQuantity, Site destinationSite, boolean bestEffortPolicy) + MagalieUser magalieUser, Building building, Article article, double requestedQuantity, Location destinationLocation, boolean bestEffortPolicy) throws UnavailableArticleException, RequiredDriverLicenceException { Preconditions.checkNotNull(magalieUser); @@ -89,9 +89,9 @@ Ordering<StoredArticle> storedArticlesOrdering = Ordering.compound( Lists.newArrayList( - StoredArticles.fixedSiteForArticleLastComparator(article), - StoredArticles.siteWithLowestQuantityFirstComparator(), - StoredArticles.articleStoredInSitesRequiringDriverLicenseFirstComparator() + StoredArticles.fixedLocationForArticleLastComparator(article), + StoredArticles.locationWithLowestQuantityFirstComparator(), + StoredArticles.articleStoredInLocationsRequiringDriverLicenseFirstComparator() ) ); @@ -110,15 +110,15 @@ double quantityLeft = requestedQuantity - quantity; - double quantityInSite = storedArticle.getQuantity(); + double quantityInLocation = storedArticle.getQuantity(); - double quantityWithdrawn = Math.min(quantityLeft, quantityInSite); + double quantityWithdrawn = Math.min(quantityLeft, quantityInLocation); if (quantityWithdrawn > 0.) { - Site originSite = storedArticle.getSite(); + Location originLocation = storedArticle.getLocation(); - RequiredDriverLicenceException.throwIfUserCannotAccessSite(magalieUser, originSite, article); + RequiredDriverLicenceException.throwIfUserCannotAccessLocation(magalieUser, originLocation, article); quantity += quantityWithdrawn; @@ -130,9 +130,9 @@ newStorageMovement.setMagalieUser(magalieUser); - newStorageMovement.setOriginSite(originSite); + newStorageMovement.setOriginLocation(originLocation); - newStorageMovement.setDestinationSite(destinationSite); + newStorageMovement.setDestinationLocation(destinationLocation); newStorageMovement.setExpectedQuantity(quantityWithdrawn); @@ -187,24 +187,24 @@ Article article = storageMovementOrder.getArticle(); - Set<Site> sitesInOrder = storageMovementOrder.getSites(); + Set<Location> locationsInOrder = storageMovementOrder.getLocations(); // we suppose the order concerns movement in the same building - Building building = Iterables.get(sitesInOrder, 0).getStore().getBuilding(); + Building building = Iterables.get(locationsInOrder, 0).getStore().getBuilding(); List<StoredArticle> storedArticles = getStoredArticles(building, article); for (StoredArticle storedArticle : storedArticles) { - Site site = storedArticle.getSite(); + Location location = storedArticle.getLocation(); - if ( ! sitesInOrder.contains(site)) { + if ( ! locationsInOrder.contains(location)) { StorageMovement newStorageMovement = new StorageMovement(); newStorageMovement.setArticle(article); - newStorageMovement.setOriginSite(site); + newStorageMovement.setOriginLocation(location); newStorageMovement.setExpectedQuantity(0.); @@ -231,17 +231,17 @@ List<StorageMovement> storageMovements = storageMovementDao.findAllByArticle(article); - ImmutableMap<Site, StoredArticle> storedArticlesBySite = + ImmutableMap<Location, StoredArticle> storedArticlesByLocation = Maps.uniqueIndex( storedArticles, - StoredArticles.getSiteFunction() + StoredArticles.getLocationFunction() ); for (StorageMovement storageMovement : storageMovements) { - Site originSite = storageMovement.getOriginSite(); + Location originLocation = storageMovement.getOriginLocation(); - StoredArticle storedArticle = storedArticlesBySite.get(originSite); + StoredArticle storedArticle = storedArticlesByLocation.get(originLocation); double actualQuantity = storedArticle.getQuantity() - storageMovement.getQuantity(); @@ -251,7 +251,7 @@ } else { - // site is empty, do not include it as a site where you can take an article + // location is empty, do not include it as a location where you can take an article storedArticles.remove(storedArticle); } @@ -260,15 +260,15 @@ // exclude storageMovements reported in error - SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class); + LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); - List<Site> allSitesInError = siteErrorsService.getAllSitesInError(); + List<Location> allLocationsInError = locationErrorsService.getAllLocationsInError(); storedArticles = Lists.newArrayList( Iterables.filter( storedArticles, - StoredArticles.articleNotStoredInSiteReportedInError(allSitesInError) + StoredArticles.articleNotStoredInLocationReportedInError(allLocationsInError) ) ); @@ -283,35 +283,35 @@ StorageMovementOrderDao storageMovementOrderDao = serviceContext.getPersistenceContext().getStorageMovementOrderDao(); - SiteDao siteDao = serviceContext.getPersistenceContext().getSiteDao(); + LocationDao locationDao = serviceContext.getPersistenceContext().getLocationDao(); StorageMovementOrder storageMovementOrder = storageMovementOrderDao.findById(storageMovementOrderId); Date confirmDate = serviceContext.getNow(); - SiteErrorsService siteErrorsService = - serviceContext.newService(SiteErrorsService.class); + LocationErrorsService locationErrorsService = + serviceContext.newService(LocationErrorsService.class); - for (Map.Entry<String, Double> siteIdToActualQuantity : confirmation.getSitesIdsToActualQuantities().entrySet()) { + for (Map.Entry<String, Double> locationIdToActualQuantity : confirmation.getLocationsIdsToActualQuantities().entrySet()) { - String siteId = siteIdToActualQuantity.getKey(); + String locationId = locationIdToActualQuantity.getKey(); - double actualQuantity = siteIdToActualQuantity.getValue(); + double actualQuantity = locationIdToActualQuantity.getValue(); StorageMovement storageMovement = - storageMovementOrder.findStorageMovementBySiteId(siteId); + storageMovementOrder.findStorageMovementByLocationId(locationId); if (storageMovement == null) { // user made a movement out of the order from its own initiative storageMovement = new StorageMovement(); - Site originSite = siteDao.findById(siteId); + Location originLocation = locationDao.findById(locationId); - storageMovement.setOriginSite(originSite); + storageMovement.setOriginLocation(originLocation); - // TODO brendan 28/03/13 what about destination site + // TODO brendan 28/03/13 what about destination location storageMovement.setMagalieUser(magalieUser); @@ -329,11 +329,11 @@ } - for (String siteInErrorId : confirmation.getSiteInErrorIds()) { + for (String locationInErrorId : confirmation.getLocationInErrorIds()) { - Site siteInError = siteDao.findById(siteInErrorId); + Location locationInError = locationDao.findById(locationInErrorId); - siteErrorsService.reportError(siteInError, magalieUser, confirmDate); + locationErrorsService.reportError(locationInError, magalieUser, confirmDate); } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-11 19:44:51 UTC (rev 87) @@ -5,14 +5,14 @@ import com.franciaflex.magalie.persistence.dao.BuildingDao; 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.LocationDao; import com.franciaflex.magalie.persistence.dao.StoreDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; 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.Location; import com.franciaflex.magalie.persistence.entity.Store; import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.services.MagalieFixtures; @@ -109,13 +109,13 @@ persistenceContext.commit(); - SiteDao siteDao = persistenceContext.getSiteDao(); + LocationDao locationDao = persistenceContext.getLocationDao(); - Collection<Site> sites = fixtures.fixture("sites"); + Collection<Location> locations = fixtures.fixture("locations"); - for (Site site : sites) { + for (Location location : locations) { - siteDao.persist(site); + locationDao.persist(location); } 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-04-11 19:44:51 UTC (rev 87) @@ -4,8 +4,8 @@ import com.franciaflex.magalie.persistence.dao.StoreDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.franciaflex.magalie.persistence.entity.Site; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import com.franciaflex.magalie.persistence.entity.Store; import com.franciaflex.magalie.services.MagalieService; @@ -68,7 +68,7 @@ Building building = destinationStore.getBuilding(); - Site destinationSite = getDestinationSite(destinationStore); + Location destinationLocation = getDestinationLocation(destinationStore); StorageMovementOrder storageMovementOrder = articleStorageService.bookArticleWithBestEffortPolicy( @@ -76,13 +76,13 @@ building, article, quantityInKanban, - destinationSite); + destinationLocation); return storageMovementOrder; } - protected Site getDestinationSite(Store destinationStore) { + protected Location getDestinationLocation(Store destinationStore) { // TODO brendan 10/04/13 how to define destination for store, something like "INC" ? Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java (from rev 83, trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java) =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-04-11 19:44:51 UTC (rev 87) @@ -0,0 +1,82 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.dao.LocationErrorDao; +import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.persistence.entity.LocationError; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +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 LocationErrorsService implements MagalieService { + + private static final Log log = LogFactory.getLog(LocationErrorsService.class); + + protected MagalieServiceContext serviceContext; + + @Override + public void setServiceContext(MagalieServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public void reportError(Location location, MagalieUser magalieUser) { + + Date reportDate = serviceContext.getNow(); + + reportError(location, magalieUser, reportDate); + + } + + public void reportError(Location location, MagalieUser magalieUser, Date reportDate) { + + LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao(); + + LocationError existingLocationError = locationErrorDao.findByLocation(location); + + if (existingLocationError == null) { + + LocationError newLocationError = new LocationError(); + + newLocationError.setMagalieUser(magalieUser); + + newLocationError.setLocation(location); + + newLocationError.setReportDate(reportDate); + + locationErrorDao.persist(newLocationError); + + serviceContext.getPersistenceContext().commit(); + + } else { + + if (log.isInfoEnabled()) { + log.info("error on location " + location + " already reported, nothing saved"); + } + + } + } + + public List<Location> getAllLocationsInError() { + + LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao(); + + List<Location> allLocationsInError = locationErrorDao.getAllLocationsInError(); + + return allLocationsInError; + + } + + public List<LocationError> getAllLocationErrors() { + + LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao(); + + List<LocationError> allLocationErrors = locationErrorDao.findAll(); + + return allLocationErrors; + + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,8 +1,8 @@ package com.franciaflex.magalie.services.service; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; +import com.franciaflex.magalie.persistence.entity.LocationError; 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; @@ -40,11 +40,11 @@ magalieReport.setAllStorageMovements(allStorageMovements); - SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class); + LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); - List<SiteError> allSitesInError = siteErrorsService.getAllSiteErrors(); + List<LocationError> allLocationsInError = locationErrorsService.getAllLocationErrors(); - magalieReport.setAllSiteErrors(allSitesInError); + magalieReport.setAllLocationErrors(allLocationsInError); return magalieReport; Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-04-11 19:44:51 UTC (rev 87) @@ -1,82 +0,0 @@ -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) { - - Date reportDate = serviceContext.getNow(); - - reportError(site, magalieUser, reportDate); - - } - - public void reportError(Site site, MagalieUser magalieUser, Date reportDate) { - - SiteErrorDao siteErrorDao = serviceContext.getPersistenceContext().getSiteErrorDao(); - - SiteError existingSiteError = siteErrorDao.findBySite(site); - - if (existingSiteError == null) { - - SiteError newSiteError = new SiteError(); - - newSiteError.setMagalieUser(magalieUser); - - newSiteError.setSite(site); - - newSiteError.setReportDate(reportDate); - - siteErrorDao.persist(newSiteError); - - serviceContext.getPersistenceContext().commit(); - - } else { - - if (log.isInfoEnabled()) { - log.info("error on site " + site + " already reported, nothing saved"); - } - - } - } - - public List<Site> getAllSitesInError() { - - SiteErrorDao siteErrorDao = serviceContext.getPersistenceContext().getSiteErrorDao(); - - List<Site> allSitesInError = siteErrorDao.getAllSitesInError(); - - return allSitesInError; - - } - - public List<SiteError> getAllSiteErrors() { - - SiteErrorDao siteErrorDao = serviceContext.getPersistenceContext().getSiteErrorDao(); - - List<SiteError> allSiteErrors = siteErrorDao.findAll(); - - return allSiteErrors; - - } -} Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-11 19:44:51 UTC (rev 87) @@ -77,118 +77,118 @@ - *U04 - *SOM -site1: - &site1 !site - id: site1 +location1: + &location1 !location + id: location1 store: *U01 locationCode: A01 requiredAccreditationLevel: 0 -site2: - &site2 !site - id: site2 +location2: + &location2 !location + id: location2 store: *U01 locationCode: B02 requiredAccreditationLevel: 9 -site3: - &site3 !site - id: site3 +location3: + &location3 !location + id: location3 store: *U01 locationCode: C03 requiredAccreditationLevel: 0 -site4: - &site4 !site - id: site4 +location4: + &location4 !location + id: location4 store: *U01 locationCode: D04 requiredAccreditationLevel: 9 -site5: - &site5 !site - id: site5 +location5: + &location5 !location + id: location5 store: *U02 locationCode: F01 requiredAccreditationLevel: 0 -site6: - &site6 !site - id: site6 +location6: + &location6 !location + id: location6 store: *U02 locationCode: G02 requiredAccreditationLevel: 0 -site7: - &site7 !site - id: site7 +location7: + &location7 !location + id: location7 store: *U02 locationCode: H03 requiredAccreditationLevel: 9 -site8: - &site8 !site - id: site8 +location8: + &location8 !location + id: location8 store: *U04 locationCode: A010 requiredAccreditationLevel: 0 -site9: - &site9 !site - id: site9 +location9: + &location9 !location + id: location9 store: *SOM locationCode: B10 requiredAccreditationLevel: 0 -site10: - &site10 !site - id: site10 +location10: + &location10 !location + id: location10 store: *SOM locationCode: B24 requiredAccreditationLevel: 0 -site11: - &site11 !site - id: site11 +location11: + &location11 !location + id: location11 store: *SOM locationCode: B77 requiredAccreditationLevel: 0 -site12: - &site12 !site - id: site12 +location12: + &location12 !location + id: location12 store: *SOM locationCode: C12 requiredAccreditationLevel: 0 -site13: - &site13 !site - id: site13 +location13: + &location13 !location + id: location13 store: *U01 locationCode: REC requiredAccreditationLevel: 0 -sites: - - *site1 - - *site2 - - *site3 - - *site4 - - *site5 - - *site6 - - *site7 - - *site8 - - *site9 - - *site10 - - *site11 - - *site12 - - *site13 +locations: + - *location1 + - *location2 + - *location3 + - *location4 + - *location5 + - *location6 + - *location7 + - *location8 + - *location9 + - *location10 + - *location11 + - *location12 + - *location13 article1: &article1 !article id: article1 - fixedSites: - - *site4 - - *site8 + fixedLocations: + - *location4 + - *location8 code: 4034108 quantityInKanban: 50 unit: M @@ -197,8 +197,8 @@ article2: &article2 !article id: article2 - fixedSites: - - *site11 + fixedLocations: + - *location11 code: 4033079 quantityInKanban: 3 unit: PCE @@ -207,8 +207,8 @@ article3: &article3 !article id: article3 - fixedSites: - - *site1 + fixedLocations: + - *location1 code: 4092459 quantityInKanban: 50 unit: PCE @@ -225,8 +225,8 @@ article5: &article5 !article id: article5 - fixedSites: - - *site5 + fixedLocations: + - *location5 code: 4020012 quantityInKanban: 10 unit: B60 @@ -235,8 +235,8 @@ article6: &article6 !article id: article6 - fixedSites: - - *site3 + fixedLocations: + - *location3 code: 1421812 quantityInKanban: 9 unit: PCE @@ -254,91 +254,91 @@ &storedArticle1 !stored-article id: storedArticle1 article: *article1 - site: *site4 + location: *location4 quantity: 40 storedArticle2: &storedArticle2 !stored-article id: storedArticle2 article: *article1 - site: *site8 + location: *location8 quantity: 20 storedArticle3: &storedArticle3 !stored-article id: storedArticle3 article: *article2 - site: *site10 + location: *location10 quantity: 2 storedArticle4: &storedArticle4 !stored-article id: storedArticle4 article: *article3 - site: *site1 + location: *location1 quantity: 90 storedArticle5: &storedArticle5 !stored-article id: storedArticle5 article: *article1 - site: *site13 + location: *location13 quantity: 30 storedArticle6: &storedArticle6 !stored-article id: storedArticle6 article: *article2 - site: *site11 + location: *location11 quantity: 100 storedArticle7: &storedArticle7 !stored-article id: storedArticle7 article: *article2 - site: *site12 + location: *location12 quantity: 10 storedArticle8: &storedArticle8 !stored-article id: storedArticle8 article: *article3 - site: *site2 + location: *location2 quantity: 500 storedArticle9: &storedArticle9 !stored-article id: storedArticle9 article: *article3 - site: *site3 + location: *location3 quantity: 50 storedArticle10: &storedArticle10 !stored-article id: storedArticle10 article: *article5 - site: *site5 + location: *location5 quantity: 5 storedArticle11: &storedArticle11 !stored-article id: storedArticle11 article: *article5 - site: *site6 + location: *location6 quantity: 2 storedArticle12: &storedArticle12 !stored-article id: storedArticle12 article: *article5 - site: *site7 + location: *location7 quantity: 25 storedArticle13: &storedArticle13 !stored-article id: storedArticle13 article: *article6 - site: *site3 + location: *location3 quantity: 70 storedArticles: Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-11 19:44:51 UTC (rev 87) @@ -77,53 +77,53 @@ - *U04 - *SOM -site1: - &site1 !site - id: site1 +location1: + &location1 !location + id: location1 store: *U01 locationCode: A1 requiredAccreditationLevel: 0 -site2: - &site2 !site - id: site2 +location2: + &location2 !location + id: location2 store: *U01 locationCode: B2 requiredAccreditationLevel: 9 -site3: - &site3 !site - id: site3 +location3: + &location3 !location + id: location3 store: *U01 locationCode: C3 requiredAccreditationLevel: 0 -site4: - &site4 !site - id: site4 +location4: + &location4 !location + id: location4 store: *U01 locationCode: D4 requiredAccreditationLevel: 9 -site5: - &site5 !site - id: site5 +location5: + &location5 !location + id: location5 store: *U02 locationCode: A1 requiredAccreditationLevel: 0 -sites: - - *site1 - - *site2 - - *site3 - - *site4 - - *site5 +locations: + - *location1 + - *location2 + - *location3 + - *location4 + - *location5 article1: &article1 !article id: article1 - fixedSites: - - *site1 + fixedLocations: + - *location1 code: 111111111 quantityInKanban: 10 unit: kg @@ -140,8 +140,8 @@ article3: &article3 !article id: article3 - fixedSites: - - *site2 + fixedLocations: + - *location2 code: 333333333 quantityInKanban: 50 unit: g @@ -156,28 +156,28 @@ &storedArticle1 !stored-article id: storedArticle1 article: *article1 - site: *site1 + location: *location1 quantity: 50 storedArticle2: &storedArticle2 !stored-article id: storedArticle2 article: *article1 - site: *site2 + location: *location2 quantity: 20 storedArticle3: &storedArticle3 !stored-article id: storedArticle3 article: *article2 - site: *site1 + location: *location1 quantity: 10 storedArticle4: &storedArticle4 !stored-article id: storedArticle4 article: *article3 - site: *site4 + location: *location4 quantity: 1000 storedArticles: 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-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-11 19:44:51 UTC (rev 87) @@ -2,8 +2,8 @@ import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Location; 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.services.AbstractMagalieServiceTest; @@ -66,7 +66,7 @@ MagalieUser basile = fixture("basile"); Article article = fixture("article1"); - Site site2 = fixture("site2"); + Location location2 = fixture("location2"); StorageMovementOrder storageMovementOrder; try { @@ -79,7 +79,7 @@ if (log.isDebugEnabled()) { log.debug("exception raised = " + e); } - Assert.assertEquals(site2.getId(), e.getSite().getId()); + Assert.assertEquals(location2.getId(), e.getLocation().getId()); } } @@ -135,10 +135,10 @@ } Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); - StorageMovement site1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(20., site1.getExpectedQuantity(), DELTA); - StorageMovement site2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(30., site2.getExpectedQuantity(), DELTA); + StorageMovement location1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); + Assert.assertEquals(20., location1.getExpectedQuantity(), DELTA); + StorageMovement location2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); + Assert.assertEquals(30., location2.getExpectedQuantity(), DELTA); } @Test @@ -159,10 +159,10 @@ Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertEquals(20., storageMovement1.getExpectedQuantity(), DELTA); - Assert.assertEquals("B2", storageMovement1.getOriginSite().getLocationCode()); + Assert.assertEquals("B2", storageMovement1.getOriginLocation().getLocationCode()); StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); Assert.assertEquals(10., storageMovement2.getExpectedQuantity(), DELTA); - Assert.assertEquals("A1", storageMovement2.getOriginSite().getLocationCode()); + Assert.assertEquals("A1", storageMovement2.getOriginLocation().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { log.debug("exception raised = " + e); @@ -183,7 +183,7 @@ Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertEquals(30., storageMovement.getExpectedQuantity(), DELTA); - Assert.assertEquals("A1", storageMovement.getOriginSite().getLocationCode()); + Assert.assertEquals("A1", storageMovement.getOriginLocation().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { log.debug("exception raised = " + e); @@ -198,17 +198,17 @@ } @Test - public void testWithdrawArticleConsiderSitesInError() throws Exception { + public void testWithdrawArticleConsiderLocationsInError() 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); + // report location 2 in error + Location location2 = fixture("location2"); + LocationErrorsService locationErrorsService = newService(LocationErrorsService.class); + locationErrorsService.reportError(location2, alexandre); try { StorageMovementOrder storageMovementOrder = service.bookArticle(cathy, building, article, 30.); @@ -218,9 +218,9 @@ Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertNotEquals( - "site2 must not be returned because it was reported in error", - site2.getId(), - storageMovement.getOriginSite().getId()); + "location2 must not be returned because it was reported in error", + location2.getId(), + storageMovement.getOriginLocation().getId()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { log.debug("exception raised = " + e); @@ -239,7 +239,7 @@ MagalieUser alexandre = fixture("alexandre"); Article article = fixture("article2"); - Site site1 = fixture("site1"); + Location location1 = fixture("location1"); try { StorageMovementOrder storageMovementOrder = service.bookArticleWithBestEffortPolicy(alexandre, building, article, 30., null); @@ -249,7 +249,7 @@ Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertEquals("only 10 is available, so don't propose more", 10., storageMovement.getQuantity(), DELTA); - Assert.assertEquals(site1.getId(), storageMovement.getOriginSite().getId()); + Assert.assertEquals(location1.getId(), storageMovement.getOriginLocation().getId()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { log.debug("exception raised = " + e); Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-11 19:44:51 UTC (rev 87) @@ -48,15 +48,15 @@ <s:property value="id" /> </td> <td> - <s:property value="originSite.storeCode" /> + <s:property value="originLocation.storeCode" /> - - <s:property value="originSite.locationCode" /> + <s:property value="originLocation.locationCode" /> </td> <td> - <s:if test="destinationSite"> - <s:property value="destinationSite.storeCode" /> + <s:if test="destinationLocation"> + <s:property value="destinationLocation.storeCode" /> - - <s:property value="destinationSite.locationCode" /> + <s:property value="destinationLocation.locationCode" /> </s:if> </td> <td> @@ -120,15 +120,15 @@ <s:property value="id" /> </td> <td> - <s:property value="originSite.storeCode" /> + <s:property value="originLocation.storeCode" /> - - <s:property value="originSite.locationCode" /> + <s:property value="originLocation.locationCode" /> </td> <td> - <s:if test="destinationSite"> - <s:property value="destinationSite.storeCode" /> + <s:if test="destinationLocation"> + <s:property value="destinationLocation.storeCode" /> - - <s:property value="destinationSite.locationCode" /> + <s:property value="destinationLocation.locationCode" /> </s:if> </td> <td> @@ -180,16 +180,16 @@ </thead> <tbody> - <s:iterator value="report.allSiteErrors"> + <s:iterator value="report.allLocationErrors"> <tr> <td> <s:property value="id" /> </td> <td> - <s:property value="site.storeCode" /> + <s:property value="location.storeCode" /> </td> <td> - <s:property value="site.locationCode" /> + <s:property value="location.locationCode" /> </td> <td> <s:property value="magalieUser.name" /> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-04-11 19:44:51 UTC (rev 87) @@ -99,7 +99,7 @@ <section id="storageMovements"> </section> <s:form cssClass="form-horizontal"> - <s:textfield name="siteBarcode" label="Empl." inputAppendIcon="barcode" cssClass="input-small" /> + <s:textfield name="locationBarcode" label="Empl." inputAppendIcon="barcode" cssClass="input-small" /> <s:textfield name="quantity" label="Qté" inputAppend="%{storageMovementTask.article.unit}" cssClass="input-mini" /> <s:hidden name="confirmation" /> @@ -111,7 +111,7 @@ <div id="storageMovementTemplate" class="template"> <dl class="dl-horizontal"> <dt>Empl.</dt> - <dd><span data="originSite.store.name"></span> <span data="originSite.locationCode"></span></dd> + <dd><span data="originLocation.store.name"></span> <span data="originLocation.locationCode"></span></dd> <dt>Prélev.</dt> <dd><span data="withdrawn">0</span> / <span data="expectedQuantity"></span> <s:property value="storageMovementTask.article.unit" /></dd> </dl> Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-04-11 15:30:47 UTC (rev 86) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-04-11 19:44:51 UTC (rev 87) @@ -75,7 +75,7 @@ model.getStorageMovement = function(barcode) { var storageMovement; for (var i = 0; i < this.storageMovements.length; i++) { - if (barcode == this.storageMovements[i].originSite.barcode) { + if (barcode == this.storageMovements[i].originLocation.barcode) { storageMovement = this.storageMovements[i]; } } @@ -92,7 +92,7 @@ var storageMovement = this.getStorageMovement(barcode); storageMovement.used = true; storageMovement.defect = - storageMovement.expectedQuantity != 0. // don't mark a site in error just because we wasn't supposed to withdraw item from it in the order + storageMovement.expectedQuantity != 0. // don't mark a location in error just because we wasn't supposed to withdraw item from it in the order && quantity != storageMovement.expectedQuantity; storageMovement.withdrawn = quantity; }; @@ -104,38 +104,38 @@ storageMovement.withdrawn = 0; }; -model.nextSite = function() { +model.nextLocation = function() { this.storageMovementsIndex += 1; if (this.storageMovementsIndex >= this.storageMovements.length) { this.storageMovementsIndex = null; } else { var storageMovement = this.storageMovements[this.storageMovementsIndex]; if (storageMovement.expectedQuantity == 0.) { - console.debug("will use extra site " + storageMovement.originSite.locationCode); + console.debug("will use extra location " + storageMovement.originLocation.locationCode); var remainingQuantity = this.quantity - this.withdrawn(); storageMovement.expectedQuantity = remainingQuantity; -// var availableQuantityInSite = storageMovement.availableQuantity; -// storageMovement.expectedQuantity = Math.min(remainingQuantity, availableQuantityInSite); +// var availableQuantityInLocation = storageMovement.availableQuantity; +// storageMovement.expectedQuantity = Math.min(remainingQuantity, availableQuantityInLocation); console.debug("pushing new value to withdraw: " + storageMovement.expectedQuantity); } } }; model.getConfirmation = function() { - var sitesIdsToActualQuantities = {}; - var siteInErrorIds = []; + var locationsIdsToActualQuantities = {}; + var locationInErrorIds = []; $.each(model.storageMovements, function(key, storageMovement) { if (storageMovement.used) { - sitesIdsToActualQuantities[storageMovement.originSite.id] = storageMovement.withdrawn; + locationsIdsToActualQuantities[storageMovement.originLocation.id] = storageMovement.withdrawn; if (storageMovement.defect) { - siteInErrorIds.push(storageMovement.originSite.id); + locationInErrorIds.push(storageMovement.originLocation.id); } } }); var confirmation = { storageMovementOrderId: this.storageMovementOrderId, - sitesIdsToActualQuantities: sitesIdsToActualQuantities, - siteInErrorIds: siteInErrorIds + locationsIdsToActualQuantities: locationsIdsToActualQuantities, + locationInErrorIds: locationInErrorIds }; return confirmation; } @@ -151,7 +151,7 @@ } }, - refreshSites : function() { + refreshLocations : function() { var storageMovementsElement = $('#storageMovements'); @@ -169,7 +169,7 @@ } else { $(storageMovementElement).addClass('success'); } - } else if (storageMovement.originSite.id === model.storageMovements[model.storageMovementsIndex].originSite.id) { + } else if (storageMovement.originLocation.id === model.storageMovements[model.storageMovementsIndex].originLocation.id) { $(storageMovementElement).addClass('pending'); storageMovementsElement.scrollTop(storageMovementElement[0].offsetTop); } else { @@ -181,8 +181,8 @@ refreshForm : function() { // reset field to prevent reuse of the value by mistake - $('#withdraw-item_siteBarcode').val(''); - // set default value of quantity to what should be withdrawn on the current site + $('#withdraw-item_locationBarcode').val(''); + // set default value of quantity to what should be withdrawn on the current location if (model.storageMovementsIndex != null) { $('#withdraw-item_quantity').val(model.storageMovements[model.storageMovementsIndex].expectedQuantity); } @@ -198,7 +198,7 @@ refresh : function() { this.refreshSummary(); - this.refreshSites(); + this.refreshLocations(); this.refreshForm(); this.refreshButtons(); } @@ -215,14 +215,14 @@ } else { - var barcode = $('#withdraw-item_siteBarcode').val(); + var barcode = $('#withdraw-item_locationBarcode').val(); var quantity = parseFloat($('#withdraw-item_quantity').val()); model.withdraw(barcode, quantity); - // if used site focused as current, highlight next site to go - if (barcode == model.storageMovements[model.storageMovementsIndex].originSite.barcode) { - model.nextSite(); + // if used location focused as current, highlight next location to go + if (barcode == model.storageMovements[model.storageMovementsIndex].originLocation.barcode) { + model.nextLocation(); } } @@ -245,13 +245,13 @@ } else { - var barcode = $('#withdraw-item_siteBarcode').val(); + var barcode = $('#withdraw-item_locationBarcode').val(); model.reportError(barcode); - // if used site focused as current, highlight next site to go - if (barcode == model.storageMovements[model.storageMovementsIndex].originSite.barcode) { - model.nextSite(); + // if used location focused as current, highlight next location to go + if (barcode == model.storageMovements[model.storageMovementsIndex].originLocation.barcode) { + model.nextLocation(); } }