Resolve #8 Replace Ticket with Action

Author: suninthesky

Gemfile

@@ -60,6 +60,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'airrecord', '~> 1.0.5'
 gem 'devise', '~> 4.7.1'
+gem 'faraday', '~> 1.0.1'
 gem 'google_drive', '~> 3.0.5'
+gem 'ransack', '~> 2.3.2'
 gem 'strong_password', '~> 0.0.8'
-gem 'faraday'

Gemfile.lock

@@ -162,6 +162,8 @@ GEM
     parser (2.7.1.3)
       ast (~> 2.4.0)
     pg (1.2.3)
+    polyamorous (2.3.2)
+      activerecord (>= 5.2.1)
     public_suffix (4.0.5)
     puma (4.3.5)
       nio4r (~> 2.0)
@@ -198,6 +200,11 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
+    ransack (2.3.2)
+      activerecord (>= 5.2.1)
+      activesupport (>= 5.2.1)
+      i18n
+      polyamorous (= 2.3.2)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -278,8 +285,6 @@ GEM
     turbolinks-source (5.2.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
-      tzinfo (>= 1.0.0)
     uber (0.1.0)
     unicode-display_width (1.7.0)
     warden (1.2.8)
@@ -315,14 +320,15 @@ DEPENDENCIES
   capybara (>= 2.15)
   devise (~> 4.7.1)
   dotenv-rails (~> 2.7.5)
-  faraday
+  faraday (~> 1.0.1)
   google_drive (~> 3.0.5)
   jbuilder (~> 2.7)
   letter_opener (~> 1.7.0)
   listen (~> 3.2)
   pg (>= 0.18, < 2.0)
   puma (~> 4.1)
   rails (~> 6.0.3, >= 6.0.3.1)
+  ransack (~> 2.3.2)
   sass-rails (>= 6)
   selenium-webdriver
   solargraph (~> 0.39.8)

README.md

@@ -22,21 +22,20 @@ To ensure consistency in code style configure your editor to work with [Solargra
 ### Importing data
 
 ```ruby
-GoogleSheetsImport.new.import!(ENV['MY_CONFIG_JSON_STRING'])
+GoogleSheetsImport.new.extract(ENV['MY_CONFIG_JSON_STRING'])
 ```
 
-Below is the structure of the config JSON the `#import!` method expects - remember to convert the JSON to a string. The integers - i.e. `"user_email": 2` - indicate the column number from the sheet to import. In the example below column 2 contains the email addresses of users you'd like to import.
+Below is the structure of the config JSON the `#extract` method expects - remember to convert the JSON to a string. The integers - i.e. `"user_email": 2` - indicate the column number from the sheet to import. In the example below column 2 contains the email addresses of users you'd like to import.
 
 ```json
 {
   "file_id": "11NZ5o5TqSvvLtM...",
   "sheet_id": "13477...",
-  "timestamp": 1,
-  "user_email": 2,
-  "organisation_name": 3,
-  "custom": {
-    "custom_column_1": 4,
-    "custom_column_2": 5
+  "fields": {
+    "timestamp": 1,
+    "user_email": 2,
+    "organisation_name": 3,
+    "etc": 4
   }
 }
 ```

app/controllers/organisations_controller.rb

@@ -4,11 +4,12 @@ class OrganisationsController < ApplicationController
   before_action :authenticate_admin!
 
   def index
-    @organisations = Organisation.order(:name)
+    @q = Organisation.order(:name).ransack(params[:q])
+    @organisations = @q.result(distinct: true)
   end
 
   def show
-    @organisation = Organisation.includes(:users).find_by(id: params[:id])
+    @organisation = Organisation.includes(:users).find_by(slug: params[:id])
     @organisation.fetch_cc_data
   end
 end

app/controllers/tickets_controller.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class AnchorOrgFormJob < ApplicationJob
+  queue_as :default
+
+  def perform(row_start: 2)
+    @rows = GoogleSheetsImport.new.extract(ENV['ANCHOR_CONFIG'], row_start: row_start)
+
+    @rows.each do |row|
+      org = Organisation.new_or_reconcile(domain_or_email: row[:user_email], name: row[:organisation_name])
+
+      if org.new_record? && row[:organisation_name].present?
+        org.name = row[:organisation_name]
+        org.save!
+      end
+
+      next if org.new_record?
+
+      create_affiliation(org, row[:user_email])
+
+      action = build_action('Submitted Anchor Org Form', org, row[:timestamp])
+      action.details = { name: row[:user_name], email: row[:user_email] }
+      action.save!
+    end
+  end
+end

app/jobs/anchor_org_form_job.rb

@@ -1,7 +1,25 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
   # Automatically retry jobs that encountered a deadlock
   # retry_on ActiveRecord::Deadlocked
 
   # Most jobs are safe to ignore if the underlying records are no longer available
   # discard_on ActiveJob::DeserializationError
+
+  def build_action(action_name, org, timestamp)
+    Action.find_or_initialize_by(
+      potential_action: PotentialAction.find_by(name: action_name),
+      organisation: org,
+      start_time: timestamp,
+      end_time: timestamp
+    )
+  end
+
+  def create_affiliation(org, email)
+    return if org.new_record? || email.blank?
+
+    user = User.find_or_create_by!(email: email.strip.downcase)
+    Affiliation.find_or_create_by!(organisation: org, individual: user)
+  end
 end

app/jobs/application_job.rb

@@ -8,41 +8,25 @@ def perform
 
     @hop_attendees.all.each do |record|
       domain = record['Email'].split('@').last.strip
-      org_name = record['Organisation name'].strip
-
-      # Create new org
-      @org = Organisation.find_by({ name: org_name }) || Organisation.find_by({ domain: domain })
-      if @org.nil?
-        @org = Organisation.create!(
-          name: org_name,
-          domain: domain
-        )
-        @org.get_charity_number
-      end
+      org_name = record['Organisation name']&.strip
+
+      org = Organisation.new_or_reconcile(domain_or_email: domain, name: org_name)
 
-      # Create new org
-      @person = Person.find_by({ email: record['Email'] })
-      if @person.nil?
-        @person = Person.create!(
-          first_name: record['First name'],
-          last_name: record['Last name'],
-          email: record['Email'],
-          organisation: @org
-        )
+      if org.new_record? && org_name.present?
+        org.name = org_name
+        org.save!
       end
 
-      # Record action
-      Action.create!(
-        potential_action: PotentialAction.find(1),
-        organisation_id: @org.id,
-        person_id: @person.id,
-        details: {
-          person_name: record['First name'] + ' ' + record['Last name'],
-          hop: record['Which design hop are you applying to join?'].first
-        },
-        start_time: record.created_at,
-        end_time: record.created_at
-      )
+      next if org.new_record?
+
+      create_affiliation(org, record['Email'])
+
+      action = build_action('Signed Up For Design Hop', org, record.created_at)
+      action.details = {
+        name: "#{record['First name']} #{record['Last name']}",
+        email: record['Email']
+      }
+      action.save!
     end
   end
 end

app/jobs/design_hops_job.rb

@@ -7,50 +7,15 @@ def perform
     @rows = GoogleSheetsImport.new.extract(ENV['DIGITAL_CANDLE_CONFIG'])
 
     @rows.each do |row|
-      domain = row[:email].split('@').last.strip
-      first_name = row[:name].match('^(\w+) ')[1].strip
-      last_name = row[:name].match(' (.*)$')[1].strip
+      org = Organisation.new_or_reconcile(domain_or_email: row[:email])
 
-      # Find org
-      @org = Organisation.find_by({ domain: domain })
+      next if org.new_record?
 
-      unless @org.nil?
-        # Create new person
-        @person = Person.find_by({ email: row[:email] })
-        if @person.nil?
-          @person = Person.create!(
-            first_name: first_name,
-            last_name: last_name,
-            email: row[:email],
-            organisation: @org
-          )
-        end
+      create_affiliation(org, row[:email])
 
-        # Record actions
-        Action.create!(
-          potential_action: PotentialAction.find(3),
-          organisation_id: @org.id,
-          person_id: @person.id,
-          details: {
-            person_name: row[:name]
-          },
-          start_time: row[:timestamp],
-          end_time: row[:timestamp]
-        )
-
-        Action.create!(
-          potential_action: PotentialAction.find(4),
-          organisation_id: @org.id,
-          person_id: @person.id,
-          details: {
-            person_name: row[:name],
-            intro: row[:intro],
-            intro_date: row[:intro_date]
-          },
-          start_time: row[:intro_date],
-          end_time: row[:intro_date]
-        )
-      end
+      action = build_action('Submitted Digital Candle Form', org, row[:timestamp])
+      action.details = { name: row[:name], email: row[:email] }
+      action.save!
     end
   end
 end

app/jobs/digital_candle_job.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class NestaFormJob < ApplicationJob
+  queue_as :default
+
+  def perform(row_start: 2)
+    @rows = GoogleSheetsImport.new.extract(ENV['NESTA_CONFIG'], row_start: row_start)
+
+    @rows.each do |row|
+      org = Organisation.new_or_reconcile(domain_or_email: row[:user_email], name: row[:organisation_name])
+
+      if org.new_record? && row[:organisation_name].present?
+        org.name = row[:organisation_name]
+        org.save!
+      end
+
+      next if org.new_record?
+
+      create_affiliation(org, row[:user_email])
+
+      action = build_action('Submitted Nesta Needs Assessment Form', org, row[:timestamp])
+      action.details = { name: row[:user_name], email: row[:user_email] }
+      action.save!
+    end
+  end
+end