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

36 måneder skal være tillatt, bytt fra isSameOrAfter til isAfter #4798

Merged
merged 8 commits into from
Oct 1, 2024

Conversation

UyQuangNguyen
Copy link
Contributor

@UyQuangNguyen UyQuangNguyen commented Sep 30, 2024

@UyQuangNguyen UyQuangNguyen requested a review from a team as a code owner September 30, 2024 13:38
UyQuangNguyen and others added 7 commits September 30, 2024 15:42
…ub.com:navikt/familie-ba-sak into Tillatt_36_mnd_etter_tom_endretutbetalingandel
Bumps
[org.cyclonedx:cyclonedx-maven-plugin](https://github.com/CycloneDX/cyclonedx-maven-plugin)
from 2.8.1 to 2.8.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/releases">org.cyclonedx:cyclonedx-maven-plugin's
releases</a>.</em></p>
<blockquote>
<h2>2.8.2</h2>
<!-- raw HTML omitted -->
<h2>🐛 Bug Fixes</h2>
<ul>
<li>display configured classifier from <a
href="https://redirect.github.com/CycloneDX/cyclonedx-maven-plugin/issues/506">#506</a>
(<a
href="https://redirect.github.com/CycloneDX/cyclonedx-maven-plugin/pull/550">#550</a>)
<a href="https://github.com/hboutemy"><code>@​hboutemy</code></a></li>
</ul>
<h2>📦 Dependency updates</h2>
<ul>
<li>Bump plugin-tools.version from 3.13.1 to 3.15.0 (<a
href="https://redirect.github.com/CycloneDX/cyclonedx-maven-plugin/pull/551">#551</a>)
<a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
<li>Bump org.apache.maven.plugins:maven-project-info-reports-plugin from
3.6.1 to 3.7.0 (<a
href="https://redirect.github.com/CycloneDX/cyclonedx-maven-plugin/pull/552">#552</a>)
<a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
<li>Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 (<a
href="https://redirect.github.com/CycloneDX/cyclonedx-maven-plugin/pull/546">#546</a>)
<a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
<li>Bump commons-codec:commons-codec from 1.17.0 to 1.17.1 (<a
href="https://redirect.github.com/CycloneDX/cyclonedx-maven-plugin/pull/537">#537</a>)
<a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/commit/a3f468f316c62d480007054773a8e4278b07f365"><code>a3f468f</code></a>
[maven-release-plugin] prepare release cyclonedx-maven-plugin-2.8.2</li>
<li><a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/commit/85e3bd81c7019fa26daa805c5d78a9e826ef0d21"><code>85e3bd8</code></a>
Bump plugin-tools.version from 3.13.1 to 3.15.0</li>
<li><a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/commit/314424d95f07d4383973d95dbe9ce4d6e63e1959"><code>314424d</code></a>
Bump org.apache.maven.plugins:maven-project-info-reports-plugin</li>
<li><a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/commit/41808a091377a836bfceabd0bebf938b10e550fb"><code>41808a0</code></a>
display configured classifier from <a
href="https://redirect.github.com/CycloneDX/cyclonedx-maven-plugin/issues/506">#506</a></li>
<li><a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/commit/be1b73a1c636a4fc33ec49af5dedc2fca2f3b872"><code>be1b73a</code></a>
Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0</li>
<li><a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/commit/bb865c4faa7761961417ac9e36523fe15e09e1f5"><code>bb865c4</code></a>
Bump commons-codec:commons-codec from 1.17.0 to 1.17.1</li>
<li><a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/commit/cb74626471281f0d708b1034be183db9cdeebe78"><code>cb74626</code></a>
[maven-release-plugin] prepare for next development iteration</li>
<li>See full diff in <a
href="https://github.com/CycloneDX/cyclonedx-maven-plugin/compare/cyclonedx-maven-plugin-2.8.1...cyclonedx-maven-plugin-2.8.2">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.cyclonedx:cyclonedx-maven-plugin&package-manager=maven&previous-version=2.8.1&new-version=2.8.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

### 💰 Hva skal gjøres, og hvorfor?
Har identhendelsetasker som feiler pga constraint på aktørid. Dette
kommer at vi ikke sender ikke lagre = false når vi oppretter personident

renamer lagre -> lagreNyAktør
sender lagre = false når vi kaller fra en kontekst der vi vet at det
eksisterer en aktør

---------

Signed-off-by: FredrikP <[email protected]>
…ub.com:navikt/familie-ba-sak into Tillatt_36_mnd_etter_tom_endretutbetalingandel
@@ -46,7 +46,7 @@ fun hentGyldigEtterbetaling3ÅrFom(kravDato: LocalDate) =

fun hentGyldigEtterbetaling3MndFom(kravDato: LocalDate) =
kravDato
.minusMonths(3)
.minusMonths(4)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Må diskutere denne litt med Anna.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Søkt i oktober, så skal du få etterbetal juli, august og september. Dette er OK gitt at vi nå bruker isAfter.

@UyQuangNguyen UyQuangNguyen marked this pull request as draft October 1, 2024 06:34
@UyQuangNguyen UyQuangNguyen marked this pull request as ready for review October 1, 2024 14:10
Copy link
Contributor

@MagnusTonnessen MagnusTonnessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🙌🏼

@UyQuangNguyen UyQuangNguyen added this pull request to the merge queue Oct 1, 2024
Merged via the queue into main with commit afc4f23 Oct 1, 2024
10 checks passed
@UyQuangNguyen UyQuangNguyen deleted the Tillatt_36_mnd_etter_tom_endretutbetalingandel branch October 1, 2024 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants