zaikio-procurement 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68bec08a8cf3b082a8c062fe76b957ec3160d1e206cda4abc1703187358c054c
-  data.tar.gz: 83315dc24f36433f048324cd014ca48300ca545314cc122e3ee491cf1e64d0af
+  metadata.gz: b6d678f0c86ce42a67eb9eeacd9849b4c7c1f119158a401c0d602f257339c9e0
+  data.tar.gz: 68afd39bf4d8b642b45717c20dab222b5278110e02054f41395742fa1478437c
 SHA512:
-  metadata.gz: 4407e261617426ea7445b723371e36814996bdeb50282c9d138eafe3276f8b244a07335533dcb84f6a6e1cd788150faeb0b55fe079c014ca363eda265457ca41
-  data.tar.gz: 1da09fc4ea5b59bb620e820e3b0949bd9e1f3d606e0d03c49250bbb2e4ffd493ee9caeb1de9668940021d5a20c43fb1437278eff716d526770363c2d5b4c8da3
+  metadata.gz: 26b7379563b6064aba1ed7d87626007de51b6e81c695ffd16c0040781c3896bc23fde94abccab0c37d52e3d60462d50d69e350557baf0555f62263c6bee131bc
+  data.tar.gz: ff0ba517aab8e36efa73dfd4200cfc59f914ca49696b6dfa4be37b9a5e6f4ee9cc9eb37851f8db524250c6d38822432231d051e32c909cd921dfd08aa4171291

data/README.md

@@ -68,6 +68,11 @@ Zaikio::Procurement.with_token(token) do
   variant = Zaikio::Procurement::Variant.find("845a4d7e-db5a-46a6-9d30-bf2e884cb393")
   variant.line_item_suggestion(amount: 10, unit: "sheet") # Returns a line item suggestion for a specifc variant
 
+  # in Supplier API one must provide a valid scope when using `Variant` or `Article`:
+  # https://docs.zaikio.com/api/procurement_suppliers/procurement.html#/Variants/get__article_type__variants__variant_id_
+  variant = Zaikio::Procurement::Variant.substrate.find("845a4d7e-db5a-46a6-9d30-bf2e884cb393")
+  variant.skus
+  
   # https://docs.zaikio.com/api/procurement_consumers/procurement.html#/LineItemSuggestions/post_suppliers__supplier_id__line_item_suggestions
   supplier = Zaikio::Procurement::Supplier.find("b5b14aa0-ae84-452b-9719-a38545365902")
   supplier.line_item_suggestions(
@@ -137,4 +142,4 @@ Zaikio::Directory.with_token(token) do
   Zaikio::Procurement::Article.with_fallback.find("7cbf51bd-35a8-47a1-84a2-57aa63140234") # => nil
   Zaikio::Procurement::Article.with_fallback.all # Automatically uses empty array as fallback
 end
-```
+```

data/lib/zaikio/procurement/address.rb

@@ -0,0 +1,22 @@
+module Zaikio
+  module Procurement
+    class Address < Base
+      attributes :addition,
+                 :addressable,
+                 :addressee,
+                 :country_code,
+                 :county,
+                 :kind,
+                 :location,
+                 :number,
+                 :state,
+                 :street,
+                 :text,
+                 :town,
+                 :types,
+                 :zip_code,
+                 :created_at,
+                 :updated_at
+    end
+  end
+end

data/lib/zaikio/procurement/article.rb

@@ -1,13 +1,16 @@
+require_relative "concern/article_type_scoped"
+
 module Zaikio
   module Procurement
     class Article < Base
+      include ArticleTypeScoped
       include_root_in_json :article
 
       # Class methods
       class << self
         # Spyke URI override
         def uri
-          Zaikio::Procurement.configuration.flavor == :supplier ? "substrate/articles(/:id)" : "articles(/:id)"
+          Zaikio::Procurement.configuration.flavor == :supplier ? ":type/articles(/:id)" : "articles(/:id)"
         end
 
         def list_by_article_type_or_supplier_slug(type_or_slug)
@@ -24,8 +27,8 @@ module Zaikio
                  :kind, :supplier_id, :created_at, :updated_at
 
       # Associations
-      has_one :supplier,  class_name: "Zaikio::Procurement::Supplier",
-                          uri: nil
+      has_one :supplier, class_name: "Zaikio::Procurement::Supplier",
+                         uri: nil
       # Manually build variants association to work for consumers and suppliers
       def variants
         self.class.request(:get, "#{uri}/variants").data.collect { |v| Zaikio::Procurement::Variant.new(v) }

data/lib/zaikio/procurement/concern/article_type_scoped.rb

@@ -0,0 +1,21 @@
+module Zaikio
+  module Procurement
+    module ArticleTypeScoped
+      extend ActiveSupport::Concern
+      included do
+        scope :substrate, -> { where(type: :substrate) }
+        scope :plate, -> { where(type: :plate) }
+      end
+      module ClassMethods
+        def find(id)
+          if Zaikio::Procurement.configuration.flavor == :supplier &&
+             (current_scope.nil? || current_scope.params[:type].blank?)
+            raise ArgumentError, "id and type are required for #{name.demodulize} in Supplier API"
+          end
+
+          super
+        end
+      end
+    end
+  end
+end

data/lib/zaikio/procurement/delivery.rb

@@ -6,11 +6,12 @@ module Zaikio
 
       # Attributes
       attributes :confirmed_delivery_date, :desired_delivery_date, :references,
-                 :address, :order_id, :created_at, :updated_at
+                 :order_id, :created_at, :updated_at
 
       # Associations
-      belongs_to :order,             class_name: "Zaikio::Procurement::Order",
-                                     uri: nil
+      belongs_to :address,           class_name: "Zaikio::Procurement::Address", uri: nil
+      belongs_to :order,             class_name: "Zaikio::Procurement::Order", uri: nil
+
       has_many :delivery_line_items, class_name: "Zaikio::Procurement::DeliveryLineItem",
                                      uri: "deliveries/:delivery_id/delivery_line_items(/:id)"
     end

data/lib/zaikio/procurement/material_requirement.rb

@@ -15,6 +15,13 @@ module Zaikio
       has_one :supplier, class_name: "Zaikio::Procurement::Supplier", uri: nil
       has_one :variant, class_name: "Zaikio::Procurement::Variant", uri: nil
       has_many :order_line_items, class_name: "Zaikio::Procurement::OrderLineItem", uri: nil
+
+      def order(purchaser_id:)
+        result = self.class.request(:post, "material_requirements/#{id}/order",
+                                    order: { purchaser_id: purchaser_id })
+
+        Zaikio::Procurement::MaterialRequirement.new(result.data)
+      end
     end
   end
 end

data/lib/zaikio/procurement/sku.rb

@@ -15,13 +15,9 @@ module Zaikio
 
       # Manually build variant association to work for consumers and suppliers
       def variant
-        path = if Zaikio::Procurement.configuration.flavor == :supplier
-                 "substrate/variants/#{variant_id}"
-               else
-                 "variants/#{variant_id}"
-               end
-
-        Zaikio::Procurement::Variant.new(self.class.request(:get, path).data)
+        Zaikio::Procurement::Variant.new(
+          self.class.request(:get, attributes.dig("variant", "links", 0, "href")).data
+        )
       end
     end
   end

data/lib/zaikio/procurement/variant.rb

@@ -1,11 +1,14 @@
+require_relative "concern/article_type_scoped"
+
 module Zaikio
   module Procurement
     class Variant < Base
+      include ArticleTypeScoped
       include_root_in_json :variant
 
       # Spyke URI override
       def self.uri
-        Zaikio::Procurement.configuration.flavor == :supplier ? "substrate/variants(/:id)" : "variants(/:id)"
+        Zaikio::Procurement.configuration.flavor == :supplier ? ":type/variants(/:id)" : "variants(/:id)"
       end
 
       # Attributes
@@ -16,8 +19,8 @@ module Zaikio
       # Associations
       has_one :article, class_name: "Zaikio::Procurement::Article",
                         uri: nil
-      has_many :skus,   class_name: "Zaikio::Procurement::Sku",
-                        uri: "variants/:variant_id/skus"
+      has_many :skus, class_name: "Zaikio::Procurement::Sku",
+                      uri: "variants/:variant_id/skus"
 
       def line_item_suggestion(**attributes)
         self.class.request(

data/lib/zaikio/procurement/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Procurement
-    VERSION = "0.2.1".freeze
+    VERSION = "0.3.2".freeze
   end
 end

data/lib/zaikio/procurement.rb

@@ -6,6 +6,7 @@ require "zaikio/procurement/authorization_middleware"
 
 # Models
 require "zaikio/procurement/base"
+require "zaikio/procurement/address"
 require "zaikio/procurement/article"
 require "zaikio/procurement/variant"
 require "zaikio/procurement/substrate_search"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-procurement
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Zaikio GmbH
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -106,9 +106,11 @@ files:
 - README.md
 - Rakefile
 - lib/zaikio/procurement.rb
+- lib/zaikio/procurement/address.rb
 - lib/zaikio/procurement/article.rb
 - lib/zaikio/procurement/authorization_middleware.rb
 - lib/zaikio/procurement/base.rb
+- lib/zaikio/procurement/concern/article_type_scoped.rb
 - lib/zaikio/procurement/configuration.rb
 - lib/zaikio/procurement/contract.rb
 - lib/zaikio/procurement/contract_request.rb
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Ruby API Client for Zaikio's Procurement Platform