rewritten import progress estimation logic

app/importers/base_importer.rb

···
     import_items
 
     @import.update!(last_completed: @import.started_from) unless requested_time_limit
-    @import.update!(cursor: nil, started_from: nil)
+    @import.update!(cursor: nil, started_from: nil, fetched_until: nil)
     @report&.update(importers: { importer_name => { :finished => true }})
   end
 

app/importers/likes_importer.rb

···
       @report&.update(importers: { importer_name => { :oldest_date => oldest_date }}) if oldest_date
 
       params[:cursor] = cursor
-      @import.update!(cursor: cursor)
+      @import.update!(cursor: cursor, fetched_until: oldest_date)
 
       break if !cursor
       break if @time_limit && oldest_date && oldest_date < @time_limit

app/importers/posts_importer.rb

···
       @report&.update(importers: { importer_name => { :oldest_date => oldest_date }}) if oldest_date
 
       params[:cursor] = cursor
-      @import.update!(cursor: cursor)
+      @import.update!(cursor: cursor, fetched_until: oldest_date)
 
       break if !cursor
       break if @time_limit && oldest_date && oldest_date < @time_limit

app/importers/reposts_importer.rb

···
       @report&.update(importers: { importer_name => { :oldest_date => oldest_date }}) if oldest_date
 
       params[:cursor] = cursor
-      @import.update!(cursor: cursor)
+      @import.update!(cursor: cursor, fetched_until: oldest_date)
 
       break if !cursor
       break if @time_limit && oldest_date && oldest_date < @time_limit

app/models/import.rb

···
   validates_uniqueness_of :collection, scope: :user_id
 
   scope :unfinished, -> { where('(started_from IS NOT NULL) OR (last_completed IS NULL)') }
+
+  IMPORT_END = Time.at(0)
+
+  def imported_until
+    return nil if cursor.nil? && last_completed.nil?
+
+    groups = case collection
+    when 'likes'
+      [:likes]
+    when 'reposts'
+      [:reposts]
+    when 'posts'
+      [:pins, :quotes]
+    end
+
+    newest_queued_items = groups.map { |g| user.send(g).where(queue: :import).order(:time).last }
+    newest_queued = newest_queued_items.compact.sort_by(&:time).last
+
+    if newest_queued
+      newest_queued.time
+    elsif fetched_until
+      fetched_until
+    else
+      IMPORT_END
+    end
+  end
 end

app/models/user.rb

···
   end
 
   def imported_until
-    return nil unless self.imports.exists?
-
-    oldest_imported_items = []
-    started = false
+    import_positions = self.imports.map(&:imported_until)
 
-    [:likes, :reposts, :pins, :quotes].each do |group|
-      if self.send(group).where(queue: :import).exists?
-        oldest_imported_items << self.send(group).where(queue: nil).order(:time).first
-      end
-    end
-
-    earliest_oldest = oldest_imported_items.compact.sort_by(&:time).last
-
-    if earliest_oldest
-      earliest_oldest.time
-    elsif self.imports.merge(Import.unfinished).exists?
+    if import_positions.empty? || import_positions.any? { |x| x.nil? }
       nil
     else
-      :end
+      import_positions.sort.last
     end
   end
 

app/server.rb

···
       else
         json_response(status: 'not_started')
       end
-    when :end
+    when Import::IMPORT_END
       json_response(status: 'finished')
     else
       progress = 1 - (until_date - user.registered_at) / (Time.now - user.registered_at)

db/migrate/20251027134657_add_fetched_until_to_imports.rb

···
+class AddFetchedUntilToImports < ActiveRecord::Migration[7.2]
+  def change
+    add_column :imports, :fetched_until, :datetime
+  end
+end

db/schema.rb

···
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_09_23_180153) do
+ActiveRecord::Schema[7.2].define(version: 2025_10_27_134657) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
···
     t.datetime "started_from"
     t.datetime "last_completed"
     t.string "collection", limit: 20, null: false
+    t.datetime "fetched_until"
     t.index ["user_id", "collection"], name: "index_imports_on_user_id_and_collection", unique: true
   end