diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 466c1593a..78d3539fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,7 @@ jobs: cd eperusteet-frontend-utils/vue yarn install --silent yarn gen:api:eperusteet + yarn gen:api:ai rm -rf node_modules cd ../.. echo "----------eperusteet-ui:n viimeisimman commitin sha----------" diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/DokumenttiDto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/DokumenttiDto.java index dc863b9f1..6b8ae2cd8 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/DokumenttiDto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/DokumenttiDto.java @@ -24,4 +24,5 @@ public class DokumenttiDto { private Suoritustapakoodi suoritustapakoodi; private GeneratorVersion generatorVersion; private Boolean julkaisuDokumentti = false; + private int julkaisuRevision; } diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/DokumenttiServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/DokumenttiServiceImpl.java index 46b08eb22..0610f236a 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/DokumenttiServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/DokumenttiServiceImpl.java @@ -153,6 +153,7 @@ public DokumenttiDto getJulkaistuDokumentti(Long perusteId, Kieli kieli, Integer if (dokumentti != null) { DokumenttiDto dokumenttiDto = mapper.map(dokumentti, DokumenttiDto.class); dokumenttiDto.setJulkaisuDokumentti(true); + dokumenttiDto.setJulkaisuRevision(julkaisu.getRevision()); return dokumenttiDto; } } diff --git a/generated/eperusteet.spec.json b/generated/eperusteet.spec.json index 34fae072e..061110f1a 100644 --- a/generated/eperusteet.spec.json +++ b/generated/eperusteet.spec.json @@ -12031,6 +12031,10 @@ }, "julkaisuDokumentti" : { "type" : "boolean" + }, + "julkaisuRevision" : { + "type" : "integer", + "format" : "int32" } } }, @@ -15171,6 +15175,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15188,19 +15205,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15217,6 +15221,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15234,19 +15251,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15263,6 +15267,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15280,19 +15297,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15309,6 +15313,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15326,19 +15343,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15355,6 +15359,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15372,19 +15389,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15401,6 +15405,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15418,19 +15435,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15447,6 +15451,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15464,19 +15481,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15493,6 +15497,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15510,19 +15527,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15539,6 +15543,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15556,19 +15573,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15585,6 +15589,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15602,19 +15619,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15631,6 +15635,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15648,19 +15665,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15677,6 +15681,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15694,19 +15711,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15723,6 +15727,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15740,19 +15757,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15769,6 +15773,19 @@ "type" : "integer", "format" : "int32" }, + "numberOfElements" : { + "type" : "integer", + "format" : "int32" + }, + "first" : { + "type" : "boolean" + }, + "last" : { + "type" : "boolean" + }, + "pageable" : { + "$ref" : "#/definitions/Pageable" + }, "size" : { "type" : "integer", "format" : "int32" @@ -15786,19 +15803,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, - "numberOfElements" : { - "type" : "integer", - "format" : "int32" - }, - "last" : { - "type" : "boolean" - }, - "pageable" : { - "$ref" : "#/definitions/Pageable" - }, "empty" : { "type" : "boolean" } @@ -15807,26 +15811,26 @@ "Pageable" : { "type" : "object", "properties" : { - "offset" : { - "type" : "integer", - "format" : "int64" - }, - "sort" : { - "$ref" : "#/definitions/Sort" - }, "paged" : { "type" : "boolean" }, - "unpaged" : { - "type" : "boolean" + "pageNumber" : { + "type" : "integer", + "format" : "int32" }, "pageSize" : { "type" : "integer", "format" : "int32" }, - "pageNumber" : { + "unpaged" : { + "type" : "boolean" + }, + "offset" : { "type" : "integer", - "format" : "int32" + "format" : "int64" + }, + "sort" : { + "$ref" : "#/definitions/Sort" } } }, @@ -17831,13 +17835,13 @@ "Sort" : { "type" : "object", "properties" : { - "empty" : { + "sorted" : { "type" : "boolean" }, "unsorted" : { "type" : "boolean" }, - "sorted" : { + "empty" : { "type" : "boolean" } } @@ -18276,7 +18280,7 @@ "$ref" : "#/definitions/Validointi" } }, - "huomautukset" : { + "virheet" : { "type" : "array", "items" : { "$ref" : "#/definitions/Virhe" @@ -18285,7 +18289,7 @@ "vaihtoOk" : { "type" : "boolean" }, - "virheet" : { + "huomautukset" : { "type" : "array", "items" : { "$ref" : "#/definitions/Virhe"