[Git][ultreiaio/ird-observe][develop] 3 commits: update pom

5 Dec 2023


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


Commits:
568bf70f by Tony Chemit at 2023-12-05T12:04:17+01:00
update pom

- - - - -
14a57d2a by Tony Chemit at 2023-12-05T12:11:45+01:00
Le service init.information de l'API retourne les informations sur la base cible, alors qu'on ne devrait que retourner son nom - Closes #2817

- - - - -
e9eb4688 by Tony Chemit at 2023-12-05T12:22:29+01:00
VesselActivity sur création d'activity par l'importeur AVDTH - Closes #2814

- - - - -


4 changed files:

- core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
- core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java
- pom.xml
- server/core/src/main/java/fr/ird/observe/server/controller/DataSourceServiceRestApi.java


Changes:

=====================================
core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
=====================================
@@ -138,7 +138,7 @@ public class ImportReferentialContext {
     private ObservedSystem observedSystem102;
     private ObservedSystem observedSystem103;
     private ObservedSystem observedSystem110;
-    private VesselActivity vesselActivity6;
+    private VesselActivity vesselActivity52;
     private VesselActivity vesselActivity101;
     private VesselActivity vesselActivity102;
     private SchoolType schoolType0;
@@ -192,7 +192,7 @@ public class ImportReferentialContext {
 
         // activity
         vesselActivity = Maps.uniqueIndex(referential.getVesselActivity(), VesselActivity::getCode);
-        vesselActivity6 = vesselActivity.get("6");
+        vesselActivity52 = vesselActivity.get("52");
         vesselActivity101 = vesselActivity.get("101");
         vesselActivity102 = vesselActivity.get("102");
         schoolType = Maps.uniqueIndex(referential.getSchoolType(), SchoolType::getCode);
@@ -592,8 +592,9 @@ public class ImportReferentialContext {
         return Objects.requireNonNull(weightCategory, String.format("Can't find weight category for code: %s", categoryCode));
     }
 
-    public VesselActivity getVesselActivity6() {
-        return vesselActivity6;
+
+    public VesselActivity getVesselActivity52() {
+        return vesselActivity52;
     }
 
     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> {
         Activity entity = newEntity(Activity.SPI);
 
         entity.setNumber(activityNumber);
-        entity.setVesselActivity(dataContext.getVesselActivity6());
+        entity.setVesselActivity(dataContext.getVesselActivity52());
         entity.setComment("Generated from AVDTH ECH_CALEE record");
         entity.setSetCount(1);
         loadCoordinate(resultSet, 7, entity);


=====================================
pom.xml
=====================================
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-  <version>2023.54</version>
+    <version>2023.55</version>
   </parent>
   <groupId>fr.ird.observe</groupId>
   <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
         Map<String, Object> result = new LinkedHashMap<>();
         result.put("url", ObserveDataSourceConfigurationInjector.getUrl(getContext()));
         result.put("login", session.getUser().getLogin());
-        result.put("database", session.getUserPermission().getDatabase());
+        result.put("database", session.getUserPermission().getDatabase().getName());
         result.put("apiAccess", session.getUserPermission().getApiAccess());
         result.put("validationMode", session.getUserPermission().getValidationMode());
         result.put("authenticationToken", session.getConnection().getAuthenticationToken());



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ba11dbb303d01e49b683e6d67...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ba11dbb303d01e49b683e6d67...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)