From e324211595b9fbc7be7838000bf37cb14b7d77c8 Mon Sep 17 00:00:00 2001 From: Katerina Date: Wed, 13 Sep 2023 13:22:21 +0300 Subject: [PATCH] added requirement_level, link, description and fair_principles in SummaryResult and ValidationRuleResults --- .../validatorapi/entities/SummaryResult.java | 48 ++++++++++++++++++- .../entities/ValidationRuleResult.java | 17 ++++++- .../validatorapi/exceptions/ErrorMessage.java | 2 + .../exceptions/ExceptionHandler.java | 2 + .../exceptions/ValidationException.java | 2 + .../validatorapi/processors/XmlProcessor.java | 8 ++++ .../ValidationResultRepository.java | 10 ++-- 7 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 src/main/java/eu/dnetlib/validatorapi/exceptions/ErrorMessage.java create mode 100644 src/main/java/eu/dnetlib/validatorapi/exceptions/ExceptionHandler.java create mode 100644 src/main/java/eu/dnetlib/validatorapi/exceptions/ValidationException.java diff --git a/src/main/java/eu/dnetlib/validatorapi/entities/SummaryResult.java b/src/main/java/eu/dnetlib/validatorapi/entities/SummaryResult.java index c4896e9..f6ec501 100644 --- a/src/main/java/eu/dnetlib/validatorapi/entities/SummaryResult.java +++ b/src/main/java/eu/dnetlib/validatorapi/entities/SummaryResult.java @@ -9,6 +9,10 @@ public class SummaryResult { @Id String rule_name; int rule_weight; + String requirement_level; + String description; + String fair_principles; + String link; String guidelines; String internal_error; String rule_status; @@ -30,10 +34,16 @@ public class SummaryResult { this.failed_records = failed_records; } - public SummaryResult(String rule_name, int rule_weight, String guidelines, String internal_error, long passed_records, - long failed_records, String rule_status, boolean has_errors, boolean has_warnings) { + + public SummaryResult(String rule_name, int rule_weight, String requirement_level, String description, String fair_principles, + String link, String guidelines, String internal_error, long passed_records, long failed_records, + String rule_status, boolean has_errors, boolean has_warnings) { this.rule_name = rule_name; this.rule_weight = rule_weight; + this.requirement_level = requirement_level; + this.description = description; + this.fair_principles = fair_principles; + this.link = link; this.guidelines = guidelines; this.internal_error = internal_error; this.rule_status = rule_status; @@ -43,6 +53,8 @@ public class SummaryResult { this.has_warnings = has_warnings; } + + public String getRule_name() { return rule_name; } @@ -59,6 +71,38 @@ public class SummaryResult { this.rule_weight = rule_weight; } + public String getRequirement_level() { + return requirement_level; + } + + public void setRequirement_level(String requirement_level) { + this.requirement_level = requirement_level; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getFair_principles() { + return fair_principles; + } + + public void setFair_principles(String fair_principles) { + this.fair_principles = fair_principles; + } + + public String getLink() { + return link; + } + + public void setLink(String link) { + this.link = link; + } + public String getGuidelines() { return guidelines; } diff --git a/src/main/java/eu/dnetlib/validatorapi/entities/ValidationRuleResult.java b/src/main/java/eu/dnetlib/validatorapi/entities/ValidationRuleResult.java index f0c87d0..a1f709b 100644 --- a/src/main/java/eu/dnetlib/validatorapi/entities/ValidationRuleResult.java +++ b/src/main/java/eu/dnetlib/validatorapi/entities/ValidationRuleResult.java @@ -27,6 +27,18 @@ public class ValidationRuleResult implements Serializable { @Column(name = "record_url") public String recordUrl; + @Column(name="requirement_level") + public String requirement_level; + + @Column(name="description") + public String description; + + @Column(name="fair_principles") + public String fair_principles; + + @Column(name="link") + public String link; + @Column(name = "internal_error") public String internalError; @@ -44,7 +56,6 @@ public class ValidationRuleResult implements Serializable { public ValidationRuleResult() {} - @Override public String toString() { return "ValidationRuleResult{" + @@ -53,6 +64,10 @@ public class ValidationRuleResult implements Serializable { ", ruleName='" + ruleName + '\'' + ", ruleWeight=" + ruleWeight + ", recordUrl='" + recordUrl + '\'' + + ", requirement_level='" + requirement_level + '\'' + + ", description='" + description + '\'' + + ", fairPrinciples='" + fair_principles + '\'' + + ", link='" + link + '\'' + ", internalError='" + internalError + '\'' + ", status='" + status + '\'' + ", score=" + score + diff --git a/src/main/java/eu/dnetlib/validatorapi/exceptions/ErrorMessage.java b/src/main/java/eu/dnetlib/validatorapi/exceptions/ErrorMessage.java new file mode 100644 index 0000000..149df22 --- /dev/null +++ b/src/main/java/eu/dnetlib/validatorapi/exceptions/ErrorMessage.java @@ -0,0 +1,2 @@ +package eu.dnetlib.validatorapi.exceptions;public class ErrorMessage { +} diff --git a/src/main/java/eu/dnetlib/validatorapi/exceptions/ExceptionHandler.java b/src/main/java/eu/dnetlib/validatorapi/exceptions/ExceptionHandler.java new file mode 100644 index 0000000..5f0177c --- /dev/null +++ b/src/main/java/eu/dnetlib/validatorapi/exceptions/ExceptionHandler.java @@ -0,0 +1,2 @@ +package eu.dnetlib.validatorapi.exceptions;public class ExceptionHandler { +} diff --git a/src/main/java/eu/dnetlib/validatorapi/exceptions/ValidationException.java b/src/main/java/eu/dnetlib/validatorapi/exceptions/ValidationException.java new file mode 100644 index 0000000..53cf6b6 --- /dev/null +++ b/src/main/java/eu/dnetlib/validatorapi/exceptions/ValidationException.java @@ -0,0 +1,2 @@ +package eu.dnetlib.validatorapi.exceptions;public class ValidationException { +} diff --git a/src/main/java/eu/dnetlib/validatorapi/processors/XmlProcessor.java b/src/main/java/eu/dnetlib/validatorapi/processors/XmlProcessor.java index afd0b34..469fbce 100644 --- a/src/main/java/eu/dnetlib/validatorapi/processors/XmlProcessor.java +++ b/src/main/java/eu/dnetlib/validatorapi/processors/XmlProcessor.java @@ -129,6 +129,14 @@ public class XmlProcessor implements Processor { validationRuleResult.guidelines = guidelines; validationRuleResult.ruleName = ruleName; validationRuleResult.ruleWeight = profile.guideline(ruleName).getWeight(); + validationRuleResult.requirement_level = profile.guideline(ruleName).getRequirementLevel().name(); + System.out.println(validationRuleResult.requirement_level); + validationRuleResult.description = profile.guideline(ruleName).getDescription(); + System.out.println(validationRuleResult.description); + validationRuleResult.fair_principles = profile.guideline(ruleName).getFairPrinciples(); + System.out.println(validationRuleResult.fair_principles); + validationRuleResult.link = profile.guideline(ruleName).getLink(); + System.out.println(validationRuleResult.link); validationRuleResult.recordUrl = recordUrl; validationRuleResult.score = engineResult.score(); validationRuleResult.status = engineResult.status().toString(); diff --git a/src/main/java/eu/dnetlib/validatorapi/repositories/ValidationResultRepository.java b/src/main/java/eu/dnetlib/validatorapi/repositories/ValidationResultRepository.java index 71df2b5..b54d844 100644 --- a/src/main/java/eu/dnetlib/validatorapi/repositories/ValidationResultRepository.java +++ b/src/main/java/eu/dnetlib/validatorapi/repositories/ValidationResultRepository.java @@ -25,7 +25,8 @@ public interface ValidationResultRepository extends JpaRepository 0 THEN TRUE ELSE FALSE END AS hasWarnings)" + "FROM eu.dnetlib.validatorapi.entities.ValidationRuleResult sr " + "WHERE sr.validationJobId = :id " + - "GROUP BY sr.ruleName, sr.ruleWeight, sr.guidelines, sr.internalError, sr.validationJobId") + "GROUP BY sr.ruleName, sr.ruleWeight, sr.description, sr.fair_principles, sr.link, sr.requirement_level, sr.guidelines, sr.internalError, sr.validationJobId") List getFullSummaryResult(@Param("id") int validationJobId); @Query(value = @@ -54,7 +55,8 @@ public interface ValidationResultRepository extends JpaRepository 0 THEN TRUE ELSE FALSE END AS hasWarnings)" + "FROM eu.dnetlib.validatorapi.entities.ValidationRuleResult sr " + "WHERE sr.validationJobId = :id AND sr.guidelines = :guidelines " + - "GROUP BY sr.ruleName, sr.ruleWeight, sr.guidelines, sr.internalError, sr.validationJobId") + "GROUP BY sr.ruleName, sr.ruleWeight, sr.requirement_level, sr.description, sr.fair_principles, sr.link, sr.description, sr.internalError, sr.validationJobId") List getFullSummaryResult(@Param("id") int validationJobId, @Param("guidelines") String guidelines);