Fix file cleanup for models with folder indexes

Gemfile.lock

@@ -428,7 +428,7 @@ GEM
     yandex_client (1.3.1)
       http
       ox
-    zeitwerk (2.6.4)
+    zeitwerk (2.6.5)
 
 PLATFORMS
   x86_64-linux-musl

app/models/photo.rb

@@ -108,8 +108,11 @@ def with_redis_transaction(&)
   def enqueue_remove_job(dir, filename)
     return if filename.blank?
 
+    dir_with_index = dir
+    dir_with_index = "#{dir}#{folder_index}" if folder_index.nonzero?
+
     ::Yandex::RemoveFileJob.perform_async \
       yandex_token_id,
-      [dir, filename].join('/')
+      [dir_with_index, filename].join('/')
   end
 end

app/models/track.rb

@@ -46,9 +46,12 @@ def remove_file
 
     return if storage_filename.blank?
 
+    dir_with_index = yandex_token.other_dir
+    dir_with_index = "#{dir_with_index}#{folder_index}" if folder_index.nonzero?
+
     ::Yandex::RemoveFileJob.perform_async(
       yandex_token_id,
-      [yandex_token.other_dir, storage_filename].join('/')
+      [dir_with_index, storage_filename].join('/')
     )
   end
 end

app/models/yandex/token.rb

@@ -44,7 +44,8 @@ def dir_names
     end
 
     def valid_dir?(directory)
-      directory.blank? || directory.to_s.starts_with?('/')
+      directory.blank? || \
+        (directory.to_s.starts_with?('/') && !directory.to_s.ends_with?('/'))
     end
   end
 end

spec/models/photo_spec.rb

@@ -180,6 +180,16 @@
       end
     end
 
+    context 'when image with a folder_index' do
+      let(:photo) { create :photo, storage_filename: '052/001/zozo.jpg', yandex_token: node, folder_index: 5 }
+
+      it do
+        expect { photo.destroy }.to change { enqueued_jobs(klass: Yandex::RemoveFileJob).size }.by(1)
+
+        expect(job_args).to eq([[node.id, '/dir5/052/001/zozo.jpg']])
+      end
+    end
+
     context 'when video' do
       let(:video) do
         create :photo,
@@ -200,6 +210,27 @@
       end
     end
 
+    context 'when video a folder_index' do
+      let(:video) do
+        create :photo,
+               :video,
+               storage_filename: 'test.mp4',
+               preview_filename: 'test.jpg',
+               video_preview_filename: 'test.preview.mp4',
+               yandex_token: node,
+               folder_index: 5
+      end
+
+      it do
+        expect { video.destroy }.
+          to change { enqueued_jobs(klass: Yandex::RemoveFileJob).size }.by(3)
+
+        expect(job_args).to match_array(
+          [[node.id, '/other5/test.mp4'], [node.id, '/other5/test.jpg'], [node.id, '/other5/test.preview.mp4']]
+        )
+      end
+    end
+
     context 'when invalid video from previous release' do
       let(:rubric) { create :rubric }
       let(:video) do

spec/models/track_spec.rb

@@ -120,6 +120,17 @@
       end
     end
 
+    context 'when upload with a folder_index' do
+      let(:track) { create :track, storage_filename: 'zozo.gpx', yandex_token: node, folder_index: 6 }
+      let(:job_args) { enqueued_jobs(klass: Yandex::RemoveFileJob).pluck('args') }
+
+      it do
+        expect { track.destroy }.to change { enqueued_jobs(klass: Yandex::RemoveFileJob).size }.by(1)
+
+        expect(job_args).to eq([[node.id, '/other6/zozo.gpx']])
+      end
+    end
+
     context 'when track is not uploaded' do
       let(:track) { create :track, local_filename: 'zozo.gpx' }
 

spec/models/yandex/token_spec.rb

@@ -112,6 +112,15 @@
 
         it { expect(token).to be_valid }
       end
+
+      context 'when ends with /' do
+        before { token[dir_attr] = '/zozo/' }
+
+        it do
+          expect(token).not_to be_valid
+          expect(token.errors).to include(dir_attr)
+        end
+      end
     end
 
     it_behaves_like 'dir validation', :dir