Merge pull request #999 from digitalservicebund/remove-delta

Stop applying time-machine when releasing norms

backend/src/main/java/de/bund/digitalservice/ris/norms/application/service/ArticleService.java

@@ -24,16 +24,13 @@ public class ArticleService
     LoadSpecificArticlesXmlFromDokumentUseCase {
 
   LoadRegelungstextPort loadRegelungstextPort;
-  TimeMachineService timeMachineService;
   XsltTransformationService xsltTransformationService;
 
   public ArticleService(
     LoadRegelungstextPort loadRegelungstextPort,
-    TimeMachineService timeMachineService,
     XsltTransformationService xsltTransformationService
   ) {
     this.loadRegelungstextPort = loadRegelungstextPort;
-    this.timeMachineService = timeMachineService;
     this.xsltTransformationService = xsltTransformationService;
   }
 

backend/src/main/java/de/bund/digitalservice/ris/norms/application/service/ReleaseService.java

@@ -17,11 +17,9 @@
 import de.bund.digitalservice.ris.norms.utils.XmlMapper;
 import java.time.Instant;
 import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,7 +34,6 @@ public class ReleaseService implements ReleaseAnnouncementUseCase {
   private final LoadAnnouncementByNormEliUseCase loadAnnouncementByNormEliUseCase;
   private final UpdateOrSaveNormPort updateOrSaveNormPort;
   private final NormService normService;
-  private final TimeMachineService timeMachineService;
   private final CreateNewVersionOfNormService createNewVersionOfNormService;
   private final DeleteNormPort deleteNormPort;
   private final SaveReleaseToAnnouncementPort saveReleaseToAnnouncementPort;
@@ -47,7 +44,6 @@ public ReleaseService(
     LoadAnnouncementByNormEliUseCase loadAnnouncementByNormEliUseCase,
     UpdateOrSaveNormPort updateOrSaveNormPort,
     NormService normService,
-    TimeMachineService timeMachineService,
     CreateNewVersionOfNormService createNewVersionOfNormService,
     DeleteNormPort deleteNormPort,
     SaveReleaseToAnnouncementPort saveReleaseToAnnouncementPort,
@@ -57,7 +53,6 @@ public ReleaseService(
     this.loadAnnouncementByNormEliUseCase = loadAnnouncementByNormEliUseCase;
     this.updateOrSaveNormPort = updateOrSaveNormPort;
     this.normService = normService;
-    this.timeMachineService = timeMachineService;
     this.createNewVersionOfNormService = createNewVersionOfNormService;
     this.deleteNormPort = deleteNormPort;
     this.saveReleaseToAnnouncementPort = saveReleaseToAnnouncementPort;
@@ -164,21 +159,6 @@ public Announcement releaseAnnouncement(ReleaseAnnouncementUseCase.Query query)
         allVersionsOfAllNormsToPublish.add(result.newManifestationOfOldExpression());
 
         latestNormExpression = result.newExpression();
-
-        latestNormExpression.setRegelungstexte(
-          latestNormExpression
-            .getRegelungstexte()
-            .stream()
-            .map(regelungstext ->
-              timeMachineService.applyPassiveModifications(
-                new ApplyPassiveModificationsUseCase.Query(
-                  regelungstext,
-                  date.atStartOfDay(ZoneId.systemDefault()).toInstant()
-                )
-              )
-            )
-            .collect(Collectors.toSet())
-        );
       }
 
       allVersionsOfAllNormsToPublish.add(latestNormExpression);