IIRR-13 Reconfigure the db for channel and server

Author: FionaDL

app/lib/discord/events/server_create.rb

@@ -44,14 +44,19 @@ def welcome_message(server_name)
 
       def create_server(server)
         # Only create a new record if it doesn't already exist
-        return if DiscordServer.exists?(discord_id: server.id)
+        return if Server.exists?(server_id: server.id)
 
-        # Create the new DiscordServer record
-        DiscordServer.create!(
-          discord_id: server.id,
-          system_channel_id: server.system_channel&.id,  # Optional, if available
-          send_questions_channel_id: server.system_channel&.id # Optional, if available
+        # Create the new Server record
+        discord_server = Server.create!(
+          server_id: server.id,
+          name: server.name
         )
+        if server.system_channel
+          discord_server.channels.create!(
+            channel_id: server.system_channel.id,
+            name: server.system_channel.name
+          )
+        end
       end
     end
   end

app/lib/discord/events/set_channel.rb

@@ -51,10 +51,17 @@ def listen_to_channel_select
         # Listen for the channel select event
         @bot.channel_select(custom_id: "set_channel_select") do |event|
           channel = event.values.first  # Get the selected channel
-          server = DiscordServer.find_by!(discord_id: event.server.id)
+          server = Server.find_by!(server_id: event.server.id)
 
-          # Update the server with the new channel ID
-          server.update(send_questions_channel_id: channel.id)
+          existing_channel = server.channels.find_by(channel_id: channel.id)
+
+          if existing_channel
+            # If the channel exists, update it
+            existing_channel.update!(name: channel.name, channel_id: channel.id)
+          else
+            # If the channel doesn't exist, create a new one associated with the server
+            server.channels.create!(name: channel.name, channel_id: channel.id)
+          end
 
           # Respond with a confirmation message
           event.respond(content: "Thank you! Ruby or Rails questions will be sent to #{channel.name} from now on.", ephemeral: true)

app/models/channel.rb

@@ -0,0 +1,3 @@
+class Channel < ApplicationRecord
+  belongs_to :server
+end

app/models/discord_server.rb

@@ -0,0 +1,3 @@
+class Server < ApplicationRecord
+  has_many :channels
+end

app/models/server.rb

@@ -0,0 +1,11 @@
+class CreateServers < ActiveRecord::Migration[8.0]
+  def change
+    create_table :servers do |t|
+      t.string :server_id, null: false
+      t.string :name
+
+      t.timestamps
+    end
+    add_index :servers, :server_id, unique: true
+  end
+end

db/migrate/20250318172735_create_discord_servers.rb

@@ -0,0 +1,11 @@
+class CreateChannels < ActiveRecord::Migration[8.0]
+  def change
+    create_table :channels do |t|
+      t.references :server, null: false, foreign_key: true
+      t.string :channel_id, null: false
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end