for initial import of users from admin page

Author: sdklos

Rakefile

@@ -12,6 +12,10 @@ namespace :progbot do
   task :import_users do
     ImportUsersTask::Syncer.new.sync
   end
+  desc "Update users from Admin Airtable Table"
+  task :import_alternate_users do
+    ImportUsersTask::Syncer.new.admin_sync
+  end
 end
 
 namespace :progbot do

app/admin/users.rb

@@ -6,15 +6,12 @@
 #
 # or
 #
-# permit_params do
-#   permitted = [:permitted, :attributes]
-#   permitted << :other if params[:action] == 'create' && current_user.admin?
-#   permitted
+# "welcome_email_sent", "attended_onboarding", "slack_invite_sent", "requested_additional_verification", "decline_membership", "irs_email_sent", "internal_notes", "contributor", "referrer_name", "skills_and_experience"
 # end
 
 permit_params :referer_id, :name, :email, :join_reason, :overview, :location,
 :anonymous, :phone, :slack_username, :read_manifesto,
-:read_code_of_conduct, :optin, :hear_about_us, :verification_urls, :is_approved, :additional_info, :gender_pronouns, tech_skill_ids: [], non_tech_skill_ids: [], flags: []
+:read_code_of_conduct, :optin, :hear_about_us, :verification_urls, :is_approved, :additional_info, :welcome_email_sent, :attended_onboarding, :slack_invite_sent, :requested_additional_verification, :decline_membership, :irs_email_sent, :internal_notes, :contributor, :referrer_name, :skills_and_experience, :gender_pronouns, tech_skill_ids: [], non_tech_skill_ids: [], flags: [] 
 
 action_item :bulk_import do
   link_to "Bulk Import From Airtable", admin_users_upload_csv_path
@@ -46,6 +43,13 @@
   filter :read_code_of_conduct, label: "Read Code of Conduct?"
   filter :optin, label: "Opted Into Skills Search?"
   filter :is_approved, label: "Approved?"
+  filter :welcome_email_sent
+  filter :attended_onboarding
+  filter :slack_invite_sent
+  filter :requested_additional_verification
+  filter :decline_membership
+  filter :irs_email_sent
+  filter :contributor
   filter :referer, collection: User.where(id: User.pluck(:referer_id).compact.uniq)
   filter :gender_pronouns, as: :select, collection: UserConstants::GENDER_PRONOUNS, input_html: { multiple: true }
   filter :by_flagged_in, label: "Flagged?", as: :select, collection: %w[Yes No]
@@ -70,6 +74,8 @@
       row :join_reason
       row :overview
       row :hear_about_us
+      row :referrer_name
+      row :skills_and_experience
       row :verification_urls
       row :gender_pronouns
       row :additional_info
@@ -80,6 +86,14 @@
       row :read_manifesto
       row :read_code_of_conduct
       row :is_approved
+      row :welcome_email_sent
+      row :attended_onboarding
+      row :slack_invite_sent
+      row :requested_additional_verification
+      row :decline_membership
+      row :irs_email_sent
+      row :contributor
+      row :internal_notes
       row :flags do
         span user.flags.try(:join, "<br>").try(:html_safe)
       end
@@ -107,19 +121,26 @@ def upload_csv
     end
 
     def import_data
+      byebug
       @users = []
       @attributes = UserConstants::COLUMN_NAMES_FOR_DISPLAY
       CSV.foreach(params[:file].path, headers: true) do |row|
+        table_type = params["airtable_type"]
+        airtable_id = row["Record ID"]
         if row[0].present?
-          airtable_id = row["Record ID"]
-          airtable_user = AirtableUser.find(airtable_id)
-          if User.where(airtable_id: airtable_id).present?
-            user = User.find_by(airtable_id: airtable_id)
-          else
+        
+          if table_type == "admin"
+            airtable_user = AirtableUserFromAdmin.find(airtable_id)
             user = User.find_or_initialize_by(email: airtable_user["Contact E-Mail"])
+          elsif table_type == "prog_apps"
+            airtable_user = AirtableUser.find(airtable_id)
+            user = User.where(airtable_id: airtable_id).first
+            if user.blank?
+              user = User.find_or_initialize_by(email: airtable_user["Contact E-Mail"])
+            end
             user.airtable_id = airtable_id
           end
-          user.sync_with_airtable(airtable_user)
+          user.sync_with_airtable(airtable_user, table_type)
           @users << user
         end
       end
@@ -136,6 +157,7 @@ def import_data
       f.input :slack_username
       f.input :location
       f.input :phone
+      f.input :referrer_name
       f.input :referer
       f.input :gender_pronouns, as: :select, collection: UserConstants::GENDER_PRONOUNS
     end
@@ -144,6 +166,7 @@ def import_data
       f.input :join_reason
       f.input :overview
       f.input :hear_about_us
+      f.input :skills_and_experience
       f.input :additional_info
     end
 
@@ -166,6 +189,15 @@ def import_data
     f.inputs "Admin Approval" do
       f.input :is_approved, label: "Is This An Approved Progcode Member?"
       f.input :verification_urls
+      f.input :welcome_email_sent
+      f.input :attended_onboarding
+      f.input :slack_invite_sent
+      f.input :requested_additional_verification
+      f.input :decline_membership
+      f.input :irs_email_sent
+      f.input :contributor
+      f.input :internal_notes
+
     end
 
     f.actions

app/assets/stylesheets/active_admin.scss

@@ -16,3 +16,7 @@
 // For example, to change the default status-tag color:
 //
 //   .status_tag { background: #6090DB; }
+
+.row {
+  margin:25px;
+}

app/models/airtable_user_from_admin.rb

@@ -0,0 +1,8 @@
+Airrecord.api_key = ENV['AIRTABLE_API_KEY']
+
+
+class AirtableUserFromAdmin < Airrecord::Table
+  self.base_key = ENV['AIRTABLE_ADMIN_BASE_KEY']
+  self.table_name = ENV['AIRTABLE_ADMIN_TABLE_NAME']
+
+end

app/models/user.rb

@@ -20,9 +20,9 @@ class User < ApplicationRecord
   has_many :active_volunteerings, -> { where state: 'active' }, class_name: 'Volunteering'
   has_many :projects, through: :active_volunteerings, source: 'user'
 
-  before_save :push_changes_to_airtable, unless: :skip_push_to_airtable
+  # before_save :push_changes_to_airtable, unless: :skip_push_to_airtable
 
-  after_create :send_slack_notification, unless: :skip_slack_notification
+  # after_create :send_slack_notification, unless: :skip_slack_notification
 
   devise :omniauthable, omniauth_providers: [:slack]
 
@@ -180,7 +180,7 @@ def airtable_twin
     end
   end
 
-  def sync_with_airtable(airtable_user)
+  def sync_with_airtable(airtable_user, airtable_table)
     self.skip_push_to_airtable = true
 
     if self.new_record?
@@ -199,41 +199,77 @@ def sync_with_airtable(airtable_user)
       self.non_tech_skill_ids = Skill.match_with_airtable(airtable_skills: airtable_user["Non-Tech Skills and Specialties"], tech: false)
     end
 
-    self.assign_attributes({
-      name: airtable_user["Name"],
-      email: airtable_user["Contact E-Mail"],
-      slack_username: airtable_user["Member Handle"],
-      slack_userid: airtable_user["slack_id"],
-      optin: airtable_user["Optin"],
-      join_reason: airtable_user["Join Reason"],
-      overview: airtable_user["Overview"],
-      location: airtable_user["Location"],
-      phone: airtable_user["Phone"],
-      hear_about_us: airtable_user["Hear About Us"],
-      verification_urls: airtable_user["Verification URLs"],
-      gender_pronouns: airtable_user["Gender Pronouns"],
-      additional_info: airtable_user["Additional Info"],
-      anonymous: airtable_user["Anonymous"],
-      read_manifesto: airtable_user["Read Manifesto"],
-      read_code_of_conduct: airtable_user["Read Code of Conduct"]
-    })
+    if airtable_table == "prog apps"
+
+      self.assign_attributes({
+        name: airtable_user["Name"],
+        email: airtable_user["Contact E-Mail"],
+        slack_username: airtable_user["Member Handle"],
+        slack_userid: airtable_user["slack_id"],
+        optin: airtable_user["Optin"],
+        join_reason: airtable_user["Join Reason"],
+        overview: airtable_user["Overview"],
+        location: airtable_user["Location"],
+        phone: airtable_user["Phone"],
+        hear_about_us: airtable_user["Hear About Us"],
+        verification_urls: airtable_user["Verification URLs"],
+        gender_pronouns: airtable_user["Gender Pronouns"],
+        additional_info: airtable_user["Additional Info"],
+        anonymous: airtable_user["Anonymous"],
+        read_manifesto: airtable_user["Read Manifesto"],
+        read_code_of_conduct: airtable_user["Read Code of Conduct"]
+      })
 
-    self.is_approved = true
+      self.is_approved = true
 
-    if self.email.blank?
-      if self.has_slack?
-        self.get_email_from_slack
+      if self.email.blank?
+        if self.has_slack?
+          self.get_email_from_slack
+        end
+      end
+
+      if self.slack_userid.blank? && self.slack_username.present?
+        self.get_slack_userid
+      elsif self.slack_userid.present? && self.slack_username.blank?
+        self.get_slack_username
+      end
+
+    elsif airtable_table == "admin"
+      self.assign_attributes({
+        name: airtable_user["Name"],
+        read_code_of_conduct: airtable_user["Read Code of Conduct"],
+        anonymous: airtable_user["I prefer to remain anonymous."],
+        welcome_email_sent: airtable_user["Welcome E-mail Sent"],
+        attended_onboarding: airtable_user["Attended Onboarding"],
+        slack_invite_sent: airtable_user["Slack invite sent?"],
+        requested_additional_verification: airtable_user["Requested additional verification"],
+        decline_membership: airtable_user["Declime Membership"],
+        irs_email_sent: airtable_user["IRS Email Sent"],
+        internal_notes: airtable_user["Internal Notes"],
+        contributor: airtable_user["Contributor?"],
+        email: airtable_user["Contact E-Mail"],
+        verification_urls: airtable_user["Verification URLs"],
+        hear_about_us: airtable_user["How did you hear about us?"],
+        referrer_name: airtable_user["Name of ProgCode member who referred you."],
+        skills_and_experience: airtable_user["Skills and Relevant Experience (Tech or Non-Tech)"],
+        join_reason: airtable_user["Bio"],
+        phone: airtable_user["Phone"],
+        optin: airtable_user["Opt In to Anonymized Member Directory"],
+        location: airtable_user["Location"],
+        read_manifesto: airtable_user["Read Manifesto"]
+      })
+
+      if self.decline_membership
+        self.is_approved = false
+      elsif self.welcome_email_sent
+        self.is_approved = true
       end
-    end
 
-    if self.slack_userid.blank? && self.slack_username.present?
-      self.get_slack_userid
-    elsif self.slack_userid.present? && self.slack_username.blank?
-      self.get_slack_username
     end
 
     if self.email.present? || self.slack_userid.present?
-      matches = AirtableUser.all.select {|u| (self.email.present? && u["Contact E-Mail"] == self.email) || (self.slack_userid.present? && u["slack_id"] == self.slack_userid)}
+      all_airtable_users = airtable_table == 'admin' ? AirtableUserFromAdmin.all : AirtableUser.all 
+      matches = all_airtable_users.select {|u| (self.email.present? && u["Contact E-Mail"] == self.email) || (self.slack_userid.present? && u["slack_id"] == self.slack_userid)}
       if matches.length > 1
         self.flags << "This user appears more than once in Airtable"
       end

app/views/admin/partials/_upload_csv.html.erb

@@ -1,6 +1,12 @@
 <h1>Import <%= controller_name.singularize.titleize %> Data from Airtable</h1>
 <%= form_tag({:controller => controller_path, :action => 'import_data'}, multipart: true) do %>
-    <%= file_field_tag :file, :class => "btn" %>
-    <%= hidden_field_tag :confirmation, "pending" %>
-    <%= submit_tag "Import", :class => "btn", :disabled => true %>
+    <div class="row"><%= file_field_tag :file, :class => "btn" %></div>
+    <div class="row"><%= label_tag 'airtable_type_prog_apps', 'From Prog Apps Table' %>
+    <%= radio_button_tag 'airtable_type', 'prog_apps', true %>
+    </div>
+    <div class="row">
+    <%= label_tag 'airtable_type_admin', 'From Admin Table' %>
+    <%= radio_button_tag 'airtable_type', 'admin' %></div>
+    <div class="row"><%= hidden_field_tag :confirmation, "pending" %>
+    <%= submit_tag "Import", :class => "btn", :disabled => true %></div>
 <% end %>

db/migrate/20210219040742_add_fields_to_users.rb

@@ -9,5 +9,6 @@ def change
     add_column :users, :internal_notes, :text
     add_column :users, :contributor, :boolean
     add_column :users, :referrer_name, :string
+    add_column :users, :skills_and_experience, :text
   end
 end

db/schema.rb

@@ -174,6 +174,7 @@
     t.text "internal_notes"
     t.boolean "contributor"
     t.string "referrer_name"
+    t.text "skills_and_experience"
     t.index ["airtable_id"], name: "index_users_on_airtable_id", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["referer_id"], name: "index_users_on_referer_id"

lib/tasks/import_users_task.rb

@@ -32,19 +32,22 @@ def sync
         end
       end
 
-        user.sync_with_airtable(airtable_user)
+        user.sync_with_airtable(airtable_user, 'prog apps')
       end
     end
-    
-    def sync_slack_ids_for_users
-      SlackBot.client
-      User.all.each do |u|
-        next if u.email.blank? || u.slack_userid.present?
-        slack_user = SlackHelpers.lookup_by_email(u.email.downcase)
-        next if slack_user.blank?
-        u.slack_userid = slack_user.id
-        u.save(:validate => false)
+
+    def admin_sync
+      AirtableUserFromAdmin.all.each do |airtable_user|
+        if airtable_user["Contact E-Mail"].blank?
+          puts "Email not in record: #{airtable_user.inspect}"
+          next
+        else
+          user = User.find_or_initialize_by email: airtable_user["Contact E-Mail"]
+
+          user.sync_with_airtable(airtable_user, 'admin')
+        end
       end
     end
+
   end
 end