Merge pull request #12 from test-IO/feature/worker-filter

Rename WorkerInvitationFilter to WorkerFilter

Author: fractaledmind

Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    cirro-ruby-client (1.2.1)
+    cirro-ruby-client (1.3.0)
+      faraday (< 1.2.0)
       faraday_middleware
-      json_api_client
+      json_api_client (>= 1.10.0)
       jwt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (6.1.1)
+      activesupport (= 6.1.1)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
@@ -43,7 +44,7 @@ GEM
       rack (>= 0.2)
     jwt (2.2.2)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     multipart-post (2.1.1)
     parallel (1.19.2)
     parser (2.7.2.0)
@@ -84,10 +85,9 @@ GEM
     rubocop-rspec (1.43.2)
       rubocop (~> 0.87)
     ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
+    ruby2_keywords (0.0.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     webmock (3.9.1)
       addressable (>= 2.3.6)

lib/cirro_io/client.rb

@@ -8,7 +8,7 @@
 require 'cirro_io/client/gig_invitation'
 require 'cirro_io/client/app_user'
 require 'cirro_io/client/app_worker'
-require 'cirro_io/client/worker_invitation_filter'
+require 'cirro_io/client/worker_filter'
 require 'cirro_io/client/gig_task'
 require 'cirro_io/client/gig_result'
 require 'cirro_io/client/gig_time_activity'

lib/cirro_io/client/gig.rb

@@ -1,16 +1,16 @@
 module CirroIO
   module Client
     class Gig < Base
-      has_one :worker_invitation_filter
+      has_one :worker_filter
       has_many :gig_tasks
       has_many :gig_results
       has_many :gig_time_activities
 
       # rubocop:disable Metrics/AbcSize
-      def bulk_create_with(worker_invitation_filter, gig_tasks)
+      def bulk_create_with(worker_filter, gig_tasks)
         payload = { data: { attributes: attributes, relationships: {} } }
         payload[:data][:relationships][:gig_tasks] = gig_tasks.map(&:attributes)
-        payload[:data][:relationships][:worker_invitation_filter] = worker_invitation_filter.attributes
+        payload[:data][:relationships][:worker_filter] = worker_filter.attributes
 
         response = self.class.custom_post('bulk/gigs', format_to_dashed_keys(payload))
 

lib/cirro_io/client/version.rb

@@ -1,7 +1,7 @@
 # rubocop:disable Style/MutableConstant
 module CirroIO
   module Client
-    VERSION = '1.2.3'
+    VERSION = '1.3.0'
   end
 end
 # rubocop:enable Style/MutableConstant

lib/cirro_io/client/worker_invitation_filter.rb renamed to lib/cirro_io/client/worker_filter.rb

@@ -1,6 +1,6 @@
 module CirroIO
   module Client
-    class WorkerInvitationFilter < Base
+    class WorkerFilter < Base
     end
   end
 end

spec/cirro_io/client/gig_spec.rb

@@ -13,19 +13,19 @@
                           archive_at: 1.month.from_now)
     end
 
-    let(:worker_invitation_filter) { CirroIO::Client::WorkerInvitationFilter.new(filter_query: '{}') }
+    let(:worker_filter) { CirroIO::Client::WorkerFilter.new(filter_query: '{}') }
     let(:gig_task1) { CirroIO::Client::GigTask.new(title: Faker::Hipster.sentence, base_price: 5) }
     let(:gig_task2) { CirroIO::Client::GigTask.new(title: Faker::Hipster.sentence, base_price: 10) }
 
     it 'bulk create a gig with gig tasks and filter query' do
       stub_request(:post, "#{test_site}/v1/bulk/gigs")
         .to_return(body: File.read('./spec/fixtures/gig_with_filter_and_gig_tasks.json'), headers: { 'Content-Type' => 'application/json' })
 
-      created_gig = gig.bulk_create_with(worker_invitation_filter, [gig_task1, gig_task2])
+      created_gig = gig.bulk_create_with(worker_filter, [gig_task1, gig_task2])
 
       expect(created_gig).to be_valid
       expect(created_gig.id).to eq('15')
-      expect(created_gig.worker_invitation_filter.id).to eq('20')
+      expect(created_gig.worker_filter.id).to eq('20')
       expect(created_gig.gig_tasks.map(&:id)).to eq(%w[24 25])
     end
   end

spec/fixtures/gig_with_filter_and_gig_tasks.json

@@ -14,9 +14,9 @@
       "archive-at": "2020-12-30T10:27:18.000Z"
     },
     "relationships": {
-      "worker-invitation-filter": {
+      "worker-filter": {
         "data": {
-          "type": "worker-invitation-filters",
+          "type": "worker-filters",
           "id": "20"
         }
       },
@@ -41,9 +41,9 @@
   "included": [
     {
       "id": "20",
-      "type": "worker-invitation-filters",
+      "type": "worker-filters",
       "links": {
-        "self": "/api/v1/worker-invitation-filters/20"
+        "self": "/api/v1/worker-filters/20"
       },
       "attributes": {
         "filter-query": "{}"