rename deleted_at to archived_at

app/controllers/api/submissions_controller.rb

@@ -78,7 +78,7 @@ module Api
     end
 
     def destroy
-      @submission.update!(deleted_at: Time.current)
+      @submission.update!(archived_at: Time.current)
 
       render json: @submission.as_json(only: %i[id], methods: %i[archived_at])
     end
@@ -118,8 +118,8 @@ module Api
 
     def serialize_params
       {
-        only: %i[id source submitters_order created_at updated_at],
-        methods: %i[audit_log_url archived_at],
+        only: %i[id source submitters_order created_at updated_at archived_at],
+        methods: %i[audit_log_url],
         include: {
           submitters: { only: %i[id slug uuid name email phone
                                  completed_at opened_at sent_at

app/controllers/api/template_folders_autocomplete_controller.rb

@@ -7,10 +7,10 @@ module Api
     LIMIT = 100
 
     def index
-      template_folders = @template_folders.joins(:templates).where(templates: { deleted_at: nil }).distinct
+      template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
       template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
 
-      render json: template_folders.as_json(only: %i[name deleted_at])
+      render json: template_folders.as_json(only: %i[name archived_at])
     end
   end
 end

app/controllers/api/templates_controller.rb

@@ -38,9 +38,9 @@ module Api
     end
 
     def destroy
-      @template.update!(deleted_at: Time.current)
+      @template.update!(archived_at: Time.current)
 
-      render json: @template.as_json(only: %i[id deleted_at])
+      render json: @template.as_json(only: %i[id archived_at])
     end
 
     private

app/controllers/start_form_controller.rb

@@ -13,7 +13,7 @@ class StartFormController < ApplicationController
   end
 
   def update
-    @submitter = Submitter.where(submission: @template.submissions.where(deleted_at: nil))
+    @submitter = Submitter.where(submission: @template.submissions.where(archived_at: nil))
                           .order(id: :desc)
                           .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
                           .find_or_initialize_by(**submitter_params.compact_blank)

app/controllers/submissions_controller.rb

@@ -63,7 +63,7 @@ class SubmissionsController < ApplicationController
   end
 
   def destroy
-    @submission.update!(deleted_at: Time.current)
+    @submission.update!(archived_at: Time.current)
 
     redirect_back(fallback_location: template_path(@submission.template), notice: 'Submission has been archived')
   end

app/controllers/submit_form_controller.rb

@@ -32,7 +32,7 @@ class SubmitFormController < ApplicationController
 
     cookies[:submitter_sid] = @submitter.signed_id
 
-    render @submitter.submission.template.deleted_at? ? :archived : :show
+    render @submitter.submission.template.archived_at? ? :archived : :show
   end
 
   def update
@@ -42,7 +42,7 @@ class SubmitFormController < ApplicationController
       return render json: { error: 'Form has been completed already.' }, status: :unprocessable_entity
     end
 
-    if submitter.template.deleted_at? || submitter.submission.deleted_at?
+    if submitter.template.archived_at? || submitter.submission.archived_at?
       Rollbar.info("Archived template: #{submitter.template.id}") if defined?(Rollbar)
 
       return render json: { error: 'Form has been archived.' }, status: :unprocessable_entity

app/controllers/templates_archived_controller.rb

@@ -4,7 +4,7 @@ class TemplatesArchivedController < ApplicationController
   load_and_authorize_resource :template, parent: false
 
   def index
-    @templates = @templates.where.not(deleted_at: nil).preload(:author, :folder).order(id: :desc)
+    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder).order(id: :desc)
     @templates = Templates.search(@templates, params[:q])
 
     @pagy, @templates = pagy(@templates, items: 12)

app/controllers/templates_archived_submissions_controller.rb

@@ -5,7 +5,7 @@ class TemplatesArchivedSubmissionsController < ApplicationController
   load_and_authorize_resource :submission, through: :template, parent: false
 
   def index
-    @submissions = @submissions.where.not(deleted_at: nil)
+    @submissions = @submissions.where.not(archived_at: nil)
     @submissions = Submissions.search(@submissions, params[:q])
 
     @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))

app/controllers/templates_controller.rb

@@ -7,7 +7,7 @@ class TemplatesController < ApplicationController
 
   def show
     submissions = @template.submissions
-    submissions = submissions.active if @template.deleted_at.blank?
+    submissions = submissions.active if @template.archived_at.blank?
     submissions = Submissions.search(submissions, params[:q])
 
     @base_submissions = submissions
@@ -70,7 +70,7 @@ class TemplatesController < ApplicationController
 
         'Template has been removed.'
       else
-        @template.update!(deleted_at: Time.current)
+        @template.update!(archived_at: Time.current)
 
         'Template has been archived.'
       end

app/controllers/templates_restore_controller.rb

@@ -4,7 +4,7 @@ class TemplatesRestoreController < ApplicationController
   load_and_authorize_resource :template
 
   def create
-    @template.update!(deleted_at: nil)
+    @template.update!(archived_at: nil)
 
     redirect_to template_path(@template), notice: 'Template has been unarchived'
   end

app/controllers/users_controller.rb

@@ -42,7 +42,7 @@ class UsersController < ApplicationController
       return redirect_to settings_users_path, notice: 'Unable to remove user'
     end
 
-    @user.update!(deleted_at: Time.current)
+    @user.update!(archived_at: Time.current)
 
     redirect_to settings_users_path, notice: 'User has been removed'
   end
@@ -52,7 +52,7 @@ class UsersController < ApplicationController
   def build_user
     @user = current_account.users.find_by(email: user_params[:email])&.tap do |user|
       user.assign_attributes(user_params)
-      user.deleted_at = nil
+      user.archived_at = nil
     end
 
     @user ||= current_account.users.new(user_params)