refactor: add datetime to chat and subscriptions tables (#152)

* chore: added migrations for date_time

* refactor: added timestamps for chats

* test: updated tests

* chore: fixed flyway applied test migrations

* refactor: updated controller update uri

* refactor: added update chat logic

* migration: added creation date to subscriptions

* feat: added dates persist to subs

* refactor: added select for update method

* refactor: permalink update through select for update

* refactor: updated dtos

* test: updated tests

* chore: added jackson jsr310 to tests

* feat: added modified at for subscription

* migration: added modified at

* refactor: select for update telegram chat

* refactor: added isolation level

* style: style

* fix: weird modification timestamp

* chore: ignore groovy lint

* migration: timestamp in utc

* migration: deleted repeatable migration

* fix: topic deleted unhandled error

* release: from 1.3.10 to 1.4.0

* refactor: removed sout

Author: Dankoy

.github/workflows/super-linter.yml

@@ -40,6 +40,7 @@ jobs:
           VALIDATE_NATURAL_LANGUAGE: false
           VALIDATE_JSCPD: false
           VALIDATE_JAVA: false # make true someday
+          VALIDATE_GROOVY: false # make true someday
           VALIDATE_SQLFLUFF: false
           VALIDATE_MARKDOWN_PRETTIER: false
           VALIDATE_YAML_PRETTIER: false

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 ext {
-    set("PROJECT_VERSION", "1.3.10")
+    set("PROJECT_VERSION", "1.4.0")
 }
 
 // doesn't work in build.gradle in buildSrc project

subscriptions_holder/build.gradle

@@ -24,8 +24,16 @@ group = 'ru.dankoy.subscriptionsholder'
 dependencies {
 
     // flyway
-    implementation 'org.flywaydb:flyway-core'
-    implementation 'org.flywaydb:flyway-database-postgresql'
+    // starting from spring boot 3.4.0 flyway (10.20.1) behavior is ridiculous
+    // it applied migrations from tests on production environment
+    // so I decided to use latest version from maven
+    // 11.1.0, 11.0.1, 10.22.0 works perfect
+    // TODO: use versions from spring dep manager (can it even be trusted after this horrendous upgrade?)
+    implementation 'org.flywaydb:flyway-core:11.1.0'
+    implementation 'org.flywaydb:flyway-database-postgresql:11.1.0'
+
+    // jackson
+    testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 
     // jasypt
     implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5'

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/controller/ChatController.java

@@ -4,13 +4,15 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.communitysub.ChatCreateDTO;
 import ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.communitysub.ChatDTO;
+import ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.communitysub.ChatUpdateDTO;
 import ru.dankoy.subscriptionsholder.subscriptions_holder.core.exceptions.ResourceNotFoundException;
 import ru.dankoy.subscriptionsholder.subscriptions_holder.core.service.TelegramChatService;
 
@@ -47,12 +49,15 @@ public ChatDTO createChat(@RequestBody @Valid ChatCreateDTO chatCreateDTO) {
     return ChatDTO.toDTO(saved);
   }
 
-  @PutMapping("/api/v1/telegram_chat")
-  public ChatDTO updateChat(@RequestBody @Valid ChatDTO chatDTO) {
+  @PutMapping("/api/v1/telegram_chat/{id}")
+  public ChatDTO updateChat(
+      @PathVariable("id") long id, @RequestBody @Valid ChatUpdateDTO chatDTO) {
 
-    var chat = ChatDTO.fromDTO(chatDTO);
+    chatDTO.setId(id);
 
-    var saved = telegramChatService.save(chat);
+    var chat = ChatUpdateDTO.fromDTO(chatDTO);
+
+    var saved = telegramChatService.update(chat);
 
     return ChatDTO.toDTO(saved);
   }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/domain/Chat.java

@@ -2,14 +2,18 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import ru.dankoy.subscriptionsholder.subscriptions_holder.core.jpalisteners.ChatListener;
 
+@EntityListeners(ChatListener.class)
 @Entity
 @Table(name = "chats")
 @Data
@@ -45,4 +49,10 @@ public class Chat {
 
   @Column(name = "message_thread_id")
   private Integer messageThreadId;
+
+  @Column(name = "date_created", nullable = false)
+  private LocalDateTime dateCreated;
+
+  @Column(name = "date_modified", nullable = true)
+  private LocalDateTime dateModified;
 }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/domain/subscriptions/Subscription.java

@@ -2,6 +2,7 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -12,11 +13,14 @@
 import jakarta.persistence.NamedAttributeNode;
 import jakarta.persistence.NamedEntityGraph;
 import jakarta.persistence.Table;
+import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import ru.dankoy.subscriptionsholder.subscriptions_holder.core.domain.Chat;
+import ru.dankoy.subscriptionsholder.subscriptions_holder.core.jpalisteners.SubscriptionListener;
 
+@EntityListeners({SubscriptionListener.class})
 @NamedEntityGraph(
     name = "subscription-full",
     attributeNodes = {
@@ -43,4 +47,10 @@ public class Subscription {
 
   @Column(name = "last_permalink")
   private String lastPermalink;
+
+  @Column(name = "created_at", nullable = false)
+  private LocalDateTime createdAt;
+
+  @Column(name = "modified_at", nullable = false)
+  private LocalDateTime modifiedAt;
 }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/dto/channelsub/ChannelSubscriptionDTO.java

@@ -1,5 +1,6 @@
 package ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.channelsub;
 
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -30,6 +31,10 @@ public class ChannelSubscriptionDTO {
 
   private String lastPermalink;
 
+  private LocalDateTime createdAt;
+
+  private LocalDateTime modifiedAt;
+
   public static ChannelSubscriptionDTO toDTO(ChannelSub channelSub) {
 
     return new ChannelSubscriptionDTO(
@@ -39,7 +44,9 @@ public static ChannelSubscriptionDTO toDTO(ChannelSub channelSub) {
         OrderDTO.toDTO(channelSub.getOrder()),
         ScopeDTO.toDTO(channelSub.getScope()),
         TypeDTO.toDTO(channelSub.getType()),
-        channelSub.getLastPermalink());
+        channelSub.getLastPermalink(),
+        channelSub.getCreatedAt(),
+        channelSub.getModifiedAt());
   }
 
   public static ChannelSub fromDTO(ChannelSubscriptionDTO dto) {
@@ -52,6 +59,8 @@ public static ChannelSub fromDTO(ChannelSubscriptionDTO dto) {
         .scope(ScopeDTO.fromDTO(dto.getScope()))
         .type(TypeDTO.fromDTO(dto.getType()))
         .lastPermalink(dto.getLastPermalink())
+        .createdAt(dto.getCreatedAt())
+        .modifiedAt(dto.getModifiedAt())
         .build();
   }
 }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/dto/communitysub/ChatCreateDTO.java

@@ -55,6 +55,8 @@ public static Chat fromDTO(ChatCreateDTO dto) {
         dto.lastName,
         dto.username,
         dto.active,
-        dto.messageThreadId);
+        dto.messageThreadId,
+        null,
+        null);
   }
 }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/dto/communitysub/ChatDTO.java

@@ -1,5 +1,6 @@
 package ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.communitysub;
 
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -32,6 +33,10 @@ public class ChatDTO {
 
   private Integer messageThreadId;
 
+  private LocalDateTime dateCreated;
+
+  private LocalDateTime dateModified;
+
   public static ChatDTO toDTO(Chat chat) {
 
     return builder()
@@ -44,6 +49,8 @@ public static ChatDTO toDTO(Chat chat) {
         .username(chat.getUsername())
         .active(chat.isActive())
         .messageThreadId(chat.getMessageThreadId())
+        .dateCreated(chat.getDateCreated())
+        .dateModified(chat.getDateModified())
         .build();
   }
 
@@ -58,6 +65,8 @@ public static Chat fromDTO(ChatDTO dto) {
         dto.lastName,
         dto.username,
         dto.active,
-        dto.messageThreadId);
+        dto.messageThreadId,
+        dto.dateCreated,
+        dto.dateModified);
   }
 }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/dto/communitysub/ChatUpdateDTO.java

@@ -0,0 +1,66 @@
+package ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.communitysub;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import ru.dankoy.subscriptionsholder.subscriptions_holder.core.domain.Chat;
+
+@ToString
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatUpdateDTO {
+
+  @Setter private long id;
+
+  private long chatId;
+
+  private String type;
+
+  private String title;
+
+  private String firstName;
+
+  private String lastName;
+
+  private String username;
+
+  private boolean active;
+
+  private Integer messageThreadId;
+
+  public static ChatUpdateDTO toDTO(Chat chat) {
+
+    return builder()
+        .id(chat.getId())
+        .chatId(chat.getChatId())
+        .type(chat.getType())
+        .title(chat.getTitle())
+        .firstName(chat.getFirstName())
+        .lastName(chat.getLastName())
+        .username(chat.getUsername())
+        .active(chat.isActive())
+        .messageThreadId(chat.getMessageThreadId())
+        .build();
+  }
+
+  public static Chat fromDTO(ChatUpdateDTO dto) {
+
+    return new Chat(
+        dto.id,
+        dto.chatId,
+        dto.type,
+        dto.title,
+        dto.firstName,
+        dto.lastName,
+        dto.username,
+        dto.active,
+        dto.messageThreadId,
+        null,
+        null);
+  }
+}

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/dto/communitysub/CommunitySubDTO.java

@@ -1,5 +1,6 @@
 package ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.communitysub;
 
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -25,6 +26,10 @@ public class CommunitySubDTO {
 
   private String lastPermalink;
 
+  private LocalDateTime createdAt;
+
+  private LocalDateTime modifiedAt;
+
   public static CommunitySubDTO toDTO(CommunitySub communitySubscription) {
 
     return CommunitySubDTO.builder()
@@ -33,6 +38,8 @@ public static CommunitySubDTO toDTO(CommunitySub communitySubscription) {
         .section(SectionDTO.toDTO(communitySubscription.getSection()))
         .chat(ChatDTO.toDTO(communitySubscription.getChat()))
         .lastPermalink(communitySubscription.getLastPermalink())
+        .createdAt(communitySubscription.getCreatedAt())
+        .modifiedAt(communitySubscription.getModifiedAt())
         .build();
   }
 
@@ -44,6 +51,8 @@ public static CommunitySub fromDTO(CommunitySubDTO dto) {
         .section(SectionDTO.fromDTO(dto.getSection()))
         .chat(ChatDTO.fromDTO(dto.getChat()))
         .lastPermalink(dto.getLastPermalink())
+        .createdAt(dto.getCreatedAt())
+        .modifiedAt(dto.getModifiedAt())
         .build();
   }
 }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/dto/tagsubscription/TagSubscriptionDTO.java

@@ -1,5 +1,6 @@
 package ru.dankoy.subscriptionsholder.subscriptions_holder.core.dto.tagsubscription;
 
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -27,6 +28,10 @@ public class TagSubscriptionDTO {
 
   private String lastPermalink;
 
+  private LocalDateTime createdAt;
+
+  private LocalDateTime modifiedAt;
+
   public static TagSubscriptionDTO toDTO(TagSub tagSubscription) {
 
     return new TagSubscriptionDTO(
@@ -36,7 +41,9 @@ public static TagSubscriptionDTO toDTO(TagSub tagSubscription) {
         OrderDTO.toDTO(tagSubscription.getOrder()),
         ScopeDTO.toDTO(tagSubscription.getScope()),
         TypeDTO.toDTO(tagSubscription.getType()),
-        tagSubscription.getLastPermalink());
+        tagSubscription.getLastPermalink(),
+        tagSubscription.getCreatedAt(),
+        tagSubscription.getModifiedAt());
   }
 
   public static TagSub fromDTO(TagSubscriptionDTO dto) {
@@ -49,6 +56,8 @@ public static TagSub fromDTO(TagSubscriptionDTO dto) {
         .scope(ScopeDTO.fromDTO(dto.getScope()))
         .type(TypeDTO.fromDTO(dto.getType()))
         .lastPermalink(dto.getLastPermalink())
+        .createdAt(dto.getCreatedAt())
+        .modifiedAt(dto.getModifiedAt())
         .build();
   }
 }

subscriptions_holder/src/main/java/ru/dankoy/subscriptionsholder/subscriptions_holder/core/jpalisteners/ChatListener.java

@@ -0,0 +1,22 @@
+package ru.dankoy.subscriptionsholder.subscriptions_holder.core.jpalisteners;
+
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import ru.dankoy.subscriptionsholder.subscriptions_holder.core.domain.Chat;
+
+public class ChatListener {
+
+  @PrePersist
+  public void prePersist(Chat chat) {
+    if (chat.getDateCreated() == null) {
+      chat.setDateCreated(LocalDateTime.now(ZoneOffset.UTC));
+    }
+  }
+
+  @PreUpdate
+  public void preUpdate(Chat chat) {
+    chat.setDateModified(LocalDateTime.now(ZoneOffset.UTC));
+  }
+}