From dbd8073b5a8221220ebb031677d00a4e997fdc2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Theodor=20Angerg=C3=A5rd?= Date: Sat, 8 Jun 2024 17:58:08 +0200 Subject: [PATCH] Update --- .../secondary/jpa/client/ClientEntityConverter.java | 2 +- .../client/restriction/ClientRestrictionEntity.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/ClientEntityConverter.java b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/ClientEntityConverter.java index 0ae2fb81f..4b1aea03f 100644 --- a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/ClientEntityConverter.java +++ b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/ClientEntityConverter.java @@ -67,7 +67,7 @@ public Client toDomain(ClientEntity clientEntity) { clientEntity.clientRestriction == null ? null : new ClientRestriction( - new ClientRestrictionId(clientEntity.clientRestriction.getRestrictionId()), + new ClientRestrictionId(clientEntity.clientRestriction.getId()), clientEntity.clientRestriction.getSuperGroupRestrictions().stream() .map( clientRestrictionSuperGroupEntity -> diff --git a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/restriction/ClientRestrictionEntity.java b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/restriction/ClientRestrictionEntity.java index 0349fe9a8..e26e86995 100644 --- a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/restriction/ClientRestrictionEntity.java +++ b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/client/restriction/ClientRestrictionEntity.java @@ -1,6 +1,7 @@ package it.chalmers.gamma.adapter.secondary.jpa.client.restriction; import it.chalmers.gamma.adapter.secondary.jpa.client.ClientEntity; +import it.chalmers.gamma.adapter.secondary.jpa.util.ImmutableEntity; import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; @@ -8,7 +9,7 @@ @Entity @Table(name = "g_client_restriction") -public class ClientRestrictionEntity { +public class ClientRestrictionEntity extends ImmutableEntity { @Column(name = "restriction_id", columnDefinition = "uuid") protected UUID restrictionId; @@ -37,11 +38,12 @@ public void setSuperGroupRestrictions( this.superGroupRestrictions = superGroupRestrictions; } - public UUID getRestrictionId() { - return restrictionId; - } - public List getSuperGroupRestrictions() { return superGroupRestrictions; } + + @Override + public UUID getId() { + return restrictionId; + } }