lib/domain/asset_group/api.rb in avs-0.1.0 vs lib/domain/asset_group/api.rb in avs-0.1.1

@@ -10,17 +10,16 @@
       puts resource
       yield AssetGroup.from_json(resource)
     end
   end
 
-  def fetch_asset_group_assets(id, opts = { read_timeout: 200 })
-    asset_ids = []
+  def fetch_asset_group_assets(id, opts = { read_timeout: 200 }, &block)
+    return to_enum(__method__, id, opts) unless block_given?
+
     endpoint = "/asset_groups/#{id}/assets"
-    fetch_all(endpoint, opts) do |asset_id|
-      asset_ids << asset_id
-    end
-    asset_ids
+
+    fetch_all(endpoint, opts, &block)
   end
 
   def all_asset_groups(opts)
     asset_groups = []
     fetch_asset_groups(opts) do |e|
@@ -57,21 +56,20 @@
     cached_asset_groups[name] = asset_group
     asset_group
   end
 
   def fetch_asset_group_by_name(name)
-    puts 'fetch_asset_group_by_name'
     fetch_all('/asset_groups', name:) do |resource|
       asset_group = AssetGroup.from_json(resource)
       return asset_group if asset_group.name == name
     end
     nil
   end
 
   def create_asset_group_for(site_id:, site_name:)
-    filter = SearchCriteria::Filter.from_site_id(site_id)
-    search_criteria = { match: 'all', filters: [filter.to_json] }
+    name SearchCriteria::Filter.from_site_id(site_id)
+    search_criteria = { match: 'all', filters: [name.to_json] }
     create_asset_group(
       name: site_name,
       description: "Access group for site #{site_id}",
       type: 'dynamic',
       search_criteria:
@@ -107,16 +105,16 @@
 
     if id
       delete_asset_group(id)
     else
       asset_group = fetch_asset_group_by_name(name)
-      delete_asset_group(asset_group.site_idte_id) if asset_group
+      delete_asset_group(asset_group.id) if asset_group
     end
   end
 
   private
 
-  def delete_asset_group(site_id)
-    puts "Delete asset_group #{site_id}"
-    delete('/asset_groups', site_id)
+  def delete_asset_group(id)
+    puts "Delete asset_group #{id}"
+    delete('/asset_groups', id)
   end
 end