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

Stop applying time-machine when releasing norms #999

Merged
merged 2 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -47,7 +44,6 @@ public ReleaseService(
LoadAnnouncementByNormEliUseCase loadAnnouncementByNormEliUseCase,
UpdateOrSaveNormPort updateOrSaveNormPort,
NormService normService,
TimeMachineService timeMachineService,
CreateNewVersionOfNormService createNewVersionOfNormService,
DeleteNormPort deleteNormPort,
SaveReleaseToAnnouncementPort saveReleaseToAnnouncementPort,
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

This file was deleted.

Loading