TFP-6023: Legger til muligheten for å laste opp vedlegg og spesifiser…

…e uuid som… (#2768) * TFP-6023: Legger til muligheten for å laste opp vedlegg og spesifisere uuid som en skal referer til
navikt · Feb 26, 2025 · da30984 · da30984
1 parent c22a8b4
commit da30984
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/.../main/java/no/nav/foreldrepenger/selvbetjening/mellomlagring/MellomlagringController.java b/.../main/java/no/nav/foreldrepenger/selvbetjening/mellomlagring/MellomlagringController.java
@@ -1,17 +1,10 @@
 package no.nav.foreldrepenger.selvbetjening.mellomlagring;
 
-import static no.nav.foreldrepenger.common.domain.validation.InputValideringRegex.FRITEKST;
-import static no.nav.foreldrepenger.selvbetjening.vedlegg.DelegerendeVedleggSjekker.DELEGERENDE;
-import static org.springframework.http.HttpStatus.NO_CONTENT;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
-import static org.springframework.http.ResponseEntity.created;
-import static org.springframework.http.ResponseEntity.noContent;
-import static org.springframework.http.ResponseEntity.notFound;
-import static org.springframework.http.ResponseEntity.ok;
-
-import java.io.IOException;
-
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Pattern;
+import no.nav.foreldrepenger.selvbetjening.http.ProtectedRestController;
+import no.nav.foreldrepenger.selvbetjening.vedlegg.Image2PDFConverter;
+import no.nav.foreldrepenger.selvbetjening.vedlegg.VedleggSjekker;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -20,15 +13,23 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Pattern;
-import no.nav.foreldrepenger.selvbetjening.http.ProtectedRestController;
-import no.nav.foreldrepenger.selvbetjening.vedlegg.Image2PDFConverter;
-import no.nav.foreldrepenger.selvbetjening.vedlegg.VedleggSjekker;
+import java.io.IOException;
+import java.util.UUID;
+
+import static no.nav.foreldrepenger.common.domain.validation.InputValideringRegex.FRITEKST;
+import static no.nav.foreldrepenger.selvbetjening.vedlegg.DelegerendeVedleggSjekker.DELEGERENDE;
+import static org.springframework.http.HttpStatus.NO_CONTENT;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
+import static org.springframework.http.ResponseEntity.created;
+import static org.springframework.http.ResponseEntity.noContent;
+import static org.springframework.http.ResponseEntity.notFound;
+import static org.springframework.http.ResponseEntity.ok;
 
 @ProtectedRestController(MellomlagringController.REST_STORAGE)
 public class MellomlagringController {
@@ -76,13 +77,17 @@ public ResponseEntity<byte[]> lesVedlegg(@PathVariable("ytelse") @Valid Ytelse y
     }
 
     @PostMapping(path = "/{ytelse}/vedlegg", consumes = MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<String> lagreVedlegg(@Valid @RequestPart("vedlegg") MultipartFile file,
-                                               @PathVariable("ytelse") @Valid Ytelse ytelse) {
+    public ResponseEntity<String> lagreVedlegg(@RequestPart("vedlegg") @Valid MultipartFile file,
+                                               @PathVariable("ytelse") @Valid Ytelse ytelse,
+                                               @RequestParam(value = "uuid", required = false) @Valid UUID uuid) { // Kan spesifisere uuid hvis ønskelig
         var originalBytes = getBytesNullSjekk(file);
         sjekker.sjekk(Attachment.of(originalBytes));
 
         var pdfBytes = converter.convert(originalBytes);
-        var attachment = Attachment.of(pdfBytes);
+
+        var attachment = uuid != null
+                ? new Attachment(pdfBytes, uuid.toString())
+                : Attachment.of(pdfBytes);
         mellomlagring.lagreKryptertVedlegg(attachment, ytelse);
         return created(attachment.uri()).body(attachment.uuid());
     }

diff --git a/.../main/java/no/nav/foreldrepenger/selvbetjening/kontrakt/innsending/v2/dto/VedleggDto.java b/.../main/java/no/nav/foreldrepenger/selvbetjening/kontrakt/innsending/v2/dto/VedleggDto.java
@@ -1,13 +1,7 @@
 package no.nav.foreldrepenger.selvbetjening.kontrakt.innsending.v2.dto;
 
-import static no.nav.foreldrepenger.common.domain.validation.InputValideringRegex.FRITEKST;
-
-import java.util.List;
-import java.util.UUID;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
@@ -17,6 +11,11 @@
 import no.nav.foreldrepenger.selvbetjening.kontrakt.innsending.dto.ÅpenPeriodeDto;
 import no.nav.foreldrepenger.selvbetjening.kontrakt.innsending.v2.dto.svangerskapspenger.ArbeidsforholdDto;
 
+import java.util.List;
+import java.util.UUID;
+
+import static no.nav.foreldrepenger.common.domain.validation.InputValideringRegex.FRITEKST;
+
 public record VedleggDto(UUID uuid,
                          @NotNull DokumentType skjemanummer,
                          InnsendingsType innsendingsType,