Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 27355e1c by Tony Chemit at 2022-10-18T13:54:08+02:00 Passer le flag saisie en 'non autorisée' sur le statut de collecte '999 - Inconnu'- Closes #2451 - - - - - 3 changed files: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java - core/persistence/resources/src/main/resources/db/migration/v9/9.0/02_1_fill-table-ps_common_acquisitionstatus-common.sql Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -117,7 +117,7 @@ public class ImportReferentialContext { private Fate fate1; private Fate fate2; private AcquisitionStatus acquisitionStatus1; - private AcquisitionStatus acquisitionStatus99; + private AcquisitionStatus acquisitionStatus999; private TransmittingBuoyType transmittingBuoyType98; private TransmittingBuoyOperation transmittingBuoyOperation1; private ObjectMaterial objectMaterialFOB; @@ -175,7 +175,7 @@ public class ImportReferentialContext { Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getId); acquisitionStatus1 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001"); // 1 - acquisitionStatus99 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99 + acquisitionStatus999 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99 // landing landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode); @@ -451,8 +451,8 @@ public class ImportReferentialContext { return acquisitionStatus1; } - public AcquisitionStatus getAcquisitionStatus99() { - return acquisitionStatus99; + public AcquisitionStatus getAcquisitionStatus999() { + return acquisitionStatus999; } public WellContentStatus getWellContentStatus(String code) { ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java ===================================== @@ -117,7 +117,7 @@ public class TripReader extends DataReader<Trip> { @Override public Trip read(ImportDataContext dataContext, ResultSet resultSet) throws SQLException { Trip entity = newEntity(Trip.SPI); - AcquisitionStatus notFilledAcquisitionStatus = dataContext.getAcquisitionStatus99(); + AcquisitionStatus notFilledAcquisitionStatus = dataContext.getAcquisitionStatus999(); entity.setObservationsAcquisitionStatus(notFilledAcquisitionStatus); entity.setTargetWellsSamplingAcquisitionStatus(notFilledAcquisitionStatus); entity.setLandingAcquisitionStatus(notFilledAcquisitionStatus); ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/02_1_fill-table-ps_common_acquisitionstatus-common.sql ===================================== @@ -27,6 +27,6 @@ INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}006' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '6' , true, false, true, false, true, true, true, true, false, 'Not done, insufficient human resources' , 'Non réalisé, ressources humaines insuffisantes' , 'Not done, insufficient human resources TODO' ); INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}007' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'7' , false, true, false, true, false, false, false, false, false, 'Not done, documents not provided by company', 'Non réalisé, documents non fournis par l''''armement', 'Not done, documents not provided by company TODO'); INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}099' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '99' , true, true, true, true, true, true, true, true, false, 'Not done, reason unknown' , 'Non réalisé, raison inconnue' , 'Not done, reason unknown TODO' ); -INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}999' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '999', true, true, true, true, true, true, true, true, true, 'Status unknown' , 'Statut inconnu' , 'Status unknown TODO' ); +INSERT INTO ps_common.Acquisitionstatus(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, observation, logbook, targetWellsSampling, landing, localMarket, localMarketWellsSampling, localMarketSurveySampling, advancedSampling, fieldEnabler, label1, label2, label3) values ('fr.ird.referential.ps.common.AcquisitionStatus#${REFERENTIAL_PREFIX}999' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, '999', true, true, true, true, true, true, true, true, false, 'Status unknown' , 'Statut inconnu' , 'Status unknown TODO' ); INSERT INTO common.LastUpdateDate(topiaId, topiaversion, topiacreatedate, type , lastUpdateDate) values ('${LAST_UPDATE_PREFIX}2032', 0, ${CURRENT_DATE}, 'fr.ird.observe.entities.referential.ps.common.AcquisitionStatus', ${CURRENT_TIMESTAMP}); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/27355e1c3fddea5eac39cfaf11... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/27355e1c3fddea5eac39cfaf11... You're receiving this email because of your account on gitlab.com.