refactor: Remove duplication

Author: arnoFleming

lib/we_transfer/communication_helper.rb

@@ -109,7 +109,10 @@ def handle_new_transfer_data(transfer:, data:)
           transfer.instance_variable_set "@#{i_var}", data[i_var]
         end
 
-        RemoteFile.upgrade(files: transfer.files, files_response: data[:files])
+        RemoteFile.upgrade(
+          transfer: transfer,
+          files_response: data[:files]
+        )
         transfer
       end
 

lib/we_transfer/remote_file.rb

@@ -11,12 +11,9 @@ def to_h
       end
     end
 
-    def self.upgrade(files:, files_response:)
+    def self.upgrade(files_response:, transfer:)
       files_response.each do |file_response|
-        local_file = files.find do |file|
-          file.name == file_response[:name]
-        end
-        raise FileMismatchError unless local_file
+        local_file = transfer.find_file_by_name(file_response[:name])
 
         local_file.instance_variable_set(
           :@id,

lib/we_transfer/transfer.rb

@@ -2,6 +2,7 @@ module WeTransfer
   class Transfer
     class DuplicateFileNameError < ArgumentError; end
     class NoFilesAddedError < StandardError; end
+    class FileMismatchError < StandardError; end
 
     extend Forwardable
 
@@ -51,7 +52,7 @@ def upload_file(name:, io: nil)
 
       raise(
         WeTransfer::RemoteFile::NoIoError,
-        "File with name '#{name}' cannot be uploaded."
+        "IO for file with name '#{name}' cannot be uploaded."
       ) unless WeTransfer::MiniIO.mini_io_able?(put_io)
 
       (1..file.multipart.chunks).each do |chunk|
@@ -97,15 +98,15 @@ def to_h
       prepared
     end
 
-    private
-
-    def_delegator self, :remote_transfer_params
-
     def find_file_by_name(name)
       @found_files ||= Hash.new do |h, name|
         h[name] = files.find { |file| file.name == name }
       end
+
+      raise FileMismatchError unless @found_files[name]
       @found_files[name]
     end
+
+    def_delegator self, :remote_transfer_params
   end
 end