Merge pull request #243 from paviliondev/group_user_population_fix

lib/custom_wizard/action.rb

@@ -456,11 +456,16 @@ class CustomWizard::Action
 
       if new_group_params[:usernames].present?
         user_ids = get_user_ids(new_group_params[:usernames])
+        if user_ids.count < new_group_params[:usernames].count
+          log_error("Warning, group creation: some users were not found!")
+        end
         user_ids -= owner_ids if owner_ids
         user_ids.each { |user_id| group.group_users.build(user_id: user_id) }
       end
 
+      if group.save
         log_success("Group created", group.name)
+      end
 
       result.output = group.name
     else

plugin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 2.3.0
+# version: 2.3.1
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: development@pavilion.tech

spec/components/custom_wizard/action_spec.rb

@@ -2,6 +2,7 @@
 
 describe CustomWizard::Action do
   fab!(:user) { Fabricate(:user, name: "Angus", username: 'angus', email: "angus@email.com", trust_level: TrustLevel[2]) }
+  fab!(:user1) { Fabricate(:user, name: "Angus One", username: 'angus1', email: "angus_one@email.com", trust_level: TrustLevel[2]) }
   fab!(:category) { Fabricate(:category, name: 'cat1', slug: 'cat-slug') }
   fab!(:tag) { Fabricate(:tag, name: 'tag1') }
   fab!(:group) { Fabricate(:group) }
@@ -12,6 +13,7 @@ describe CustomWizard::Action do
   let(:watch_categories) { get_wizard_fixture("actions/watch_categories") }
   let(:watch_tags) { get_wizard_fixture("actions/watch_tags") }
   let(:create_group) { get_wizard_fixture("actions/create_group") }
+  let(:create_group_with_nonexistent_user) { get_wizard_fixture("actions/create_group_bad_user") }
   let(:add_to_group) { get_wizard_fixture("actions/add_to_group") }
   let(:send_message) { get_wizard_fixture("actions/send_message") }
   let(:send_message_multi) { get_wizard_fixture("actions/send_message_multi") }
@@ -350,7 +352,25 @@ describe CustomWizard::Action do
       wizard = CustomWizard::Builder.new(@template[:id], user).build
       wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
 
+      group_id = Group.where(name: wizard.current_submission.fields['action_9']).first.id
+      user_id =  User.find_by(username: wizard_template['actions'][4]['usernames'][0]["output"][0]).id
+
       expect(Group.where(name: wizard.current_submission.fields['action_9']).exists?).to eq(true)
+      expect(GroupUser.where(group_id: group_id, user_id: user_id).exists?).to eq(true)
+    end
+
+    it '#create_group completes successfully when user included in usernames does not exist but excludes users who do not exist and includes warning in log' do
+      wizard_template['actions'] << create_group_with_nonexistent_user
+      update_template(wizard_template)
+
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
+
+      group_id = Group.where(name: wizard.current_submission.fields['action_9']).first.id
+
+      expect(CustomWizard::Log.list_query.all.last.value.include? "some users were not found").to eq(true)
+      expect(Group.where(name: wizard.current_submission.fields['action_9']).exists?).to eq(true)
+      expect(GroupUser.where(group_id: group_id).count).to eq(1)
     end
 
     it '#add_to_group' do

spec/fixtures/actions/create_group_bad_user.json

@@ -0,0 +1,104 @@
+{
+  "id": "action_9",
+  "run_after": "step_1",
+  "type": "create_group",
+  "title": [
+    {
+      "type": "assignment",
+      "output": "New Group Member",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "custom_fields": [
+    {
+      "type": "association",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "group_custom_field",
+          "key_type": "text",
+          "value": "step_3_field_1",
+          "value_type": "wizard_field",
+          "connector": "association"
+        }
+      ]
+    }
+  ],
+  "name": [
+    {
+      "type": "assignment",
+      "output": "step_1_field_1",
+      "output_type": "wizard_field",
+      "output_connector": "set"
+    }
+  ],
+  "full_name": [
+    {
+      "type": "assignment",
+      "output": "step_1_field_1",
+      "output_type": "wizard_field",
+      "output_connector": "set"
+    }
+  ],
+  "usernames": [
+    {
+      "type": "assignment",
+      "output_type": "user",
+      "output_connector": "set",
+      "output": [
+        "angus3"
+      ]
+    }
+  ],
+  "owner_usernames": [
+    {
+      "type": "assignment",
+      "output_type": "user",
+      "output_connector": "set",
+      "output": [
+        "angus"
+      ]
+    }
+  ],
+  "grant_trust_level": [
+    {
+      "type": "assignment",
+      "output": "3",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "mentionable_level": [
+    {
+      "type": "assignment",
+      "output": "1",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "messageable_level": [
+    {
+      "type": "assignment",
+      "output": "2",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "visibility_level": [
+    {
+      "type": "assignment",
+      "output": "3",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "members_visibility_level": [
+    {
+      "type": "assignment",
+      "output": "99",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ]
+}