From a8ec7f69b2d54e368b867dc24e49eaff896c1355 Mon Sep 17 00:00:00 2001 From: Ellen Wittingen Date: Tue, 6 Feb 2024 17:16:01 +0100 Subject: [PATCH 1/3] Added groups for SOFIA roles --- db/seeds/users_and_groups.rb | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/db/seeds/users_and_groups.rb b/db/seeds/users_and_groups.rb index ef47a2c6..48d5dcc0 100644 --- a/db/seeds/users_and_groups.rb +++ b/db/seeds/users_and_groups.rb @@ -7,6 +7,12 @@ bestuur = Group.create!(name: 'Bestuur', kind: 'bestuur', description: 'Wij zijn de echte bazen', recognized_at_gma: 'ALV 21', rejected_at_gma: 'ALV 218') +sofia_treasurers = Group.create!(name: 'SOFIA Penningmeester', kind: 'bestuur', administrative: true) + +sofia_secretaries = Group.create!(name: 'SOFIA Secretaris', kind: 'bestuur', administrative: true) + +sofia_main_bartenders = Group.create!(name: 'SOFIA Hoofdtappers', kind: 'groep') + old_members_group = Group.create!(name: 'Oud-Leden', kind: 'groep', description: 'Oud-Alphanen, verenigt u!') @@ -25,6 +31,21 @@ password: 'password1234', password_confirmation: 'password1234') +sofia_treasurer = FactoryBot.create(:user, activated_at: Time.zone.now) +sofia_treasurer.update(username: 'sofia_secretary', + password: 'password1234', + password_confirmation: 'password1234') + +sofia_secretary = FactoryBot.create(:user, activated_at: Time.zone.now) +sofia_secretary.update(username: 'sofia_secretary', + password: 'password1234', + password_confirmation: 'password1234') + +sofia_bartenders = FactoryBot.create_list(:user, 6, activated_at: Time.zone.now) +sofia_bartenders.first.update(username: 'sofia_main_bartender', + password: 'password1234', + password_confirmation: 'password1234') + old_members = FactoryBot.create_list(:user, 8, activated_at: Time.zone.now) old_members.first.update(username: 'oudlid', password: 'password1234', @@ -49,6 +70,15 @@ function: Faker::Job.title) end +Membership.create(user: sofia_treasurer, group: sofia_treasurers, start_date: Date.current.months_ago(10)) + +Membership.create(user: sofia_secretary, group: sofia_secretaries, start_date: Date.current.months_ago(10)) + +sofia_bartenders.each do |user| + Membership.create(user: user, group: sofia_main_bartenders, start_date: Date.current.months_ago(10), + function: Faker::Job.title) +end + old_members.each do |user| Membership.create(user: user, group: old_members_group, start_date: Date.current.months_ago(10), function: Faker::Job.title) From 340eec3bc3351c615a683bc9a1848d0cb6be016e Mon Sep 17 00:00:00 2001 From: Ellen Wittingen Date: Mon, 26 Feb 2024 16:21:58 +0100 Subject: [PATCH 2/3] Fixed members and groups for sofia --- db/seeds/users_and_groups.rb | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/db/seeds/users_and_groups.rb b/db/seeds/users_and_groups.rb index 48d5dcc0..d54690a5 100644 --- a/db/seeds/users_and_groups.rb +++ b/db/seeds/users_and_groups.rb @@ -7,9 +7,11 @@ bestuur = Group.create!(name: 'Bestuur', kind: 'bestuur', description: 'Wij zijn de echte bazen', recognized_at_gma: 'ALV 21', rejected_at_gma: 'ALV 218') -sofia_treasurers = Group.create!(name: 'SOFIA Penningmeester', kind: 'bestuur', administrative: true) +sofia_treasurers = Group.create!(name: 'SOFIA Penningmeester', kind: 'bestuur', + administrative: true) -sofia_secretaries = Group.create!(name: 'SOFIA Secretaris', kind: 'bestuur', administrative: true) +sofia_renting_managers = Group.create!(name: 'SOFIA Verhuur Manager', kind: 'bestuur', + administrative: true) sofia_main_bartenders = Group.create!(name: 'SOFIA Hoofdtappers', kind: 'groep') @@ -32,14 +34,14 @@ password_confirmation: 'password1234') sofia_treasurer = FactoryBot.create(:user, activated_at: Time.zone.now) -sofia_treasurer.update(username: 'sofia_secretary', +sofia_treasurer.update(username: 'sofia_treasurer', password: 'password1234', password_confirmation: 'password1234') -sofia_secretary = FactoryBot.create(:user, activated_at: Time.zone.now) -sofia_secretary.update(username: 'sofia_secretary', - password: 'password1234', - password_confirmation: 'password1234') +sofia_renting_manager = FactoryBot.create(:user, activated_at: Time.zone.now) +sofia_renting_manager.update(username: 'sofia_renting_manager', + password: 'password1234', + password_confirmation: 'password1234') sofia_bartenders = FactoryBot.create_list(:user, 6, activated_at: Time.zone.now) sofia_bartenders.first.update(username: 'sofia_main_bartender', @@ -70,12 +72,20 @@ function: Faker::Job.title) end -Membership.create(user: sofia_treasurer, group: sofia_treasurers, start_date: Date.current.months_ago(10)) +Membership.create(user: sofia_treasurer, group: sofia_treasurers, + start_date: Date.current.months_ago(10)) +Membership.create(user: sofia_treasurer, group: member_group, + start_date: Date.current.months_ago(4), function: Faker::Job.title) -Membership.create(user: sofia_secretary, group: sofia_secretaries, start_date: Date.current.months_ago(10)) +Membership.create(user: sofia_renting_manager, group: sofia_renting_managers, + start_date: Date.current.months_ago(10)) +Membership.create(user: sofia_renting_manager, group: member_group, + start_date: Date.current.months_ago(4), function: Faker::Job.title) sofia_bartenders.each do |user| - Membership.create(user: user, group: sofia_main_bartenders, start_date: Date.current.months_ago(10), + Membership.create(user: user, group: sofia_main_bartenders, + start_date: Date.current.months_ago(10), function: Faker::Job.title) + Membership.create(user: user, group: member_group, start_date: Date.current.months_ago(4), function: Faker::Job.title) end From 31ef426389d3e090dd5f17f1365ef662ccbe71bb Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Fri, 22 Nov 2024 01:22:26 +0100 Subject: [PATCH 3/3] Fixed Lint --- db/seeds/users_and_groups.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/db/seeds/users_and_groups.rb b/db/seeds/users_and_groups.rb index d54690a5..dd9c6f07 100644 --- a/db/seeds/users_and_groups.rb +++ b/db/seeds/users_and_groups.rb @@ -54,21 +54,21 @@ password_confirmation: 'password1234') leden.each do |user| - Membership.create(user: user, group: member_group, start_date: Date.current.months_ago(4), + Membership.create(user:, group: member_group, start_date: Date.current.months_ago(4), function: Faker::Job.title) end nerds.each do |user| - Membership.create(user: user, group: ictcie, start_date: Date.current.months_ago(10), + Membership.create(user:, group: ictcie, start_date: Date.current.months_ago(10), function: Faker::Job.title) - Membership.create(user: user, group: member_group, start_date: Date.current.months_ago(4), + Membership.create(user:, group: member_group, start_date: Date.current.months_ago(4), function: Faker::Job.title) end bestuurders.each do |user| - Membership.create(user: user, group: bestuur, start_date: Date.current.months_ago(10), + Membership.create(user:, group: bestuur, start_date: Date.current.months_ago(10), function: Faker::Job.title) - Membership.create(user: user, group: member_group, start_date: Date.current.months_ago(11), + Membership.create(user:, group: member_group, start_date: Date.current.months_ago(11), function: Faker::Job.title) end @@ -83,14 +83,14 @@ start_date: Date.current.months_ago(4), function: Faker::Job.title) sofia_bartenders.each do |user| - Membership.create(user: user, group: sofia_main_bartenders, + Membership.create(user:, group: sofia_main_bartenders, start_date: Date.current.months_ago(10), function: Faker::Job.title) - Membership.create(user: user, group: member_group, start_date: Date.current.months_ago(4), + Membership.create(user:, group: member_group, start_date: Date.current.months_ago(4), function: Faker::Job.title) end old_members.each do |user| - Membership.create(user: user, group: old_members_group, start_date: Date.current.months_ago(10), + Membership.create(user:, group: old_members_group, start_date: Date.current.months_ago(10), function: Faker::Job.title) end