Persist the last import timestamp so that we can get messages posted if the server is not running.

Author: ocielliottc

server/src/main/java/com/objectcomputing/checkins/services/slack/kudos/KudosChannelReadTime.java

@@ -0,0 +1,42 @@
+package com.objectcomputing.checkins.services.slack.kudos;
+
+import io.micronaut.core.annotation.Introspected;
+import io.micronaut.data.annotation.TypeDef;
+import io.micronaut.data.model.DataType;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@Introspected
+@Table(name = "automated_kudos_read_time")
+public class KudosChannelReadTime {
+    static final public String key = "Singleton";
+
+    @Id
+    @Column(name = "id")
+    @Schema(description = "the id of the kudos channel read time")
+    private String id;
+
+    @NotNull
+    @Column(name = "readtime")
+    @TypeDef(type = DataType.TIMESTAMP)
+    @Schema(description = "date the kudos were created")
+    private LocalDateTime readTime;
+
+    public KudosChannelReadTime() {
+        id = key;
+        readTime = LocalDateTime.now();
+    }
+}

server/src/main/java/com/objectcomputing/checkins/services/slack/kudos/KudosChannelReadTimeStore.java

@@ -0,0 +1,9 @@
+package com.objectcomputing.checkins.services.slack.kudos;
+
+import io.micronaut.data.jdbc.annotation.JdbcRepository;
+import io.micronaut.data.model.query.builder.sql.Dialect;
+import io.micronaut.data.repository.CrudRepository;
+
+@JdbcRepository(dialect = Dialect.POSTGRES)
+public interface KudosChannelReadTimeStore extends CrudRepository<KudosChannelReadTime, String> {
+}

server/src/main/java/com/objectcomputing/checkins/services/slack/kudos/KudosChannelReader.java

@@ -14,13 +14,15 @@
 import jakarta.inject.Inject;
 
 import java.util.List;
+import java.util.Optional;
 import java.time.LocalDateTime;
 
 @Singleton
 public class KudosChannelReader {
     private static final Logger LOG = LoggerFactory.getLogger(KudosChannelReader.class);
 
-    private static LocalDateTime lastImport = null;
+    @Inject
+    private KudosChannelReadTimeStore kudosChannelReadTimeStore;
 
     @Inject
     private CheckInsConfiguration configuration;
@@ -33,23 +35,23 @@ public class KudosChannelReader {
 
     @Scheduled(fixedDelay = "10m")
     public void readChannel() {
-        if (lastImport == null) {
-            lastImport = LocalDateTime.now();
-        }
+        Optional<KudosChannelReadTime> readTime =
+            kudosChannelReadTimeStore.findById(KudosChannelReadTime.key);
+        boolean present = readTime.isPresent();
+        LocalDateTime lastImport = present ? readTime.get().getReadTime()
+                                           : LocalDateTime.now();
 
         String channelId = configuration.getApplication()
                                         .getSlack().getKudosChannel();
+        LOG.info("Reading messages from " + channelId +
+                 " as of " + lastImport.toString());
         List<Message> messages = slackReader.read(channelId, lastImport);
-        updateLastImportTime();
+        if (present) {
+            kudosChannelReadTimeStore.update(new KudosChannelReadTime());
+        } else {
+            kudosChannelReadTimeStore.save(new KudosChannelReadTime());
+        }
 
         slackKudosCreator.store(messages);
     }
-
-    private LocalDateTime getLastImportTime() {
-        return lastImport;
-    }
-
-    private void updateLastImportTime() {
-        lastImport = LocalDateTime.now();
-    }
 }

server/src/main/java/com/objectcomputing/checkins/services/slack/kudos/SlackKudosCreator.java

@@ -50,8 +50,7 @@ public class SlackKudosCreator {
 
     public void store(List<Message> messages) {
         for (Message message : messages) {
-            if (message.getSubtype() == null &&
-                message.getText().toLowerCase().contains("kudos")) {
+            if (message.getSubtype() == null) {
                 try {
                     AutomatedKudosDTO kudosDTO = createFromMessage(message);
                     if (kudosDTO.getRecipientIds().size() == 0) {
@@ -64,6 +63,8 @@ public void store(List<Message> messages) {
                 } catch (Exception ex) {
                     LOG.error("store: " + ex.toString());
                 }
+            } else {
+                LOG.info("Skipping message: " + message.getText());
             }
         }
 

server/src/main/resources/db/common/V121__automated_kudos_table.sql

@@ -9,3 +9,11 @@ CREATE TABLE automated_kudos
     senderid        varchar REFERENCES member_profile (id),
     recipientids    varchar[]
 );
+
+DROP TABLE IF EXISTS automated_kudos_read_time;
+
+CREATE TABLE automated_kudos_read_time
+(
+    id              varchar PRIMARY KEY,
+    readtime        timestamp
+);