nexus_core 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d397d4a83206b0252f4a7a4f3091e3917a9ec952
-  data.tar.gz: 281c0120b3d8960ac303185b6788533cce3038b3
+  metadata.gz: 4539337c664651ef414aebdb3f59affdb3d6ab7d
+  data.tar.gz: e9c50c15bfbfa5656c58960786abb70dd12781f9
 SHA512:
-  metadata.gz: afbdaebfcb5a24c6cc732982065fa9eb818f92ffbff8999c9dc4dc143e069b1603dcd7f3b3cf48bf4c48edf2074265adbbb5be40a7774838c951737b5539f142
-  data.tar.gz: b853e48b49862d9ea047f0ff691f425059052e8602402ac3e34f49726fefd6abb6c9c5879f69e288668c9f2c13f82c3c1c89d738559e8cc790fdd9b483293f03
+  metadata.gz: 820bff9ba3cdda432f2e3d0704954552bed71ac2b80fb620ed719b40aaa49a74e558810d62fe5845b7a65d66255bda0a2e9707b48b5522d15d29b1a539663082
+  data.tar.gz: 4bfc0a707e01ac3229b8297e263b5a3216357e8b6d43a644d4dd49cb0d8b5d0978c9f3ce7a6ecc3c78b2ecc68bd88f58419dd78f205a4d89585039d0706e60b7

data/app/accessors/bank_account_accessor.rb

@@ -0,0 +1,8 @@
+module BankAccountAccessor
+  def self.included(base)
+    base.class_eval do
+      belongs_to :investor_account
+      has_many :wallets, dependent: :destroy
+    end
+  end
+end

data/app/accessors/investor_account_accessor.rb

@@ -2,8 +2,9 @@ module InvestorAccountAccessor
   def self.included(base)
     base.class_eval do
       belongs_to :member
+      has_many :wallets # will be destroyed by bank account cascade destroy
       has_many :bank_accounts, dependent: :destroy
-      has_many :wallets, dependent: :destroy
+      has_many :investor_state_transitions, dependent: :destroy, class_name: InvestorAccount.investor_state_transition_klass.to_s
     end
   end
 
@@ -19,12 +20,4 @@ module InvestorAccountAccessor
   def long_account_id
     'U' + id.to_s.rjust(6, '0')
   end
-
-  def approved?
-    approval_status == STATUS_APPROVED
-  end
-
-  def pending?
-    approval_status == STATUS_PENDING_VERIFICATION
-  end
 end

data/app/accessors/member_accessor.rb

@@ -3,6 +3,7 @@ module MemberAccessor
     base.class_eval do
       has_many :identities, dependent: :destroy, primary_key: :email, foreign_key: :email
       has_one :member_profile, dependent: :destroy
+      alias_method :profile, :member_profile
       has_one :investor_account, dependent: :destroy
       alias_method :investor, :investor_account
       has_one :preference, dependent: :destroy

data/app/delegations/member_profile_delegation.rb

@@ -0,0 +1,8 @@
+module MemberProfileDelegation
+  module Instance
+    def method_missing(method_sym, *args)
+      return member.send(method_sym, *args) if member.respond_to?(method_sym)
+      super
+    end
+  end
+end

data/app/form_models/investor_profile_form.rb

@@ -0,0 +1,126 @@
+class InvestorProfileForm
+  include ActiveModel::Model
+  include Virtus.model
+
+  attr_accessor :member, :investor_account, :bank_account
+  attribute :model_id, Integer
+
+  AggregateRoot = Member
+
+  # Member fields
+  attribute :name, String
+  attribute :nationality, String
+  attribute :id_number, String
+  attribute :date_of_birth, Date
+  attribute :phone_number, String
+  attribute :address1, String
+  attribute :address2, String
+  attribute :city, String
+  attribute :postal_code, String
+  attribute :country_of_residence, String
+  attribute :id_document, String
+  attribute :id_document_additional, String
+  attribute :proof_of_residence, String
+
+  # Bank account fields
+  attribute :account_holder, String
+  attribute :account_number, String
+  attribute :account_type, String
+  attribute :bank_name, String
+  attribute :bank_address, String
+  attribute :bank_country, String
+  attribute :swift_code, String
+
+  class << self
+    def find(id)
+      member = AggregateRoot.find id
+      investor_account = member.investor_account
+      bank_account = investor_account.bank_accounts.first
+      attrs = member.attributes.merge(investor_account.attributes).merge(bank_account.attributes)
+      form = self.new attrs
+      form.set_model id
+      return form
+    end
+
+    def update(params)
+      if params[:model_id].blank?
+        raise 'Model ID not found'
+      end
+      form = self.new sanitized_params(params)
+      form.set_model params[:model_id]
+      form.persist(params)
+      return form
+    end
+
+    def sanitized_params(params)
+      params[:date_of_birth] = Date.parse("#{params['date_of_birth(3i)']}-#{params['date_of_birth(2i)']}-#{params['date_of_birth(1i)']}")
+      return params
+    end
+  end
+
+  def set_model(member_id)
+    @model_id = (member_id.respond_to? :id)? member_id.id : member_id
+    @member = AggregateRoot.find member_id
+    @investor_account = @member.investor_account
+    @bank_account = @investor_account.bank_accounts.first
+  end
+
+  def persist(params)
+    params.each do |k,v|
+      setter_method = "#{k}="
+      if @member.respond_to? setter_method
+        @member.send setter_method, v
+      end
+      if @investor_account.respond_to? setter_method
+        @investor_account.send setter_method, v
+      end
+      if @bank_account.respond_to? setter_method
+        @bank_account.send setter_method, v
+      end
+    end
+    @member.save!
+    @investor_account.save!
+    @bank_account.save!
+  end
+
+  module Validator
+    extend ActiveSupport::Concern
+
+    included do
+      validates_presence_of :name,
+                            :id_number, :date_of_birth, :phone_number,
+                            :address1, :city, :postal_code,
+                            :country_of_residence, :nationality,
+                            :account_holder, :account_number, :account_type,
+                            :bank_country, :bank_name
+
+      validates_presence_of :id_document, if: :id_document_blank?
+      validates_presence_of :id_document_additional, if: :is_passport_blank_and_not_local_region?
+      validate :age_must_be_above_18
+      validate :name_and_account_holder_must_be_the_same
+    end
+
+    def age_must_be_above_18
+      too_young = date_of_birth.present? && TimeDifference.between(date_of_birth, Date.today).in_years.to_i < 18
+      errors.add(:date_of_birth, I18n.t('investor_form.must_be_older_than_18')) if too_young
+    end
+
+    def name_and_account_holder_must_be_the_same
+      if name.to_s != account_holder.to_s
+        msg = I18n.t('investor_form.name_and_account_holder_must_be_the_same')
+        errors.add(:name, msg)
+        errors.add(:account_holder, msg)
+      end
+    end
+
+    def id_document_blank?
+      @member.id_document.blank?
+    end
+
+    def is_passport_blank_and_not_local_region?
+      is_local_region = %w(Singapore Indonesia).include? nationality
+      !is_local_region && @member.id_document_additional.blank?
+    end
+  end
+  include Validator
+end

data/app/form_models/investor_tier_form.rb

@@ -0,0 +1,60 @@
+class InvestorTierForm
+  include ActiveModel::Model
+  include Virtus.model
+
+  attr_accessor :member, :investor_account
+  attribute :model_id, Integer
+
+
+  class << self
+    def find(id)
+      member = Member.find id
+      form = self.new member.attributes.merge(member.investor_account && member.investor_account.attributes || {})
+      form.set_model id
+      return form
+    end
+
+    def update(params)
+      if params[:model_id].blank?
+        raise 'Model ID not found'
+      end
+      form = self.new sanitized_params(params)
+      form.set_model params[:model_id]
+      form.persist(params)
+      return form
+    end
+
+    def sanitized_params(params)
+      return params
+    end
+  end
+
+  def set_model(member_id)
+    @model_id = (member_id.respond_to? :id)? member_id.id : member_id
+    @member = Member.find member_id
+    @investor_account = @member.investor.blank?? InvestorAccount.create!(member: @member) : @member.investor
+  end
+
+  def persist(params)
+    params.each do |k,v|
+      setter_method = "#{k}="
+      if @member.respond_to? setter_method
+        @member.send setter_method, v
+      end
+      if @investor_account.respond_to? setter_method
+        @investor_account.send setter_method, v
+      end
+    end
+    @member.save!
+    @investor_account.save!
+  end
+
+  module Validator
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+  end
+  include Validator
+end

data/lib/nexus_core.rb

@@ -1,4 +1,5 @@
 require 'nexus_core/engine'
+require 'nexus_core/geoip_dat_location'
 require 'nexus_core/report_utils'
 
 module NexusCore

data/lib/nexus_core/geoip_dat_location.rb

@@ -0,0 +1,3 @@
+module NexusCore
+  GEOIP_DAT_LOCATION = File.join(File.expand_path('../../../data', __FILE__), 'GeoIP.dat')
+end

data/lib/nexus_core/report_utils.rb

@@ -54,7 +54,7 @@ module NexusCore
     extend PercentageHelper
 
     def self.decode_ip(ip_addr)
-      g = GeoIP.new(File.join(Gem.datadir('nexus_core'), 'GeoIP.dat'))
+      g = GeoIP.new(NexusCore::GEOIP_DAT_LOCATION)
       begin
         country = g.country(ip_addr).country_name
       rescue

data/lib/nexus_core/version.rb

@@ -1,3 +1,3 @@
 module NexusCore
-  VERSION = '0.5.0'
-end
+  VERSION = '0.6.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexus_core
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Felix Tioh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - felixsagitta@gmail.com
@@ -88,6 +102,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/accessors/bank_account_accessor.rb
 - app/accessors/investor_account_accessor.rb
 - app/accessors/journal_entry_accessor.rb
 - app/accessors/member_accessor.rb
@@ -101,8 +116,11 @@ files:
 - app/constants/withdrawal_constants.rb
 - app/delegations/investor_account_delegation.rb
 - app/delegations/member_delegation.rb
+- app/delegations/member_profile_delegation.rb
 - app/delegations/top_up_delegation.rb
 - app/delegations/withdrawal_delegation.rb
+- app/form_models/investor_profile_form.rb
+- app/form_models/investor_tier_form.rb
 - app/lifecycle/investor_account_lifecycle.rb
 - app/lifecycle/member_lifecycle.rb
 - app/lifecycle/top_up_lifecycle.rb
@@ -112,6 +130,7 @@ files:
 - app/state_machines/withdrawal_state_machine.rb
 - lib/nexus_core.rb
 - lib/nexus_core/engine.rb
+- lib/nexus_core/geoip_dat_location.rb
 - lib/nexus_core/report_utils.rb
 - lib/nexus_core/version.rb
 - lib/tasks/nexus_core_tasks.rake