Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
970ba3e5
by Tony Chemit at 2021-11-24T00:12:22+01:00
2 changed files:
- models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
- models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java
Changes:
| ... | ... | @@ -62,6 +62,7 @@ import fr.ird.observe.persistence.avdth.data.logbook.WellPlanReader; |
| 62 | 62 |
import fr.ird.observe.persistence.avdth.referential.AvdthReferentialImportResult;
|
| 63 | 63 |
import fr.ird.observe.persistence.avdth.referential.SpeciesCache;
|
| 64 | 64 |
import fr.ird.observe.persistence.avdth.referential.interceptors.SchoolTypeInterceptor;
|
| 65 |
+import fr.ird.observe.persistence.avdth.referential.interceptors.VesselActivityInterceptor;
|
|
| 65 | 66 |
import fr.ird.observe.persistence.avdth.referential.interceptors.WeightCategoryInterceptor;
|
| 66 | 67 |
|
| 67 | 68 |
import java.util.List;
|
| ... | ... | @@ -502,7 +503,8 @@ public class ImportReferentialContext { |
| 502 | 503 |
}
|
| 503 | 504 |
|
| 504 | 505 |
public VesselActivity getVesselActivity(String code) {
|
| 505 |
- VesselActivity result = vesselActivity.get(code);
|
|
| 506 |
+ String observeVesselActivityCode = VesselActivityInterceptor.CODE_MAPPING.get(code);
|
|
| 507 |
+ VesselActivity result = vesselActivity.get(observeVesselActivityCode);
|
|
| 506 | 508 |
return Objects.requireNonNull(result, String.format("Can't find vessel activity wth code: %s", code));
|
| 507 | 509 |
}
|
| 508 | 510 |
|
| ... | ... | @@ -31,10 +31,10 @@ import fr.ird.observe.entities.referential.ps.common.ObjectOperation; |
| 31 | 31 |
import fr.ird.observe.entities.referential.ps.common.ObservedSystem;
|
| 32 | 32 |
import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOperation;
|
| 33 | 33 |
import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyType;
|
| 34 |
+import fr.ird.observe.entities.referential.ps.common.VesselActivity;
|
|
| 34 | 35 |
import fr.ird.observe.persistence.avdth.data.DataReader;
|
| 35 | 36 |
import fr.ird.observe.persistence.avdth.data.ImportDataContext;
|
| 36 | 37 |
import fr.ird.observe.persistence.avdth.data.ImportEngine;
|
| 37 |
-import fr.ird.observe.persistence.avdth.referential.interceptors.VesselActivityInterceptor;
|
|
| 38 | 38 |
import org.apache.commons.lang3.mutable.MutableInt;
|
| 39 | 39 |
|
| 40 | 40 |
import java.sql.ResultSet;
|
| ... | ... | @@ -211,9 +211,9 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { |
| 211 | 211 |
public FloatingObject read(ImportDataContext dataContext, ResultSet resultSet) throws SQLException {
|
| 212 | 212 |
|
| 213 | 213 |
String vesselActivityCode = resultSet.getString(13);
|
| 214 |
- String observeVesselActivityCode = VesselActivityInterceptor.CODE_MAPPING.get(vesselActivityCode);
|
|
| 214 |
+ VesselActivity vesselActivity = dataContext.getVesselActivity(vesselActivityCode);
|
|
| 215 | 215 |
Set<String> observedSystemCodes = dataContext.getObservedSystemCodes();
|
| 216 |
- if (!Objects.equals(observeVesselActivityCode, "13")) {
|
|
| 216 |
+ if (!Objects.equals(vesselActivity.getCode(), "13")) {
|
|
| 217 | 217 |
boolean noDcpInObservedSystems = observedSystemCodes.stream().noneMatch(OBSERVED_SYTEM_CODES_WITH_DCP::contains);
|
| 218 | 218 |
if (noDcpInObservedSystems) {
|
| 219 | 219 |
reset(dataContext);
|