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

Commits:

4 changed files:

Changes:

  • core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
    ... ... @@ -138,7 +138,7 @@ public class ImportReferentialContext {
    138 138
         private ObservedSystem observedSystem102;
    
    139 139
         private ObservedSystem observedSystem103;
    
    140 140
         private ObservedSystem observedSystem110;
    
    141
    -    private VesselActivity vesselActivity6;
    
    141
    +    private VesselActivity vesselActivity52;
    
    142 142
         private VesselActivity vesselActivity101;
    
    143 143
         private VesselActivity vesselActivity102;
    
    144 144
         private SchoolType schoolType0;
    
    ... ... @@ -192,7 +192,7 @@ public class ImportReferentialContext {
    192 192
     
    
    193 193
             // activity
    
    194 194
             vesselActivity = Maps.uniqueIndex(referential.getVesselActivity(), VesselActivity::getCode);
    
    195
    -        vesselActivity6 = vesselActivity.get("6");
    
    195
    +        vesselActivity52 = vesselActivity.get("52");
    
    196 196
             vesselActivity101 = vesselActivity.get("101");
    
    197 197
             vesselActivity102 = vesselActivity.get("102");
    
    198 198
             schoolType = Maps.uniqueIndex(referential.getSchoolType(), SchoolType::getCode);
    
    ... ... @@ -592,8 +592,9 @@ public class ImportReferentialContext {
    592 592
             return Objects.requireNonNull(weightCategory, String.format("Can't find weight category for code: %s", categoryCode));
    
    593 593
         }
    
    594 594
     
    
    595
    -    public VesselActivity getVesselActivity6() {
    
    596
    -        return vesselActivity6;
    
    595
    +
    
    596
    +    public VesselActivity getVesselActivity52() {
    
    597
    +        return vesselActivity52;
    
    597 598
         }
    
    598 599
     
    
    599 600
         public VesselActivity getVesselActivity101() {
    

  • core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java
    ... ... @@ -322,7 +322,7 @@ public class ActivityReader extends DataReader<Activity> {
    322 322
             Activity entity = newEntity(Activity.SPI);
    
    323 323
     
    
    324 324
             entity.setNumber(activityNumber);
    
    325
    -        entity.setVesselActivity(dataContext.getVesselActivity6());
    
    325
    +        entity.setVesselActivity(dataContext.getVesselActivity52());
    
    326 326
             entity.setComment("Generated from AVDTH ECH_CALEE record");
    
    327 327
             entity.setSetCount(1);
    
    328 328
             loadCoordinate(resultSet, 7, entity);
    

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23
       <parent>
    
    24 24
         <groupId>io.ultreia.maven</groupId>
    
    25 25
         <artifactId>pom</artifactId>
    
    26
    -  <version>2023.54</version>
    
    26
    +    <version>2023.55</version>
    
    27 27
       </parent>
    
    28 28
       <groupId>fr.ird.observe</groupId>
    
    29 29
       <artifactId>ird-observe</artifactId>
    

  • server/core/src/main/java/fr/ird/observe/server/controller/DataSourceServiceRestApi.java
    ... ... @@ -49,7 +49,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
    49 49
             Map<String, Object> result = new LinkedHashMap<>();
    
    50 50
             result.put("url", ObserveDataSourceConfigurationInjector.getUrl(getContext()));
    
    51 51
             result.put("login", session.getUser().getLogin());
    
    52
    -        result.put("database", session.getUserPermission().getDatabase());
    
    52
    +        result.put("database", session.getUserPermission().getDatabase().getName());
    
    53 53
             result.put("apiAccess", session.getUserPermission().getApiAccess());
    
    54 54
             result.put("validationMode", session.getUserPermission().getValidationMode());
    
    55 55
             result.put("authenticationToken", session.getConnection().getAuthenticationToken());