fixes upstream conflict

jmayergit · jmayergit · commit 7783285edd39 · 2017-08-21T16:01:50.000-05:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ So, you want to learn how to program? Contributing to Operation Code is a great
   * [Install Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 
   ### Make (for Windows only)
-  Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files.  It is a standard part of the GNU library and is included in most distrubtions of Linux, as well as OSX.  Unfortunately, Windows does not have a native make program, so it will need to be installed and added to PATH in order for the command line commands to work.  You can use the [GNUWin general installation guide](http://gnuwin32.sourceforge.net/install.html) as a general guide on how to install a GNU package and add it to PATH.
+  Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. It is a standard part of the GNU library and is included in most distributions of Linux, as well as OSX. Unfortunately, Windows does not have a native make program, so it will need to be installed and added to PATH in order for the command line commands to work. You can use the [GNUWin general installation guide](http://gnuwin32.sourceforge.net/install.html) as a general guide on how to install a GNU package and add it to PATH.
 
   * [Install Make](http://gnuwin32.sourceforge.net/packages/make.htm)
 
@@ -44,7 +44,7 @@ So, you want to learn how to program? Contributing to Operation Code is a great
   * Forking a repo is done through GitHub's web UI. It can be found in the top right corner of the **Operation Code**'s [GitHub](https://github.com/OperationCode/operationcode_backend) page.
 
   * The following commands will pull down the source code from your forked repo.
-  * Make sure to replace `[YOUR-GITHUB-NAME]` with your GitHub name.  (example: https://github.com/iserbit/operationcode_backend.git)
+  * Make sure to replace `[YOUR-GITHUB-NAME]` with your GitHub name. (example: https://github.com/iserbit/operationcode_backend.git)
 
   #### Local Development Environment
     _Fork the repo first._
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # README
 
 * Ruby version
-    2.3.1
+    2.3.3
 * System dependencies
     PostgreSQL 9.5.6
     React 2.0.1
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
@@ -1,6 +1,8 @@
 module Api
   module V1
     class UsersController < ApplicationController
+      before_action :authenticate_user!, only: %i[update]
+
       def index
         render json: { user_count: User.count }, status: :ok
       rescue StandardError => e
@@ -12,12 +14,21 @@ def create
 
         if user.save
           UserMailer.welcome(user).deliver unless user.invalid?
-          render json: user
+          sign_in(user)
+          render json: { token: user.token }
         else
           render json: user.errors, status: :unprocessable_entity
         end
       end
 
+      def update
+        if current_user.update_attributes(user_params)
+          render json: current_user
+        else
+          render json: current_user.errors, status: :unprocessable_entity
+        end
+      end
+
       def verify
         verified = IdMe.verify! params[:access_token]
 
@@ -40,7 +51,36 @@ def by_location
       private
 
       def user_params
-        params.require(:user).permit(:email, :zip, :password, :first_name, :last_name, :mentor, :slack_name, :verified, :state)
+        params.require(:user).permit(
+          :email,
+          :zip,
+          :password,
+          :mentor,
+          :slack_name,
+          :first_name,
+          :last_name,
+          :bio,
+          :verified,
+          :state,
+          :address1,
+          :address2,
+          :username,
+          :volunteer,
+          :branch_of_service,
+          :years_of_service,
+          :pay_grade,
+          :military_occupational_specialty,
+          :github,
+          :twitter,
+          :linked_in,
+          :employment_status,
+          :education,
+          :company_role,
+          :company_name,
+          :education_level,
+          :scholarship_info,
+          interests: []
+        )
       end
     end
   end
diff --git a/config/code_schools.yml b/config/code_schools.yml
@@ -47,33 +47,6 @@
       state: TN
       zip: 37210
 
-- name: Dev Bootcamp
-  url: http://devbootcamp.com
-  logo: https://raw.githubusercontent.com/OperationCode/operationcode_frontend/master/src/images/codeSchoolLogos/dev_bootcamp.jpg
-  full_time: true
-  hardware_included: false
-  has_online: false
-  online_only: false
-  locations:
-    - va_accepted: false
-      address1: 633 Folsom Street (at Hawthorne)
-      address2: 6th Floor
-      city: San Francisco
-      state: CA
-      zip: 94107
-    - va_accepted: false
-      address1: 1033 W. Van Buren Street
-      address2: 3rd Floor
-      city: Chicago
-      state: IL
-      zip: 60607
-    - va_accepted: false
-      address1: 48 Wall Street
-      address2: 15th Floor
-      city: New York
-      state: NY
-      zip: 10005
-
 - name: Galvanize
   url: https://new.galvanize.com
   logo: https://raw.githubusercontent.com/OperationCode/operationcode_frontend/master/src/images/codeSchoolLogos/galvanize.jpg
@@ -142,22 +115,6 @@
       state: CA
       zip: 94105
 
-- name: RefactorU
-  url: http://refactoru.com
-  logo: https://raw.githubusercontent.com/OperationCode/operationcode_frontend/master/src/images/codeSchoolLogos/refactoru.jpg
-  full_time: true
-  hardware_included: false
-  has_online: false
-  online_only: false
-  notes: RefactorU is proud and honored to announce that its Web Development Bootcamp has been approved by the <a href="http://www.benefits.va.gov/gibill/">Colorado State Approving Agency for Veterans Education & Training</a>. Students eligible for the The Post-9/11 GI Bill, Montgomery GI Bill (Active Duty/Selected Reserve), Reserve Educational Assistance Program, Veterans Educational Assistance Program, and Survivors’ and Dependents’ Educational Assistance Program may be eligible to apply those benefits to RefactorU’s Web Application Development Bootcamp.
-  locations:
-    - va_accepted: true
-      address1: 5717 Arapahoe Avenue
-      address2: "Suite #216"
-      city: Boulder
-      state: CO
-      zip: 80303
-
 - name: Turing School of Software & Design
   url: http://turing.io/
   logo: https://raw.githubusercontent.com/OperationCode/operationcode_frontend/master/src/images/codeSchoolLogos/turing.jpg
@@ -173,60 +130,6 @@
       state: CO
       zip: 80202
 
-- name: The Iron Yard
-  url: https://www.theironyard.com
-  logo: https://raw.githubusercontent.com/OperationCode/operationcode_frontend/master/src/images/codeSchoolLogos/iron_yard.jpg
-  full_time: true
-  hardware_included: false
-  has_online: false
-  online_only: false
-  locations:
-    - va_accepted: false
-      address1: 101 S. Garland Avenue
-      address2: Suite 102
-      city: Orlando
-      state: FL
-      zip: 32801
-    - va_accepted: false
-      address1: "260 1st Avenue S"
-      address2: Suite 300
-      city: Tampa Bay
-      state: FL
-      zip: 33701
-    - va_accepted: false
-      address1: 3423 Piedmont Road NE
-      city: Atlanta
-      state: GA
-      zip: 30305
-    - va_accepted: false
-      address1: 334 Blackwell Street
-      address2: Suite B017
-      city: Durham
-      state: NC
-      zip: 27701
-    - va_accepted: false
-      address1: 510 Mill Street
-      city: Mount Pleasant
-      state: SC
-      zip: 29464
-    - va_accepted: false
-      address1: 411 University Ridge
-      address2: Suite 220
-      city: Greenville
-      state: SC
-      zip: 29601
-    - va_accepted: false
-      address1: 3601 South Congress Avenue
-      address2: Suite c304
-      city: Austin
-      state: TX
-      zip: 78704
-    - va_accepted: false
-      address1: 1121 Delano Street
-      city: Houstin
-      state: TX
-      zip: 77003
-
 - name: General Assembly
   url: https://generalassemb.ly
   logo: https://raw.githubusercontent.com/OperationCode/operationcode_frontend/master/src/images/codeSchoolLogos/general_assembly.jpg
@@ -771,3 +674,17 @@
       city: Chicago
       state: IL
       zip: 60603
+
+- name: DevPoint Labs
+  url: http://www.devpointlabs.com/
+  logo: https://raw.githubusercontent.com/OperationCode/operationcode_frontend/master/src/images/codeSchoolLogos/DPL_logo.png
+  full_time: true
+  hardware_included: false
+  has_online: false
+  online_only: false
+  locations:
+    - va_accepted: true
+      address1: 370 South 300 East
+      city: Downtown Salt Lake City 
+      state: UT
+      zip: 84111
diff --git a/config/routes.rb b/config/routes.rb
@@ -30,6 +30,7 @@
       resources :tags, only: :index
       resources :team_members, only: [:index, :create, :update, :destroy]
       resources :users, only: [:index, :create]
+      patch '/users', to: 'users#update'
 
       devise_scope :user do
         post '/sessions', to: 'sessions#create'
diff --git a/db/migrate/20170806214216_add_additional_fields_for_profiles_to_users.rb b/db/migrate/20170806214216_add_additional_fields_for_profiles_to_users.rb
@@ -0,0 +1,8 @@
+class AddAdditionalFieldsForProfilesToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :company_role, :string
+    add_column :users, :company_name, :string
+    add_column :users, :education_level, :string
+    add_column :users, :interests, :string
+  end
+end
diff --git a/db/migrate/20170809164559_add_scholarship_info_field_to_users.rb b/db/migrate/20170809164559_add_scholarship_info_field_to_users.rb
@@ -0,0 +1,5 @@
+class AddScholarshipInfoFieldToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :scholarship_info, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -191,6 +191,11 @@
     t.string   "linkedin"
     t.string   "employment_status"
     t.string   "education"
+    t.string   "company_role"
+    t.string   "company_name"
+    t.string   "education_level"
+    t.string   "interests"
+    t.boolean  "scholarship_info",                default: false
     t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
   end
diff --git a/test/controllers/api/v1/users_controller_test.rb b/test/controllers/api/v1/users_controller_test.rb
@@ -10,6 +10,17 @@ class Api::V1::UsersControllerTest < ActionDispatch::IntegrationTest
     assert_equal 200, response.status
   end
 
+  test 'can update a user' do
+    user = create(:user)
+    headers = authorization_headers(user)
+
+    refute_equal 'new first name', user.first_name
+    patch api_v1_users_url, params: { user: { first_name: 'new first name'} }, headers: headers, as: :json
+    user.reload
+    assert_equal 'new first name', user.first_name
+    assert_response :success
+  end
+
   test ":by_location returns User.count of users located in the passed in location" do
     tom = create :user
     sam = create :user
