Feat/meta data v2

application/src/main/java/org/togetherjava/tjbot/features/Features.java

@@ -88,6 +88,8 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
                 new CodeMessageHandler(blacklistConfig.special(), jshellEval);
         ChatGptService chatGptService = new ChatGptService(config);
         HelpSystemHelper helpSystemHelper = new HelpSystemHelper(config, database, chatGptService);
+        HelpThreadLifecycleListener helpThreadLifecycleListener =
+                new HelpThreadLifecycleListener(helpSystemHelper, database);
 
         // NOTE The system can add special system relevant commands also by itself,
         // hence this list may not necessarily represent the full list of all commands actually
@@ -106,6 +108,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
             .add(new AutoPruneHelperRoutine(config, helpSystemHelper, modAuditLogWriter, database));
         features.add(new HelpThreadAutoArchiver(helpSystemHelper));
         features.add(new LeftoverBookmarksCleanupRoutine(bookmarksSystem));
+        features.add(new MarkHelpThreadCloseInDBRoutine(database, helpThreadLifecycleListener));
 
         // Message receivers
         features.add(new TopHelpersMessageListener(database, config));
@@ -125,6 +128,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         features.add(new GuildLeaveCloseThreadListener(config));
         features.add(new LeftoverBookmarksListener(bookmarksSystem));
         features.add(new HelpThreadCreatedListener(helpSystemHelper));
+        features.add(new HelpThreadLifecycleListener(helpSystemHelper, database));
 
         // Message context commands
         features.add(new TransferQuestionCommand(config));

application/src/main/java/org/togetherjava/tjbot/features/help/HelpSystemHelper.java

@@ -24,6 +24,7 @@
 import org.togetherjava.tjbot.features.componentids.ComponentIdInteractor;
 
 import java.awt.*;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -202,11 +203,17 @@ private RestAction<Message> useChatGptFallbackMessage(ThreadChannel threadChanne
     }
 
     void writeHelpThreadToDatabase(long authorId, ThreadChannel threadChannel) {
+
+        Instant createdAt = Instant.now();
+        String tag = threadChannel.getAppliedTags().getFirst().getName();
+
         database.write(content -> {
             HelpThreadsRecord helpThreadsRecord = content.newRecord(HelpThreads.HELP_THREADS)
                 .setAuthorId(authorId)
                 .setChannelId(threadChannel.getIdLong())
-                .setCreatedAt(threadChannel.getTimeCreated().toInstant());
+                .setCreatedAt(createdAt)
+                .setTag(tag)
+                .setTicketStatus(TicketStatus.ACTIVE.val);
             if (helpThreadsRecord.update() == 0) {
                 helpThreadsRecord.insert();
             }
@@ -356,6 +363,17 @@ public String getTagName() {
         }
     }
 
+    enum TicketStatus {
+        ARCHIVED(0),
+        ACTIVE(1);
+
+        final int val;
+
+        TicketStatus(int val) {
+            this.val = val;
+        }
+    }
+
     Optional<Long> getAuthorByHelpThreadId(final long channelId) {
 
         logger.debug("Looking for thread-record using channel ID: {}", channelId);

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadLifecycleListener.java

@@ -0,0 +1,115 @@
+package org.togetherjava.tjbot.features.help;
+
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.events.channel.update.ChannelUpdateAppliedTagsEvent;
+import net.dv8tion.jda.api.events.channel.update.ChannelUpdateArchivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.togetherjava.tjbot.db.Database;
+import org.togetherjava.tjbot.features.EventReceiver;
+
+import java.time.Instant;
+
+import static org.togetherjava.tjbot.db.generated.tables.HelpThreads.HELP_THREADS;
+
+/**
+ * Listens for help thread events after creation of thread. Updates metadata based on those events
+ * in database.
+ */
+public final class HelpThreadLifecycleListener extends ListenerAdapter implements EventReceiver {
+
+    private final HelpSystemHelper helper;
+    private final Logger logger = LoggerFactory.getLogger(HelpThreadLifecycleListener.class);
+    private final Database database;
+
+    /**
+     * Creates a new instance.
+     *
+     * @param helper to work with the help threads
+     * @param database the database to store help thread metadata in
+     */
+    public HelpThreadLifecycleListener(HelpSystemHelper helper, Database database) {
+        this.helper = helper;
+        this.database = database;
+    }
+
+    @Override
+    public void onChannelUpdateArchived(@NotNull ChannelUpdateArchivedEvent event) {
+        if (!event.getChannelType().isThread()) {
+            return;
+        }
+        ThreadChannel threadChannel = event.getChannel().asThreadChannel();
+
+        if (!helper.isHelpForumName(threadChannel.getParentChannel().getName())) {
+            return;
+        }
+        handleThreadStatus(threadChannel);
+    }
+
+    @Override
+    public void onChannelUpdateAppliedTags(@NotNull ChannelUpdateAppliedTagsEvent event) {
+        ThreadChannel threadChannel = event.getChannel().asThreadChannel();
+
+        if (!helper.isHelpForumName(threadChannel.getParentChannel().getName())) {
+            return;
+        }
+
+        String updatedTag = event.getAddedTags().getFirst().getName();
+        long threadId = threadChannel.getIdLong();
+
+        handleTagsUpdate(threadId, updatedTag);
+    }
+
+    private void handleThreadStatus(ThreadChannel threadChannel) {
+        Instant closedAt = Instant.now();
+        long threadId = threadChannel.getIdLong();
+
+        int status = database.read(context -> context.selectFrom(HELP_THREADS)
+            .where(HELP_THREADS.CHANNEL_ID.eq(threadId))
+            .fetchOne(HELP_THREADS.TICKET_STATUS));
+
+        if (status == HelpSystemHelper.TicketStatus.ACTIVE.val) {
+            handleArchiveStatus(closedAt, threadChannel);
+            return;
+        }
+
+        changeStatusToActive(threadId);
+    }
+
+    void handleArchiveStatus(Instant closedAt, ThreadChannel threadChannel) {
+        long threadId = threadChannel.getIdLong();
+        int messageCount = threadChannel.getMessageCount();
+        int participantsExceptAuthor = threadChannel.getMemberCount() - 1;
+
+        database.write(context -> context.update(HELP_THREADS)
+            .set(HELP_THREADS.CLOSED_AT, closedAt)
+            .set(HELP_THREADS.TICKET_STATUS, HelpSystemHelper.TicketStatus.ARCHIVED.val)
+            .set(HELP_THREADS.MESSAGE_COUNT, messageCount)
+            .set(HELP_THREADS.PARTICIPANTS, participantsExceptAuthor)
+            .where(HELP_THREADS.CHANNEL_ID.eq(threadId))
+            .execute());
+
+        logger.info("Thread with id: {}, updated to archived status in database", threadId);
+    }
+
+    private void changeStatusToActive(long threadId) {
+        database.write(context -> context.update(HELP_THREADS)
+            .set(HELP_THREADS.TICKET_STATUS, HelpSystemHelper.TicketStatus.ACTIVE.val)
+            .where(HELP_THREADS.CHANNEL_ID.eq(threadId))
+            .execute());
+
+        logger.info("Thread with id: {}, updated to active status in database", threadId);
+    }
+
+    private void handleTagsUpdate(long threadId, String updatedTag) {
+        database.write(context -> context.update(HELP_THREADS)
+            .set(HELP_THREADS.TAG, updatedTag)
+            .where(HELP_THREADS.CHANNEL_ID.eq(threadId))
+            .execute());
+
+        logger.info("Updated tag for thread with id: {} in database", threadId);
+    }
+}

application/src/main/java/org/togetherjava/tjbot/features/help/MarkHelpThreadCloseInDBRoutine.java

@@ -0,0 +1,71 @@
+package org.togetherjava.tjbot.features.help;
+
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.togetherjava.tjbot.db.Database;
+import org.togetherjava.tjbot.db.generated.tables.records.HelpThreadsRecord;
+import org.togetherjava.tjbot.features.Routine;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.togetherjava.tjbot.db.generated.tables.HelpThreads.HELP_THREADS;
+
+/**
+ * Updates the status of help threads in database that were created a few days ago and couldn't be
+ * closed.
+ */
+public final class MarkHelpThreadCloseInDBRoutine implements Routine {
+    private final Logger logger = LoggerFactory.getLogger(MarkHelpThreadCloseInDBRoutine.class);
+    private final Database database;
+    private final HelpThreadLifecycleListener helpThreadLifecycleListener;
+
+    /**
+     * Creates a new instance.
+     *
+     * @param database the database to store help thread metadata in
+     * @param helpThreadLifecycleListener class which offers method to update thread status in
+     *        database
+     */
+    public MarkHelpThreadCloseInDBRoutine(Database database,
+            HelpThreadLifecycleListener helpThreadLifecycleListener) {
+        this.database = database;
+        this.helpThreadLifecycleListener = helpThreadLifecycleListener;
+    }
+
+    @Override
+    public Schedule createSchedule() {
+        return new Schedule(ScheduleMode.FIXED_RATE, 0, 1, TimeUnit.HOURS);
+    }
+
+    @Override
+    public void runRoutine(JDA jda) {
+        updateTicketStatus(jda);
+    }
+
+    private void updateTicketStatus(JDA jda) {
+        Instant now = Instant.now();
+        Instant threeDaysAgo = now.minus(3, ChronoUnit.DAYS);
+        List<Long> threadIdsToClose = database.read(context -> context.selectFrom(HELP_THREADS)
+            .where(HELP_THREADS.TICKET_STATUS.eq(HelpSystemHelper.TicketStatus.ACTIVE.val))
+            .and(HELP_THREADS.CREATED_AT.lessThan(threeDaysAgo))
+            .stream()
+            .map(HelpThreadsRecord::getChannelId)
+            .toList());
+
+
+        threadIdsToClose.forEach(id -> {
+            try {
+                ThreadChannel threadChannel = jda.getThreadChannelById(id);
+                helpThreadLifecycleListener.handleArchiveStatus(now, threadChannel);
+            } catch (Exception exception) {
+                logger.warn("unable to mark thread as close with id :{}", id, exception);
+            }
+        });
+    }
+}

application/src/main/resources/db/V14__Alter_Help_Thread_Metadata.sql

@@ -0,0 +1,5 @@
+ALTER TABLE help_threads ADD ticket_status INTEGER DEFAULT 0;
+ALTER TABLE help_threads ADD tag TEXT DEFAULT 'none';
+ALTER TABLE help_threads ADD closed_at TIMESTAMP NULL;
+ALTER TABLE help_threads ADD participants INTEGER DEFAULT 1;
+ALTER TABLE help_threads ADD message_count INTEGER DEFAULT 0;