diff --git a/collaboration-service/pom.xml b/collaboration-service/pom.xml index 575b2bee11..0c9598ef29 100644 --- a/collaboration-service/pom.xml +++ b/collaboration-service/pom.xml @@ -24,7 +24,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.8 diff --git a/common-utitlities/src/main/java/org/eea/multitenancy/TenantResolver.java b/common-utitlities/src/main/java/org/eea/multitenancy/TenantResolver.java index cbbffc4a47..8c4aa765a7 100644 --- a/common-utitlities/src/main/java/org/eea/multitenancy/TenantResolver.java +++ b/common-utitlities/src/main/java/org/eea/multitenancy/TenantResolver.java @@ -27,7 +27,7 @@ public static void setTenantName(String tenantName) { */ public static String getTenantName() { Map properties = thread.get(); - String datasetName = ""; + String datasetName = "dataset_0"; // default schema if (null != properties && !properties.isEmpty()) { Object value = properties.get(LiteralConstants.DATASET_NAME); if (null != value && StringUtils.isNotEmpty(value.toString())) { diff --git a/database/pom.xml b/database/pom.xml index 4a7502974f..c795443421 100644 --- a/database/pom.xml +++ b/database/pom.xml @@ -33,7 +33,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.8 diff --git a/dataflow-service/pom.xml b/dataflow-service/pom.xml index 7e9483b5da..40c4a2085c 100644 --- a/dataflow-service/pom.xml +++ b/dataflow-service/pom.xml @@ -24,7 +24,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.8 com.opencsv diff --git a/dataset-service/pom.xml b/dataset-service/pom.xml index b5f616848d..ce7e889a56 100644 --- a/dataset-service/pom.xml +++ b/dataset-service/pom.xml @@ -29,7 +29,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.8 org.mongodb diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/AttachmentValue.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/AttachmentValue.java index fc65613398..528ba7f17c 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/AttachmentValue.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/AttachmentValue.java @@ -23,7 +23,7 @@ @Getter @Setter @ToString -@Table(name = "ATTACHMENT_VALUE") +@Table(name = "attachment_value") public class AttachmentValue { diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValidation.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValidation.java index fa20a894a5..981794bf73 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValidation.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "DATASET_VALIDATION") +@Table(name = "dataset_validation") public class DatasetValidation { /** diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValue.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValue.java index 66071c134e..0ee3cde116 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValue.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValue.java @@ -23,7 +23,7 @@ @Getter @Setter @ToString -@Table(name = "DATASET_VALUE") +@Table(name = "dataset_value") public class DatasetValue { diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValidation.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValidation.java index 60bad53477..440ae53b29 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValidation.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "FIELD_VALIDATION") +@Table(name = "field_validation") public class FieldValidation { /** diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValue.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValue.java index 866884b186..bab70eec39 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValue.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValue.java @@ -31,7 +31,7 @@ @Getter @Setter @ToString -@Table(name = "FIELD_VALUE") +@Table(name = "field_value") public class FieldValue { /** diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValidation.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValidation.java index ca47059916..5984decc33 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValidation.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "RECORD_VALIDATION") +@Table(name = "record_validation") public class RecordValidation { /** diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValue.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValue.java index ec428692cf..16e5741559 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValue.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValue.java @@ -6,7 +6,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @@ -16,6 +15,7 @@ import org.eea.interfaces.vo.dataset.CsvLineAndRecordFieldsHolder; import org.eea.interfaces.vo.dataset.enums.ErrorTypeEnum; +import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.GenericGenerator; import lombok.Getter; import lombok.Setter; @@ -28,7 +28,7 @@ @Getter @Setter @ToString -@Table(name = "RECORD_VALUE") +@Table(name = "record_value") public class RecordValue { @@ -36,10 +36,12 @@ public class RecordValue { * The id. */ @Id - @GenericGenerator(name = "record_sequence_generator", - strategy = "org.eea.dataset.persistence.data.sequence.RecordValueIdGenerator") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "record_sequence_generator") - @Column(name = "ID", columnDefinition = "serial") + @GenericGenerator( + name = "record_sequence_generator", + strategy = "org.eea.dataset.persistence.data.sequence.RecordValueIdGenerator" + ) + @GeneratedValue(generator = "record_sequence_generator") + @Column(name = "ID") private String id; /** diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValidation.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValidation.java index e0c67ae5fe..cef2148ba7 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValidation.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "TABLE_VALIDATION") +@Table(name = "table_validation") public class TableValidation { /** diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValue.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValue.java index a624d5b5f2..6a39deb4f4 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValue.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValue.java @@ -18,6 +18,7 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.hibernate.annotations.BatchSize; /** * The Class TableValue. @@ -26,7 +27,7 @@ @Getter @Setter @ToString -@Table(name = "TABLE_VALUE") +@Table(name = "table_value") public class TableValue { @@ -35,10 +36,13 @@ public class TableValue { * The id. */ @Id - @SequenceGenerator(name = "table_sequence_generator", sequenceName = "table_sequence", - allocationSize = 1) + @SequenceGenerator( + name = "table_sequence_generator", + sequenceName = "table_sequence", + allocationSize = 1 + ) @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "table_sequence_generator") - @Column(name = "ID", columnDefinition = "serial") + @Column(name = "ID") private Long id; /** diff --git a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/Validation.java b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/Validation.java index 1dfb6656e1..c87e8e47ea 100644 --- a/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/Validation.java +++ b/dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/Validation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "VALIDATION") +@Table(name = "validation") public class Validation { /** diff --git a/dataset-service/src/main/java/org/eea/dataset/service/impl/DatasetServiceImpl.java b/dataset-service/src/main/java/org/eea/dataset/service/impl/DatasetServiceImpl.java index 38daa08276..2223e14a9d 100644 --- a/dataset-service/src/main/java/org/eea/dataset/service/impl/DatasetServiceImpl.java +++ b/dataset-service/src/main/java/org/eea/dataset/service/impl/DatasetServiceImpl.java @@ -2577,12 +2577,27 @@ private List createRecords(Long datasetId, String dataProviderCode, partitionDataSetMetabaseRepository.findFirstByIdDataSet_idAndUsername(datasetId, USER) .orElse(new PartitionDataSetMetabase()).getId(); - DatasetValue dataset = new DatasetValue(); - dataset.setId(datasetId); - - TableValue tableValue = new TableValue(); - tableValue.setId(tableRepository.findIdByIdTableSchema(tableSchemaId)); - tableValue.setDatasetId(dataset); + LOG.info("[CHRIS]"); + // fetch dataset_value here, if null then save it + DatasetValue datasetValue = datasetRepository.findById(datasetId).orElse(null); + if (datasetValue == null) { + datasetValue = new DatasetValue(); + datasetValue.setId(datasetId); + datasetValue = datasetRepository.save(datasetValue); + } + LOG.info("[CHRIS] DatasetValue: {}", datasetValue); + + + String schemaId = tableSchema.getIdTableSchema().toString(); + // fetch table_value here, if null then save it + TableValue tableValue = tableRepository.findByIdTableSchema(schemaId); + if (tableValue == null) { + tableValue = new TableValue(); + tableValue.setDatasetId(datasetValue); + tableValue.setIdTableSchema(schemaId); + tableValue = tableRepository.save(tableValue); + } + LOG.info("[CHRIS] TableValue: {}", tableValue); List recordValues = new ArrayList<>(); diff --git a/orchestrator-service/pom.xml b/orchestrator-service/pom.xml index 670e653fb0..6da6460204 100644 --- a/orchestrator-service/pom.xml +++ b/orchestrator-service/pom.xml @@ -24,7 +24,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.8 diff --git a/recordstore-service/pom.xml b/recordstore-service/pom.xml index 49a0f9a2c7..7bbf176a79 100644 --- a/recordstore-service/pom.xml +++ b/recordstore-service/pom.xml @@ -41,7 +41,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.8 com.dremio.distribution diff --git a/validation-service/pom.xml b/validation-service/pom.xml index 829828d498..f58be023fa 100644 --- a/validation-service/pom.xml +++ b/validation-service/pom.xml @@ -57,7 +57,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.8 org.mongodb diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValidation.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValidation.java index 413361a858..5bd8d085d6 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValidation.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "DATASET_VALIDATION") +@Table(name = "dataset_validation") public class DatasetValidation { /** The id. */ diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValue.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValue.java index b76427d5c5..8b3afc34c8 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValue.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValue.java @@ -21,7 +21,7 @@ @Getter @Setter @ToString -@Table(name = "DATASET_VALUE") +@Table(name = "dataset_value") public class DatasetValue { diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValidation.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValidation.java index 8e0ca40ebb..f426eb55a6 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValidation.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "FIELD_VALIDATION") +@Table(name = "field_validation") public class FieldValidation { /** diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValue.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValue.java index be89b70800..6e465ca88a 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValue.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValue.java @@ -29,7 +29,7 @@ @Getter @Setter @ToString -@Table(name = "FIELD_VALUE") +@Table(name = "field_value") public class FieldValue { /** The id. */ diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValidation.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValidation.java index 5d5238b2b5..5a577a3f3c 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValidation.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "RECORD_VALIDATION") +@Table(name = "record_validation") public class RecordValidation { /** diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValue.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValue.java index b1db119215..7d37a9bc08 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValue.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValue.java @@ -24,7 +24,7 @@ @Getter @Setter @ToString -@Table(name = "RECORD_VALUE") +@Table(name = "record_value") public class RecordValue { /** The id. */ diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValidation.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValidation.java index 1165092ca6..9b1061f567 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValidation.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValidation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "TABLE_VALIDATION") +@Table(name = "table_validation") public class TableValidation { /** diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValue.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValue.java index 3056e6542f..a728c46d41 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValue.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValue.java @@ -26,7 +26,7 @@ @Getter @Setter @ToString -@Table(name = "TABLE_VALUE") +@Table(name = "table_value") public class TableValue { /** diff --git a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/Validation.java b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/Validation.java index f94ca00b6f..f7194352da 100644 --- a/validation-service/src/main/java/org/eea/validation/persistence/data/domain/Validation.java +++ b/validation-service/src/main/java/org/eea/validation/persistence/data/domain/Validation.java @@ -22,7 +22,7 @@ @Getter @Setter @ToString -@Table(name = "VALIDATION") +@Table(name = "validation") public class Validation { /**