Merge pull request #1062 from consul/gender

Renames "Genre" to "Gender"
This commit is contained in:
Juanjo Bazán
2016-04-13 18:12:55 +02:00
6 changed files with 16 additions and 11 deletions

View File

@@ -32,7 +32,7 @@ class Verification::Residence
document_type: document_type,
geozone: self.geozone,
date_of_birth: date_of_birth.to_datetime,
genre: genre,
gender: gender,
residence_verified_at: Time.now)
end
@@ -77,8 +77,8 @@ class Verification::Residence
@census_api_response.district_code
end
def genre
@census_api_response.genre
def gender
@census_api_response.gender
end
private

View File

@@ -0,0 +1,5 @@
class RenameGenreToGender < ActiveRecord::Migration
def change
rename_column :users, :genre, :gender
end
end

View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160411161531) do
ActiveRecord::Schema.define(version: 20160413122359) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -422,7 +422,7 @@ ActiveRecord::Schema.define(version: 20160411161531) do
t.string "oauth_email"
t.integer "geozone_id"
t.string "redeemable_code"
t.string "genre", limit: 10
t.string "gender", limit: 10
t.datetime "date_of_birth"
end

View File

@@ -52,7 +52,7 @@ class CensusApi
data[:datos_vivienda][:item][:codigo_distrito]
end
def genre # "Varón" or "Mujer"
def gender
case data[:datos_habitante][:item][:descripcion_sexo]
when "Varón"
"male"

View File

@@ -42,11 +42,11 @@ namespace :users do
desc "Associates demographic information to users"
task assign_demographic: :environment do
User.residence_verified.where(genre: nil).find_each do |u|
User.residence_verified.where(gender: nil).find_each do |u|
begin
response = CensusApi.new.call(u.document_type, u.document_number)
if response.valid?
u.genre = response.genre
u.gender = response.gender
u.date_of_birth = response.date_of_birth.to_datetime
u.save
print "."
@@ -54,7 +54,7 @@ namespace :users do
print "X"
end
rescue
puts "Could not assign genre/dob for user: #{u.id}"
puts "Could not assign gender/dob for user: #{u.id}"
end
end
end

View File

@@ -85,7 +85,7 @@ describe Verification::Residence do
describe "save" do
it "should store document number, document type, geozone, date of birth and genre" do
it "should store document number, document type, geozone, date of birth and gender" do
user = create(:user)
residence.user = user
residence.save
@@ -96,7 +96,7 @@ describe Verification::Residence do
expect(user.date_of_birth.year).to eq(1980)
expect(user.date_of_birth.month).to eq(12)
expect(user.date_of_birth.day).to eq(31)
expect(user.genre).to eq('male')
expect(user.gender).to eq('male')
expect(user.geozone).to eq(geozone)
end