Update dependency faker to v3.4.2

Gemfile.lock

@@ -91,7 +91,7 @@ GEM
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diff-lcs (1.5.1)
+    diff-lcs (1.5.0)
     drb (2.2.1)
     erubi (1.13.0)
     faker (3.4.2)
@@ -204,15 +204,15 @@ GEM
       connection_pool
     reline (0.5.9)
       io-console (~> 0.5)
-    rspec-core (3.12.3)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.4)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.7)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -220,7 +220,7 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-support (3.12.2)
+    rspec-support (3.12.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -233,7 +233,7 @@ GEM
     stringio (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
-    turbo-rails (2.0.6)
+    turbo-rails (2.0.5)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)

app/controllers/guests_controller.rb

@@ -1,5 +1,3 @@
-require 'csv'
-
 class GuestsController < ApplicationController
   before_action :set_guest, only: %i[show edit update destroy]
 
@@ -60,20 +58,6 @@ class GuestsController < ApplicationController
     end
   end
 
-  def import
-    csv = CSV.parse(params[:file].read, headers: true)
-    ActiveRecord::Base.transaction do
-      csv.each do |row|
-        guest = Guest.create!(first_name: row['name'])
-
-        guest.affinity_group_list.add(row['affinity_group'])
-        guest.save!
-      end
-    end
-
-    redirect_to guests_url
-  end
-
   private
 
   # Use callbacks to share common setup or constraints between actions.

app/views/guests/index.html.erb

@@ -29,9 +29,3 @@
 </div>
 
 <%= link_to "New guest", new_guest_path %>
-
-<%= form_with url: import_guests_path, method: :post do |form| %>
-  <%= form.label :file %>
-  <%= form.file_field :file %>
-  <%= form.submit "Import" %>
-<% end %>

config/routes.rb

@@ -1,7 +1,5 @@
 Rails.application.routes.draw do
-  resources :guests do
+  resources :guests
-    post :import, on: :collection
-  end
   resources :expenses
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
 

db/seeds.rb

@@ -28,6 +28,10 @@ Expense.create!(name: 'Transportation', amount: 3000, pricing_type: 'fixed')
 Expense.create!(name: 'Invitations', amount: 200, pricing_type: 'fixed')
 Expense.create!(name: 'Cake', amount: 500, pricing_type: 'fixed')
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> 8fd0b7c (Modify seeds file to make sure every guest is part of a group)
 samples = {
   close_family: 10,
   family_1_group_a: 5,