From 0aefe616b36a5dcc416d5aeb50f7f59b1774d043 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 22 Dec 2023 23:12:00 +0200 Subject: [PATCH] add archived add to submissions --- app/controllers/api/submissions_controller.rb | 4 ++-- app/models/submission.rb | 4 ++++ lib/submissions/normalize_param_utils.rb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb index 3bb3ab88..73be0585 100644 --- a/app/controllers/api/submissions_controller.rb +++ b/app/controllers/api/submissions_controller.rb @@ -69,7 +69,7 @@ module Api def destroy @submission.update!(deleted_at: Time.current) - render json: @submission.as_json(only: %i[id deleted_at]) + render json: @submission.as_json(only: %i[id archived_at]) end private @@ -108,7 +108,7 @@ module Api def serialize_params { only: %i[id source submitters_order created_at updated_at], - methods: %i[audit_log_url], + methods: %i[audit_log_url archived_at], include: { submitters: { only: %i[id slug uuid name email phone completed_at opened_at sent_at diff --git a/app/models/submission.rb b/app/models/submission.rb index 33f01c4b..6575cdfc 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -71,6 +71,10 @@ class Submission < ApplicationRecord preserved: 'preserved' }, scope: false, prefix: true + def archived_at + deleted_at + end + def audit_trail_url return if audit_trail.blank? diff --git a/lib/submissions/normalize_param_utils.rb b/lib/submissions/normalize_param_utils.rb index 8d4a4172..23ce86bd 100644 --- a/lib/submissions/normalize_param_utils.rb +++ b/lib/submissions/normalize_param_utils.rb @@ -46,7 +46,7 @@ module Submissions attachments_index = attachments.index_by(&:uuid) submitters.each do |submitter| - submitter.values.to_a.each do |_, value| + submitter.values.each_value do |value| attachment = attachments_index[value] next unless attachment