diff --git a/app/controllers/api/v1/projects/datasets_controller.rb b/app/controllers/api/v1/projects/datasets_controller.rb index a3d3a54b3..d890d1373 100644 --- a/app/controllers/api/v1/projects/datasets_controller.rb +++ b/app/controllers/api/v1/projects/datasets_controller.rb @@ -27,7 +27,7 @@ class Api::V1::Projects::DatasetsController < Api::V1::BaseController private def dataset_params - params.permit(:title, :description) + params.permit(:title, :description, :license_id, :paper_content) end def find_dataset diff --git a/app/models/project_dataset.rb b/app/models/project_dataset.rb index a7e3f4c30..ae4bb5789 100644 --- a/app/models/project_dataset.rb +++ b/app/models/project_dataset.rb @@ -2,21 +2,25 @@ # # Table name: project_datasets # -# id :integer not null, primary key -# title :string(255) -# description :text(65535) -# project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# id :integer not null, primary key +# title :string(255) +# description :text(65535) +# project_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# license_id :integer +# paper_content :text(65535) # # Indexes # +# index_project_datasets_on_license_id (license_id) # index_project_datasets_on_project_id (project_id) # class ProjectDataset < ApplicationRecord belongs_to :project + belongs_to :license, optional: true has_many :attachments, as: :container, dependent: :destroy end diff --git a/app/views/api/v1/projects/datasets/show.json.jbuilder b/app/views/api/v1/projects/datasets/show.json.jbuilder index fe4c74dcf..ac9f2d777 100644 --- a/app/views/api/v1/projects/datasets/show.json.jbuilder +++ b/app/views/api/v1/projects/datasets/show.json.jbuilder @@ -1,4 +1,5 @@ -json.(@project_dataset, :id, :title, :description) +json.(@project_dataset, :id, :title, :description, :license_id, :paper_content) +json.license_name @project_dataset&.license&.name json.attachments @attachments do |at| json.partial! "api/v1/attachments/detail", locals: {attachment: at} end \ No newline at end of file diff --git a/db/migrate/20240403015938_add_license_and_paper_content_to_project_dataset.rb b/db/migrate/20240403015938_add_license_and_paper_content_to_project_dataset.rb new file mode 100644 index 000000000..4a2a72a2d --- /dev/null +++ b/db/migrate/20240403015938_add_license_and_paper_content_to_project_dataset.rb @@ -0,0 +1,6 @@ +class AddLicenseAndPaperContentToProjectDataset < ActiveRecord::Migration[5.2] + def change + add_reference :project_datasets, :license + add_column :project_datasets, :paper_content, :text + end +end