Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48db4da9 by Tony CHEMIT at 2017-06-20T18:21:02+02:00 Insérer dans un ordre précis les ObjectMaterial - - - - - 2 changed files: - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - + services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -23,12 +23,15 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy */ import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.*; +import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto; +import fr.ird.observe.services.dto.referential.seine.ObjectMaterialHelper; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; @@ -116,7 +119,14 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser if (request.withReferentialToAdd()) { InsertSqlStatementGenerator<R> sqlStatementGenerator = new InsertSqlStatementGenerator<>(metadataEntity, dtoType); - for (R referentialDto : request.getReferentialToAdd()) { + ImmutableSet<R> referentialToAdd = request.getReferentialToAdd(); + if (ObjectMaterialDto.class.equals(dtoType)) { + + // must reorder to be sure to insert parent before sons + referentialToAdd = (ImmutableSet)ObjectMaterialHelper.reorder((ImmutableSet)referentialToAdd); + + } + for (R referentialDto : referentialToAdd) { ImmutableList<String> sql = sqlStatementGenerator.generateSql(referentialDto); result.addAll(sql); } ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java ===================================== --- /dev/null +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java @@ -0,0 +1,37 @@ +package fr.ird.observe.services.dto.referential.seine; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Set; + +public class ObjectMaterialHelper extends GeneratedObjectMaterialHelper { + + public static ImmutableSet<ObjectMaterialDto> reorder(ImmutableSet<ObjectMaterialDto> incoming) { + + Set<ObjectMaterialDto> roots = new LinkedHashSet<>(); + Multimap<String, ObjectMaterialDto> map = ArrayListMultimap.create(); + for (ObjectMaterialDto objectMaterialDto : incoming) { + if (objectMaterialDto.getParent() == null) { + roots.add(objectMaterialDto); + } else { + map.put(objectMaterialDto.getParent().getId(), objectMaterialDto); + } + } + ImmutableSet.Builder<ObjectMaterialDto> result = ImmutableSet.builder(); + for (ObjectMaterialDto root : roots) { + fill(root, result, map); + } + return result.build(); + } + + private static void fill(ObjectMaterialDto root, ImmutableSet.Builder<ObjectMaterialDto> result, Multimap<String, ObjectMaterialDto> map) { + result.add(root); + Collection<ObjectMaterialDto> objectMaterialDtos = map.get(root.getId()); + for (ObjectMaterialDto objectMaterialDto : objectMaterialDtos) { + fill(objectMaterialDto, result, map); + } + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/48db4da990f329219fa2953c8552... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/48db4da990f329219fa2953c8552... You're receiving this email because of your account on gitlab.com.