Fix JSON parsing, add tests, update swagger file

Author: brunto

app/controllers/pias_controller.rb

@@ -26,7 +26,9 @@ def show
 
   # POST /pias
   def create
-    @pia = Pia.new(pia_params)
+    pia_parameters = pia_params
+    pia_parameters[:structure_data] = JSON.parse(pia_parameters[:structure_data]) if pia_parameters[:structure_data]
+    @pia = Pia.new(pia_parameters)
 
     if @pia.save
       render json: @pia, status: :created
@@ -37,7 +39,10 @@ def create
 
   # PATCH/PUT /pias/1
   def update
-    if @pia.update(pia_params)
+    pia_parameters = pia_params
+    pia_parameters[:structure_data] = JSON.parse(pia_parameters[:structure_data]) if pia_parameters[:structure_data]
+
+    if @pia.update(pia_parameters)
       render json: @pia
     else
       render json: @pia.errors, status: :unprocessable_entity
@@ -100,6 +105,10 @@ def pia_params
                                   :concerned_people_searched_opinion,
                                   :rejection_reason,
                                   :applied_adjustments,
-                                  :is_example)
+                                  :is_example,
+                                  :structure_id,
+                                  :structure_name,
+                                  :structure_sector_name,
+                                  :structure_data)
   end
 end

app/controllers/structures_controller.rb

@@ -0,0 +1,72 @@
+class StructuresController < ApplicationController
+  before_action :set_structure, only: %i[show update destroy duplicate]
+
+  # GET /structures
+  def index
+    sorting = sorting_params
+    sorting = nil unless Structure.attribute_names.include?(sorting[:column])
+    sorting[:direction] = 'asc' if sorting && sorting[:direction] != 'desc'
+    @structures = Structure.all
+    @structures = @structures.order("#{sorting[:column]} #{sorting[:direction]}") if sorting.present?
+
+    render json: @structures
+  end
+
+  # GET /structures/1
+  def show
+    render json: @structure
+  end
+
+  # POST /structures
+  def create
+    structures_parameters = structure_params
+    structures_parameters[:data] = JSON.parse(structures_parameters[:data])
+    @structure = Structure.new(structures_parameters)
+
+    if @structure.save
+      render json: @structure, status: :created
+    else
+      render json: @structure.errors, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /structures/1
+  def update
+    structures_parameters = structure_params
+    structures_parameters[:data] = JSON.parse(structures_parameters[:data]) if structures_parameters[:data]
+
+    if @structure.update(structures_parameters)
+      render json: @structure
+    else
+      render json: @structure.errors, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE /structures/1
+  def destroy
+    @structure.destroy
+  end
+
+  private
+
+  def import_params
+    params.fetch(:import, {}).permit(:data)
+  end
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_structure
+    @structure = Structure.find(params[:id])
+  end
+
+  # Only allow trusted sorting parameters
+  def sorting_params
+    params.fetch(:sort, {}).permit(:column, :direction)
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def structure_params
+    params.fetch(:structure, {}).permit(:name,
+                                        :sector_name,
+                                        :data)
+  end
+end

app/models/pia.rb

@@ -4,6 +4,7 @@ class Pia < ApplicationRecord
   has_many :evaluations, inverse_of: :pia, dependent: :destroy
   has_many :measures, inverse_of: :pia, dependent: :destroy
   has_many :attachments, inverse_of: :pia, dependent: :destroy
+  belongs_to :structure, optional: true
   validates :name, presence: true
 
   def self.import(json_string)

app/models/structure.rb

@@ -0,0 +1,3 @@
+class Structure < ApplicationRecord
+  has_many :pias, dependent: :nullify
+end

app/serializers/pia_serializer.rb

@@ -17,5 +17,9 @@ class PiaSerializer < ActiveModel::Serializer
              :created_at,
              :updated_at,
              :concerned_people_searched_opinion,
-             :concerned_people_searched_content
+             :concerned_people_searched_content,
+             :structure_id,
+             :structure_name,
+             :structure_sector_name,
+             :structure_data
 end

app/serializers/structure_serializer.rb

@@ -0,0 +1,8 @@
+class StructureSerializer < ActiveModel::Serializer
+  attributes :id,
+             :name,
+             :sector_name,
+             :data,
+             :created_at,
+             :updated_at
+end

config/routes.rb

@@ -19,4 +19,5 @@
       post '/import', to: 'pias#import'
     end
   end
+  resources :structures
 end

db/migrate/20181008150745_create_structures.rb

@@ -0,0 +1,11 @@
+class CreateStructures < ActiveRecord::Migration[5.0]
+  def change
+    create_table :structures do |t|
+      t.string :name, null: false
+      t.string :sector_name, null: false
+      t.jsonb :data, null: false, default: {}
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20181008150920_add_structure_to_pia.rb

@@ -0,0 +1,8 @@
+class AddStructureToPia < ActiveRecord::Migration[5.0]
+  def change
+    add_reference :pias, :structure, foreign_key: true
+    add_column :pias, :structure_name, :string
+    add_column :pias, :structure_sector_name, :string
+    add_column :pias, :structure_data, :jsonb
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180525222420) do
+ActiveRecord::Schema.define(version: 20181008150920) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -89,11 +89,25 @@
     t.integer  "is_example",                        default: 0
     t.boolean  "concerned_people_searched_opinion", default: false
     t.string   "concerned_people_searched_content"
+    t.integer  "structure_id"
+    t.string   "structure_name"
+    t.string   "structure_sector_name"
+    t.jsonb    "structure_data"
+    t.index ["structure_id"], name: "index_pias_on_structure_id", using: :btree
+  end
+
+  create_table "structures", force: :cascade do |t|
+    t.string   "name",                     null: false
+    t.string   "sector_name",              null: false
+    t.jsonb    "data",        default: {}, null: false
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
   add_foreign_key "answers", "pias"
   add_foreign_key "attachments", "pias"
   add_foreign_key "comments", "pias"
   add_foreign_key "evaluations", "pias"
   add_foreign_key "measures", "pias"
+  add_foreign_key "pias", "structures"
 end