Merge branch 'release/2.0.4'

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>net.sumaris</groupId>
   <artifactId>sumaris-pod</artifactId>
-  <version>2.0.2</version>
+  <version>2.0.4</version>
   <packaging>pom</packaging>
   <name>SUMARiS</name>
   <description>SUMARiS :: Maven parent</description>

sumaris-core-shared/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
   </parent>
 
   <artifactId>sumaris-core-shared</artifactId>

sumaris-core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
   </parent>
 
   <artifactId>sumaris-core</artifactId>

sumaris-core/src/main/java/net/sumaris/core/dao/referential/ReferentialEntities.java

@@ -49,6 +49,8 @@
 import net.sumaris.core.model.referential.taxon.TaxonName;
 import net.sumaris.core.model.referential.taxon.TaxonomicLevel;
 import net.sumaris.core.model.referential.transcribing.TranscribingItem;
+import net.sumaris.core.model.referential.transcribing.TranscribingItemType;
+import net.sumaris.core.model.referential.transcribing.TranscribingSystem;
 import net.sumaris.core.model.technical.configuration.Software;
 import net.sumaris.core.model.technical.extraction.ExtractionProduct;
 import net.sumaris.core.model.technical.extraction.ExtractionProductTable;
@@ -94,7 +96,6 @@ public class ReferentialEntities {
         I18n.n("sumaris.persistence.table.qualitativeValue");
         I18n.n("sumaris.persistence.table.program");
         I18n.n("sumaris.persistence.table.acquisitionLevel");
-        I18n.n("sumaris.persistence.table.transcribingItem");
         I18n.n("sumaris.persistence.table.groupingClassification");
         I18n.n("sumaris.persistence.table.groupingLevel");
         I18n.n("sumaris.persistence.table.grouping");
@@ -114,6 +115,11 @@ public class ReferentialEntities {
         // Job
         I18n.n("sumaris.persistence.table.processingType");
         I18n.n("sumaris.persistence.table.processingStatus");
+        // Transcribing
+        I18n.n("sumaris.persistence.table.transcribingSystem");
+        I18n.n("sumaris.persistence.table.transcribingItem");
+        I18n.n("sumaris.persistence.table.transcribingItemType");
+
     }
 
     public static final List<Class<? extends IReferentialEntity>> ROOT_CLASSES = ImmutableList.of(
@@ -151,6 +157,8 @@ public class ReferentialEntities {
                 Strategy.class,
                 AcquisitionLevel.class,
                 // Transcribing
+                TranscribingSystem.class,
+                TranscribingItemType.class,
                 TranscribingItem.class,
                 // Grouping
                 GroupingClassification.class,

sumaris-core/src/main/java/net/sumaris/core/dao/social/UserEventRepositoryImpl.java

@@ -41,7 +41,6 @@
 
 import javax.persistence.EntityManager;
 import java.sql.Timestamp;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -83,7 +82,9 @@ public List<UserEventVO> findAllVO(@NonNull UserEventFilterVO filter, @Nullable
 
     @Override
     public void toEntity(UserEventVO source, UserEvent target, boolean copyIfNull) {
-        super.toEntity(source, target, copyIfNull);
+        Beans.copyProperties(source, target,
+            // Exclude computed field
+            UserEventVO.Fields.HAS_CONTENT);
 
         target.setLevel(source.getLevel().name());
         target.setType(source.getType().name());
@@ -118,17 +119,20 @@ protected void onAfterSaveEntity(UserEventVO vo, UserEvent savedEntity, boolean
         if (isNew) {
             vo.setCreationDate(savedEntity.getCreationDate());
         }
+        // Update computed property
+        vo.setHasContent(savedEntity.getContent() != null);
     }
 
-
     protected UserEventVO toVO(UserEvent source, UserEventFetchOptions fetchOptions) {
         UserEventVO target = new UserEventVO();
         this.toVO(source, target, fetchOptions, true);
         return target;
     }
 
     protected void toVO(UserEvent source, UserEventVO target, UserEventFetchOptions fetchOptions, boolean copyIfNull) {
-        Beans.copyProperties(source, target, UserEventVO.Fields.CONTENT /*skip content here*/);
+        Beans.copyProperties(source, target,
+            // Do not fetch 'content' (should be lazy loaded, only if fetched)
+            UserEventVO.Fields.CONTENT);
 
         target.setLevel(EventLevelEnum.valueOfOrNull(source.getLevel()));
         target.setType(EventTypeEnum.valueOfOrNull(source.getType()));

sumaris-core/src/main/java/net/sumaris/core/model/referential/transcribing/TranscribingItem.java

@@ -46,7 +46,6 @@ public class TranscribingItem implements IItemReferentialEntity<Integer>  {
     @Id
     @GeneratedValue(strategy=GenerationType.SEQUENCE, generator = "TRANSCRIBING_ITEM_SEQ")
     @SequenceGenerator(name = "TRANSCRIBING_ITEM_SEQ", sequenceName="TRANSCRIBING_ITEM_SEQ", allocationSize = SEQUENCE_ALLOCATION_SIZE)
-
     @EqualsAndHashCode.Include
     private Integer id;
 
@@ -63,7 +62,6 @@ public class TranscribingItem implements IItemReferentialEntity<Integer>  {
     private Date updateDate;
 
     @Column(name = "object_id")
-
     private Integer objectId;
 
     @Column(nullable = false, length = LENGTH_LABEL)

sumaris-core/src/main/java/net/sumaris/core/model/social/UserEvent.java

@@ -31,6 +31,7 @@
 import net.sumaris.core.model.annotation.Comment;
 import net.sumaris.core.model.data.IDataEntity;
 import net.sumaris.core.model.referential.IItemReferentialEntity;
+import org.hibernate.annotations.Formula;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -79,8 +80,12 @@ public class UserEvent implements ISignedEntity<Integer, Date>, IUpdateDateEntit
     @Lob
     @Column(length=20971520)
     @Basic(fetch = FetchType.LAZY)
+    // TODO: find a way to avoid selection of this field
     private String content;
 
+    @Formula("CASE WHEN CONTENT IS NOT NULL THEN 1 ELSE 0 END")
+    private Boolean hasContent;
+
     @Column(name = "hash", length = CRYPTO_HASH_LENGTH)
     private String hash;
 

sumaris-core/src/main/java/net/sumaris/core/vo/social/UserEventVO.java

@@ -52,6 +52,7 @@ public class UserEventVO implements IValueObject<Integer>, IUpdateDateEntity<Int
 
     private String hash;
     private String content;
+    private Boolean hasContent;
     private String signature;
     private Date readDate;
     private String readSignature;

sumaris-core/src/main/resources/i18n/sumaris-core_en_GB.properties

@@ -161,6 +161,8 @@ sumaris.persistence.table.taxonGroupType=TAXON_GROUP_TYPE
 sumaris.persistence.table.taxonName=TAXON_NAME
 sumaris.persistence.table.taxonomicLevel=TAXONOMIC_LEVEL
 sumaris.persistence.table.transcribingItem=TRANSCRIBING_ITEM
+sumaris.persistence.table.transcribingItemType=
+sumaris.persistence.table.transcribingSystem=
 sumaris.persistence.table.trip=TRIP
 sumaris.persistence.table.unit=UNIT
 sumaris.persistence.table.unitConversion=

sumaris-core/src/main/resources/i18n/sumaris-core_fr_FR.properties

@@ -160,6 +160,8 @@ sumaris.persistence.table.taxonGroupType=TAXON_GROUP_TYPE
 sumaris.persistence.table.taxonName=TAXON_NAME
 sumaris.persistence.table.taxonomicLevel=TAXONOMIC_LEVEL
 sumaris.persistence.table.transcribingItem=TRANSCRIBING_ITEM
+sumaris.persistence.table.transcribingItemType=
+sumaris.persistence.table.transcribingSystem=
 sumaris.persistence.table.trip=TRIP
 sumaris.persistence.table.unit=UNIT
 sumaris.persistence.table.unitConversion=

sumaris-extraction/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sumaris</groupId>
 		<artifactId>sumaris-pod</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.4</version>
 	</parent>
 
 	<artifactId>sumaris-extraction</artifactId>

sumaris-importation/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>sumaris-pod</artifactId>
     <groupId>net.sumaris</groupId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

sumaris-rdf/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sumaris-pod</artifactId>
         <groupId>net.sumaris</groupId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sumaris-server/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
   </parent>
 
   <artifactId>sumaris-server</artifactId>

sumaris-server/src/main/java/net/sumaris/server/http/graphql/data/DataGraphQLService.java

@@ -457,13 +457,13 @@ public List<MetierVO> getTripMetiers(@GraphQLContext TripVO trip) {
     @GraphQLQuery(name = "observedLocations", description = "Search in observed locations")
     @Transactional(readOnly = true)
     @IsUser
-    public List<ObservedLocationVO> findObservedLocationsByFilter(@GraphQLArgument(name = "filter") ObservedLocationFilterVO filter,
-                                                                  @GraphQLArgument(name = "offset", defaultValue = "0") Integer offset,
-                                                                  @GraphQLArgument(name = "size", defaultValue = "1000") Integer size,
-                                                                  @GraphQLArgument(name = "sortBy", defaultValue = ObservedLocationVO.Fields.START_DATE_TIME) String sort,
-                                                                  @GraphQLArgument(name = "sortDirection", defaultValue = "asc") String direction,
-                                                                  @GraphQLArgument(name = "trash", defaultValue = "false") Boolean trash,
-                                                                  @GraphQLEnvironment ResolutionEnvironment env
+    public List<ObservedLocationVO> findAllObservedLocations(@GraphQLArgument(name = "filter") ObservedLocationFilterVO filter,
+                                                             @GraphQLArgument(name = "offset", defaultValue = "0") Integer offset,
+                                                             @GraphQLArgument(name = "size", defaultValue = "1000") Integer size,
+                                                             @GraphQLArgument(name = "sortBy", defaultValue = ObservedLocationVO.Fields.START_DATE_TIME) String sort,
+                                                             @GraphQLArgument(name = "sortDirection", defaultValue = "asc") String direction,
+                                                             @GraphQLArgument(name = "trash", defaultValue = "false") Boolean trash,
+                                                             @GraphQLEnvironment ResolutionEnvironment env
     ) {
         SortDirection sortDirection = SortDirection.fromString(direction, SortDirection.DESC);
 
@@ -482,8 +482,9 @@ public List<ObservedLocationVO> findObservedLocationsByFilter(@GraphQLArgument(n
         }
 
         filter = fillRootDataFilter(filter, ObservedLocationFilterVO.class);
-
         Set<String> fields = GraphQLUtils.fields(env);
+
+        long now = TimeLog.getTime();
         final List<ObservedLocationVO> result = observedLocationService.findAll(
                 filter,
                 offset, size, sort,
@@ -493,6 +494,8 @@ public List<ObservedLocationVO> findObservedLocationsByFilter(@GraphQLArgument(n
         // Add additional properties if needed
         fillObservedLocationsFields(result, fields);
 
+        timeLog.log(now, "findAllObservedLocations");
+
         return result;
     }
 

sumaris-server/src/main/java/net/sumaris/server/http/graphql/social/UserEventGraphQLService.java

@@ -41,14 +41,13 @@
 import net.sumaris.core.vo.social.UserEventFetchOptions;
 import net.sumaris.core.vo.social.UserEventFilterVO;
 import net.sumaris.core.vo.social.UserEventVO;
-import net.sumaris.core.vo.technical.extraction.ExtractionProductFetchOptions;
-import net.sumaris.core.vo.technical.extraction.ExtractionProductVO;
 import net.sumaris.server.http.graphql.GraphQLApi;
 import net.sumaris.server.http.graphql.GraphQLUtils;
 import net.sumaris.server.http.security.AuthService;
 import net.sumaris.server.http.security.IsAdmin;
 import net.sumaris.server.http.security.IsUser;
 import net.sumaris.server.service.technical.EntityWatchService;
+import org.nuiton.util.TimeLog;
 import org.reactivestreams.Publisher;
 import org.springframework.stereotype.Service;
 
@@ -72,6 +71,8 @@ public class UserEventGraphQLService {
 
     private final AuthService authService;
 
+    private final TimeLog timeLog = new TimeLog(UserEventGraphQLService.class);
+
 
     @GraphQLQuery(name = "userEvents", description = "Search in user events")
     @IsUser
@@ -99,7 +100,13 @@ public List<UserEventVO> findUserEvents(
 
         UserEventFetchOptions fetchOptions = getFetchOptions(GraphQLUtils.fields(env));
 
-        return userEventService.findAll(filter, page, fetchOptions);
+        long now = TimeLog.getTime();
+
+        final List<UserEventVO> result = userEventService.findAll(filter, page, fetchOptions);
+
+        timeLog.log(now, "findUserEvents");
+
+        return result;
     }
 
 

sumaris-test-shared/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
   </parent>
 
   <artifactId>sumaris-test-shared</artifactId>

sumaris-test-shared/src/main/resources/data-hsqldb-02-program-ADAP.xml

@@ -48,7 +48,7 @@
   <PROGRAM_PROPERTY ID="23" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.observers.enable" NAME="false"/>
   <PROGRAM_PROPERTY ID="24" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.metiers.enable" NAME="false"/>
   <PROGRAM_PROPERTY ID="25" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.gear.rankOrder.enable" NAME="true"/>
-  <PROGRAM_PROPERTY ID="26" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.minDurationInHours" NAME="24"/><!-- 24 hours -->
+  <PROGRAM_PROPERTY ID="26" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.minDurationInHours" NAME="12"/><!-- 24 hours -->
   <PROGRAM_PROPERTY ID="27" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.maxDurationInHours" NAME="400"/>
   <PROGRAM_PROPERTY ID="28" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.batch.autoFill" NAME="true"/>
   <PROGRAM_PROPERTY ID="29" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.batch.taxonGroups.noWeight" NAME="RJB_1,RJB_2"/>
@@ -61,6 +61,8 @@
   <PROGRAM_PROPERTY ID="36" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.batch.roundWeightConversion.country.id" NAME="1"/>
   <PROGRAM_PROPERTY ID="37" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.batch.lengthWeightConversion.enable" NAME="true"/>
   <PROGRAM_PROPERTY ID="38" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.batch.taxonGroups.noLanding" NAME="RJB_1,RJB_2"/>
+  <PROGRAM_PROPERTY ID="39" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2023-02-24" LABEL="sumaris.trip.extraction.sampling.method" NAME="true"/>
+  <PROGRAM_PROPERTY ID="40" STATUS_FK="1" PROGRAM_FK="10" CREATION_DATE="2023-02-24" LABEL="sumaris.trip.gears.columns.pmfmIds" NAME="4"/>
 
   <PROGRAM_PROPERTY ID="14" STATUS_FK="1" PROGRAM_FK="11" CREATION_DATE="2019-02-11" LABEL="sumaris.landing.samples.weightUnit" NAME="g"/>
   <PROGRAM_PROPERTY ID="15" STATUS_FK="1" PROGRAM_FK="11" CREATION_DATE="2019-02-11" LABEL="sumaris.i18nSuffix" NAME="AUCTION_CONTROL."/>
@@ -69,6 +71,7 @@
   <PROGRAM_PROPERTY ID="18" STATUS_FK="1" PROGRAM_FK="11" CREATION_DATE="2019-02-11" LABEL="sumaris.landing.editor" NAME="control"/>
   <PROGRAM_PROPERTY ID="19" STATUS_FK="1" PROGRAM_FK="11" CREATION_DATE="2020-09-29"  LABEL="sumaris.report.enable" NAME="true"/>
 
+
   <PROGRAM2LOCATION_CLASSIF PROGRAM_FK="10" LOCATION_CLASSIFICATION_FK="2"/>
   <PROGRAM2LOCATION_CLASSIF PROGRAM_FK="11" LOCATION_CLASSIFICATION_FK="1"/>
 
@@ -105,7 +108,7 @@
   <!-- Has selective device ?
   <PMFM_STRATEGY ID="226"  STRATEGY_FK="10" ACQUISITION_LEVEL_FK="2" PMFM_FK="27" RANK_ORDER="7" ACQUISITION_NUMBER="1" IS_MANDATORY="1"></PMFM_STRATEGY>-->
   <!-- Selective device -->
-  <PMFM_STRATEGY ID="227" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="2" PMFM_FK="4" RANK_ORDER="8" ACQUISITION_NUMBER="1" IS_MANDATORY="0"/>
+  <PMFM_STRATEGY ID="227" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="2" PMFM_FK="4" RANK_ORDER="8" ACQUISITION_NUMBER="3" IS_MANDATORY="0"/>
 
 
   <!-- PmfmStrategy / Operation -->
@@ -119,8 +122,8 @@
   <!--<PMFM_STRATEGY ID="233" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="3" PMFM_FK="30" RANK_ORDER="4" ACQUISITION_NUMBER="1" IS_MANDATORY="0" MAX_VALUE="2000"></PMFM_STRATEGY>-->
   <!-- Sea state -->
   <PMFM_STRATEGY ID="234" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="3" PMFM_FK="33" RANK_ORDER="5" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
-  <!-- Has individual measures ? -->
-  <PMFM_STRATEGY ID="235" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="3" PMFM_FK="121" RANK_ORDER="6" ACQUISITION_NUMBER="1" IS_MANDATORY="1"></PMFM_STRATEGY>
+  <!-- Has individual measures ?
+  <PMFM_STRATEGY ID="235" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="3" PMFM_FK="121" RANK_ORDER="6" ACQUISITION_NUMBER="1" IS_MANDATORY="1"></PMFM_STRATEGY>-->
 
   <!-- PmfmStrategy / Catch batch -->
 <!--  <PMFM_STRATEGY ID="240" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="4" PMFM_FK="50" RANK_ORDER="4" ACQUISITION_NUMBER="1" IS_MANDATORY="0"></PMFM_STRATEGY>-->

sumaris-test-shared/src/main/resources/data-hsqldb-02-program-APASE.xml

@@ -58,6 +58,8 @@
   <PROGRAM_PROPERTY ID="224" STATUS_FK="1" PROGRAM_FK="70" CREATION_DATE="2022-04-15"  LABEL="sumaris.operation.editor" NAME="selectivity"/>
   <PROGRAM_PROPERTY ID="225" STATUS_FK="1" PROGRAM_FK="70" CREATION_DATE="2022-04-15"  LABEL="sumaris.trip.gear.help.message" NAME="Pour les maillages, saisir uniquement les &lt;b&gt;maillages à la jauge&lt;/b&gt;."/>
   <PROGRAM_PROPERTY ID="226" STATUS_FK="1" PROGRAM_FK="70" CREATION_DATE="2022-10-18"  LABEL="sumaris.report.enable" NAME="true"/>
+  <PROGRAM_PROPERTY ID="227" STATUS_FK="1" PROGRAM_FK="70" CREATION_DATE="2022-10-18"  LABEL="sumaris.trip.gear.minChildrenCount" NAME="2"/>
+
 
   <PROGRAM2LOCATION_CLASSIF PROGRAM_FK="70" LOCATION_CLASSIFICATION_FK="1"/>
 

sumaris-test-shared/src/main/resources/data-hsqldb-06-configs.xml

@@ -58,7 +58,7 @@
     <SOFTWARE_PROPERTY ID="51" STATUS_FK="1" SOFTWARE_FK="2" CREATION_DATE="2019-02-11" LABEL="sumaris.referential.vessel.import.enable" NAME="true"/>
     <SOFTWARE_PROPERTY ID="52" STATUS_FK="1" SOFTWARE_FK="2" CREATION_DATE="2022-11-11" LABEL="sumaris.data.images.enable" NAME="true"/>
     <SOFTWARE_PROPERTY ID="53" STATUS_FK="1" SOFTWARE_FK="2" CREATION_DATE="2023-01-16" LABEL="sumaris.persistence.vessel.registrationCode.searchAsPrefix" NAME="false"/>
-    <SOFTWARE_PROPERTY ID="54" STATUS_FK="1" SOFTWARE_FK="1" CREATION_DATE="2023-02-03" LABEL="sumaris.social.notification.icons.enable" NAME="true"/>
+    <SOFTWARE_PROPERTY ID="54" STATUS_FK="1" SOFTWARE_FK="2" CREATION_DATE="2023-02-03" LABEL="sumaris.social.notification.icons.enable" NAME="true"/>
 
     <!-- ****** OBSDEB properties ****** -->
     <SOFTWARE_PROPERTY ID="70" STATUS_FK="1" SOFTWARE_FK="4" CREATION_DATE="2019-02-11" LABEL="sumaris.logo" NAME="image:22"/>