From 7fba53c9c7def5f519a39a95081bfdd2bae4fb8d Mon Sep 17 00:00:00 2001 From: William Nolin Date: Thu, 4 Mar 2021 17:26:26 -0500 Subject: [PATCH] =?UTF-8?q?Resolve=20"D=C3=A9finir=20les=20noms=20des=20ta?= =?UTF-8?q?bles=20et=20des=20colonnes"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- build.gradle.kts | 8 ++++++++ .../trial/colorrecipesexplorer/model/AccountModel.kt | 3 +-- .../dev/fyloz/trial/colorrecipesexplorer/model/Company.kt | 2 +- .../fyloz/trial/colorrecipesexplorer/model/Material.kt | 2 +- .../trial/colorrecipesexplorer/model/MaterialType.kt | 2 +- .../dev/fyloz/trial/colorrecipesexplorer/model/Mix.kt | 2 +- .../fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt | 2 +- .../dev/fyloz/trial/colorrecipesexplorer/model/MixType.kt | 2 +- .../dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt | 2 +- .../fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt | 2 +- src/main/resources/application-h2.properties | 1 + src/main/resources/application.properties | 2 +- 13 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92a75f5..64ca9bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ test: - docker run --name $TEST_CONTAINER_NAME $CI_REGISTRY_IMAGE_GRADLE gradle test after_script: - mkdir test-results && docker cp $TEST_CONTAINER_NAME:/usr/src/cre/build/test-results/test/ test-results - - docker rm $TEST_CONTAINER_NAME + - docker rm $TEST_CONTAINER_NAME || true artifacts: when: always reports: diff --git a/build.gradle.kts b/build.gradle.kts index fc927bb..d2e9fc2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,10 @@ plugins { repositories { mavenCentral() + + maven { + url = uri("https://git.fyloz.dev/api/v4/projects/40/packages/maven") + } } dependencies { @@ -47,6 +51,10 @@ dependencies { runtimeOnly("com.h2database:h2:1.4.199") runtimeOnly("mysql:mysql-connector-java:8.0.22") + runtimeOnly("org.postgresql:postgresql:42.2.16") + runtimeOnly("com.microsoft.sqlserver:mssql-jdbc:9.2.1.jre11") + + compileOnly("org.projectlombok:lombok:1.18.10") } diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/AccountModel.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/AccountModel.kt index 00a23cc..b54a862 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/AccountModel.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/AccountModel.kt @@ -131,7 +131,7 @@ private const val GROUP_PERMISSIONS_EMPTY_MESSAGE = "Au moins une permission est @Table(name = "employee_group") data class EmployeeGroup( @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) override var id: Long? = null, @Column(unique = true) @@ -368,4 +368,3 @@ fun employeeGroupUpdateDto( permissions: MutableSet = mutableSetOf(), op: EmployeeGroupUpdateDto.() -> Unit = {} ) = EmployeeGroupUpdateDto(id, name, permissions).apply(op) - diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Company.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Company.kt index fb45019..87c7a2c 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Company.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Company.kt @@ -13,7 +13,7 @@ private const val COMPANY_NAME_NULL_MESSAGE = "Un nom est requis" @Table(name = "company") data class Company( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long?, @Column(unique = true) diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Material.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Material.kt index c97b836..a32183e 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Material.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Material.kt @@ -21,7 +21,7 @@ private const val MATERIAL_TYPE_NULL_MESSAGE = "Un type de produit est requis" @Table(name = "material") data class Material( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long?, @Column(unique = true) diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MaterialType.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MaterialType.kt index 3d5d281..2c1479b 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MaterialType.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MaterialType.kt @@ -20,7 +20,7 @@ const val IDENTIFIER_PREFIX_NAME = "prefix" @Table(name = "material_type") data class MaterialType( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long? = null, @Column(unique = true) diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Mix.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Mix.kt index fff6cfe..c1d96dc 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Mix.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Mix.kt @@ -18,7 +18,7 @@ private const val MIX_MATERIAL_TYPE_NULL_MESSAGE = "Un type de prodsuit est requ @Table(name = "mix") data class Mix( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long?, var location: String?, diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt index af91cac..cbad684 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixMaterial.kt @@ -8,7 +8,7 @@ import javax.persistence.* @Table(name = "mix_material") data class MixMaterial( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long?, @JsonIgnore diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixType.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixType.kt index 5c23056..d25fb8a 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixType.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/MixType.kt @@ -9,7 +9,7 @@ const val IDENTIFIER_MATERIAL_NAME = "material" @Table(name = "mix_type") data class MixType( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long?, @Column(unique = true) diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt index a8a6763..353d1e9 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/Recipe.kt @@ -21,7 +21,7 @@ private const val RECIPE_COMPANY_NULL_MESSAGE = "Une bannière est requise" @Table(name = "recipe") data class Recipe( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long?, /** The name of the recipe. It is not unique in the entire system, but is unique in the scope of a [Company]. */ diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt index 15f356c..393fb21 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/model/RecipeStep.kt @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull @Table(name = "recipe_step") data class RecipeStep( @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) override val id: Long?, @JsonIgnore diff --git a/src/main/resources/application-h2.properties b/src/main/resources/application-h2.properties index 346ad2a..ecf43bb 100644 --- a/src/main/resources/application-h2.properties +++ b/src/main/resources/application-h2.properties @@ -2,6 +2,7 @@ spring.datasource.url=jdbc:h2:mem:cre #spring.datasource.url=jdbc:h2:file:./workdir/recipes spring.datasource.username=sa spring.datasource.password=LWK4Y7TvEbNyhu1yCoG3 +spring.jpa.hibernate.ddl-auto=update spring.h2.console.path=/dbconsole spring.h2.console.enabled=true spring.h2.console.settings.trace=false diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 26ddf86..1c41823 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -27,7 +27,7 @@ spring.jpa.show-sql=true spring.messages.fallback-to-system-locale=true spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-request-size=15MB -spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=none spring.jpa.open-in-view=true server.http2.enabled=true server.error.whitelabel.enabled=false