forest_liana 2.15.8 → 3.0.0.pre.beta.0

data/app/services/forest_liana/resources_getter.rb

@@ -1,7 +1,6 @@
 module ForestLiana
   class ResourcesGetter < BaseGetter
     attr_reader :search_query_builder
-    attr_reader :includes
     attr_reader :records_count
 
     def initialize(resource, params)
@@ -10,24 +9,22 @@ module ForestLiana
       @count_needs_includes = false
       @collection_name = ForestLiana.name_for(@resource)
       @collection = get_collection(@collection_name)
-      @fields_to_serialize = get_fields_to_serialize
       @field_names_requested = field_names_requested
       get_segment()
-      compute_includes()
-      @search_query_builder = SearchQueryBuilder.new(@params, @includes, @collection)
+      @search_query_builder = SearchQueryBuilder.new(@params, includes, @collection)
 
       prepare_query()
     end
 
     def perform
-      @records = @records.eager_load(@includes)
+      @records = @records.eager_load(includes)
       @records_sorted = sort_query
     end
 
     def count
-      # NOTICE: For performance reasons, do not eager load the data if there is  no search or
-      #         filters on associations.
-      @records_count = @count_needs_includes ? @records.eager_load(@includes).count : @records.count
+      # NOTICE: For performance reasons, do not eager load the data if there is
+      #         no search or filters on associations.
+      @records_count = @count_needs_includes ? @records.eager_load(includes).count : @records.count
     end
 
     def query_for_batch
@@ -38,10 +35,10 @@ module ForestLiana
       @records_sorted.offset(offset).limit(limit).to_a
     end
 
-    def compute_includes
-      associations_has_one = ForestLiana::QueryHelper.get_one_associations(@resource)
-
-      includes = associations_has_one.map(&:name)
+    def includes
+      includes = SchemaUtils.one_associations(@resource)
+        .select { |association| SchemaUtils.model_included?(association.klass) }
+        .map(&:name)
       includes_for_smart_search = []
 
       if @collection && @collection.search_fields
@@ -57,26 +54,14 @@ module ForestLiana
       end
 
       if @field_names_requested
-        @includes = (includes & @field_names_requested).concat(includes_for_smart_search)
+        (includes & @field_names_requested).concat(includes_for_smart_search)
       else
-        @includes = includes
+        includes
       end
     end
 
-    def includes_for_serialization
-      super & @fields_to_serialize.map(&:to_s)
-    end
-
     private
 
-    def get_fields_to_serialize
-      if @params[:fields] && @params[:fields][@collection_name]
-        @params[:fields][@collection_name].split(',').map { |name| name.to_sym }
-      else
-        []
-      end
-    end
-
     def get_segment
       if @params[:segment]
         @segment = @collection.segments.find do |segment|
@@ -107,7 +92,8 @@ module ForestLiana
         associations_for_query << @params[:sort].split('.').first.to_sym
       end
 
-      @fields_to_serialize | associations_for_query
+      field_names = @params[:fields][@collection_name].split(',').map { |name| name.to_sym }
+      field_names | associations_for_query
     end
 
     def search_query

data/app/services/forest_liana/schema_adapter.rb

@@ -98,8 +98,7 @@ module ForestLiana
     def add_columns
       @model.columns.each do |column|
         unless is_sti_column_of_child_model?(column)
-          field_schema = get_schema_for_column(column)
-          collection.fields << field_schema unless field_schema.nil?
+          collection.fields << get_schema_for_column(column)
         end
       end
 
@@ -112,20 +111,18 @@ module ForestLiana
         collection.fields << {
           field: :intercom_conversations,
           type: ['String'],
-          relationship: 'HasMany',
           reference: "#{model_name}_intercom_conversations.id",
           column: nil,
-          'is-filterable': false,
+          is_filterable: false,
           integration: 'intercom'
         }
 
-        @collection.fields << {
+        collection.fields << {
           field: :intercom_attributes,
           type: 'String',
-          relationship: 'HasOne',
           reference: "#{model_name}_intercom_attributes.id",
           column: nil,
-          'is-filterable': false,
+          is_filterable: false,
           integration: 'intercom'
         }
       end
@@ -144,50 +141,45 @@ module ForestLiana
           collection.fields << {
             field: :stripe_payments,
             type: ['String'],
-            relationship: 'HasMany',
             reference: "#{model_name}_stripe_payments.id",
             column: nil,
-            'is-filterable': false,
+            is_filterable: false,
             integration: 'stripe'
           }
 
           collection.fields << {
             field: :stripe_invoices,
             type: ['String'],
-            relationship: 'HasMany',
             reference: "#{model_name}_stripe_invoices.id",
             column: nil,
-            'is-filterable': false,
+            is_filterable: false,
             integration: 'stripe'
           }
 
           collection.fields << {
             field: :stripe_cards,
             type: ['String'],
-            relationship: 'HasMany',
             reference: "#{model_name}_stripe_cards.id",
             column: nil,
-            'is-filterable': false,
+            is_filterable: false,
             integration: 'stripe'
           }
 
           collection.fields << {
             field: :stripe_subscriptions,
             type: ['String'],
-            relationship: 'HasMany',
             reference: "#{model_name}_stripe_subscriptions.id",
             column: nil,
-            'is-filterable': false,
+            is_filterable: false,
             integration: 'stripe'
           }
 
           collection.fields << {
             field: :stripe_bank_accounts,
             type: ['String'],
-            relationship: 'HasMany',
             reference: "#{model_name}_stripe_bank_accounts.id",
             column: nil,
-            'is-filterable': false,
+            is_filterable: false,
             integration: 'stripe'
           }
         end
@@ -207,11 +199,9 @@ module ForestLiana
         collection.fields << {
           field: :mixpanel_last_events,
           type: ['String'],
-          relationship: 'HasMany',
           reference: "#{model_name}_mixpanel_events.id",
           column: nil,
-          'is-filterable': false,
-          'display-name': 'Last events',
+          is_filterable: false,
           integration: 'mixpanel',
         }
       end
@@ -252,8 +242,7 @@ module ForestLiana
             [:has_one, :belongs_to].include?(association.macro)
               field[:reference] = get_reference_for(association)
               field[:field] = association.name
-              field[:inverseOf] = inverse_of(association)
-              field[:relationship] = get_relationship_type(association)
+              field[:inverse_of] = inverse_of(association)
           # NOTICE: Create the fields of hasOne, HasMany, … relationships.
           else
             collection.fields << get_schema_for_association(association)
@@ -284,10 +273,22 @@ module ForestLiana
     end
 
     def get_schema_for_column(column)
-      column_type = get_type_for(column)
-      return nil if column_type.nil?
-
-      schema = { field: column.name, type: column_type }
+      schema = {
+        field: column.name,
+        type: get_type_for(column),
+        is_filterable: true,
+        is_sortable: true,
+        is_read_only: false,
+        is_required: false,
+        is_virtual: false,
+        default_value: nil,
+        integration: nil,
+        reference: nil,
+        inverse_of: nil,
+        relationships: nil,
+        widget: nil,
+        validations: []
+      }
       add_enum_values_if_is_enum(schema, column)
       add_enum_values_if_is_sti_model(schema, column)
       add_default_value(schema, column)
@@ -298,17 +299,21 @@ module ForestLiana
       {
         field: association.name.to_s,
         type: get_type_for_association(association),
-        relationship: get_relationship_type(association),
         reference: "#{ForestLiana.name_for(association.klass)}.id",
-        inverseOf: inverse_of(association),
-        'is-filterable': !is_many_association(association)
+        inverse_of: inverse_of(association),
+        is_filterable: !is_many_association(association),
+        is_sortable: true,
+        is_read_only: false,
+        is_required: false,
+        is_virtual: false,
+        default_value: nil,
+        integration: nil,
+        relationships: nil,
+        widget: nil,
+        validations: []
       }
     end
 
-    def get_relationship_type(association)
-      association.macro.to_s.camelize
-    end
-
     def get_type_for(column)
       # NOTICE: Rails 3 do not have a defined_enums method
       if @model.respond_to?(:defined_enums) &&
@@ -376,7 +381,7 @@ module ForestLiana
     def add_default_value(column_schema, column)
       # TODO: detect/introspect the attribute default value with Rails 5
       #       ex: attribute :email, :string, default: 'arnaud@forestadmin.com'
-      column_schema['default-value'] = column.default if column.default
+      column_schema[:default_value] = column.default if column.default
     end
 
     def add_validations(column_schema, column)
@@ -387,8 +392,6 @@ module ForestLiana
       end
 
       if @model._validators? && @model._validators[column.name.to_sym].size > 0
-        column_schema[:validations] = []
-
         @model._validators[column.name.to_sym].each do |validator|
           # NOTICE: Do not consider conditional validations
           next if validator.options[:if] || validator.options[:unless]
@@ -399,7 +402,7 @@ module ForestLiana
               type: 'is present',
               message: validator.options[:message]
             }
-            column_schema['is-required'] = true
+            column_schema[:is_required] = true
           when ActiveModel::Validations::NumericalityValidator
             validator.options.each do |option, value|
               case option
@@ -418,33 +421,31 @@ module ForestLiana
               end
             end
           when ActiveModel::Validations::LengthValidator
-            if column_schema[:type] == 'String'
-              validator.options.each do |option, value|
-                case option
-                when :minimum
-                  column_schema[:validations] << {
-                    type: 'is longer than',
-                    value: value,
-                    message: validator.options[:message]
-                  }
-                when :maximum
-                  column_schema[:validations] << {
-                    type: 'is shorter than',
-                    value: value,
-                    message: validator.options[:message]
-                  }
-                when :is
-                  column_schema[:validations] << {
-                    type: 'is longer than',
-                    value: value,
-                    message: validator.options[:message]
-                  }
-                  column_schema[:validations] << {
-                    type: 'is shorter than',
-                    value: value,
-                    message: validator.options[:message]
-                  }
-                end
+            validator.options.each do |option, value|
+              case option
+              when :minimum
+                column_schema[:validations] << {
+                  type: 'is longer than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+              when :maximum
+                column_schema[:validations] << {
+                  type: 'is shorter than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+              when :is
+                column_schema[:validations] << {
+                  type: 'is longer than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+                column_schema[:validations] << {
+                  type: 'is shorter than',
+                  value: value,
+                  message: validator.options[:message]
+                }
               end
             end
           when ActiveModel::Validations::FormatValidator

data/app/services/forest_liana/search_query_builder.rb

@@ -14,8 +14,6 @@ module ForestLiana
 
     def perform(resource)
       @resource = @records = resource
-      @tables_associated_to_relations_name =
-        ForestLiana::QueryHelper.get_tables_associated_to_relations_name(@resource)
       @records = search_param
       @records = filter_param
       @records = has_many_filter
@@ -89,7 +87,8 @@ module ForestLiana
         end
 
         if (@params['searchExtended'].to_i == 1)
-          ForestLiana::QueryHelper.get_one_association_names_symbol(@resource).each do |association|
+          SchemaUtils.one_associations(@resource).map(&:name).each do
+            |association|
             if @collection.search_fields
               association_search = @collection.search_fields.map do |field|
                 if field.include?('.') && field.split('.')[0] == association.to_s
@@ -261,8 +260,28 @@ module ForestLiana
     end
 
     def belongs_to_subfield_filter(field, value)
-      condition = OperatorValueParser.get_has_one_condition(@resource, field, value, @params[:timezone])
-      @records.where(condition) if condition
+      field, subfield = field.split(':')
+
+      association = @resource.reflect_on_association(field.to_sym)
+      return if association.blank?
+
+      operator, value = OperatorValueParser.parse(value)
+      filter = OperatorValueParser
+        .get_condition_end(subfield, operator, value, association.klass, @params[:timezone])
+
+      association_name = association.name.to_s
+      association_name_pluralized = association_name.pluralize
+
+      if [association_name, association_name_pluralized].include? association.table_name
+        # NOTICE: Default case. When the belongsTo association name and the referenced table name are identical.
+        association_name_for_condition = association.table_name
+      else
+        # NOTICE: When the the belongsTo association name and the referenced table name are identical.
+        #         Format with the ActiveRecord query generator style.
+        association_name_for_condition = "#{association_name_pluralized}_#{@resource.table_name}"
+      end
+
+      @records.where("#{association_name_for_condition}.#{subfield} #{filter}")
     end
 
     def belongs_to_filter

data/app/services/forest_liana/stat_getter.rb

@@ -5,7 +5,14 @@ module ForestLiana
     def initialize(resource, params)
       @resource = resource
       @params = params
-      compute_includes()
+    end
+
+    private
+
+    def includes
+      SchemaUtils.one_associations(@resource)
+        .select { |association| SchemaUtils.model_included?(association.klass) }
+        .map(&:name)
     end
   end
 end

data/app/services/forest_liana/value_stat_getter.rb

@@ -4,8 +4,8 @@ module ForestLiana
 
     def perform
       return if @params[:aggregate].blank?
-      valueCurrent = get_resource().eager_load(@includes)
-      valuePrevious = get_resource().eager_load(@includes)
+      valueCurrent = get_resource().eager_load(includes)
+      valuePrevious = get_resource().eager_load(includes)
       filter_date_interval = false
 
       if @params[:filterType] && @params[:filters]

data/lib/forest_liana.rb

@@ -24,6 +24,7 @@ module ForestLiana
   mattr_accessor :included_models
   mattr_accessor :user_class_name
   mattr_accessor :names_overriden
+  mattr_accessor :meta
   # TODO: Remove once lianas prior to 2.0.0 are not supported anymore.
   mattr_accessor :names_old_overriden
 
@@ -34,6 +35,7 @@ module ForestLiana
   self.included_models = []
   self.user_class_name = nil
   self.names_overriden = {}
+  self.meta = {}
 
   # TODO: Remove once lianas prior to 2.0.0 are not supported anymore.
   self.names_old_overriden = {}

data/lib/forest_liana/bootstraper.rb

@@ -1,5 +1,8 @@
+require_relative 'schema_file_updater'
+
 module ForestLiana
   class Bootstraper
+    SCHEMA_FILENAME = File.join(Dir.pwd, '.forestadmin-schema.json')
 
     def initialize
       @integration_stripe_valid = false
@@ -38,6 +41,26 @@ module ForestLiana
       create_apimap
       require_lib_forest_liana
       format_and_validate_smart_actions
+
+      if Rails.env.development?
+        @collections_sent = ForestLiana.apimap.as_json
+        @meta_sent = ForestLiana.meta
+        SchemaFileUpdater.new(SCHEMA_FILENAME, @collections_sent, @meta_sent).perform()
+      else
+        if File.exists?(SCHEMA_FILENAME)
+          begin
+            content = JSON.parse(File.read(SCHEMA_FILENAME))
+            @collections_sent = content['collections']
+            @meta_sent = content['meta']
+          rescue JSON::JSONError
+            FOREST_LOGGER.error "The content of .forestadmin-schema.json file is not a correct JSON."
+            FOREST_LOGGER.error "The schema cannot be synchronized with Forest Admin servers."
+          end
+        else
+          FOREST_LOGGER.error "The .forestadmin-schema.json file does not exists."
+          FOREST_LOGGER.error "The schema cannot be synchronized with Forest Admin servers."
+        end
+      end
     end
 
     def is_sti_parent_model?(model)
@@ -148,7 +171,19 @@ module ForestLiana
         end
     end
 
+    def setup_forest_liana_meta
+      ForestLiana.meta = {
+        database_type: database_type,
+        framework_version: Gem.loaded_specs["rails"].version.version,
+        liana: 'forest-rails',
+        liana_version: liana_version,
+        orm_version: Gem.loaded_specs["activerecord"].version.version
+      }
+    end
+
     def create_apimap
+      setup_forest_liana_meta
+
       ForestLiana.models.map do |model|
         if analyze_model?(model)
           SchemaAdapter.new(model).perform
@@ -184,17 +219,6 @@ module ForestLiana
     def format_and_validate_smart_actions
       ForestLiana.apimap.each do |collection|
         collection.actions.each do |action|
-          if action.global
-            FOREST_LOGGER.warn "DEPRECATION WARNING: Smart Action \"global\" option is now " \
-              "deprecated. Please set \"type: 'global'\" instead of \"global: true\" for the " \
-              "\"#{action.name}\" Smart Action."
-          end
-
-          if action.type && !['bulk', 'global', 'single'].include?(action.type)
-            FOREST_LOGGER.warn "Please set a valid Smart Action type (\"bulk\", \"global\" or " \
-              "\"single\") for the \"#{action.name}\" Smart Action."
-          end
-
           if action.fields
             # NOTICE: Set a position to the Smart Actions fields.
             action.fields.each_with_index do |field, index|
@@ -206,18 +230,8 @@ module ForestLiana
     end
 
     def get_apimap_serialized
-      apimap = JSONAPI::Serializer.serialize(ForestLiana.apimap, {
-        is_collection: true,
-        include: ['actions', 'segments'],
-        meta: {
-          liana: 'forest-rails',
-          liana_version: liana_version,
-          framework_version: Gem.loaded_specs["rails"].version.version,
-          orm_version: Gem.loaded_specs["activerecord"].version.version,
-          database_type: database_type
-        }
-      })
-
+      serializer = ForestLiana::SchemaSerializer.new(@collections_sent, @meta_sent)
+      apimap = serializer.serialize
       ForestLiana::ApimapSorter.new(apimap).perform
     end
 
@@ -287,12 +301,10 @@ module ForestLiana
       model_name = ForestLiana.name_for(collection_name.constantize)
       # TODO: Remove once lianas prior to 2.0.0 are not supported anymore.
       model_name_old = ForestLiana.name_old_for(collection_name.constantize)
-      collection_display_name = collection_name.capitalize
 
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_intercom_conversations",
         name_old: "#{model_name_old}_intercom_conversations",
-        display_name: collection_display_name + ' Conversations',
         icon: 'intercom',
         integration: 'intercom',
         only_for_relationships: true,
@@ -310,30 +322,29 @@ module ForestLiana
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_intercom_attributes",
         name_old: "#{model_name_old}_intercom_attributes",
-        display_name: collection_display_name + ' Attributes',
         icon: 'intercom',
         integration: 'intercom',
         only_for_relationships: true,
         is_virtual: true,
         is_searchable: false,
         fields: [
-          { field: :created_at, type: 'Date', 'is-filterable': false },
-          { field: :updated_at, type: 'Date', 'is-filterable': false },
-          { field: :session_count, type: 'Number', 'is-filterable': false },
-          { field: :last_seen_ip, type: 'String', 'is-filterable': false },
-          { field: :signed_up_at, type: 'Date', 'is-filterable': false },
-          { field: :country, type: 'String', 'is-filterable': false },
-          { field: :city, type: 'String', 'is-filterable': false },
-          { field: :browser, type: 'String', 'is-filterable': false },
-          { field: :platform, type: 'String', 'is-filterable': false },
-          { field: :companies, type: 'String', 'is-filterable': false },
-          { field: :segments, type: 'String', 'is-filterable': false },
-          { field: :tags, type: 'String', 'is-filterable': false },
+          { field: :created_at, type: 'Date', is_filterable: false },
+          { field: :updated_at, type: 'Date', is_filterable: false },
+          { field: :session_count, type: 'Number', is_filterable: false },
+          { field: :last_seen_ip, type: 'String', is_filterable: false },
+          { field: :signed_up_at, type: 'Date', is_filterable: false },
+          { field: :country, type: 'String', is_filterable: false },
+          { field: :city, type: 'String', is_filterable: false },
+          { field: :browser, type: 'String', is_filterable: false },
+          { field: :platform, type: 'String', is_filterable: false },
+          { field: :companies, type: 'String', is_filterable: false },
+          { field: :segments, type: 'String', is_filterable: false },
+          { field: :tags, type: 'String', is_filterable: false },
           {
             field: :geoloc,
             type: 'String',
             widget: 'map',
-            'is-filterable': false
+            is_filterable: false
           }
         ]
       })
@@ -355,12 +366,10 @@ module ForestLiana
       model_name = ForestLiana.name_for(collection_name.constantize)
       # TODO: Remove once lianas prior to 2.0.0 are not supported anymore.
       model_name_old = ForestLiana.name_old_for(collection_name.constantize)
-      collection_display_name = model_name.capitalize
 
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_stripe_payments",
         name_old: "#{model_name_old}_stripe_payments",
-        display_name: collection_display_name + ' Payments',
         icon: 'stripe',
         integration: 'stripe',
         is_virtual: true,
@@ -368,24 +377,22 @@ module ForestLiana
         is_searchable: false,
         pagination_type: 'cursor',
         fields: [
-          { field: :id, type: 'String', 'is-filterable': false },
-          { field: :created, type: 'Date', 'is-filterable': false },
-          { field: :amount, type: 'Number', 'is-filterable': false },
-          { field: :status, type: 'String', 'is-filterable': false },
-          { field: :currency, type: 'String', 'is-filterable': false },
-          { field: :refunded, type: 'Boolean', 'is-filterable': false },
-          { field: :description, type: 'String', 'is-filterable': false },
+          { field: :id, type: 'String', is_filterable: false },
+          { field: :created, type: 'Date', is_filterable: false },
+          { field: :amount, type: 'Number', is_filterable: false },
+          { field: :status, type: 'String', is_filterable: false },
+          { field: :currency, type: 'String', is_filterable: false },
+          { field: :refunded, type: 'Boolean', is_filterable: false },
+          { field: :description, type: 'String', is_filterable: false },
           {
             field: :customer,
             type: 'String',
-            relationship: 'BelongsTo',
             reference: "#{model_name}.id",
-            'is-filterable': false
+            is_filterable: false
           }
         ],
         actions: [
           ForestLiana::Model::Action.new({
-            id: 'stripe.Refund',
             name: 'Refund',
             endpoint: '/forest/stripe_payments/refunds'
           })
@@ -395,7 +402,6 @@ module ForestLiana
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_stripe_invoices",
         name_old: "#{model_name_old}_stripe_invoices",
-        display_name: collection_display_name + ' Invoices',
         icon: 'stripe',
         integration: 'stripe',
         is_virtual: true,
@@ -403,27 +409,26 @@ module ForestLiana
         is_searchable: false,
         pagination_type: 'cursor',
         fields: [
-          { field: :id, type: 'String', 'is-filterable': false },
-          { field: :amount_due, type: 'Number', 'is-filterable': false },
-          { field: :attempt_count, type: 'Number', 'is-filterable': false },
-          { field: :attempted, type: 'Boolean', 'is-filterable': false },
-          { field: :closed, type: 'Boolean', 'is-filterable': false },
-          { field: :currency, type: 'String', 'is-filterable': false },
-          { field: :date, type: 'Date', 'is-filterable': false },
-          { field: :forgiven, type: 'Boolean', 'is-filterable': false },
-          { field: :period_start, type: 'Date', 'is-filterable': false },
-          { field: :period_end, type: 'Date', 'is-filterable': false },
-          { field: :subtotal, type: 'Number', 'is-filterable': false },
-          { field: :total, type: 'Number', 'is-filterable': false },
-          { field: :application_fee, type: 'Number', 'is-filterable': false },
-          { field: :tax, type: 'Number', 'is-filterable': false },
-          { field: :tax_percent, type: 'Number', 'is-filterable': false },
+          { field: :id, type: 'String', is_filterable: false },
+          { field: :amount_due, type: 'Number', is_filterable: false },
+          { field: :attempt_count, type: 'Number', is_filterable: false },
+          { field: :attempted, type: 'Boolean', is_filterable: false },
+          { field: :closed, type: 'Boolean', is_filterable: false },
+          { field: :currency, type: 'String', is_filterable: false },
+          { field: :date, type: 'Date', is_filterable: false },
+          { field: :forgiven, type: 'Boolean', is_filterable: false },
+          { field: :period_start, type: 'Date', is_filterable: false },
+          { field: :period_end, type: 'Date', is_filterable: false },
+          { field: :subtotal, type: 'Number', is_filterable: false },
+          { field: :total, type: 'Number', is_filterable: false },
+          { field: :application_fee, type: 'Number', is_filterable: false },
+          { field: :tax, type: 'Number', is_filterable: false },
+          { field: :tax_percent, type: 'Number', is_filterable: false },
           {
             field: :customer,
             type: 'String',
-            relationship: 'BelongsTo',
             reference: "#{model_name}.id",
-            'is-filterable': false
+            is_filterable: false
           }
         ]
       })
@@ -431,7 +436,6 @@ module ForestLiana
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_stripe_cards",
         name_old: "#{model_name_old}_stripe_cards",
-        display_name: collection_display_name + ' Cards',
         icon: 'stripe',
         integration: 'stripe',
         is_virtual: true,
@@ -440,27 +444,26 @@ module ForestLiana
         only_for_relationships: true,
         pagination_type: 'cursor',
         fields: [
-          { field: :id, type: 'String', 'is-filterable': false },
-          { field: :last4, type: 'String', 'is-filterable': false },
-          { field: :brand, type: 'String', 'is-filterable': false },
-          { field: :funding, type: 'String', 'is-filterable': false },
-          { field: :exp_month, type: 'Number', 'is-filterable': false },
-          { field: :exp_year, type: 'Number', 'is-filterable': false },
-          { field: :country, type: 'String', 'is-filterable': false },
-          { field: :name, type: 'String', 'is-filterable': false },
-          { field: :address_line1, type: 'String', 'is-filterable': false },
-          { field: :address_line2, type: 'String', 'is-filterable': false },
-          { field: :address_city, type: 'String', 'is-filterable': false },
-          { field: :address_state, type: 'String', 'is-filterable': false },
-          { field: :address_zip, type: 'String', 'is-filterable': false },
-          { field: :address_country, type: 'String', 'is-filterable': false },
-          { field: :cvc_check, type: 'String', 'is-filterable': false },
+          { field: :id, type: 'String', is_filterable: false },
+          { field: :last4, type: 'String', is_filterable: false },
+          { field: :brand, type: 'String', is_filterable: false },
+          { field: :funding, type: 'String', is_filterable: false },
+          { field: :exp_month, type: 'Number', is_filterable: false },
+          { field: :exp_year, type: 'Number', is_filterable: false },
+          { field: :country, type: 'String', is_filterable: false },
+          { field: :name, type: 'String', is_filterable: false },
+          { field: :address_line1, type: 'String', is_filterable: false },
+          { field: :address_line2, type: 'String', is_filterable: false },
+          { field: :address_city, type: 'String', is_filterable: false },
+          { field: :address_state, type: 'String', is_filterable: false },
+          { field: :address_zip, type: 'String', is_filterable: false },
+          { field: :address_country, type: 'String', is_filterable: false },
+          { field: :cvc_check, type: 'String', is_filterable: false },
           {
             field: :customer,
             type: 'String',
-            relationship: 'BelongsTo',
             reference: "#{model_name}.id",
-            'is-filterable': false
+            is_filterable: false
           }
         ]
       })
@@ -468,7 +471,6 @@ module ForestLiana
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_stripe_subscriptions",
         name_old: "#{model_name_old}_stripe_subscriptions",
-        display_name: collection_display_name + ' Subscriptions',
         icon: 'stripe',
         integration: 'stripe',
         is_virtual: true,
@@ -476,26 +478,25 @@ module ForestLiana
         is_searchable: false,
         pagination_type: 'cursor',
         fields: [
-          { field: :id, type: 'String', 'is-filterable': false },
-          { field: :cancel_at_period_end, type: 'Boolean', 'is-filterable': false },
-          { field: :canceled_at, type: 'Date', 'is-filterable': false },
-          { field: :created, type: 'Date', 'is-filterable': false },
-          { field: :current_period_end, type: 'Date', 'is-filterable': false },
-          { field: :current_period_start, type: 'Date', 'is-filterable': false },
-          { field: :ended_at, type: 'Date', 'is-filterable': false },
-          { field: :livemode, type: 'Boolean', 'is-filterable': false },
-          { field: :quantity, type: 'Number', 'is-filterable': false },
-          { field: :start, type: 'Date', 'is-filterable': false },
-          { field: :status, type: 'String', 'is-filterable': false },
-          { field: :tax_percent, type: 'Number', 'is-filterable': false },
-          { field: :trial_end, type: 'Date', 'is-filterable': false },
-          { field: :trial_start, type: 'Date', 'is-filterable': false },
+          { field: :id, type: 'String', is_filterable: false },
+          { field: :cancel_at_period_end, type: 'Boolean', is_filterable: false },
+          { field: :canceled_at, type: 'Date', is_filterable: false },
+          { field: :created, type: 'Date', is_filterable: false },
+          { field: :current_period_end, type: 'Date', is_filterable: false },
+          { field: :current_period_start, type: 'Date', is_filterable: false },
+          { field: :ended_at, type: 'Date', is_filterable: false },
+          { field: :livemode, type: 'Boolean', is_filterable: false },
+          { field: :quantity, type: 'Number', is_filterable: false },
+          { field: :start, type: 'Date', is_filterable: false },
+          { field: :status, type: 'String', is_filterable: false },
+          { field: :tax_percent, type: 'Number', is_filterable: false },
+          { field: :trial_end, type: 'Date', is_filterable: false },
+          { field: :trial_start, type: 'Date', is_filterable: false },
           {
             field: :customer,
             type: 'String',
-            relationship: 'BelongsTo',
             reference: "#{model_name}.id",
-            'is-filterable': false
+            is_filterable: false
           }
         ]
       })
@@ -503,7 +504,6 @@ module ForestLiana
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_stripe_bank_accounts",
         name_old: "#{model_name_old}_stripe_bank_accounts",
-        display_name: collection_display_name + ' Bank Accounts',
         icon: 'stripe',
         integration: 'stripe',
         is_virtual: true,
@@ -512,24 +512,23 @@ module ForestLiana
         only_for_relationships: true,
         pagination_type: 'cursor',
         fields: [
-          { field: :id, type: 'String', 'is-filterable': false },
-          { field: :account, type: 'String', 'is-filterable': false },
-          { field: :account_holder_name, type: 'String', 'is-filterable': false },
-          { field: :account_holder_type, type: 'String', 'is-filterable': false },
-          { field: :bank_name, type: 'String', 'is-filterable': false },
-          { field: :country, type: 'String', 'is-filterable': false },
-          { field: :currency, type: 'String', 'is-filterable': false },
-          { field: :default_for_currency, type: 'Boolean', 'is-filterable': false },
-          { field: :fingerprint, type: 'String', 'is-filterable': false },
-          { field: :last4, type: 'String', 'is-filterable': false },
-          { field: :rooting_number, type: 'String', 'is-filterable': false },
-          { field: :status, type: 'String', 'is-filterable': false },
+          { field: :id, type: 'String', is_filterable: false },
+          { field: :account, type: 'String', is_filterable: false },
+          { field: :account_holder_name, type: 'String', is_filterable: false },
+          { field: :account_holder_type, type: 'String', is_filterable: false },
+          { field: :bank_name, type: 'String', is_filterable: false },
+          { field: :country, type: 'String', is_filterable: false },
+          { field: :currency, type: 'String', is_filterable: false },
+          { field: :default_for_currency, type: 'Boolean', is_filterable: false },
+          { field: :fingerprint, type: 'String', is_filterable: false },
+          { field: :last4, type: 'String', is_filterable: false },
+          { field: :rooting_number, type: 'String', is_filterable: false },
+          { field: :status, type: 'String', is_filterable: false },
           {
             field: :customer,
             type: 'String',
-            relationship: 'BelongsTo',
             reference: "#{model_name}.id",
-            'is-filterable': false
+            is_filterable: false
           }
         ]
       })
@@ -567,9 +566,8 @@ module ForestLiana
     def setup_mixpanel_integration(collection_name_and_field)
       collection_name = collection_name_and_field.split('.')[0]
       model_name = ForestLiana.name_for(collection_name.constantize)
-      collection_display_name = model_name.capitalize
 
-      field_attributes = { 'is-filterable': false , 'is-virtual': true, 'is-sortable': false }
+      field_attributes = { is_filterable: false , is_virtual: true, is_sortable: false }
 
       fields = [
         { field: :id, type: 'String' },
@@ -596,7 +594,6 @@ module ForestLiana
 
       ForestLiana.apimap << ForestLiana::Model::Collection.new({
         name: "#{model_name}_mixpanel_events",
-        display_name: "#{collection_display_name} Events",
         icon: 'mixpanel',
         integration: 'mixpanel',
         is_virtual: true,