Skip to content

Commit

Permalink
Merge pull request #58 from DiSSCo/feature/add-translator-job-record
Browse files Browse the repository at this point in the history
Translator Job Record
  • Loading branch information
samleeflang authored Apr 18, 2024
2 parents a0fab6b + d745e58 commit c3810a2
Show file tree
Hide file tree
Showing 36 changed files with 2,538 additions and 1,285 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/.trivyignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Date: Feb 12, 2024
# Notes: Issue with libexpat, parsing large tokens can trigger a denial of service
# Needs to be fixed in Docker Image.
CVE-2023-52425
# April 18 2024
# Spring boot needs to update its version of spring
CVE-2024-22262
1 change: 1 addition & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
vuln-type: 'os,library'
- name: Trivy - Stop on Severe Vulnerabilities
uses: aquasecurity/trivy-action@master
if: github.event_name == 'pull_request'
with:
image-ref: '${{ github.event.repository.name }}'
format: 'table'
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.3</version>
<version>3.2.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>eu.dissco.core</groupId>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/eu/dissco/core/translator/ProjectRunner.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package eu.dissco.core.translator;

import eu.dissco.core.translator.service.TranslatorJobRecordService;
import eu.dissco.core.translator.service.WebClientService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -14,10 +15,13 @@ public class ProjectRunner implements CommandLineRunner {

private final WebClientService webService;
private final ConfigurableApplicationContext context;
private final TranslatorJobRecordService tjrService;

@Override
public void run(String... args) {
webService.retrieveData();
var jobId = tjrService.createNewJobRecord();
var processingResult = webService.retrieveData();
tjrService.updateJobState(jobId, processingResult);
context.close();
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 19 additions & 11 deletions src/main/java/eu/dissco/core/translator/database/jooq/Keys.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 46 additions & 36 deletions src/main/java/eu/dissco/core/translator/database/jooq/Public.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 15 additions & 9 deletions src/main/java/eu/dissco/core/translator/database/jooq/Tables.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c3810a2

Please sign in to comment.