standardapi 6.0.0.32 → 6.1.0

data/test/standard_api/standard_api_test.rb

@@ -6,13 +6,13 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
 
   self.includes = [ :photos, :landlord, :english_name ]
 
-  # def normalizers
-  #   {
-  #     Property => {
-  #       "size" => lambda { |value| value.to_i }
-  #     }
-  #   }
-  # end
+  def normalizers
+    {
+      Property => {
+        "size" => lambda { |value| value.round(4).to_s }
+      }
+    }
+  end
 
   # = Routing Tests
   #
@@ -94,7 +94,8 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
 
   test 'Controller#model_params defaults to []' do
     @controller = ReferencesController.new
-    assert_equal @controller.send(:model_params), []
+    @controller.params = {}
+    assert_equal @controller.send(:model_params), ActionController::Parameters.new
   end
 
   test 'Controller#current_mask' do
@@ -123,8 +124,9 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
 
       model.columns.each do |column|
         assert_equal json_column_type(column.sql_type), schema.dig('models', model.name, 'attributes', column.name, 'type')
-        default = column.default || column.default_function
+        default = column.default
         if default then
+          default = model.connection.lookup_cast_type_from_column(column).deserialize(default)
           assert_equal default, schema.dig('models', model.name, 'attributes', column.name, 'default')
         else
           assert_nil schema.dig('models', model.name, 'attributes', column.name, 'default')
@@ -190,7 +192,7 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
     property = create(:property, photos: [])
     photo = create(:photo)
 
-    post "/properties/#{property.id}/photos/#{photo.id}.json"
+    post "/properties/#{property.id}/photos/#{photo.id}"
     assert_equal property.photos.reload.map(&:id), [photo.id]
     assert_response :created
 
@@ -198,9 +200,18 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
     assert_response :not_found
   end
 
+  test 'Controller#add_resource with has_one' do
+    photo = create(:document)
+    property = create(:property)
+    post "/properties/#{property.id}/document/#{photo.id}"
+    assert_equal property.reload.document, photo
+    assert_response :created
+  end
+
   test 'Controller#remove_resource' do
     photo = create(:photo)
     property = create(:property, photos: [photo])
+    assert_equal property.photos.reload, [photo]
     delete "/properties/#{property.id}/photos/#{photo.id}"
     assert_equal property.photos.reload, []
     assert_response :no_content
@@ -209,6 +220,15 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
     assert_response :not_found
   end
 
+  test 'Controller#remove_resource with has_one' do
+    photo = create(:document)
+    property = create(:property, document: photo)
+    assert_equal property.document, photo
+    delete "/properties/#{property.id}/document/#{photo.id}"
+    assert_nil property.reload.document
+    assert_response :no_content
+  end
+
   # = View Tests
 
   test 'rendering tables' do
@@ -222,7 +242,7 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
   test 'rendering null attribute' do
     property = create(:property)
     get property_path(property, format: 'json'), params: { id: property.id, include: [:landlord] }
-    assert_equal true, JSON(response.body).has_key?('landlord')
+    assert JSON(response.body).has_key?('landlord')
     assert_nil JSON(response.body)['landlord']
   end
 
@@ -320,14 +340,22 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
   test 'include with where key' do
     photo_a = create(:photo)
     photo_b = create(:photo)
+    photo_c = create(:photo)
 
-    property = create(:property, photos: [photo_b])
+    property = create(:property, photos: [photo_b, photo_c])
     get property_path(property, include: { photos: { where: { id: photo_a.id } } }, format: :json)
     assert_equal [], JSON(response.body)['photos']
 
     property.photos << photo_a
     get property_path(property, include: { photos: { where: { id: photo_a.id } } }, format: :json)
     assert_equal [photo_a.id], JSON(response.body)['photos'].map { |x| x['id'] }
+    get property_path(property, include: { photos: { where: [
+      { id: photo_a.id },
+      'OR',
+      { id: photo_c.id}
+    ] } }, format: :json)
+    assert_equal [photo_a.id, photo_c.id].sort,
+      JSON(response.body)['photos'].map { |x| x['id'] }.sort
   end
 
   test 'include with order key' do
@@ -338,6 +366,14 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
     assert_equal photos.map(&:id).sort, JSON(response.body)['photos'].map { |x| x['id'] }
   end
 
+  test 'include relation with default order using an order key' do
+    p1 = create(:photo)
+    p2 = create(:photo)
+    account = create(:account, photos: [ p1, p2 ])
+    get account_path(account, include: { photos: { order: { created_at: :desc } } }, format: 'json')
+    assert_equal [ p2.id, p1.id ], JSON(response.body)['photos'].map { |x| x["id"] }
+  end
+
   test 'include with limit key' do
     5.times { create(:property, photos: Array.new(5) { create(:photo) }) }
     get properties_path(include: { photos: { limit: 1 } }, limit: 5, format: 'json')
@@ -380,8 +416,8 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
 
     json = JSON(response.body)
 
-    assert_equal json.find { |x| x['id'] == account_reference.id }.dig('subject', 'photos', 0, 'id'), photo.id
-    assert_equal json.find { |x| x['id'] == property_reference.id }.dig('subject', 'landlord', 'id'), account.id
+    assert_equal photo.id, json.find { |x| x['id'] == account_reference.id }.dig('subject', 'photos', 0, 'id')
+    assert_equal account.id, json.find { |x| x['id'] == property_reference.id }.dig('subject', 'landlord', 'id')
   end
 
   test 'include with distinct key' do
@@ -549,6 +585,19 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
     assert_equal properties.map(&:id).sort.reverse, JSON(response.body).map { |x| x['id'] }
   end
 
+  test 'ordering via nulls_first/last' do
+    p1 = create(:property, description: 'test')
+    p2 = create(:property, description: nil)
+
+    get properties_path(format: 'json'), params: { limit: 100, order: { description: { desc: 'nulls_last' } } }
+    properties = JSON(response.body)
+    assert_equal p1.id, properties.first['id']
+
+    get properties_path(format: 'json'), params: { limit: 100, order: { description: { asc: 'nulls_last' } } }
+    properties = JSON(response.body)
+    assert_equal p1.id, properties.first['id']
+  end
+
   # Calculate Test
   test 'calculate' do
     create(:photo)
@@ -556,6 +605,65 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
     assert_equal [1], JSON(response.body)
   end
 
+  test 'calculate distinct aggregation' do
+    assert_sql(<<-SQL) do
+      SELECT DISTINCT COUNT("properties"."id") FROM "properties"
+    SQL
+      create(:property)
+      create(:property)
+      get '/properties/calculate', params: {
+        select: { count: "id" },
+        distinct: true
+      }
+      assert_equal [2], JSON(response.body)
+    end
+  end
+
+  test 'calculate aggregation distinctly' do
+    assert_sql(<<-SQL) do
+      SELECT COUNT(DISTINCT "properties"."id") FROM "properties"
+    SQL
+      create(:property)
+      create(:property)
+      get '/properties/calculate', params: {
+        select: { count: { distinct: "id" } }
+      }
+      assert_equal [2], JSON(response.body)
+    end
+  end
+
+  test 'calculate distinct aggregation distinctly' do
+    assert_sql(<<-SQL) do
+      SELECT DISTINCT COUNT(DISTINCT "properties"."id") FROM "properties"
+    SQL
+      create(:property)
+      create(:property)
+      get '/properties/calculate', params: {
+        select: { count: { distinct: "id" } },
+        distinct: true
+      }
+      assert_equal [2], JSON(response.body)
+    end
+  end
+
+  test 'calculate distinct count' do
+    p1 = create(:property)
+    p2 = create(:property)
+    a1 = create(:account, property: p1)
+    a2 = create(:account, property: p2)
+    get '/properties/calculate', params: {
+      select: { count: 'id' },
+      where: {
+        accounts: {
+          id: [a1.id, a2.id]
+        }
+      },
+      group_by: 'id',
+      distinct: true
+    }
+    assert_equal Hash[p1.id.to_s, 1, p2.id.to_s, 1], JSON(response.body)
+  end
+
   test 'calculate group_by' do
     create(:photo, format: 'jpg')
     create(:photo, format: 'jpg')

data/test/standard_api/test_app/app/controllers/acl/account_acl.rb

@@ -0,0 +1,15 @@
+module AccountACL
+
+  def attributes
+    [ "property_id", "name" ]
+  end
+
+  def orders
+    [ "id" ]
+  end
+
+  def includes
+    [ "photos", "subject", "property" ]
+  end
+
+end

data/test/standard_api/test_app/app/controllers/acl/property_acl.rb

@@ -0,0 +1,27 @@
+module PropertyACL
+
+  def attributes
+    [ :name,
+      :aliases,
+      :description,
+      :constructed,
+      :size,
+      :active
+      # :photos_attributes,
+      # { photos_attributes: [ :id, :account_id, :property_id, :format] }
+    ]
+  end
+
+  def orders
+    ["id", "name", "aliases", "description", "constructed", "size", "created_at", "active"]
+  end
+
+  def includes
+    [ :photos, :landlord, :english_name, :document ]
+  end
+
+  def nested
+    [ :photos ]
+  end
+
+end

data/test/standard_api/test_app/app/controllers/acl/reference_acl.rb

@@ -0,0 +1,7 @@
+module ReferenceACL
+
+  def includes
+    { subject: [ :landlord, :photos ] }
+  end
+
+end

data/test/standard_api/test_app/controllers.rb

@@ -1,77 +1,45 @@
 class ApplicationController < ActionController::Base
   include StandardAPI::Controller
+  include StandardAPI::AccessControlList
   prepend_view_path File.join(File.dirname(__FILE__), 'views')
 
-  private
-
-  def account_params
-    [ "property_id", "name" ]
-  end
-
-  def account_orders
-    [ "id" ]
-  end
-
-  def account_includes
-    [ "photos" ]
-  end
-
-  def property_params
-    [ :name,
-      :aliases,
-      :description,
-      :constructed,
-      :size,
-      :active,
-      :photos_attributes,
-      { photos_attributes: [ :id, :account_id, :property_id, :format] }
-    ]
-  end
-
-  def property_orders
-    ["id", "name", "aliases", "description", "constructed", "size", "created_at", "active"]
-  end
-
-  def property_includes
-    [:photos, :landlord, :english_name, :document]
-  end
-
-  def reference_includes
-    { subject: [ :landlord, :photos ] }
-  end
-
 end
 
 class PropertiesController < ApplicationController
 end
 
 class AccountsController < ApplicationController
+
+  def show
+    @account = Account.last
+  end
+
 end
 
 class DocumentsController < ApplicationController
 
-  def document_params
+  def document_attributes
     [ :file, :type ]
   end
-  
+
   def document_orders
-    [:id]
+    [ :id ]
   end
 
 end
 
 class PhotosController < ApplicationController
 
-  def photo_params
+  def photo_attributes
     [ :id, :account_id, :property_id, :format ]
   end
 
   def photo_orders
-    [:id]
+    [ :id ]
   end
 
   def photo_includes
-    [:account]
+    [ :account ]
   end
 
 end
@@ -104,4 +72,4 @@ class DefaultLimitController < ApplicationController
     100
   end
 
-end
+end

data/test/standard_api/test_app/models.rb

@@ -1,8 +1,9 @@
 # = Models
 
 class Account < ActiveRecord::Base
-  has_many :photos
+  has_many :photos, -> { order(:created_at) }
   belongs_to :property
+  belongs_to :subject, polymorphic: true
 end
 
 class Photo < ActiveRecord::Base
@@ -24,6 +25,7 @@ class Property < ActiveRecord::Base
   has_one :document_attachments, class_name: "Attachment", as: :record, inverse_of: :record
   has_one :document, through: "document_attachments"
 
+
   validates :name, presence: true
   accepts_nested_attributes_for :photos
 
@@ -59,13 +61,23 @@ class CreateModelTables < ActiveRecord::Migration[6.0]
     create_table "accounts", force: :cascade do |t|
       t.string   'name',                 limit: 255
       t.integer  'property_id'
+      t.integer  "subject_id"
+      t.string   "subject_type"
+      t.datetime "property_cached_at"
+      t.datetime "subject_cached_at"
       t.integer  'photos_count', null: false, default: 0
+      t.datetime "created_at",                         null: false
+    end
+
+    create_table "landlords", force: :cascade do |t|
+      t.string  "name"
     end
 
     create_table "photos", force: :cascade do |t|
       t.integer  "account_id"
       t.integer  "property_id"
       t.string   "format",                 limit: 255
+      t.datetime "created_at",                         null: false
     end
 
     create_table "properties", force: :cascade do |t|
@@ -84,12 +96,12 @@ class CreateModelTables < ActiveRecord::Migration[6.0]
       t.string   "key"
       t.string   "value"
     end
-    
+
     create_table "photos_properties", force: :cascade do |t|
       t.integer  "photo_id"
       t.integer  "property_id"
     end
-    
+
     create_table "landlords_properties", force: :cascade do |t|
       t.integer  "landlord_id"
       t.integer  "property_id"
@@ -98,8 +110,8 @@ class CreateModelTables < ActiveRecord::Migration[6.0]
     create_table "documents", force: :cascade do |t|
       t.string   'type'
     end
-    
-    create_table "attachments", force: :cascade do |t| 
+
+    create_table "attachments", force: :cascade do |t|
       t.string  'record_type'
       t.integer  'record_id'
       t.integer  'document_id'

data/test/standard_api/test_app/test/factories.rb

@@ -1,4 +1,5 @@
 FactoryBot.define do
+
   factory :account do
     name            { Faker::Name.name }
 
@@ -7,7 +8,7 @@ FactoryBot.define do
       name { nil }
     end
   end
-  
+
   factory :landlord do
     name            { Faker::Name.name }
   end
@@ -17,12 +18,12 @@ FactoryBot.define do
   end
 
   factory :document do
-    file            { fixture_file_upload(Rails.root + 'test/fixtures/photo.png', 'image/png') }
+    file            { Rack::Test::UploadedFile.new(File.join(Rails.root, 'test/fixtures/photo.png'), 'image/png') }
   end
 
   factory :pdf do
     type            { 'Pdf' }
-    file            { fixture_file_upload(Rails.root + 'test/fixtures/photo.png', 'image/png') }
+    file            { Rack::Test::UploadedFile.new(File.join(Rails.root, 'test/fixtures/photo.png'), 'image/png') }
   end
 
   factory :reference do