Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: e40de480 by Tony CHEMIT at 2018-03-06T23:39:50Z Spatialiser la table Ocean (See #288) Marées sans logbooks : gestion de leurs échantillons (remplissage de l'ocean après import) (See #116) - - - - - 8 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractOceanTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_3.java - + t3-domain/src/main/resources/db/migration/V_2_3_03-spatialize-ocean.sql - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -24,9 +24,14 @@ import fr.ird.t3.actions.T3Action; import fr.ird.t3.entities.T3EntityEnum; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; +import fr.ird.t3.entities.data.Activity; +import fr.ird.t3.entities.data.ActivityTopiaDao; import fr.ird.t3.entities.data.T3DataEntity; import fr.ird.t3.entities.data.Trip; import fr.ird.t3.entities.data.TripTopiaDao; +import fr.ird.t3.entities.data.TripType; +import fr.ird.t3.entities.reference.Ocean; +import fr.ird.t3.entities.reference.OceanTopiaDao; import fr.ird.t3.entities.reference.Vessel; import fr.ird.t3.entities.reference.VesselTopiaDao; import fr.ird.t3.services.ioc.InjectDAO; @@ -58,12 +63,16 @@ public class ImportInputSourceAction extends T3Action<ImportInputSourceConfigura // public static final String PARAM_TRIPS_TO_IMPORT = "tripsToImport"; // public static final String PARAM_TRIPS_TO_DELETE = "tripsToDelete"; private static final Log log = LogFactory.getLog(ImportInputSourceAction.class); - protected Set<Trip> trips; @InjectDAO(entityType = Trip.class) - protected TripTopiaDao tripDAO; - private Set<Trip> tripToDelete; + private TripTopiaDao tripDAO; @InjectDAO(entityType = Vessel.class) private VesselTopiaDao vesselDAO; + @InjectDAO(entityType = Activity.class) + private ActivityTopiaDao activityDAO; + @InjectDAO(entityType = Ocean.class) + private OceanTopiaDao oceanDAO; + private Set<Trip> tripToDelete; + private Set<Trip> trips; @Override protected void prepareAction() throws Exception { @@ -109,7 +118,7 @@ public class ImportInputSourceAction extends T3Action<ImportInputSourceConfigura addInfoMessage(message); } } - + boolean logbookMissing = TripType.LOGBOOKMISSING == getConfiguration().getTripType(); boolean createVirtualVessel = getConfiguration().isCreateVirtualVessel(); BuildVisitor builder = new BuildVisitor(getActionContext().getApplicationContext(), getT3TopiaPersistenceContext().get()); for (Trip trip : trips) { @@ -130,6 +139,9 @@ public class ImportInputSourceAction extends T3Action<ImportInputSourceConfigura String message = l(locale, "t3.message.trip.was.imported", tripLabel); addInfoMessage(message); + if (logbookMissing) { + fillActivityOcean(builder.activitiesWithNoOcean); + } // clean the builder after each entity (since each entity is // standalone and does not share data with other trips) builder.clear(); @@ -138,13 +150,26 @@ public class ImportInputSourceAction extends T3Action<ImportInputSourceConfigura return true; } + private void fillActivityOcean(Set<Activity> ids) { + + // Need to flush as we are going to query new data + getT3TopiaPersistenceContext().get().getHibernateSupport().getHibernateSession().flush(); + + String prefix = Activity.class.getName() + "#"; + for (Activity activity : ids) { + Ocean ocean = oceanDAO.findOceanByActivity(activity); + activity.setOcean(ocean); + } + } + protected static class BuildVisitor implements TopiaEntityVisitor { + protected final Set<String> ids = new HashSet<>(); + final Set<Activity> activitiesWithNoOcean = new HashSet<>(); final T3TopiaPersistenceContext tx; final T3TopiaApplicationContext rootTx; - protected final Set<String> ids = new HashSet<>(); - protected TopiaEntity current; final Stack<TopiaEntity> stack = new Stack<>(); + protected TopiaEntity current; BuildVisitor(T3TopiaApplicationContext rootTx, T3TopiaPersistenceContext tx) { this.tx = tx; @@ -189,6 +214,12 @@ public class ImportInputSourceAction extends T3Action<ImportInputSourceConfigura @SuppressWarnings("unchecked") TopiaDao<TopiaEntity> dao = tx.getDao(T3EntityEnum.getContractClass((Class) entity.getClass())); dao.update(entity); + if (entity instanceof Activity) { + Activity activity = (Activity) entity; + if (activity.getOcean() == null) { + activitiesWithNoOcean.add(activity); + } + } } catch (TopiaException e) { throw new IllegalStateException("Could not get dao for entity " + entity, e); } @@ -224,6 +255,7 @@ public class ImportInputSourceAction extends T3Action<ImportInputSourceConfigura @Override public void clear() { ids.clear(); + activitiesWithNoOcean.clear(); } } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractOceanTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractOceanTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractOceanTopiaDao.java @@ -20,8 +20,14 @@ */ package fr.ird.t3.entities.reference; +import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.Trip; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -51,4 +57,33 @@ public class AbstractOceanTopiaDao<E extends Ocean> extends GeneratedOceanTopiaD String hql = "SELECT DISTINCT(o) FROM OceanImpl o, ActivityImpl a WHERE a.ocean = o.id"; return new HashSet<>(findAll(hql)); } + + public E findOceanByActivity(Activity activity) { + GetOceanIdByActivityCoordinateQuery query = new GetOceanIdByActivityCoordinateQuery(activity.getTopiaId()); + String oceanId = topiaSqlSupport.findSingleResult(query); + return forTopiaIdEquals(oceanId).findUnique(); + } + + private static class GetOceanIdByActivityCoordinateQuery extends TopiaSqlQuery<String> { + + private final String activity; + + GetOceanIdByActivityCoordinateQuery(String activity) { + this.activity = activity; + } + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + @SuppressWarnings("SqlResolve") + PreparedStatement ps = connection.prepareStatement( + "SELECT o.topiaid FROM activity a, ocean o WHERE a.topiaId = ? AND ST_Contains(o.the_geom, a.the_geom)"); + ps.setString(1, activity); + return ps; + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + } } ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java @@ -144,14 +144,6 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T // on ne veut charger que les données observateurs, pas le referentiel continue; } - if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.Activity) { - //FIXME-116 Just to test remove this ASAP - cache.put(meta, new Map[]{}); - } - if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.WellPlan) { - //FIXME-116 Just to test remove this ASAP - cache.put(meta, new Map[]{}); - } Map<String, Object>[] data = getTableData(meta); if (hits != null) { long hit = hits.getHit(meta.getType()); ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java @@ -76,10 +76,6 @@ public abstract class T3AvdthDataEntityVisitor extends T3DataEntityVisitor { activity.setLatitude(Objects.requireNonNull(sampleSet.getActivityLatitude())); activity.setLongitude(Objects.requireNonNull(sampleSet.getActivityLongitude())); activity.setSchoolType(Objects.requireNonNull(sampleSet.getActivitySchoolType())); - - //FIXME-116 Get ocean from coordinates - activity.setOcean(parent.getDepartureHarbour().getOcean()); - sampleSet.setActivity(endActivity(activity)); parent.addActivity(activity); } ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_3.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_3.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_3.java @@ -48,6 +48,7 @@ public class T3MigrationCallbackV2_3 extends T3MigrationCallbackSupport { @Override protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { addScript("01", "add-Trip-tripType", queries); + addScript("03", "spatialize-ocean", queries); } } ===================================== t3-domain/src/main/resources/db/migration/V_2_3_03-spatialize-ocean.sql ===================================== The diff for this file was not included because it is too large. ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java @@ -10,12 +10,12 @@ package fr.ird.t3.actions.io.input; * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -40,7 +40,6 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu return new MSAccessTestConfiguration("testExecute_([^_]*)_(\\d+)(_.+)*", "%s_%s_V35.mdb", T3InputProviderAvdth35.ID); } - @Ignore @Test public void testExecute_OA_2000() throws Exception { testExecute(AtlanticOceanFixtures.OA_2000); @@ -51,16 +50,4 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu testExecute(IndianOceanFixtures.OI_2000); } - @Ignore - @Test - public void testExecute_OA_2000_withoutLogbook() throws Exception { - testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING); - } - - @Ignore - @Test - public void testExecute_OI_2002_withoutLogbook() throws Exception { - testExecute(IndianOceanFixtures.OI_2002,TripType.LOGBOOKMISSING); - } - } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java @@ -23,9 +23,7 @@ package fr.ird.t3.actions.io.input; import fr.ird.t3.actions.io.input.test.ImportInputSourceActionTestSupport; import fr.ird.t3.actions.io.input.test.MSAccessTestConfiguration; -import fr.ird.t3.entities.data.TripType; import fr.ird.t3.io.input.avdth.v35.T3InputProviderAvdth35; -import org.junit.Ignore; import org.junit.Test; /** @@ -50,16 +48,4 @@ public class ImportInputSourceActionTest extends ImportInputSourceActionTestSupp testExecute(IndianOceanFixtures.OI_2000); } - @Ignore - @Test - public void testExecute_OA_2000_withoutLogbook() throws Exception { - testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING); - } - - @Ignore - @Test - public void testExecute_OI_2002_withoutLogbook() throws Exception { - testExecute(IndianOceanFixtures.OI_2002, TripType.LOGBOOKMISSING); - } - } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/e40de48024b18af42224187d0c3bb0f17... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/e40de48024b18af42224187d0c3bb0f17... You're receiving this email because of your account on gitlab.com.