torg_api 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42298cad62244fa2aff7ba5bb601d05ae8f65b35
-  data.tar.gz: 7074c9741e1934456ee29c665aa3e930088fcad5
+  metadata.gz: a1d232ea54a784e418f472ef55117987f7344017
+  data.tar.gz: d978df9953b942273ed704a969a3a915e1114730
 SHA512:
-  metadata.gz: 92deafe0c4d46d27281b88eab9fd4c6bc8ac97a93cf7de4df5cf54226f95c34ef99398e75ba6e9dc92476f9f5e6412ce08fbd161ebf43d81508548dcba527a18
-  data.tar.gz: 481cf529839a037d3d753e4ed3d30312676142176a2e4f8436ae9d1bda1aaf4518da7e10d47194f7b1137cfc01cf04b934299f95faab11c4151dc9f651c9e181
+  metadata.gz: 0310f82f3609efbc5e15952f9c58875f43233f940126bec474c323561f046f70c93d42a6d5349a4e0e87a84fd80275664e8e554db0a8170d807b9fc9f8b4ee52
+  data.tar.gz: 451aea8a62f84888c6c3d2e485b86cba6f4211cdf271f2c18b14d940ed74c2a14002857faa85aac4dea94880ff308662807e16dbb40d921fe1f27ef1d566ea0e

data/lib/torg_api/api/bidder.rb

@@ -55,7 +55,7 @@ module TorgApi
             area_id: TenderFileArea::BIDDER,
             year: Date.current.year,
             document: File.open(file),
-            user_id: EtpUsers::B2B_CENTER,
+            user_id: Settings.service_user[:id],
             external_filename: name
           )
           TorgApi::Models::BidderFile.create!(

data/lib/torg_api/api/contractor.rb

@@ -56,14 +56,15 @@ module TorgApi
             .where(inn: inn)
             .where(next_id: nil)
             .order("#{DECODE_STATUS_ORDER}, updated_at desc")
-            .pluck('id')
+            .first
+            .try(:to_api)
         end
 
         # Создаёт контрагента
         # @param hash [Hash] хэш ответа веб-сервиса B2B
         # @param user [Integer] id автора
-        # @return [Integer] id созданного объекта
-        def create_from_b2b(hash, user)
+        # @return Contractor
+        def create_from_b2b(hash)
           c = Contractor.new
           c.name = hash[:org_name_short]
           c.fullname = hash[:org_name]
@@ -75,14 +76,15 @@ module TorgApi
           c.status = 0 # enum status: { orig: 0, active: 1, old: 2, inactive: 3 }
           c.form = extract_form(hash[:bank_inn])
           c.legal_addr = hash[:jury_address]
-          c.user_id = user
+          c.user_id = Settings.service_user[:id]
           c.is_resident = extract_resident(hash[:country])
           c.is_dzo = nil
           c.is_sme = hash[:is_smb]
           c.jsc_form_id = nil
           c.sme_type_id = nil
 
-          TorgApi::Models::Contractor.create!(c.to_h).id
+          c.id = TorgApi::Models::Contractor.create(c.to_h).id
+          c
         end
 
         def extract_ownership(org_name_short)

data/lib/torg_api/api/tender_file.rb

@@ -19,13 +19,13 @@ module TorgApi
       # @return [Integer] FileSize
       attr_accessor :file_size
       class << self
-        def create_from_b2b(hash, area, file_size, user_id)
+        def create_from_b2b(hash, area, file_size)
           mime_types = MIME::Types.type_for(hash[:name])
           file = TenderFile.new
           file.area_id = area
           file.year = Date.current.year
           file.document = hash[:title]
-          file.user_id = user_id
+          file.user_id = Settings.service_user[:id]
           file.external_filename = hash[:name]
           file.content_type = mime_types.empty? ? 'text/plain' : mime_types.first.content_type
           file.file_size = file_size

data/lib/torg_api/constants.rb

@@ -15,9 +15,5 @@ module TorgApi
       TENDER = 2
       BIDDER = 3
     end
-
-    module EtpUsers
-      B2B_CENTER = 411
-    end
   end
 end

data/lib/torg_api/models/contractor.rb

@@ -1,6 +1,27 @@
 module TorgApi
   module Models
     class Contractor < ActiveRecord::Base
+      def to_api
+        c = TorgApi::Api::Contractor.new
+        c.id = id
+        c.name = name
+        c.fullname = fullname
+        c.ownership = ownership
+        c.inn = inn
+        c.kpp = kpp
+        c.ogrn = ogrn
+        c.okpo = okpo
+        c.status = status
+        c.form = form
+        c.legal_addr = legal_addr
+        c.user_id = user_id
+        c.is_resident = is_resident
+        c.is_dzo = is_dzo
+        c.is_sme = is_sme
+        c.jsc_form_id = jsc_form_id
+        c.sme_type_id = sme_type_id
+        c
+      end
     end
   end
 end

data/lib/torg_api/settings.rb

@@ -0,0 +1,14 @@
+module TorgApi
+  class Settings
+    @service_user = {}
+
+    # Configure through hash
+    def self.service_user_configure(opts = {})
+      opts.each { |k, v| @service_user[k.to_sym] = v }
+    end
+
+    class << self
+      attr_reader :service_user
+    end
+  end
+end

data/lib/torg_api/version.rb

@@ -1,3 +1,3 @@
 module TorgApi
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/torg_api.rb

@@ -3,6 +3,7 @@ require 'torg_api/version'
 require 'torg_api/constants'
 require 'torg_api/base'
 require 'torg_api/api'
+require 'torg_api/settings'
 
 CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torg_api
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Archakov Aleksandr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/torg_api/models/tender.rb
 - lib/torg_api/models/tender_file.rb
 - lib/torg_api/models/tender_file_uploader.rb
+- lib/torg_api/settings.rb
 - lib/torg_api/version.rb
 - torg_api.gemspec
 homepage: https://github.com/kodram/torg_api