unidom-geo-china 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4c698cb0b5f946d24d256fd7be15bbae5f4dc2e
-  data.tar.gz: 8a17f513dcdf0d8b31f971d39a0b8c8aadcaacf5
+  metadata.gz: c644d279817669978931c34931bc44835a42c084
+  data.tar.gz: 8f5cea3672acb64e112cfe2c5d8727b206e989ee
 SHA512:
-  metadata.gz: 6d26eb0dd473d5b37d42a81c1233007efdb67ecc88a93c44b6b9baca93e25b898fa72fe9b4d20027764ee71ddfbac17272ccca70a9e084607b78e813f641e345
-  data.tar.gz: 5bc709580f3ecfb7f9a7ed498d2739e0fd7014f7c021105091f5065d5ed12e39ac67b9809817d1fd03a66ff235c49e301e0dbf69e771de00da94ca81ef7830da
+  metadata.gz: 680ce9d86dec8bec6d500b856704748ebd61cdcba4a802286139c94553fd03847f39e99c3229fda70977d8832dc50a7ea9faec348d3826ff48b2f6f2c651b660
+  data.tar.gz: d64016110315bbbac2fa61ddefd6f3864e5430e472a4e0a9d78ef114d314a84f9b46bebc4610a963a39ea5f9cb207ef6edce8d2aa247566e88b7b1a4bba66844

data/README.md

@@ -18,7 +18,8 @@ rake db:migrate
 
 ## Import Data
 ```shell
-bundle exec rake unidom:geo:china:import file=/china-region-data/NBS-county/20141031.csv from_date=2014-10-31 scheme_id= scheme_type=
+bundle exec rake unidom:geo:china:region:import file=/china-region-data/NBS-county/20141031.csv from_date=2014-10-31 scheme_id= scheme_type=
+bundle exec rake unidom:geo:china:town:import file=/china-region-data/NBS-town/20141031.csv from_date=2014-10-31 scheme_id= scheme_type=
 ```
 
 ## Call the Model

data/app/models/unidom/geo/china/region.rb

@@ -31,6 +31,7 @@ class Unidom::Geo::China::Region < ActiveRecord::Base
 
   belongs_to :scheme,    polymorphic: true
   has_many   :locations, class_name: 'Unidom::Geo::Location', as: :region
+  has_many   :towns,     class_name: 'Unidom::Geo::China::Town'
 
   scope :scheme_is,      ->(scheme) { scheme.present? ? where(scheme: scheme) : scheme_id_is.scheme_type_is }
   scope :scheme_id_is,   ->(scheme_id   = ::Unidom::Common::NULL_UUID) { where scheme_id:   scheme_id   }

data/app/models/unidom/geo/china/town.rb

@@ -0,0 +1,15 @@
+# Town 是乡或者镇。
+
+class Unidom::Geo::China::Town < ActiveRecord::Base
+
+  self.table_name = 'unidom_china_towns'
+
+  include Unidom::Common::Concerns::ModelExtension
+
+  validates :name, presence: true, length: { in: 2..self.columns_hash['name'].limit }
+
+  belongs_to :region, class_name: 'Unidom::Geo::China::Region'
+
+  scope :region_is, ->(region) { where region_id: to_id(region) }
+
+end

data/db/migrate/20010491560020_create_unidom_china_towns.rb

@@ -0,0 +1,32 @@
+class CreateUnidomChinaTowns < ActiveRecord::Migration
+
+  def change
+
+    create_table :unidom_china_towns, id: :uuid do |t|
+
+      t.references :region, type: :uuid, null: false
+
+      t.column :numeric_code, 'char(9)', null: false, default: '0'*9
+
+      t.string  :name,    null: false, default: '', limit: 200
+      t.boolean :virtual, null: false, default: false
+
+      t.text :instruction
+      t.text :description
+
+      t.column   :state, 'char(1)', null: false, default: 'C'
+      t.datetime :opened_at,        null: false, default: ::Time.utc(1970)
+      t.datetime :closed_at,        null: false, default: ::Time.utc(3000)
+      t.boolean  :defunct,          null: false, default: false
+      t.jsonb    :notation,         null: false, default: {}
+
+      t.timestamps null: false
+
+    end
+
+    add_index :unidom_china_towns, :region_id
+    add_index :unidom_china_towns, :numeric_code
+
+  end
+
+end

data/lib/tasks/data_tasks.rake

@@ -4,58 +4,101 @@ namespace :unidom do
   namespace :geo do
     namespace :china do
 
-      # bundle exec rake unidom:geo:china:import
-      #   file=/data.csv
-      #   from_date=2020-01-01
-      #   scheme_id=
-      #   scheme_type=
-      task import: :environment do
+      namespace :region do
 
-        include ::Unidom::Common::DataHelper
+        # bundle exec rake unidom:geo:china:region:import
+        #   file=/data.csv
+        #   from_date=2020-01-01
+        #   scheme_id=
+        #   scheme_type=
+        task import: :environment do
 
-        file_name   = ENV['file']
-        scheme_id   = ENV['scheme_id']||::Unidom::Common::NULL_UUID
-        scheme_type = ENV['scheme_type']||''
-        opened_at   = parse_time ENV['from_date']
+          include ::Unidom::Common::DataHelper
 
-        updated_count = 0
-        created_count = 0
+          file_name   = ENV['file']
+          scheme_id   = ENV['scheme_id']||::Unidom::Common::NULL_UUID
+          scheme_type = ENV['scheme_type']||''
+          opened_at   = parse_time ENV['from_date']
 
-        region_entities = ::Unidom::Geo::China::Region.scheme_id_is(scheme_id).scheme_type_is(scheme_type).select('id, name, virtual, numeric_code, alphabetic_code, scheme_id, scheme_type, opened_at, closed_at, defunct, updated_at').to_a
+          updated_count = 0
+          created_count = 0
 
-        each_csv_row file_name do |region|
+          region_entities = ::Unidom::Geo::China::Region.scheme_id_is(scheme_id).scheme_type_is(scheme_type).select('id, name, virtual, numeric_code, alphabetic_code, scheme_id, scheme_type, opened_at, closed_at, defunct, updated_at').to_a
 
-          numeric_code    = region['numeric_code']
-          alphabetic_code = region['alphabetic_code']
+          each_csv_row file_name do |region|
 
-          attributes = { name: region['name'], virtual: region['virtual'], scheme_id: scheme_id, scheme_type: scheme_type, opened_at: opened_at }
-          attributes[:alphabetic_code] = alphabetic_code if alphabetic_code.present?
+            numeric_code    = region['numeric_code']
+            alphabetic_code = region['alphabetic_code']
 
-          if region_entities.present?
-            found_region_entities = region_entities.select { |region_entity| region_entity.numeric_code==numeric_code }
-            if found_region_entities.present?
-              found_region_entities.each do |found_region_entity|
-                found_region_entity.assign_attributes attributes
-                if found_region_entity.changed?
-                  found_region_entity.save!
-                  updated_count += 1
+            attributes = { name: region['name'], virtual: region['virtual'], scheme_id: scheme_id, scheme_type: scheme_type, opened_at: opened_at }
+            attributes[:alphabetic_code] = alphabetic_code if alphabetic_code.present?
+
+            if region_entities.present?
+              found_region_entities = region_entities.select { |region_entity| region_entity.numeric_code==numeric_code }
+              if found_region_entities.present?
+                found_region_entities.each do |found_region_entity|
+                  found_region_entity.assign_attributes attributes
+                  if found_region_entity.changed?
+                    found_region_entity.save!
+                    updated_count += 1
+                  end
                 end
+              else
+                attributes[:numeric_code] = numeric_code
+                ::Unidom::Geo::China::Region.create! attributes
+                created_count += 1
               end
             else
               attributes[:numeric_code] = numeric_code
               ::Unidom::Geo::China::Region.create! attributes
               created_count += 1
             end
-          else
-            attributes[:numeric_code] = numeric_code
-            ::Unidom::Geo::China::Region.create! attributes
-            created_count += 1
+
           end
 
+          puts "#{created_count} China Regions were created. #{updated_count} China Regions were updated per CSV."
+          puts "#{created_count+updated_count} China Regions were handled totally."
+
         end
 
-        puts "#{created_count} China Regions were created. #{updated_count} China Regions were updated per CSV."
-        puts "#{created_count+updated_count} China Regions were handled totally."
+      end
+
+      namespace :town do
+
+        # bundle exec rake unidom:geo:china:town:import
+        #   file=/data.csv
+        #   from_date=2020-01-01
+        task import: :environment do
+
+          include ::Unidom::Common::DataHelper
+
+          file_name   = ENV['file']
+          opened_at   = parse_time ENV['from_date']
+
+          updated_count = 0
+          created_count = 0
+
+          each_csv_row file_name do |region|
+
+            numeric_code = region['numeric_code']
+
+            town   = Unidom::Geo::China::Town.numeric_coded_as(numeric_code).first
+            county = Unidom::Geo::China::Region.numeric_coded_as(numeric_code[0..5]).valid_at.alive.first
+            if town.present?
+              town.assign_attributes region: county, name: region['name'], virtual: region['virtual']
+              town.save!
+              updated_count += 1
+            else
+              town = Unidom::Geo::China::Town.create! region: county, numeric_code: numeric_code, name: region['name'], virtual: region['virtual'], opened_at: opened_at
+              created_count += 1
+            end
+
+          end
+
+          puts "#{created_count} China Regions were created. #{updated_count} China Regions were updated per CSV."
+          puts "#{created_count+updated_count} China Regions were handled totally."
+
+        end
 
       end
 

data/lib/unidom/geo/china/version.rb

@@ -1,7 +1,7 @@
 module Unidom
   module Geo
     module China
-      VERSION = '0.1'.freeze
+      VERSION = '0.2'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-geo-china
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 description: Unidom (UNIfied Domain Object Model) is a series of domain model engines.
   The China Contact domain model engine includes Mobile Phone Number and its relative
   models. Unidom (统一领域对象模型)是一系列的领域模型引擎。中国地理领域模型引擎包括中国大陆的行政区划及其相关的模型。
@@ -41,9 +41,11 @@ files:
 - app/controllers/unidom/geo/china/application_controller.rb
 - app/helpers/unidom/geo/china/application_helper.rb
 - app/models/unidom/geo/china/region.rb
+- app/models/unidom/geo/china/town.rb
 - app/views/layouts/unidom/geo/china/application.html.erb
 - config/routes.rb
 - db/migrate/20010491560010_create_unidom_china_regions.rb
+- db/migrate/20010491560020_create_unidom_china_towns.rb
 - lib/tasks/data_tasks.rake
 - lib/unidom/geo/china.rb
 - lib/unidom/geo/china/engine.rb