vng 1.7.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec68041442659731246003b523c47c70f41ac3127190c3f966a0c774274f9a2e
-  data.tar.gz: b34853bfd235358cb485ff8fbe84a090dd4104e01f6f01065d6269b20f7f9fbe
+  metadata.gz: b55414af3d991f40577d333dca79e445d4c71a50966982680c62045a76588bb3
+  data.tar.gz: 3cbccf175981d60238a834c2ecd97940f5bcb09a4bf731b034ec94877a3cf8ec
 SHA512:
-  metadata.gz: b2c9cb81c4ec152b7e98800ee01ba68b05617e5b5f85d6dee04607e9c3347faa402f0d3e8109d9579e3683bd7e8d234c5c209ef3e67e8e7d6dd8277e08930dd7
-  data.tar.gz: 91abf7c0f28cd38e7cd9151797eb3312ea6046db8c07af63ba53861b00cf6603f0b2e17c5a585bba9b75623fe2a58aa17c89df739437ee8de027893a25836d32
+  metadata.gz: 8ac26b5eff9feb7f2bc234855b0cbc6c06cc5c8073f0308c2edc3938a0196b60d3b2316aee28c6660bdfed8281bdd0769682162102eeeccae2698fb50d52c211
+  data.tar.gz: ec80bef2801ad13ff0ad63edb503eae435b07d7e0889483ac2dd4700d1ad94cead7293f1dd87f5e1c9f00e2db8e19e361f4f484089b5ec2032355d79b5d954be

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.0.1] - 2024-12-26
+
+- Fix MockRequest for types
+
+## [2.0.0] - 2024-12-26
+
+** Breaking changes**
+
+- Remove ServiceType.all and ServiceType.where(zip:)
+
 ## [1.7.0] - 2024-12-26
 
 - Adds PriceItem.for_price_list_id

data/lib/vng/mock_request.rb

@@ -122,13 +122,13 @@ module Vng
           { "fieldID"=>96, "fieldValue"=>"8648648640" },
         ] }
       when '/api/v1/data/Locations/'
-        { "Location"=>{ "objectID"=>"995681" } }
+        { "Location"=>{ "objectID"=>995681 } }
       when '/api/v1/data/Assets/'
         if @body[:method].eql? '3'
           if @body[:Fields].find{|field| field[:fieldID] == 1014}[:optionID].eql? 304
-            { "Asset"=>{ "objectID"=>"2201008" } } # dog
+            { "Asset"=>{ "objectID"=>2201008 } } # dog
           elsif @body[:Fields].find{|field| field[:fieldID] == 1014}[:optionID].eql? 305
-            { "Asset"=>{ "objectID"=>"2201009" } } # cat
+            { "Asset"=>{ "objectID"=>2201009 } } # cat
           end
         elsif @body[:method].eql? '4'
           {}
@@ -172,7 +172,7 @@ module Vng
           { }
         end
       when '/api/v1/data/priceLists/'
-        if @body[:assetID].eql?("2201008")
+        if @body[:assetID].eql?(2201008)
           { "PriceItems"=>[
             { "priceItemID"=>275111, "priceBlockID"=>329, "descriptionHelp"=>"A price item", "sequence"=>1, "priceItem"=>"Bulldog American - 15 Step SPA Grooming Service", "value"=>85.0, "taxID"=>256, "durationPerUnit"=>45.0, "serviceBadge"=>"Required", "serviceCategory"=>"15 Step Spa", "isOnline"=>true, "isActive"=>true },
             { "priceItemID"=>275112, "priceBlockID"=>329, "descriptionHelp"=>"A price item", "sequence"=>2, "priceItem"=>"Bulldog American - 15 Step SPA Super Grooming Service", "value"=>105.0, "taxID"=>256, "durationPerUnit"=>75.0, "serviceBadge"=>nil, "serviceCategory"=>"15 Step Spa", "isOnline"=>true, "isActive"=>true },
@@ -189,7 +189,7 @@ module Vng
             { "priceItemID"=>275307, "priceBlockID"=>332, "descriptionHelp"=>"A price item", "sequence"=>10, "priceItem"=>"Aches & Pains Package", "value"=>0.0, "taxID"=>256, "durationPerUnit"=>60.0, "serviceBadge"=>"Offered", "serviceCategory"=>"Add Ons", "isOnline"=>true, "isActive"=>true },
             { "priceItemID"=>275308, "priceBlockID"=>332, "descriptionHelp"=>"A price item", "sequence"=>11, "priceItem"=>"Old Add On", "value"=>0.0, "taxID"=>256, "durationPerUnit"=>60.0, "serviceBadge"=>"Not Offered", "serviceCategory"=>"Add Ons", "isOnline"=>true, "isActive"=>true },
           ] }
-        elsif @body[:assetID].eql? "2201009"
+        elsif @body[:assetID].eql? 2201009
           { "PriceItems"=>[
             { "priceItemID"=>276111, "priceBlockID"=>333, "descriptionHelp"=>"A price item", "sequence"=>21, "priceItem"=>"Cat Short Hair - 15 Step SPA Grooming Service", "value"=>65.0, "taxID"=>256, "durationPerUnit"=>60.0, "serviceBadge"=>"Recommended", "serviceCategory"=>"15 Step Spa", "isOnline"=>true, "isActive"=>true },
 

data/lib/vng/service_type.rb

@@ -5,42 +5,13 @@ module Vng
   class ServiceType < Resource
     PATH = '/api/v1/resources/serviceTypes/'
 
-    attr_reader :id, :type, :duration
+    attr_reader :id, :type, :duration, :price_list_id
 
-    def initialize(id:, type:, duration:)
+    def initialize(id:, type:, duration:, price_list_id:)
       @id = id
       @type = type
       @duration = duration
-    end
-
-    def self.all
-      data = request path: PATH
-
-      data['ServiceTypes'].map do |body|
-        id = body['serviceTypeID']
-        type = body['serviceType']
-        duration = body['duration']
-
-        new id: id, type: type, duration: duration
-      end
-    end
-
-    def self.where(zip:)
-      body = {
-        zip: zip,
-      }
-
-      data = request path: PATH, body: body
-
-      data.fetch('ServiceTypes', []).filter do |body|
-        body['isActive']
-      end.map do |body|
-        id = body['serviceTypeID']
-        type = body['serviceType']
-        duration = body['duration']
-
-        new id: id, type: type, duration: duration
-      end
+      @price_list_id = price_list_id
     end
   end
 end

data/lib/vng/version.rb

@@ -1,3 +1,3 @@
 module Vng
-  VERSION = '1.7.0'
+  VERSION = '2.0.1'
 end

data/lib/vng/zip.rb

@@ -20,6 +20,7 @@ module Vng
       data = request path: PATH
 
       data['Zips'].reject do |franchise|
+        # TODO: add "Owned - Not In Service"
         franchise['zipStatus'].eql? 'Owned – Deactivated'
       end.map do |body|
         zip = body['zip']
@@ -39,12 +40,15 @@ module Vng
       data = request path: PATH, body: body
       zip_data = data['Zip']
 
+      # TODO: Remove ServiceType class, store duration and price_list_id
+      # inside Zip itself
       unless zip_data['zipCodeID'] == '0'
         service_types = data['ServiceTypes'].map do |body|
           id = body['serviceTypeID']
           type = body['serviceType']
           duration = body['duration']
-          ServiceType.new id: id, type: type, duration: duration
+          price_list_id = body['priceID']
+          ServiceType.new id: id, type: type, duration: duration, price_list_id: price_list_id
         end
 
         new zip: zip_data['zipCode'], state: zip_data['provinceAbbr'], zone_name: zip_data['zoneName'], city: zip_data['defaultCity'], service_types: service_types

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vng
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.1
 platform: ruby
 authors:
 - claudiob
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-26 00:00:00.000000000 Z
+date: 2024-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov