Skip to content

Commit

Permalink
Merge pull request #23 from FINTLabs/FFS-1204-lage-migration-i-histor…
Browse files Browse the repository at this point in the history
…y-service-slik-at-file-uuid-fra-instance-flow-headers-blir-lagret-i-databasen

Ffs 1204 lage migration i history service slik at file UUID fra instance flow headers blir lagret i databasen
  • Loading branch information
Battlestad authored Oct 16, 2024
2 parents 1743dc5 + 04146b7 commit 56b41ac
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public InstanceFlowHeadersEmbeddable toEmbeddable(InstanceFlowHeaders instanceFl
.sourceApplicationId(instanceFlowHeaders.getSourceApplicationId())
.sourceApplicationIntegrationId(instanceFlowHeaders.getSourceApplicationIntegrationId())
.sourceApplicationInstanceId(instanceFlowHeaders.getSourceApplicationInstanceId())
.fileIds(instanceFlowHeaders.getFileIds())
.correlationId(instanceFlowHeaders.getCorrelationId())
.integrationId(instanceFlowHeaders.getIntegrationId())
.instanceId(instanceFlowHeaders.getInstanceId())
Expand All @@ -25,6 +26,7 @@ public InstanceFlowHeaders toInstanceFlowHeaders(InstanceFlowHeadersEmbeddable e
.sourceApplicationId(embeddable.getSourceApplicationId())
.sourceApplicationIntegrationId(embeddable.getSourceApplicationIntegrationId())
.sourceApplicationInstanceId(embeddable.getSourceApplicationInstanceId())
.fileIds(embeddable.getFileIds())
.correlationId(embeddable.getCorrelationId())
.integrationId(embeddable.getIntegrationId())
.instanceId(embeddable.getInstanceId())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import lombok.*;

import javax.persistence.Embeddable;
import javax.persistence.*;
import java.util.List;
import java.util.UUID;

@Getter
Expand All @@ -17,6 +18,14 @@ public class InstanceFlowHeadersEmbeddable {
private String sourceApplicationIntegrationId;
private String sourceApplicationInstanceId;

@ElementCollection
@CollectionTable(
name = "file_id",
joinColumns = @JoinColumn(name = "event_id")
)
@Column(name = "file_id")
private List<UUID> fileIds;

private UUID correlationId;
private Long integrationId;
private Long instanceId;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
create table file_id (
event_id bigint not null,
file_id UUID,
constraint fk_event foreign key (event_id) references event (id) on delete cascade
);
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import no.fintlabs.model.InstanceFlowHeadersEmbeddable;
import org.junit.jupiter.api.Test;

import java.util.List;
import java.util.UUID;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -45,6 +46,7 @@ void testToInstanceFlowHeaders() {
.sourceApplicationId(1L)
.sourceApplicationIntegrationId("integrationId")
.sourceApplicationInstanceId("instanceId")
.fileIds(List.of(UUID.randomUUID()))
.correlationId(UUID.randomUUID())
.integrationId(1L)
.instanceId(1L)
Expand All @@ -59,6 +61,7 @@ void testToInstanceFlowHeaders() {
assertEquals(embeddable.getSourceApplicationIntegrationId(), instanceFlowHeaders.getSourceApplicationIntegrationId());
assertEquals(embeddable.getSourceApplicationInstanceId(), instanceFlowHeaders.getSourceApplicationInstanceId());
assertEquals(embeddable.getCorrelationId(), instanceFlowHeaders.getCorrelationId());
assertEquals(embeddable.getFileIds(), instanceFlowHeaders.getFileIds());
assertEquals(embeddable.getIntegrationId(), instanceFlowHeaders.getIntegrationId());
assertEquals(embeddable.getInstanceId(), instanceFlowHeaders.getInstanceId());
assertEquals(embeddable.getConfigurationId(), instanceFlowHeaders.getConfigurationId());
Expand Down

0 comments on commit 56b41ac

Please sign in to comment.