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.

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

Legg til søknadsid på bidrag beregning request #230

Merged
merged 1 commit into from
Sep 3, 2024
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,23 +1,50 @@
package no.nav.bidrag.transport.behandling.beregning.felles

import jakarta.validation.Constraint
import jakarta.validation.ConstraintValidator
import jakarta.validation.ConstraintValidatorContext
import jakarta.validation.Valid
import jakarta.validation.constraints.NotBlank
import jakarta.validation.constraints.Size
import no.nav.bidrag.domene.enums.vedtak.Stønadstype
import no.nav.bidrag.domene.ident.Personident
import java.time.LocalDate
import kotlin.reflect.KClass

data class BidragBeregningRequestDto(
@field:Valid
val hentBeregningerFor: List<HentBidragBeregning>,
) {
@GyldigBidragBeregning
data class HentBidragBeregning(
@field:NotBlank(message = "Saksnummer kan ikke være blank")
@field:Size(max = 7, min = 7, message = "Saksnummer må bestå av 7 tegn")
val saksnummer: String,
@field:GyldigPersonidentLengde
val personidentBarn: Personident,
val datoSøknad: LocalDate,
val datoSøknad: LocalDate? = null,
val søknadsid: String? = null,
val stønadstype: Stønadstype,
)
}

@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
@Constraint(validatedBy = arrayOf(GyldigBidragBeregningValidator::class))
annotation class GyldigBidragBeregning(
val message: String = "Enten datoSøknad eller søknadsid må settes",
val groups: Array<KClass<*>> = [],
val payload: Array<KClass<out Any>> = [],
)

class GyldigBidragBeregningValidator : ConstraintValidator<GyldigBidragBeregning, BidragBeregningRequestDto.HentBidragBeregning> {
override fun isValid(
input: BidragBeregningRequestDto.HentBidragBeregning?,
constraintValidatorContext: ConstraintValidatorContext,
): Boolean {
if (input == null) {
return false
}
return input.datoSøknad == null && input.søknadsid.isNullOrEmpty()
}
}
Loading