From d21a730b2db6e8851c9b28ceb3014f8f92a3f75c Mon Sep 17 00:00:00 2001 From: dylan Date: Fri, 7 Feb 2025 19:29:45 +0100 Subject: [PATCH] Fix ugly TODO :) --- .../swisssignchallenge/entities/SigningRequestDocument.java | 5 +++-- .../services/impl/SigningRequestDocumentServiceImpl.java | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/ch/dlmw/swisssignchallenge/entities/SigningRequestDocument.java b/src/main/java/ch/dlmw/swisssignchallenge/entities/SigningRequestDocument.java index 0a83869..09a1c62 100644 --- a/src/main/java/ch/dlmw/swisssignchallenge/entities/SigningRequestDocument.java +++ b/src/main/java/ch/dlmw/swisssignchallenge/entities/SigningRequestDocument.java @@ -1,6 +1,7 @@ package ch.dlmw.swisssignchallenge.entities; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIdentityInfo; +import com.fasterxml.jackson.annotation.ObjectIdGenerators; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; @@ -11,6 +12,7 @@ import java.util.UUID; @Table(name = "signing_request_document") @Getter @Setter +@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id") public class SigningRequestDocument { @Id @GeneratedValue(generator = "UUID") @@ -19,7 +21,6 @@ public class SigningRequestDocument { @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "signing_request_id", nullable = false) - @JsonIgnore private SigningRequest signingRequest; @Column(name = "name", nullable = false) diff --git a/src/main/java/ch/dlmw/swisssignchallenge/services/impl/SigningRequestDocumentServiceImpl.java b/src/main/java/ch/dlmw/swisssignchallenge/services/impl/SigningRequestDocumentServiceImpl.java index adfe03c..990d4bd 100644 --- a/src/main/java/ch/dlmw/swisssignchallenge/services/impl/SigningRequestDocumentServiceImpl.java +++ b/src/main/java/ch/dlmw/swisssignchallenge/services/impl/SigningRequestDocumentServiceImpl.java @@ -15,8 +15,6 @@ public class SigningRequestDocumentServiceImpl implements SigningRequestDocument @Override public void updateSigningRequestDocument(SigningRequestDocument signingRequestDocument) { - var document = signingRequestDocumentRepository.findById(signingRequestDocument.getId()).orElseThrow(); - signingRequestDocument.setSigningRequest(document.getSigningRequest()); // todo: this is a bit ugly.. due to recursion the relationship is ignored so I set it manually signingRequestDocumentRepository.save(signingRequestDocument); }