wip

service/lib/agama/storage/config_conversions/to_model_conversions/with_partitions.rb

@@ -34,17 +34,30 @@ def convert_partitions
               .compact
           end
 
+          # @return [Array<Configs::Partition>]
           def valid_partitions
-            partitions_to_create + partitions_to_reuse
+            config.partitions.select { |p| valid_partition?(p) }
           end
 
-          def partitions_to_create
-            config.partitions.reject(&:search) +
-              config.partitions.select { |p| p.search&.create_device? }
+          # @param partition_config [Configs::Partition]
+          # @return [Boolean]
+          def valid_partition?(partition_config)
+            valid_new_partition(partition_config) || valid_existing_partition(partition_config)
           end
 
-          def partitions_to_reuse
-            config.partitions.select(&:found_device)
+          # @param partition_config [Configs::Partition]
+          # @return [Boolean]
+          def valid_new_partition(partition_config)
+            delete = partition_config.delete? || partition_config.delete_if_needed?
+            return false if delete
+
+            partition_config.search.nil? || partition_config.search.create_device?
+          end
+
+          # @param partition_config [Configs::Partition]
+          # @return [Boolean]
+          def valid_existing_partition(partition_config)
+            !partition_config.found_device.nil?
           end
         end
       end