forest_liana 1.3.28 → 1.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6c7f15a6e133527eec75f090625392109cb4c6
-  data.tar.gz: 28303118fd5b82b5521729466fb29e99aea40e85
+  metadata.gz: 260b5a5f3205cc16a71e70e18ba1082f2e886d38
+  data.tar.gz: e3d7e787be1f394888c948d7db0c89c90866179d
 SHA512:
-  metadata.gz: cc6e3b73720d9ea1656f65f69e893d5d0a67d53b184774a82aa03439c8c7f60292f77141d2e0551d99c7b279cd27853758710ee60609447816e344b9d4e17b9c
-  data.tar.gz: 0d432fa88bf65db51ad5e2183f4d26714833c05c8cb0622a0d6310146b61647a90b4a0b2beb9f22a1685e670c0904c5e4109e70baf41c258b715e1e2b2202378
+  metadata.gz: f15bb5a2fe9c322dfa86639076a26d7cbe44ed33532e5ee8ae2c01ec282857619e9a3bf277067b52c51d25c02bb89204399d34cf0a51e0b69aef84780b90e48d
+  data.tar.gz: 7a98b3b22f891447a3f28357045478312621bf10662ced2d960f09cd4451109c93aa4aa8e4c01cf75f3e8d4ba7c25f6fed0aa0fa3fdd89a965ff74d4b880425d

data/app/controllers/forest_liana/intercom_controller.rb

@@ -5,6 +5,7 @@ module ForestLiana
       getter.perform
 
       render serializer: nil, json: serialize_models(getter.records, {
+        context: { type: get_serializer_type('intercom_conversations') },
         count: getter.count
       })
     end
@@ -13,7 +14,13 @@ module ForestLiana
       getter = IntercomAttributesGetter.new(params)
       getter.perform
 
-      render json: serialize_model(getter.records), serializer: nil
+      render serializer: nil, json: serialize_model(getter.records, {
+        context: { type: get_serializer_type('intercom_attributes') }
+      })
+    end
+
+    def get_serializer_type(suffix)
+      "#{params[:collection]}_#{suffix}"
     end
   end
 end

data/app/controllers/forest_liana/stripe_controller.rb

@@ -8,6 +8,7 @@ module ForestLiana
       getter.perform
 
       render serializer: nil, json: serialize_models(getter.records, {
+        context: { type: get_serializer_type('stripe_payments') },
         count: getter.count,
         include: ['customer']
       })
@@ -31,6 +32,7 @@ module ForestLiana
       getter.perform
 
       render serializer: nil, json: serialize_models(getter.records, {
+        context: { type: get_serializer_type('stripe_cards') },
         count: getter.count,
         include: ['customer']
       })
@@ -43,9 +45,40 @@ module ForestLiana
       getter.perform
 
       render serializer: nil, json: serialize_models(getter.records, {
+        context: { type: get_serializer_type('stripe_invoices') },
         count: getter.count,
         include: ['customer']
       })
     end
+
+    def subscriptions
+      getter = StripeSubscriptionsGetter.new(params,
+                                     request.headers['Stripe-Secret-Key'],
+                                     request.headers['Stripe-Reference'])
+      getter.perform
+
+      render serializer: nil, json: serialize_models(getter.records, {
+        context: { type: get_serializer_type('stripe_subscriptions') },
+        count: getter.count,
+        include: ['customer']
+      })
+    end
+
+    def bank_accounts
+      getter = StripeBankAccountsGetter.new(params,
+                                     request.headers['Stripe-Secret-Key'],
+                                     request.headers['Stripe-Reference'])
+      getter.perform
+
+      render serializer: nil, json: serialize_models(getter.records, {
+        context: { type: get_serializer_type('stripe_bank_accounts') },
+        count: getter.count,
+        include: ['customer']
+      })
+    end
+
+    def get_serializer_type(suffix)
+      "#{params[:collection]}_#{suffix}"
+    end
   end
 end

data/app/models/forest_liana/model/collection.rb

@@ -5,7 +5,7 @@ class ForestLiana::Model::Collection
   extend ActiveModel::Naming
 
   attr_accessor :name, :fields, :actions, :only_for_relationships, :is_virtual,
-    :is_read_only, :is_searchable
+    :is_read_only, :is_searchable, :display_name, :icon, :pagination_type
 
   def initialize(attributes = {})
     @actions = []

data/app/serializers/forest_liana/collection_serializer.rb

@@ -4,11 +4,14 @@ class ForestLiana::CollectionSerializer
   include JSONAPI::Serializer
 
   attribute :name
+  attribute :display_name
+  attribute :icon
   attribute :fields
   attribute :only_for_relationships
   attribute :is_virtual
   attribute :is_read_only
   attribute :is_searchable
+  attribute :pagination_type
 
   has_many :actions do
     object.actions

data/app/serializers/forest_liana/intercom_attribute_serializer.rb

@@ -63,7 +63,7 @@ module ForestLiana
     end
 
     def type
-      'intercom-attributes'
+      @options[:context][:type] || 'intercom-attributes'
     end
 
     def format_name(attribute_name)

data/app/serializers/forest_liana/intercom_conversation_serializer.rb

@@ -24,7 +24,7 @@ module ForestLiana
     end
 
     def type
-      'intercom-conversations'
+      @options[:context][:type] || 'intercom-conversations'
     end
 
     def format_name(attribute_name)

data/app/serializers/forest_liana/serializer_factory.rb

@@ -29,6 +29,12 @@ module ForestLiana
       elsif defined?(::Stripe::Invoice) &&
         active_record_class == ::Stripe::Invoice
         "ForestLiana::StripeInvoiceSerializer"
+      elsif defined?(::Stripe::Subscription) &&
+        active_record_class == ::Stripe::Subscription
+        "ForestLiana::StripeSubscriptionSerializer"
+      elsif defined?(::Stripe::BankAccount) &&
+        active_record_class == ::Stripe::BankAccount
+        "ForestLiana::StripeBankAccountSerializer"
       elsif active_record_class == ForestLiana::Model::Stat
         "ForestLiana::StatSerializer"
       elsif active_record_class == ForestLiana::Model::Collection
@@ -118,15 +124,25 @@ module ForestLiana
         private
 
         def intercom_integration?
-          object.class.name == ForestLiana.integrations
+          ForestLiana.integrations
             .try(:[], :intercom)
-            .try(:[], :user_collection)
+            .try(:[], :mapping)
+            .try(:include?, object.class.name)
         end
 
         def stripe_integration?
-          object.class.name == ForestLiana.integrations
+          mapping = ForestLiana.integrations
             .try(:[], :stripe)
-            .try(:[], :user_collection)
+            .try(:[], :mapping)
+
+          if mapping
+            collection_names = mapping.map do |collection_name_and_field|
+              collection_name_and_field.split('.')[0]
+            end
+            collection_names.include?(object.class.name)
+          else
+            false
+          end
         end
       }
 
@@ -169,15 +185,13 @@ module ForestLiana
       end
 
       # Intercom
-      if active_record_class.name == ForestLiana.integrations
-        .try(:[], :intercom).try(:[], :user_collection)
+      if has_intercom_integration?(active_record_class.name)
         serializer.send(:has_many, :intercom_conversations) { }
         serializer.send(:has_many, :intercom_attributes) { }
       end
 
       # Stripe
-      if active_record_class.name == ForestLiana.integrations
-        .try(:[], :stripe).try(:[], :user_collection)
+      if has_stripe_integration?(active_record_class.name)
         serializer.send(:has_many, :stripe_payments) { }
         serializer.send(:has_many, :stripe_invoices) { }
         serializer.send(:has_many, :stripe_cards) { }
@@ -195,6 +209,28 @@ module ForestLiana
       active_record_class.to_s.tableize.to_sym
     end
 
+    def has_intercom_integration?(collection_name)
+      ForestLiana.integrations
+        .try(:[], :intercom)
+        .try(:[], :mapping)
+        .try(:include?, collection_name)
+    end
+
+    def has_stripe_integration?(collection_name)
+      mapping = ForestLiana.integrations
+        .try(:[], :stripe)
+        .try(:[], :mapping)
+
+      if mapping
+        collection_names = mapping.map do |collection_name_and_field|
+          collection_name_and_field.split('.')[0]
+        end
+        collection_names.include?(collection_name)
+      else
+        false
+      end
+    end
+
     def serializer_association(association)
       case association.macro
       when :has_one, :belongs_to

data/app/serializers/forest_liana/stripe_bank_account_serializer.rb

@@ -0,0 +1,43 @@
+module ForestLiana
+  class StripeCardSerializer
+    include JSONAPI::Serializer
+
+    attribute :account
+    attribute :account_holder_name
+    attribute :account_holder_type
+    attribute :bank_name
+    attribute :country
+    attribute :currency
+    attribute :default_for_currency
+    attribute :fingerprint
+    attribute :last4
+    attribute :rooting_number
+    attribute :status
+
+    has_one :customer
+
+    def self_link
+      "/forest#{super}"
+    end
+
+    def type
+      @options[:context][:type] || 'stripe_bank_accounts'
+    end
+
+    def format_name(attribute_name)
+      attribute_name.to_s
+    end
+
+    def unformat_name(attribute_name)
+      attribute_name.to_s
+    end
+
+    def relationship_self_link(attribute_name)
+      nil
+    end
+
+    def relationship_related_link(attribute_name)
+      nil
+    end
+  end
+end

data/app/serializers/forest_liana/stripe_card_serializer.rb

@@ -24,7 +24,7 @@ module ForestLiana
     end
 
     def type
-      'stripe_cards'
+      @options[:context][:type] || 'stripe_cards'
     end
 
     def format_name(attribute_name)

data/app/serializers/forest_liana/stripe_invoice_serializer.rb

@@ -25,7 +25,7 @@ module ForestLiana
     end
 
     def type
-      'stripe_invoices'
+      @options[:context][:type] || 'stripe_invoices'
     end
 
     def format_name(attribute_name)

data/app/serializers/forest_liana/stripe_payment_serializer.rb

@@ -16,7 +16,7 @@ module ForestLiana
     end
 
     def type
-      'stripe_payments'
+      @options[:context][:type] || 'stripe_payments'
     end
 
     def format_name(attribute_name)

data/app/serializers/forest_liana/stripe_subscription_serializer.rb

@@ -0,0 +1,45 @@
+module ForestLiana
+  class StripeInvoiceSerializer
+    include JSONAPI::Serializer
+
+    attribute :cancel_at_period_end
+    attribute :canceled_at
+    attribute :created
+    attribute :current_period_end
+    attribute :current_period_start
+    attribute :ended_at
+    attribute :livemode
+    attribute :quantity
+    attribute :start
+    attribute :status
+    attribute :tax_percent
+    attribute :trial_end
+    attribute :trial_start
+
+    has_one :customer
+
+    def self_link
+      "/forest#{super}"
+    end
+
+    def type
+      @options[:context][:type] || 'stripe_subscriptions'
+    end
+
+    def format_name(attribute_name)
+      attribute_name.to_s
+    end
+
+    def unformat_name(attribute_name)
+      attribute_name.to_s
+    end
+
+    def relationship_self_link(attribute_name)
+      nil
+    end
+
+    def relationship_related_link(attribute_name)
+      nil
+    end
+  end
+end

data/app/services/forest_liana/intercom_attributes_getter.rb

@@ -14,9 +14,8 @@ module ForestLiana
     end
 
     def perform
-      resource = user_collection.find(@params[:id])
-
       begin
+        resource = collection.find(@params[:id])
         user = @intercom.users.find(email: resource.email)
 
         user.segments = user.segments.map do |segment|
@@ -30,15 +29,8 @@ module ForestLiana
 
     private
 
-    def user_collection
-      ForestLiana.integrations
-        .try(:[], :intercom)
-        .try(:[], :user_collection)
-        .try(:constantize)
-    end
-
-    def user_collection?
-      user_collection.present?
+    def collection
+      @params[:collection].singularize.capitalize.constantize
     end
   end
 end

data/app/services/forest_liana/intercom_conversations_getter.rb

@@ -27,7 +27,7 @@ module ForestLiana
 
     def perform
       begin
-        resource = user_collection.find(@params[:id])
+        resource = collection.find(@params[:id])
         @records = @intercom.conversations.find_all(
           email: resource.email,
           type: 'user',
@@ -40,15 +40,8 @@ module ForestLiana
 
     private
 
-    def user_collection
-      ForestLiana.integrations
-        .try(:[], :intercom)
-        .try(:[], :user_collection)
-        .try(:constantize)
-    end
-
-    def user_collection?
-      user_collection.present?
+    def collection
+      @params[:collection].singularize.capitalize.constantize
     end
 
     def link(conversation)

data/app/services/forest_liana/operator_value_parser.rb

@@ -14,7 +14,7 @@ module ForestLiana
         operator = '<'
         value.slice!(0)
       elsif value.include?('*')
-        operator = 'ILIKE'
+        operator = 'LIKE'
         value.gsub!('*', '%')
       elsif value === '$present'
         operator = 'IS NOT NULL'

data/app/services/forest_liana/schema_adapter.rb

@@ -56,11 +56,14 @@ module ForestLiana
 
       # Intercom
       if ForestLiana.integrations.try(:[], :intercom)
-        .try(:[], :user_collection) == @model.name
+        .try(:[], :mapping).try(:include?, @model.name)
+
+        model_name = @model.table_name
+
         collection.fields << {
           field: :intercom_conversations,
           type: ['String'],
-          reference: 'intercom_conversations.id',
+          reference: "#{model_name}_intercom_conversations.id",
           column: nil,
           is_searchable: false,
           integration: 'intercom'
@@ -69,7 +72,7 @@ module ForestLiana
         @collection.fields << {
           field: :intercom_attributes,
           type: 'String',
-          reference: 'intercom_attributes.id',
+          reference: "#{model_name}_intercom_attributes.id",
           column: nil,
           is_searchable: false,
           integration: 'intercom'
@@ -77,34 +80,61 @@ module ForestLiana
       end
 
       # Stripe
-      if ForestLiana.integrations.try(:[], :stripe)
-        .try(:[], :user_collection) == @model.name
-        collection.fields << {
-          field: :stripe_payments,
-          type: ['String'],
-          reference: 'stripe_payments.id',
-          column: nil,
-          is_searchable: false,
-          integration: 'stripe'
-        }
-
-        collection.fields << {
-          field: :stripe_invoices,
-          type: ['String'],
-          reference: 'stripe_invoices.id',
-          column: nil,
-          is_searchable: false,
-          integration: 'stripe'
-        }
-
-        collection.fields << {
-          field: :stripe_cards,
-          type: ['String'],
-          reference: 'stripe_cards.id',
-          column: nil,
-          is_searchable: false,
-          integration: 'stripe'
-        }
+      stripe_mapping = ForestLiana.integrations.try(:[], :stripe)
+                                               .try(:[], :mapping)
+
+      if stripe_mapping
+        if stripe_mapping
+            .select { |mapping| mapping.split('.')[0] == @model.name }
+            .size > 0
+
+          model_name = @model.table_name
+
+          collection.fields << {
+            field: :stripe_payments,
+            type: ['String'],
+            reference: "#{model_name}_stripe_payments.id",
+            column: nil,
+            is_searchable: false,
+            integration: 'stripe'
+          }
+
+          collection.fields << {
+            field: :stripe_invoices,
+            type: ['String'],
+            reference: "#{model_name}_stripe_invoices.id",
+            column: nil,
+            is_searchable: false,
+            integration: 'stripe'
+          }
+
+          collection.fields << {
+            field: :stripe_cards,
+            type: ['String'],
+            reference: "#{model_name}_stripe_cards.id",
+            column: nil,
+            is_searchable: false,
+            integration: 'stripe'
+          }
+
+          collection.fields << {
+            field: :stripe_subscriptions,
+            type: ['String'],
+            reference: "#{model_name}_stripe_subscriptions.id",
+            column: nil,
+            is_searchable: false,
+            integration: 'stripe'
+          }
+
+          collection.fields << {
+            field: :stripe_bank_accounts,
+            type: ['String'],
+            reference: "#{model_name}_stripe_bank_accounts.id",
+            column: nil,
+            is_searchable: false,
+            integration: 'stripe'
+          }
+        end
       end
 
       # Paperclip url attribute