Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
    ... ... @@ -117,7 +117,7 @@ public class ImportReferentialContext {
    117 117
         private Fate fate1;
    
    118 118
         private Fate fate2;
    
    119 119
         private AcquisitionStatus acquisitionStatus1;
    
    120
    -    private AcquisitionStatus acquisitionStatus99;
    
    120
    +    private AcquisitionStatus acquisitionStatus999;
    
    121 121
         private TransmittingBuoyType transmittingBuoyType98;
    
    122 122
         private TransmittingBuoyOperation transmittingBuoyOperation1;
    
    123 123
         private ObjectMaterial objectMaterialFOB;
    
    ... ... @@ -175,7 +175,7 @@ public class ImportReferentialContext {
    175 175
     
    
    176 176
             Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getId);
    
    177 177
             acquisitionStatus1 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001"); // 1
    
    178
    -        acquisitionStatus99 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99
    
    178
    +        acquisitionStatus999 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99
    
    179 179
             // landing
    
    180 180
             landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode);
    
    181 181
     
    
    ... ... @@ -451,8 +451,8 @@ public class ImportReferentialContext {
    451 451
             return acquisitionStatus1;
    
    452 452
         }
    
    453 453
     
    
    454
    -    public AcquisitionStatus getAcquisitionStatus99() {
    
    455
    -        return acquisitionStatus99;
    
    454
    +    public AcquisitionStatus getAcquisitionStatus999() {
    
    455
    +        return acquisitionStatus999;
    
    456 456
         }
    
    457 457
     
    
    458 458
         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> {
    117 117
         @Override
    
    118 118
         public Trip read(ImportDataContext dataContext, ResultSet resultSet) throws SQLException {
    
    119 119
             Trip entity = newEntity(Trip.SPI);
    
    120
    -        AcquisitionStatus notFilledAcquisitionStatus = dataContext.getAcquisitionStatus99();
    
    120
    +        AcquisitionStatus notFilledAcquisitionStatus = dataContext.getAcquisitionStatus999();
    
    121 121
             entity.setObservationsAcquisitionStatus(notFilledAcquisitionStatus);
    
    122 122
             entity.setTargetWellsSamplingAcquisitionStatus(notFilledAcquisitionStatus);
    
    123 123
             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,
    27 27
     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'     );
    
    28 28
     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');
    
    29 29
     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'                   );
    
    30
    -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'                             );
    
    30
    +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'                             );
    
    31 31
     
    
    32 32
     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});