Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TFP-6023: Legger til muligheten for å laste opp vedlegg og spesifisere uuid som… #2768

Merged
merged 3 commits into from
Feb 26, 2025
+30 −26
Merged

TFP-6023: Legger til muligheten for å laste opp vedlegg og spesifisere uuid som… #2768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47a17c8
Legger til muligheten for å laste opp vedlegg og spesifisere uuid som…
espenwaaga Feb 25, 2025
5b0715f
Legg inn valid
espenwaaga Feb 26, 2025
b991671
Legg inn valid
espenwaaga Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions .../main/java/no/nav/foreldrepenger/selvbetjening/mellomlagring/MellomlagringController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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());
}
Expand Down
11 changes: 5 additions & 6 deletions .../main/java/no/nav/foreldrepenger/selvbetjening/kontrakt/innsending/v2/dto/VedleggDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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,
Expand Down