geoblacklight_admin 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbde8ddbc9a147e70292b99dc32062b43c8517821ad3aff392e73b7bcd428c8
-  data.tar.gz: 13405c8253ee7f0f6ce925eba479a880f7ef06634841169622be946cc6ee2c53
+  metadata.gz: d79715a53de267b1c6610d96834bafc9564fa1f1ffd1cc42040ede65c3b3e831
+  data.tar.gz: 8ffad49338a30230adc65578911502f2d349474b6c1b6e51fb3f41bf7743cf1e
 SHA512:
-  metadata.gz: b7f19df4aecd8bbf08e0536b1cbcdc720d5f8c55e20e5c13d5296bbff61a8e8f79f724adda0899fbe566131bc7de2fdc3da141742fa064263b4136d9443dc26e
-  data.tar.gz: 524b5e9a4a1c37205d01456b5d3585183493e9d1c18397669ec692eb9072c31d1defbe8d7ca71cc3fdfef8b3dd6336ece4453cc589f4c7db92312fa00b84c9af
+  metadata.gz: 314eb14972a616c59c5c229defdec096ba5c4300520898f636f23f783c62251aec5dd48dea1d0db519a9a442258c11e83b6159422d1e7457ba234a38c9a10189
+  data.tar.gz: 1f6cd97abecdf5d29e39a7e7088c4db076ceb08e48b49cb0a7fbe0aa0e4a1e4cd37a8a4b42a793f579ca93821ce36da089c48fc923dedbfb2f8dd017ba9d1c3e

data/app/controllers/admin/document_licensed_accesses_controller.rb

@@ -0,0 +1,169 @@
+# frozen_string_literal: true
+
+# Admin::DocumentLicensedAccessesController
+#
+# This controller manages the CRUD operations for DocumentAccess objects
+# within the admin namespace. It provides actions to list, show, create,
+# update, and destroy document access records. It also includes custom
+# actions for importing and destroying all document access links.
+#
+# Actions:
+# - index: Lists all document accesses, optionally filtered by document_id.
+# - show: Displays a specific document access.
+# - new: Renders a form for creating a new document access.
+# - edit: Renders a form for editing an existing document access.
+# - create: Creates a new document access.
+# - update: Updates an existing document access.
+# - destroy: Deletes a specific document access.
+# - destroy_all: Deletes all document access links provided in the params.
+# - import: Imports document licensed access links from a file provided in the params.
+#
+# Before Actions:
+# - set_document: Sets the @document instance variable if document_id is present.
+# - set_document_licensed_access: Sets the @document_licensed_access instance variable for specific actions.
+#
+# Private Methods:
+# - set_document: Finds and sets the document based on the document_id parameter.
+# - set_document_licensed_access: Finds and sets the document licensed access based on the id parameter.
+# - document_licensed_access_params: Permits only trusted parameters for document licensed access.
+module Admin
+  class DocumentLicensedAccessesController < Admin::AdminController
+    before_action :set_document
+    before_action :set_document_licensed_access, only: %i[show edit update destroy]
+
+    # GET /documents/#id/licensed_access
+    # GET /documents/#id/licensed_access.json
+    # Lists all document licensed accesses, optionally filtered by document_id.
+    def index
+      if params[:document_id]
+        @document_licensed_accesses = DocumentLicensedAccess.where(friendlier_id: @document.friendlier_id).order(institution_code: :asc)
+      else
+        @pagy, @document_licensed_accesses = pagy(DocumentLicensedAccess.all.order(friendlier_id: :asc, updated_at: :desc), items: 20)
+      end
+    end
+
+    # GET /document_licensed_accesses/1
+    # GET /document_licensed_accesses/1.json
+    # Displays a specific document licensed access.
+    def show
+    end
+
+    # GET /document_licensed_accesses/new
+    # Renders a form for creating a new document licensed access.
+    def new
+      @document_licensed_access = DocumentLicensedAccess.new
+    end
+
+    # GET /document_licensed_accesses/1/edit
+    # Renders a form for editing an existing document licensed access.
+    def edit
+    end
+
+    # POST /document_licensed_accesses
+    # POST /document_licensed_accesses.json
+    # Creates a new document licensed access.
+    def create
+      @document_licensed_access = DocumentLicensedAccess.new(document_licensed_access_params)
+      logger.debug("DA Params: #{DocumentLicensedAccess.new(document_licensed_access_params).inspect}")
+      logger.debug("Document LICENSED ACCESS: #{@document_licensed_access.inspect}")
+
+      respond_to do |format|
+        if @document_licensed_access.save
+          format.html do
+            redirect_to admin_document_document_licensed_accesses_path(@document), notice: "Document licensed access was successfully created."
+          end
+          format.json { render :show, status: :created, location: @document_licensed_access }
+        else
+          format.html { render :new }
+          format.json { render json: @document_licensed_access.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # PATCH/PUT /document_licensed_accesses/1
+    # PATCH/PUT /document_licensed_accesses/1.json
+    # Updates an existing document licensed access.
+    def update
+      respond_to do |format|
+        if @document_licensed_access.update(document_licensed_access_params)
+          format.html do
+            redirect_to admin_document_document_licensed_accesses_path(@document), notice: "Document licensed access was successfully updated."
+          end
+          format.json { render :show, status: :ok, location: @document_licensed_access }
+        else
+          format.html { render :edit }
+          format.json { render json: @document_licensed_access.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # DELETE /document_licensed_accesses/1
+    # DELETE /document_licensed_accesses/1.json
+    # Deletes a specific document licensed access.
+    def destroy
+      @document_licensed_access.destroy
+      respond_to do |format|
+        format.html do
+          redirect_to admin_document_document_licensed_accesses_path(@document), notice: "Document licensed access was successfully destroyed."
+        end
+        format.json { head :no_content }
+      end
+    end
+
+    # DELETE /document_licensed_accesses/destroy_all
+    # Deletes all document licensed access links provided in the params.
+    def destroy_all
+      logger.debug("Destroy Access Links")
+      return unless params.dig(:document_licensed_access, :assets, :file)
+
+      respond_to do |format|
+        if DocumentLicensedAccess.destroy_all(params.dig(:document_licensed_access, :assets, :file))
+          format.html { redirect_to admin_document_licensed_accesses_path, notice: "Document Licensed Access Links were created destroyed." }
+        else
+          format.html { redirect_to admin_document_licensed_accesses_path, notice: "Document Licensed Access Links could not be destroyed." }
+        end
+      rescue => e
+        format.html { redirect_to admin_document_licensed_accesses_path, notice: "Document Licensed Access Links could not be destroyed. #{e}" }
+      end
+    end
+
+    # GET   /documents/#id/licensed_access/import
+    # POST  /documents/#id/licensed_access/import
+    # Imports document licensed access links from a file provided in the params.
+    def import
+      logger.debug("Import Action")
+      return unless params.dig(:document_licensed_access, :assets, :file)
+
+      respond_to do |format|
+        if DocumentLicensedAccess.import(params.dig(:document_licensed_access, :assets, :file))
+          format.html { redirect_to admin_document_licensed_accesses_path, notice: "Document licensed access links were created successfully." }
+        else
+          format.html { redirect_to admin_document_licensed_accesses_path, notice: "Document licensed access links could not be created." }
+        end
+      rescue => e
+        format.html { redirect_to admin_document_licensed_accesses_path, notice: "Document licensed access links could not be created. #{e}" }
+      end
+    end
+
+    private
+
+    # Use callbacks to share common setup or constraints between actions.
+    # Finds and sets the document based on the document_id parameter.
+    def set_document
+      return unless params[:document_id] # If not nested
+
+      @document = Document.includes(:leaf_representative).find_by!(friendlier_id: params[:document_id])
+    end
+
+    # Finds and sets the document licensed access based on the id parameter.
+    def set_document_licensed_access
+      @document_licensed_access = DocumentLicensedAccess.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    # Permits only trusted parameters for document licensed access.
+    def document_licensed_access_params
+      params.require(:document_licensed_access).permit(:friendlier_id, :institution_code, :access_url)
+    end
+  end
+end

data/app/controllers/admin/documents_controller.rb

@@ -54,12 +54,8 @@ module Admin
           ExportJob.perform_later(@request, current_user, query_params, ExportCsvService)
           head :no_content
         end
-        format.csv_document_downloads do
-          ExportJob.perform_later(@request, current_user, query_params, ExportCsvDocumentDownloadsService)
-          head :no_content
-        end
-        format.csv_document_access_links do
-          ExportJob.perform_later(@request, current_user, query_params, ExportCsvDocumentAccessLinksService)
+        format.csv_document_licensed_access_links do
+          ExportJob.perform_later(@request, current_user, query_params, ExportCsvDocumentLicensedAccessLinksService)
           head :no_content
         end
         format.csv_document_distributions do
@@ -94,12 +90,8 @@ module Admin
           ExportJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "csv"}, ExportCsvService)
           head :no_content
         end
-        format.csv_document_downloads do
-          ExportJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "csv_document_downloads"}, ExportCsvDocumentDownloadsService)
-          head :no_content
-        end
-        format.csv_document_access_links do
-          ExportJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "csv_document_access_links"}, ExportCsvDocumentAccessLinksService)
+        format.csv_document_licensed_access_links do
+          ExportJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "csv_document_licensed_access_links"}, ExportCsvDocumentLicensedAccessLinksService)
           head :no_content
         end
         format.csv_document_distributions do
@@ -189,6 +181,14 @@ module Admin
       end
     end
 
+    def export
+      case params[:format]
+      when "csv_document_licensed_access_links"
+        ExportJob.perform_later(@request, current_user, query_params, ExportCsvDocumentLicensedAccessLinksService)
+        redirect_to admin_documents_path, notice: "Export job started. You will receive a notification when it is complete."
+      end
+    end
+
     private
 
     # Use callbacks to share common setup or constraints between actions.

data/app/controllers/admin/elements_controller.rb

@@ -12,7 +12,7 @@ module Admin
     # Lists all elements, ordered by position in ascending order.
     # Uses pagination to limit the number of elements displayed per page.
     def index
-      @pagy, @elements = pagy(Element.all.order(position: :asc), items: 100)
+      @elements = Element.all.order(position: :asc)
     end
 
     # GET /elements/1 or /elements/1.json

data/app/controllers/admin/import_distributions_controller.rb

@@ -37,8 +37,9 @@ module Admin
     # GET /import_distributions/1.json
     # Displays a specific import distribution and its associated documents, with pagination for success and failed states.
     def show
-      @pagy_failed, @import_failed_distributions = pagy(@import_distribution.import_document_distributions.not_in_state(:success), items: 50, page_param: :failed_page)
       @pagy_success, @import_success_distributions = pagy(@import_distribution.import_document_distributions.in_state(:success), items: 50, page_param: :success_page)
+      @pagy_queued, @import_queued_distributions = pagy(@import_distribution.import_document_distributions.in_state(:queued), items: 50, page_param: :queued_page)
+      @pagy_failed, @import_failed_distributions = pagy(@import_distribution.import_document_distributions.in_state(:failed), items: 50, page_param: :failed_page)
     end
 
     # GET /import_distributions/new

data/app/controllers/admin/imports_controller.rb

@@ -37,8 +37,9 @@ module Admin
     # GET /imports/1.json
     # Displays a specific import and its associated documents, with pagination for success and failed states.
     def show
-      @pagy_failed, @import_failed_documents = pagy(@import.import_documents.not_in_state(:success), items: 50, page_param: :failed_page)
       @pagy_success, @import_success_documents = pagy(@import.import_documents.in_state(:success), items: 50, page_param: :success_page)
+      @pagy_queued, @import_queued_documents = pagy(@import.import_documents.in_state(:queued), items: 50, page_param: :queued_page)
+      @pagy_failed, @import_failed_documents = pagy(@import.import_documents.in_state(:failed), items: 50, page_param: :failed_page)
     end
 
     # GET /imports/new

data/app/indexers/document_indexer.rb

@@ -41,11 +41,11 @@ class DocumentIndexer < Kithe::Indexer
     # May want to switch to or add a 'date published' instead, right
     # now we only have date added to DB, which is what we had in sufia.
     to_field "date_created_dtsi" do |rec, _acc|
-      rec.created_at.utc.iso8601 if rec&.created_at
+      rec&.created_at&.utc&.iso8601
     end
 
     to_field "date_modified_dtsi" do |rec, _acc|
-      rec.updated_at.utc.iso8601 if rec&.updated_at
+      rec&.updated_at&.utc&.iso8601
     end
 
     # - GBL ADMIN

data/app/javascript/controllers/results_controller.js

@@ -103,6 +103,7 @@ export default class extends Controller {
     this.setResultSelectionVisibility('hide');
     this.setResultActionsVisibility('hide')
     this.removeResultSet();
+    this.setPagesetURL();
 
     // Set selection scope
     var el = document.querySelector('div#result-selection-options');
@@ -228,25 +229,14 @@ export default class extends Controller {
     }
   }
 
-  exportCsvDocumentDownloads() {
-    console.log('Export - CsvDocumentDownloads')
-    var scope = this.checkSelectionScope();
-    var el = document.querySelector('#result-selected-options');
-    if(scope === 'pageset') {
-      window.location = el.dataset.pageset + "&format=csv_document_downloads"
-    } else {
-      window.location = el.dataset.resultset + "&format=csv_document_downloads"
-    }
-  }
-
-  exportCsvDocumentAccessLinks() {
-    console.log('Export - CsvDocumentAccessLinks')
+  exportCsvDocumentLicensedAccessLinks() {
+    console.log('Export - CsvDocumentLicensedAccessLinks')
     var scope = this.checkSelectionScope();
     var el = document.querySelector('#result-selected-options');
     if(scope === 'pageset') {
-      window.location = el.dataset.pageset + "&format=csv_document_access_links"
+      window.location = el.dataset.pageset + "&format=csv_document_licensed_access_links"
     } else {
-      window.location = el.dataset.resultset + "&format=csv_document_access_links"
+      window.location = el.dataset.resultset + "&format=csv_document_licensed_access_links"
     }
   }
 

data/app/jobs/bulk_action_run_document_job.rb

@@ -23,9 +23,19 @@ class BulkActionRunDocumentJob < ApplicationJob
   def update_publication_status(doc, field_value)
     document = Document.find_by!(friendlier_id: doc.friendlier_id)
 
-    logger.debug("Update PubStatus - #{document.friendlier_id} => #{field_value}")
+    # Map field value to publication state
+    pub_state = case field_value
+    when "publish"
+      "published"
+    when "unpublish"
+      "unpublished"
+    when "set as draft"
+      "draft"
+    end
+
+    logger.debug("Update PubStatus - #{document.friendlier_id} - #{pub_state} - #{field_value}")
 
-    document.update!(publication_state: field_value.to_sym)
+    document.update!(publication_state: pub_state)
   end
 
   def update_delete(doc, field_value)

data/app/jobs/export_job.rb

@@ -27,8 +27,14 @@ class ExportJob < ApplicationJob
     file_content_documents = export_service.call(document_ids)
     file_content_document_distributions = ExportCsvDocumentDistributionsService.call(document_ids)
 
+    # Filename
+    filename = export_service.short_name.parameterize(separator: "_")
+
+    # Include Distributions?
+    include_distributions = export_service&.include_distributions? || false
+
     # Write Documents into tempfile
-    @tempfile_documents = Tempfile.new(["documents-#{Time.zone.today}", ".csv"]).tap do |file|
+    @tempfile_documents = Tempfile.new(["#{filename}-#{Time.zone.now.strftime("%Y-%m-%d-%H%M%S")}", ".csv"]).tap do |file|
       CSV.open(file, "wb") do |csv|
         file_content_documents.each do |row|
           csv << row
@@ -38,39 +44,43 @@ class ExportJob < ApplicationJob
       logger.debug("Tempfile Documents Size: #{File.size(file.path)} bytes")
     end
 
-    # Write DocumentDistributions into tempfile
-    @tempfile_document_distributions = Tempfile.new(["document-distributions-#{Time.zone.today}", ".csv"]).tap do |file|
-      CSV.open(file, "wb") do |csv|
-        file_content_document_distributions.each do |row|
-          csv << row
+    if include_distributions
+      # Write DocumentDistributions into tempfile
+      @tempfile_document_distributions = Tempfile.new(["distributions-#{Time.zone.now.strftime("%Y-%m-%d-%H%M%S")}", ".csv"]).tap do |file|
+        CSV.open(file, "wb") do |csv|
+          file_content_document_distributions.each do |row|
+            csv << row
+          end
         end
+        logger.debug("Tempfile Document Distributions Path: #{file.path}")
+        logger.debug("Tempfile Document Distributions Size: #{File.size(file.path)} bytes")
       end
-      logger.debug("Tempfile Document Distributions Path: #{file.path}")
-      logger.debug("Tempfile Document Distributions Size: #{File.size(file.path)} bytes")
-    end
 
-    # Create a zip file containing both tempfiles
-    zipfile_name = "export-#{Time.zone.today}.zip"
-    tmp_dir = Rails.root.join("tmp")
-    @tempfile_zip = Tempfile.new([zipfile_name, ".zip"], tmp_dir)
+      # Create a zip file containing both tempfiles
+      zipfile_name = "export-#{filename}-#{Time.zone.now.strftime("%Y-%m-%d-%H%M%S")}.zip"
+      tmp_dir = Rails.root.join("tmp")
+      @tempfile_zip = Tempfile.new([zipfile_name, ".zip"], tmp_dir)
 
-    Zip::File.open(@tempfile_zip.path, Zip::File::CREATE) do |zipfile|
-      zipfile.add("documents.csv", @tempfile_documents.path)
-      zipfile.add("document-distributions.csv", @tempfile_document_distributions.path)
+      Zip::File.open(@tempfile_zip.path, Zip::File::CREATE) do |zipfile|
+        zipfile.add("#{filename}.csv", @tempfile_documents.path)
+        zipfile.add("distributions.csv", @tempfile_document_distributions.path)
+      end
+      logger.debug("Zipfile Path: #{@tempfile_zip.path}")
+      logger.debug("Zipfile Size: #{File.size(@tempfile_zip.path)} bytes")
+
+      # Create notification
+      notification = ExportNotification.with(message: "#{export_service.short_name}|#{ActionController::Base.helpers.number_with_delimiter(file_content_documents.size - 1)} rows|ZIP")
+      notification.deliver(current_user)
+      notification.record.file.attach(io: File.open(@tempfile_zip), filename: zipfile_name,
+        content_type: "application/zip")
+    else
+      # Only primary CSV, attach directly
+      csvfile_name = "#{filename}-#{Time.zone.now.strftime("%Y-%m-%d-%H%M%S")}.csv"
+      notification = ExportNotification.with(message: "#{export_service.short_name}|#{ActionController::Base.helpers.number_with_delimiter(file_content_documents.size - 1)} rows|CSV")
+      notification.deliver(current_user)
+      notification.record.file.attach(io: File.open(@tempfile_documents), filename: csvfile_name,
+        content_type: "text/csv")
     end
-    logger.debug("Zipfile Path: #{@tempfile_zip.path}")
-    logger.debug("Zipfile Size: #{File.size(@tempfile_zip.path)} bytes")
-
-    # Create notification
-    # Message: "Download Type|Row Count|Button Label"
-    notification = ExportNotification.with(message: "ZIP (#{export_service.short_name})|#{ActionController::Base.helpers.number_with_delimiter(file_content_documents.size - 1)} rows|ZIP")
-
-    # Deliver notification
-    notification.deliver(current_user)
-
-    # Attach ZIP file (can only attach after persisted)
-    notification.record.file.attach(io: File.open(@tempfile_zip), filename: zipfile_name,
-      content_type: "application/zip")
 
     # Update UI
     ActionCable.server.broadcast("export_channel", {
@@ -97,6 +107,6 @@ class ExportJob < ApplicationJob
         doc_ids)
     end
 
-    doc_ids
+    doc_ids.flatten
   end
 end

data/app/jobs/export_json_bulk_job.rb

@@ -89,6 +89,6 @@ class ExportJsonBulkJob < ApplicationJob
         doc_ids)
     end
 
-    doc_ids
+    doc_ids.flatten
   end
 end

data/app/jobs/export_json_job.rb

@@ -117,6 +117,6 @@ class ExportJsonJob < ApplicationJob
         doc_ids)
     end
 
-    doc_ids
+    doc_ids.flatten
   end
 end

data/app/jobs/import_document_job.rb

@@ -10,7 +10,18 @@ class ImportDocumentJob < ApplicationJob
     # Set the geom
     document.set_geometry
 
-    if document.update(import_document.to_hash)
+    # Update document with import data
+    document_data = import_document.to_hash
+    publication_state = document_data[:json_attributes]["b1g_publication_state_s"]
+    document_data[:json_attributes].delete("b1g_publication_state_s")
+    document_data.delete(:publication_state)
+
+    if document.update(document_data)
+      # Handle state transition separately
+      if publication_state.present?
+        document.publication_state = publication_state
+        document.save
+      end
       import_document.state_machine.transition_to!(:success)
     else
       import_document.state_machine.transition_to!(:failed, "Failed - #{document.errors.inspect}")

data/app/jobs/import_run_job.rb

@@ -12,6 +12,11 @@ class ImportRunJob < ApplicationJob
 
       converted_data = import.convert_data(extract_hash)
 
+      # Set default publication state if not present
+      unless converted_data["b1g_publication_state_s"].present?
+        converted_data["b1g_publication_state_s"] = "draft"
+      end
+
       kithe_document = {
         title: converted_data[GeoblacklightAdmin::Schema.instance.solr_fields[:title]],
         json_attributes: converted_data,

data/app/models/asset.rb

@@ -43,11 +43,21 @@ class Asset < Kithe::Asset
     GeoblacklightAdmin::RemoveParentDctReferencesUriJob.perform_later(self) if parent_id.present?
   end
 
-  # After Save Callbacks
-  after_save :reindex_parent
+  # After Commit Callbacks
+  after_commit :reindex_parent
 
   def reindex_parent
-    parent.save if parent.present?
+    # Set the "file size" on the parent document
+    file_size = 0
+    if parent.present? && !parent.destroyed?
+      unless thumbnail?
+        parent.document_assets.each do |document_asset|
+          file_size += document_asset.file_data["metadata"]["size"]
+        end
+        parent.gbl_fileSize_s = ApplicationController.helpers.number_to_human_size(file_size)
+        parent.save(validate: false)
+      end
+    end
   end
 
   def to_aardvark_reference

data/app/models/document/controlled_lists.rb

@@ -43,10 +43,11 @@ class Document
     ].freeze
 
     RESOURCE_CLASS = [
-      "Maps",
+      "Collections",
       "Datasets",
       "Imagery",
-      "Collections",
+      "Maps",
+      "Series",
       "Websites",
       "Web services",
       "Other"

data/app/models/document/date_validator.rb

@@ -12,19 +12,21 @@ class Document
       # Assume true
       valid_date = true
 
-      date_elements = Element.where(field_type: "date")
+      # Cache date elements to avoid repeated queries
+      @date_elements ||= Element.where(field_type: "date").to_a
 
       # Sane date values?
-      date_elements.each do |element|
-        unless record.send(element.solr_field).nil?
-          Rails.logger.debug("Date Validator")
-          Rails.logger.debug("Dates: #{record.send(element.solr_field).inspect}")
-          record.send(element.solr_field).each do |date|
-            Rails.logger.debug("\nDate: #{date}")
-            valid_date = proper_date(record, element, date, valid_date)
-
-            break if !valid_date
-          end
+      @date_elements.each do |element|
+        value = record.send(element.solr_field)
+        next if value.nil?
+
+        Rails.logger.debug("Date Validator")
+        Rails.logger.debug("Dates: #{value.inspect}")
+
+        Array(value).each do |date|
+          Rails.logger.debug("\nDate: #{date}")
+          valid_date = proper_date(record, element, date, valid_date)
+          break if !valid_date
         end
       end
 
@@ -36,7 +38,7 @@ class Document
         valid_date = true
       elsif date.class != Date
         valid_date = false
-        record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[element.to_sym], "Bad date field type.")
+        record.errors.add(element.solr_field, "Bad date field type.")
       end
 
       Rails.logger.debug("#{date} - #{valid_date}")