From bc635f2832856beec442e784cb6639f08470bcb8 Mon Sep 17 00:00:00 2001 From: manuwei <44226745+manuwei@users.noreply.github.com> Date: Wed, 21 Jul 2021 17:18:05 +0200 Subject: [PATCH 1/2] add paper reference to original source to pattern entity --- .../java/io/github/patternatlas/api/entities/Pattern.java | 2 ++ .../api/rest/controller/PatternController.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/patternatlas/api/entities/Pattern.java b/src/main/java/io/github/patternatlas/api/entities/Pattern.java index 3aba17f..26f7072 100644 --- a/src/main/java/io/github/patternatlas/api/entities/Pattern.java +++ b/src/main/java/io/github/patternatlas/api/entities/Pattern.java @@ -26,6 +26,8 @@ public class Pattern extends EntityWithURI { private String iconUrl; + private String paperRef; + @JsonIgnore @ToString.Exclude @ManyToOne diff --git a/src/main/java/io/github/patternatlas/api/rest/controller/PatternController.java b/src/main/java/io/github/patternatlas/api/rest/controller/PatternController.java index b4cc2e0..d9c9ef0 100644 --- a/src/main/java/io/github/patternatlas/api/rest/controller/PatternController.java +++ b/src/main/java/io/github/patternatlas/api/rest/controller/PatternController.java @@ -36,16 +36,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.patternatlas.api.exception.DirectedEdgeNotFoundException; -import io.github.patternatlas.api.exception.UndirectedEdgeNotFoundException; -import io.github.patternatlas.api.rest.model.PatternRenderedContentModel; import io.github.patternatlas.api.entities.DirectedEdge; import io.github.patternatlas.api.entities.Pattern; import io.github.patternatlas.api.entities.PatternLanguage; import io.github.patternatlas.api.entities.PatternViewPattern; import io.github.patternatlas.api.entities.UndirectedEdge; +import io.github.patternatlas.api.exception.DirectedEdgeNotFoundException; +import io.github.patternatlas.api.exception.UndirectedEdgeNotFoundException; import io.github.patternatlas.api.rest.model.PatternContentModel; import io.github.patternatlas.api.rest.model.PatternModel; +import io.github.patternatlas.api.rest.model.PatternRenderedContentModel; import io.github.patternatlas.api.service.PatternLanguageService; import io.github.patternatlas.api.service.PatternRelationDescriptorService; import io.github.patternatlas.api.service.PatternRenderService; @@ -402,6 +402,7 @@ EntityModel updatePatternViaPut(@PathVariable UUID patternLanguageId, @ persistedVersion.setRenderedContent(pattern.getContent()); } persistedVersion.setIconUrl(pattern.getIconUrl()); + persistedVersion.setPaperRef(pattern.getPaperRef()); persistedVersion.setContent(pattern.getContent()); persistedVersion.setName(pattern.getName()); From 6a518672abf7c7e1f3d73770121f821d1bb9eaf8 Mon Sep 17 00:00:00 2001 From: manuwei <44226745+manuwei@users.noreply.github.com> Date: Fri, 23 Jul 2021 09:08:51 +0200 Subject: [PATCH 2/2] adapt to new database port --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b5bbf4..145af1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ENV JDBC_DATABASE_URL localhost ENV JDBC_DATABASE_USERNAME postgres ENV JDBC_DATABASE_PASSWORD postgres ENV JDBC_DATABASE_NAME postgres -ENV JDBC_DATABASE_PORT 5432 +ENV JDBC_DATABASE_PORT 5060 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \