This is an automated email from the git hooks/post-receive script. New commit to branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git commit d6fcd2b1510741359981deec9793dd24eb23caed Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 14:46:46 2015 +0100 Ajout de la talbe LastupdateDate dans la synchronisation du référentiel --- .../observe/ObserveTopiaPersistenceContext.java | 28 ++++++++++++++++++++- .../java/fr/ird/observe/entities/Entities.java | 4 ++- .../observe/entities/LastUpdateDateTopiaDao.java | 9 +++++++ .../dto/result/TripChildSaveResultDtos.java | 12 +++++++++ .../resources/db/5.0-3/dataForTestSeine.sql.gz | Bin 437565 -> 439122 bytes .../src/main/resources/db/5.0-3/referentiel.sql.gz | Bin 142041 -> 143337 bytes 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java index f3d777c..1eb669b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -23,16 +23,43 @@ package fr.ird.observe; */ import com.google.common.base.Preconditions; +import fr.ird.observe.entities.LastUpdateDate; +import fr.ird.observe.entities.LastUpdateDateTopiaDao; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; +import java.util.Date; + public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersistenceContext { public ObserveTopiaPersistenceContext(AbstractTopiaPersistenceContextConstructorParameter parameter) { super(parameter); } + public Date getLastUpdateDate(Class entityType) { + + LastUpdateDateTopiaDao dao = getDao(LastUpdateDate.class, LastUpdateDateTopiaDao.class); + LastUpdateDate lastUpdateDate = dao.findUniqueByType(entityType.getName()); + return lastUpdateDate.getLastUpdateDate(); + + } + + public <E extends TopiaEntity> void updateLastUpdateDate(Class<E> entityType, Date date) { + + LastUpdateDateTopiaDao dao = getDao(LastUpdateDate.class, LastUpdateDateTopiaDao.class); + LastUpdateDate lastUpdateDate = dao.findUniqueByType(entityType.getName()); + lastUpdateDate.setLastUpdateDate(date); + + } + + public <E extends TopiaEntity> void updateLastUpdateDate(E entityType, Date date) { + + Class<E> type = getType(entityType); + updateLastUpdateDate(type, date); + + } + public void flush() { getHibernateSupport().getHibernateSession().flush(); } @@ -48,5 +75,4 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste public <E extends TopiaEntity> TopiaDao<E> getDao(E entity) { return getDao(getType(entity)); } - } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index b2d3f62..2df93dc 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -72,7 +72,8 @@ public class Entities { ObserveEntityEnum.Program, ObserveEntityEnum.GearCaracteristicType, ObserveEntityEnum.GearCaracteristic, - ObserveEntityEnum.Gear + ObserveEntityEnum.Gear, + ObserveEntityEnum.LastUpdateDate }; public static final ObserveEntityEnum[] REFERENCE_SEINE_ENTITIES = @@ -153,6 +154,7 @@ public class Entities { ObserveEntityEnum.GearCaracteristicType, ObserveEntityEnum.GearCaracteristic, ObserveEntityEnum.Gear, + ObserveEntityEnum.LastUpdateDate, ObserveEntityEnum.VesselActivitySeine, ObserveEntityEnum.SurroundingActivity, diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java new file mode 100644 index 0000000..e8c5582 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java @@ -0,0 +1,9 @@ +package fr.ird.observe.entities; + +public class LastUpdateDateTopiaDao extends AbstractLastUpdateDateTopiaDao<LastUpdateDate> { + + public LastUpdateDate findUniqueByType(String v) { + return forTypeEquals(v).findUnique(); + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java new file mode 100644 index 0000000..56d2d6c --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java @@ -0,0 +1,12 @@ +package fr.ird.observe.services.dto.result; + +public class TripChildSaveResultDtos extends AbstractTripChildSaveResultDtos { + + public static TripChildSaveResultDto of(SaveResultDto incoming) { + TripChildSaveResultDto result = new TripChildSaveResultDto(); + result.setId(incoming.getId()); + result.setLastUpdate(incoming.getLastUpdate()); + return result; + } + +} diff --git a/observe-test-data/src/main/resources/db/5.0-3/dataForTestSeine.sql.gz b/observe-test-data/src/main/resources/db/5.0-3/dataForTestSeine.sql.gz index f9f2226..e776b2d 100644 Binary files a/observe-test-data/src/main/resources/db/5.0-3/dataForTestSeine.sql.gz and b/observe-test-data/src/main/resources/db/5.0-3/dataForTestSeine.sql.gz differ diff --git a/observe-test-data/src/main/resources/db/5.0-3/referentiel.sql.gz b/observe-test-data/src/main/resources/db/5.0-3/referentiel.sql.gz index 25eba82..508bb0a 100644 Binary files a/observe-test-data/src/main/resources/db/5.0-3/referentiel.sql.gz and b/observe-test-data/src/main/resources/db/5.0-3/referentiel.sql.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.