This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 8bd6337 Ouverture de la marée après sa création (See #7588) new 23aaa1f Not null sur la propriété lastupdateDate pour toutes les entités new 4f38fb0 Il est possible qu'on est pas dans la table LastUpdateDate une ligne que l'on doit alors créer new 89fc2c7 Lors de la recopie dto → entité, si le lastupdateDate n'est pas définie, on en met un arbitrairement new dcded5a On repousse le même lastUpdateDate que celui de l'entité parente The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dcded5af6be73181c7a38cf99ee111ef426e4c2e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:15:02 2016 +0100 On repousse le même lastUpdateDate que celui de l'entité parente commit 89fc2c77c68a2b278b2150318aa71661784dab13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:14:15 2016 +0100 Lors de la recopie dto → entité, si le lastupdateDate n'est pas définie, on en met un arbitrairement commit 4f38fb0a09453d38ccf02c43e9df7f78cfe5df1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:13:31 2016 +0100 Il est possible qu'on est pas dans la table LastUpdateDate une ligne que l'on doit alors créer commit 23aaa1fc4d623ba979e9fc13144fec0f65e7d213 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:12:51 2016 +0100 Not null sur la propriété lastupdateDate pour toutes les entités Summary of changes: .../observe/ObserveTopiaPersistenceContext.java | 24 +++++++++++++++++---- .../src/main/xmi/observe-common.properties | 1 + .../services/binder/data/DataBinderSupport.java | 11 +++++++--- .../longline/TripLonglineGearUseServiceTopia.java | 25 +++++++++++++++++++++- 4 files changed, 53 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 23aaa1fc4d623ba979e9fc13144fec0f65e7d213 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:12:51 2016 +0100 Not null sur la propriété lastupdateDate pour toutes les entités --- observe-entities/src/main/xmi/observe-common.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index e586ffe..1393bef 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -84,3 +84,4 @@ fr.ird.observe.entities.referentiel.Program.attribute.organism.tagvalue.lazy=fal fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.ocean.tagvalue.notNull=true fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.species.tagvalue.notNull=true fr.ird.observe.entities.referentiel.LengthWeightParameter.attribute.sex.tagValue.notNull=true +fr.ird.observe.entities.ObserveEntity.attribute.lastUpdateDate.tagValue.notNull=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4f38fb0a09453d38ccf02c43e9df7f78cfe5df1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:13:31 2016 +0100 Il est possible qu'on est pas dans la table LastUpdateDate une ligne que l'on doit alors créer --- .../observe/ObserveTopiaPersistenceContext.java | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 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 32e3f6e..6ca60d4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -22,6 +22,7 @@ package fr.ird.observe; * #L% */ +import com.google.common.base.Optional; import com.google.common.base.Preconditions; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.LastUpdateDateTopiaDao; @@ -76,11 +77,26 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste public <E extends ObserveEntity> void updateLastUpdateDate(Class<E> entityType, Date date) { LastUpdateDateTopiaDao dao = getDao(LastUpdateDate.class, LastUpdateDateTopiaDao.class); - LastUpdateDate lastUpdateDate = dao.findUniqueByType(entityType.getName()); - if (log.isInfoEnabled()) { - log.info("Change LastUpdateDate: " + date + " for entity type: " + entityType.getName()); + String entityTypeName = entityType.getName(); + Optional<LastUpdateDate> optionalLastUpdateDate = dao.forTypeEquals(entityTypeName).tryFindUnique(); + LastUpdateDate lastUpdateDate; + if (!optionalLastUpdateDate.isPresent()) { + + lastUpdateDate = dao.newInstance(); + lastUpdateDate.setLastUpdateDate(date); + lastUpdateDate.setType(entityTypeName); + dao.create(lastUpdateDate); + if (log.isInfoEnabled()) { + log.info("Add LastUpdateDate: " + date + " for entity type: " + entityTypeName); + } + } else { + + lastUpdateDate = optionalLastUpdateDate.get(); + if (log.isInfoEnabled()) { + log.info("Change LastUpdateDate: " + date + " for entity type: " + entityTypeName); + } + lastUpdateDate.setLastUpdateDate(date); } - lastUpdateDate.setLastUpdateDate(date); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 89fc2c77c68a2b278b2150318aa71661784dab13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:14:15 2016 +0100 Lors de la recopie dto → entité, si le lastupdateDate n'est pas définie, on en met un arbitrairement --- .../ird/observe/services/binder/data/DataBinderSupport.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java index dce95d3..f8167e4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java @@ -19,6 +19,7 @@ import org.nuiton.topia.persistence.TopiaEntities; import java.io.Serializable; import java.util.Collection; +import java.util.Date; import java.util.LinkedHashSet; import java.util.Set; @@ -57,7 +58,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D dto.setLastUpdateDate(entity.getLastUpdateDate()); if (dto instanceof CommentableDto && entity instanceof CommentableEntity) { - ((CommentableDto)dto).setComment(((CommentableEntity)entity).getComment()); + ((CommentableDto) dto).setComment(((CommentableEntity) entity).getComment()); } } @@ -148,9 +149,13 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D protected void copyDtoDataFieldsToEntity(D dto, E entity) { entity.setTopiaId(dto.getId()); - entity.setLastUpdateDate(dto.getLastUpdateDate()); + Date lastUpdateDate = dto.getLastUpdateDate(); + if (lastUpdateDate == null) { + lastUpdateDate = new Date(); + } + entity.setLastUpdateDate(lastUpdateDate); if (dto instanceof CommentableDto && entity instanceof CommentableEntity) { - ((CommentableEntity)entity).setComment(((CommentableDto)dto).getComment()); + ((CommentableEntity) entity).setComment(((CommentableDto) dto).getComment()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit dcded5af6be73181c7a38cf99ee111ef426e4c2e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 4 18:15:02 2016 +0100 On repousse le même lastUpdateDate que celui de l'entité parente --- .../longline/TripLonglineGearUseServiceTopia.java | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java index bd16a1b..80ad894 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java @@ -22,6 +22,8 @@ package fr.ird.observe.services.service.longline; * #L% */ +import fr.ird.observe.entities.longline.GearUseFeaturesLongline; +import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; @@ -31,6 +33,9 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Date; +import java.util.Set; + /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -72,5 +77,23 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme // dao.updateEndDate(entity); } - + + protected SaveResultDto saveEntity(TripLongline entity) { + SaveResultDto saveResultDto = super.saveEntity(entity); + Date lastUpdateDate = saveResultDto.getLastUpdateDate(); + + // propagate lastUpdateDate to every gear uses + setLastUpdateDate(entity, lastUpdateDate); + return saveResultDto; + } + + protected void setLastUpdateDate(TripLongline entity, Date lastUpdateDate) { + Set<GearUseFeaturesLongline> gearUseFeaturesLonglines = entity.getGearUseFeaturesLongline(); + for (GearUseFeaturesLongline gearUseFeaturesLongline : gearUseFeaturesLonglines) { + gearUseFeaturesLongline.setLastUpdateDate(lastUpdateDate); + for (GearUseFeaturesMeasurementLongline gearUseFeaturesMeasurementLongline : gearUseFeaturesLongline.getGearUseFeaturesMeasurement()) { + gearUseFeaturesMeasurementLongline.setLastUpdateDate(lastUpdateDate); + } + } + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm