分報チャンネルが分報カテゴリー内に作成されるように変更

fjordllc · Jun 11, 2023 · 9623033 · 9623033
1 parent 8808d01
commit 9623033
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/app/models/discord/times_channel.rb b/app/models/discord/times_channel.rb
@@ -2,9 +2,6 @@
 
 module Discord
   class TimesChannel
-    include ActiveSupport::Configurable
-    config_accessor :category_id, instance_accessor: false
-
     class << self
       def to_channel_name(username)
         username.downcase
@@ -18,7 +15,7 @@ def initialize(username)
     def save
       @channel = Discord::Server.create_text_channel(
         name: @name,
-        parent: Discord::TimesChannel.category_id
+        parent: Discord::TimesCategory.categorize_by_initials(@name)
       )
 
       !!@channel

diff --git a/test/models/discord/times_channel_test.rb b/test/models/discord/times_channel_test.rb
@@ -5,9 +5,6 @@
 module Discord
   class TimesChannelTest < ActiveSupport::TestCase
     setup do
-      @category_id = Discord::TimesChannel.category_id
-      Discord::TimesChannel.category_id = nil
-
       @stub_create_text_channel = lambda { |name:, parent:|
         Discordrb::Channel.new({
           id: '1234567890',
@@ -17,27 +14,25 @@ class TimesChannelTest < ActiveSupport::TestCase
       }
     end
 
-    teardown do
-      Discord::TimesChannel.category_id = @category_id
-    end
-
     test '#save return true' do
-      Discord::TimesChannel.category_id = '9876543210'
-      Discord::Server.stub(:create_text_channel, @stub_create_text_channel) do
-        times_channel = Discord::TimesChannel.new('piyo')
-
-        assert_equal true, times_channel.save
-        assert_equal '1234567890', times_channel.id
-        assert_equal '9876543210', times_channel.category_id
+      Discord::TimesCategory.stub(:categorize_by_initials, ->(_) { '9876543210' }) do
+        Discord::Server.stub(:create_text_channel, @stub_create_text_channel) do
+          times_channel = Discord::TimesChannel.new('piyo')
+
+          assert_equal true, times_channel.save
+          assert_equal '1234567890', times_channel.id
+          assert_equal '9876543210', times_channel.category_id
+        end
       end
 
-      Discord::TimesChannel.category_id = nil
-      Discord::Server.stub(:create_text_channel, @stub_create_text_channel) do
-        times_channel = Discord::TimesChannel.new('piyo')
+      Discord::TimesCategory.stub(:categorize_by_initials, ->(_) { nil }) do
+        Discord::Server.stub(:create_text_channel, @stub_create_text_channel) do
+          times_channel = Discord::TimesChannel.new('piyo')
 
-        assert_equal true, times_channel.save
-        assert_equal '1234567890', times_channel.id
-        assert_nil times_channel.category_id
+          assert_equal true, times_channel.save
+          assert_equal '1234567890', times_channel.id
+          assert_nil times_channel.category_id
+        end
       end
     end