Move domain specific code from service to domain object

RISDEV-0000
digitalservicebund · Jan 14, 2025 · 4b80cec · 4b80cec
1 parent d8f2d6a
commit 4b80cec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/...c/main/java/de/bund/digitalservice/ris/norms/application/service/AnnouncementService.java b/...c/main/java/de/bund/digitalservice/ris/norms/application/service/AnnouncementService.java
@@ -101,7 +101,7 @@ public List<Norm> loadTargetNormsAffectedByAnnouncement(
         .orElseThrow(() -> new NormNotFoundException(query.eli().toString()));
 
     return amendingNorm
-      .targetLawElis()
+      .getTargetLawElis()
       .stream()
       .map(eli ->
         loadNormPort

diff --git a/backend/src/main/java/de/bund/digitalservice/ris/norms/domain/entity/Article.java b/backend/src/main/java/de/bund/digitalservice/ris/norms/domain/entity/Article.java
@@ -119,4 +119,14 @@ public List<Mod> getMods() {
       .map(Mod::new)
       .toList();
   }
+
+  /**
+   * Checks weather the {@link Article} refers to a Geltungszeitregel (which would define when a law e.g. enters
+   * into force)
+   *
+   * @return {@link Boolean}
+   */
+  public Boolean isGeltungszeitregel() {
+    return getRefersTo().orElse("").equals("geltungszeitregel");
+  }
 }
diff --git a/backend/src/main/java/de/bund/digitalservice/ris/norms/domain/entity/Norm.java b/backend/src/main/java/de/bund/digitalservice/ris/norms/domain/entity/Norm.java
@@ -141,14 +141,10 @@ public List<Article> getArticles() {
    *
    * @return The list of target norm elis
    */
-  public List<ExpressionEli> targetLawElis() {
-    return getNodesFromExpression("//body//article[not(ancestor-or-self::mod)]", document)
+  public List<ExpressionEli> getTargetLawElis() {
+    return getArticles()
       .stream()
-      .map(Article::new)
-      .filter(article ->
-        article.getRefersTo().isPresent() &&
-        !article.getRefersTo().get().equals("geltungszeitregel")
-      )
+      .filter(article -> !article.isGeltungszeitregel())
       .map(Article::getMandatoryAffectedDocumentEli)
       .toList();
   }