From 9917ca262807b1a0d822db64b5ade85a6f7eb712 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 15 Aug 2024 15:01:59 +0200 Subject: [PATCH] Remove AnsettelseLoggDTO and update Flyway config #deploy-levende-arbeidsforhold-ansettelse Deleted the unused AnsettelseLoggDTO class as part of code cleanup. Additionally, enabled the Flyway `baseline-on-migrate` option in application.yml to ensure proper database migration handling. --- ...deArbeidsforholdAnsettelseApplication.java | 3 +-- .../src/main/resources/application.yml | 1 + .../v1/logging/AnsettelseLoggDTO.java | 24 ------------------- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/levendearbeidsforhold/v1/logging/AnsettelseLoggDTO.java diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java b/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java index c825eae956e..c355ad3a629 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java @@ -9,5 +9,4 @@ public class LevendeArbeidsforholdAnsettelseApplication { public static void main(String[] args) { SpringApplication.run(LevendeArbeidsforholdAnsettelseApplication.class, args); } - -} +} \ No newline at end of file diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml index ad6fb4b1323..bf6af3ed035 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml @@ -20,6 +20,7 @@ spring: flyway: locations: classpath:db/migration enabled: true + baseline-on-migrate: true springdoc: swagger-ui: disable-swagger-default-url: true diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/levendearbeidsforhold/v1/logging/AnsettelseLoggDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/levendearbeidsforhold/v1/logging/AnsettelseLoggDTO.java deleted file mode 100644 index c05f97c25b2..00000000000 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/levendearbeidsforhold/v1/logging/AnsettelseLoggDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package no.nav.testnav.libs.dto.levendearbeidsforhold.v1.logging; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class AnsettelseLoggDTO { - - private Integer id; - private String organisajonsnummer; - private String folkeregisterident; - private LocalDateTime timestamp; - private LocalDate ansattfra; - private String arbeidsforholdstype; - private Integer stillingsprosent; -} \ No newline at end of file