TMS - Common DAO migration

Author: imashkanov

.gitignore

@@ -19,3 +19,4 @@ hs_err_pid*
 build/
 .gradle/
 out/
+src/test/resources/db/migration/*.sql

project-properties.gradle

@@ -16,7 +16,7 @@ project.ext {
     isDebugMode = System.getProperty("DEBUG", "false") == "true"
     releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false
     scriptsUrl = commonScriptsUrl + (releaseMode ? '5.14.0' : 'develop')
-    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.14.0' : 'develop')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.14.0' : 'feature/EPMRPP-migrate-tms-to-develop')
     manifestSchemaUrl = schemaUrl + ('manifest.schema.json')
     //TODO refactor with archive download
     testScriptsSrc = [
@@ -92,6 +92,7 @@ project.ext {
             (migrationsUrl + '/migrations/209_add_activity_org_id.up.sql')             : 'V209__add_activity_org_id.sql',
             (migrationsUrl + '/migrations/210_organization_settings_table.up.sql')     : 'V210__organization_settings_table.sql',
             (migrationsUrl + '/migrations/212_update_default_users.up.sql')            : 'V212__update_default_users.sql',
+            (migrationsUrl + '/migrations/1000_tms_initial.up.sql')                    : 'V1000__tms_initial.up.sql',
     ]
     excludeTests = ['**/entity/**',
                     '**/aop/**',

src/main/java/com/epam/reportportal/core/configs/DataStoreConfiguration.java

@@ -23,6 +23,8 @@
 import com.epam.reportportal.infrastructure.persistence.filesystem.DataStore;
 import com.epam.reportportal.infrastructure.persistence.filesystem.LocalDataStore;
 import com.epam.reportportal.infrastructure.persistence.filesystem.distributed.s3.S3DataStore;
+import com.epam.reportportal.infrastructure.persistence.filesystem.tms.LocalTmsDataStore;
+import com.epam.reportportal.infrastructure.persistence.filesystem.tms.TmsDataStore;
 import com.epam.reportportal.infrastructure.persistence.util.FeatureFlagHandler;
 import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
@@ -42,10 +44,12 @@
 import org.jclouds.rest.ConfiguresHttpApi;
 import org.jclouds.s3.S3Client;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
 /**
  * @author Dzianis_Shybeka
@@ -137,6 +141,7 @@ public String toString() {
 
   @Bean
   @ConditionalOnProperty(name = "datastore.type", havingValue = "filesystem")
+  @Primary
   public BlobStore filesystemBlobStore(
       @Value("${datastore.path:/data/store}") String baseDirectory) {
 
@@ -171,6 +176,7 @@ public DataStore localDataStore(@Autowired BlobStore blobStore,
    */
   @Bean
   @ConditionalOnProperty(name = "datastore.type", havingValue = "s3-compatible")
+  @Primary
   public BlobStore minioBlobStore(@Value("${datastore.accessKey}") String accessKey,
       @Value("${datastore.secretKey}") String secretKey,
       @Value("${datastore.endpoint}") String endpoint) {
@@ -213,6 +219,7 @@ public DataStore minioDataStore(@Autowired BlobStore blobStore,
    */
   @Bean
   @ConditionalOnProperty(name = "datastore.type", havingValue = "aws-s3")
+  @Primary
   public BlobStore s3BlobStore(
       @Value("${datastore.accessKey:}") String accessKey,
       @Value("${datastore.secretKey:}") String secretKey,
@@ -247,6 +254,33 @@ public DataStore s3DataStore(@Autowired BlobStore blobStore,
     );
   }
 
+  @Bean
+  @ConditionalOnProperty(name = "rp.tms.datastore.type", havingValue = "filesystem")
+  public BlobStore tmsFilesystemBlobStore(
+      @Value("${rp.tms.datastore.path:/data/store}") String baseDirectory) {
+
+    Properties properties = new Properties();
+    properties.setProperty(FilesystemConstants.PROPERTY_BASEDIR, baseDirectory);
+
+    BlobStoreContext blobStoreContext =
+        ContextBuilder.newBuilder("filesystem").overrides(properties)
+            .buildView(BlobStoreContext.class);
+
+    return blobStoreContext.getBlobStore();
+  }
+
+  @Bean
+  @ConditionalOnProperty(name = "rp.tms.datastore.type", havingValue = "filesystem")
+  public TmsDataStore tmsLocalDataStore(
+      @Autowired @Qualifier("tmsFilesystemBlobStore") BlobStore tmsFilesystemBlobStore,
+      FeatureFlagHandler featureFlagHandler,
+      @Value("${rp.tms.datastore.bucketPrefix:tms-prj-}") String bucketPrefix,
+      @Value("${rp.tms.datastore.bucketPostfix:}") String bucketPostfix,
+      @Value("${rp.tms.datastore.defaultBucketName:tms-rp-bucket}") String defaultBucketName) {
+    return new LocalTmsDataStore(
+        tmsFilesystemBlobStore, featureFlagHandler, bucketPrefix, bucketPostfix, defaultBucketName);
+  }
+
   @Bean("attachmentThumbnailator")
   public Thumbnailator attachmentThumbnailator(
       @Value("${datastore.thumbnail.attachment.width}") int width,

src/main/java/com/epam/reportportal/infrastructure/persistence/binary/tms/TmsAttachmentDataStoreService.java

@@ -0,0 +1,79 @@
+package com.epam.reportportal.infrastructure.persistence.binary.tms;
+
+import static java.util.Optional.ofNullable;
+
+import com.epam.reportportal.infrastructure.commons.Thumbnailator;
+import com.epam.reportportal.infrastructure.persistence.filesystem.DataEncoder;
+import com.epam.reportportal.infrastructure.persistence.filesystem.tms.TmsDataStore;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+/**
+ * TMS Attachment Data Store Service for managing TMS-specific attachments. Uses dedicated TMS
+ * DataStore bean to separate TMS attachments from regular attachments.
+ *
+ * @author ReportPortal Team
+ */
+@Service("tmsAttachmentDataStoreService")
+public class TmsAttachmentDataStoreService implements TmsDataStoreService {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(TmsAttachmentDataStoreService.class);
+
+  private final TmsDataStore dataStore;
+  private final DataEncoder dataEncoder;
+  private final Thumbnailator thumbnailator;
+
+  @Autowired
+  public TmsAttachmentDataStoreService(
+      TmsDataStore dataStore,
+      DataEncoder dataEncoder,
+      @Qualifier("attachmentThumbnailator") Thumbnailator thumbnailator) {
+    this.dataEncoder = dataEncoder;
+    this.dataStore = dataStore;
+    this.thumbnailator = thumbnailator;
+  }
+
+  @Override
+  public String saveThumbnail(String fileName, InputStream data) {
+    try {
+      return dataEncoder.encode(dataStore.save(fileName, thumbnailator.createThumbnail(data)));
+    } catch (IOException e) {
+      LOGGER.error("TMS thumbnail is not created for file [{}]. Error:\n{}", fileName, e);
+    }
+    return null;
+  }
+
+  @Override
+  public String save(String fileName, InputStream data) {
+    return dataEncoder.encode(dataStore.save(fileName, data));
+  }
+
+  @Override
+  public void delete(String fileId) {
+    dataStore.delete(dataEncoder.decode(fileId));
+  }
+
+  @Override
+  public void deleteAll(List<String> fileIds, String bucketName) {
+    dataStore.deleteAll(
+        fileIds.stream().map(dataEncoder::decode).collect(Collectors.toList()), bucketName);
+  }
+
+  @Override
+  public void deleteContainer(String containerName) {
+    dataStore.deleteContainer(containerName);
+  }
+
+  @Override
+  public Optional<InputStream> load(String fileId) {
+    return ofNullable(dataStore.load(dataEncoder.decode(fileId)));
+  }
+}

src/main/java/com/epam/reportportal/infrastructure/persistence/binary/tms/TmsDataStoreService.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2019 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.epam.reportportal.infrastructure.persistence.binary.tms;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author <a href="mailto:[email protected]">Ihar Kahadouski</a>
+ */
+public interface TmsDataStoreService {
+
+  String save(String fileName, InputStream data);
+
+  String saveThumbnail(String fileName, InputStream data);
+
+  void delete(String fileId);
+
+  void deleteAll(List<String> fileIds, String bucketName);
+
+  void deleteContainer(String containerName);
+
+  Optional<InputStream> load(String fileId);
+}

src/main/java/com/epam/reportportal/infrastructure/persistence/commons/querygen/Condition.java

@@ -603,6 +603,37 @@ public Object castValue(CriteriaHolder criteriaHolder, String value, ErrorType e
         return castArray(criteriaHolder, value, errorType);
       }
     }
+  },
+
+  /**
+   * Full text search condition using PostgreSQL tsvector
+   */
+  FULL_TEXT_SEARCH("fts") {
+    @Override
+    public org.jooq.Condition toCondition(FilterCondition filter, CriteriaHolder criteriaHolder) {
+      this.validate(criteriaHolder, filter.getValue(), filter.isNegative(),
+          INCORRECT_FILTER_PARAMETERS);
+      return DSL.condition(
+          "{0} @@ plainto_tsquery('simple', {1})",
+          DSL.field(criteriaHolder.getAggregateCriteria()),
+          DSL.val(filter.getValue())
+      );
+    }
+
+    @Override
+    public void validate(CriteriaHolder criteriaHolder, String value, boolean isNegative,
+        ErrorType errorType) {
+      expect(criteriaHolder, filterForString()).verify(errorType, formattedSupplier(
+          "Full text search condition applicable only for search_vector fields. Type of field is '{}'",
+          criteriaHolder.getDataType().getSimpleName()
+      ));
+    }
+
+    @Override
+    public Object castValue(CriteriaHolder criteriaHolder, String value, ErrorType errorType) {
+      // value cast is not required for full text search
+      return value;
+    }
   };
 
   /*
@@ -612,6 +643,7 @@ public Object castValue(CriteriaHolder criteriaHolder, String value, ErrorType e
   public static final String CNT = "cnt.";
   public static final String HAS_FILTER = "has.";
   public static final String UNDR = "under.";
+  public static final String FTS = "fts.";
 
   public static final String VALUES_SEPARATOR = ",";
   public static final String TIMESTAMP_SEPARATOR = ";";