Fix: replace not keeping order

Author: SirMarjan

NotificationsSystemApplication/src/main/java/pl/marcinsobanski/notificationssystem/application/replacetemplate/ReplaceTemplateCommandHandler.java

@@ -29,7 +29,8 @@ public Void handle(ReplaceTemplateCommand command) {
                 .content(command.content())
                 .receiversEmails(command.receiversEmails())
                 .rules(command.rules().stream().map(ruleConverter::convertRule).toList())
-                .creationTime(Instant.now()).build();
+                .creationTime(templateRepository.getTemplateCreationTime(command.id()))
+                .build();
         templateRepository.updateTemplate(template);
 
         compiledRuleFactory

NotificationsSystemDomain/src/main/java/pl/marcinsobanski/notificationssystem/domain/template/TemplateRepository.java

@@ -1,12 +1,15 @@
 package pl.marcinsobanski.notificationssystem.domain.template;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
 public interface TemplateRepository {
 
+    Instant getTemplateCreationTime(UUID id);
+
     List<SimpleTemplate> getAllSimpleTemplates();
 
     Optional<Template> getTemplate(UUID id);

NotificationsSystemInfrastructure/src/main/java/pl/marcinsobanski/notificationssystem/infrastructure/adapters/TemplateRepositoryImpl.java

@@ -11,6 +11,7 @@
 import pl.marcinsobanski.notificationssystem.infrastructure.repository.TemplateJpaRepository;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -26,6 +27,11 @@ public class TemplateRepositoryImpl implements TemplateRepository {
     private final TemplateEntityToTemplateConverter templateEntityToTemplateConverter;
     private final TemplateToTemplateEntityConverter templateToTemplateEntityConverter;
 
+    @Override
+    public Instant getTemplateCreationTime(UUID id) {
+        return templateJpaRepository.findTemplateCreationTimeById(id).orElseThrow();
+    }
+
     @Override
     public List<SimpleTemplate> getAllSimpleTemplates() {
         return templateJpaRepository.findAllSimpleTemplateByCreationTimeDesc();

NotificationsSystemInfrastructure/src/main/java/pl/marcinsobanski/notificationssystem/infrastructure/repository/TemplateJpaRepository.java

@@ -7,6 +7,7 @@
 import pl.marcinsobanski.notificationssystem.domain.template.SimpleTemplate;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -41,4 +42,7 @@ List<SimpleTemplate> findTemplatesMatchingRule(
             ItemType itemType,
             BigDecimal price
     );
+
+    @Query("SELECT t.creationTime FROM TemplateEntity t where t.id = :id")
+    Optional<Instant> findTemplateCreationTimeById(UUID id);
 }

NotificationsSystemInfrastructure/src/test/java/pl/marcinsobanski/notificationssystem/infrastructure/delivery/TemplateApiImplIT.java

@@ -219,6 +219,7 @@ void shouldAddNewTemplate() throws Exception {
     @Test
     void shouldReplaceTemplate() throws Exception {
         // GIVEN
+        final var creationTime = Instant.parse("2007-12-03T10:15:30.00Z");
         final var templateEntity = TemplateEntity.builder()
                 .title("Title")
                 .content("Content")
@@ -233,7 +234,7 @@ void shouldReplaceTemplate() throws Exception {
                                 .itemTypeOperand(ItemType.PLATINUM)
                                 .build()
                 )))
-                .creationTime(Instant.now())
+                .creationTime(creationTime)
                 .build();
 
         final var savedTemplateId = templateJpaRepository.save(templateEntity).getId();
@@ -263,6 +264,7 @@ void shouldReplaceTemplate() throws Exception {
         assertEquals("Content2", savedTemplate.getContent());
         assertEquals(List.of("a3@a.com"), savedTemplate.getReceiversEmails());
         assertEquals(3, savedTemplate.getRules().size());
+        assertEquals(creationTime, savedTemplate.getCreationTime());
 
         final var rules = ruleJpaRepository.findAll();
         assertEquals(3, rules.size());