feat: #89 Remove frequency from charge

getlago · Apr 21, 2022 · 4df09f1 · 4df09f1
1 parent a5fe95a
commit 4df09f1
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 113 deletions.
diff --git a/app/graphql/types/charges/frequency_enum.rb b/app/graphql/types/charges/frequency_enum.rb
diff --git a/app/graphql/types/charges/input.rb b/app/graphql/types/charges/input.rb
@@ -9,7 +9,6 @@ class Input < Types::BaseInputObject
       argument :billable_metric_id, ID, required: true
       argument :amount_cents, Integer, required: true
       argument :amount_currency, Types::CurrencyEnum, required: true
-      argument :frequency, Types::Charges::FrequencyEnum, required: true
       argument :charge_model, Types::Charges::ChargeModelEnum, required: true
       argument :pro_rata, Boolean, required: true
       argument :vat_rate, Float, required: false

diff --git a/app/graphql/types/charges/object.rb b/app/graphql/types/charges/object.rb
@@ -9,7 +9,6 @@ class Object < Types::BaseObject
       field :billable_metric, Types::BillableMetrics::Object, null: false
       field :amount_cents, Integer, null: false
       field :amount_currency, Types::CurrencyEnum, null: false
-      field :frequency, Types::Charges::FrequencyEnum, null: false
       field :charge_model, Types::Charges::ChargeModelEnum, null: false
       field :pro_rata, Boolean, null: false
       field :vat_rate, Float

diff --git a/app/models/charge.rb b/app/models/charge.rb
@@ -8,16 +8,10 @@ class Charge < ApplicationRecord
 
   has_many :fees
 
-  FREQUENCIES = %i[
-    one_time
-    recurring
-  ].freeze
-
   CHARGE_MODELS = %i[
     standard
   ].freeze
 
-  enum frequency: FREQUENCIES
   enum charge_model: CHARGE_MODELS
 
   monetize :amount_cents

diff --git a/app/services/plans_service.rb b/app/services/plans_service.rb
@@ -108,15 +108,14 @@ def create_charge(plan, args)
       billable_metric_id: args[:billable_metric_id],
       amount_cents: args[:amount_cents],
       amount_currency: args[:amount_currency],
-      frequency: args[:frequency].to_sym,
       pro_rata: args[:pro_rata],
       vat_rate: args[:vat_rate],
       charge_model: args[:charge_model].to_sym,
     )
   end
 
   def sanitize_charges(plan, args_charges, created_charges_ids)
-    args_charges_ids = args_charges.select { |c| c[:id] != nil }.map { |c| c[:id] }
+    args_charges_ids = args_charges.reject { |c| c[:id].nil? }.map { |c| c[:id] }
     charges_ids = plan.charges.pluck(:id) - args_charges_ids - created_charges_ids
     charges_ids.each do |charge_id|
       Charge.find_by(id: charge_id).destroy!

diff --git a/db/migrate/20220421150849_remove_charges_frequency.rb b/db/migrate/20220421150849_remove_charges_frequency.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveChargesFrequency < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :charges, :frequency
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/schema.graphql b/schema.graphql
@@ -50,24 +50,17 @@ type Charge {
   billableMetric: BillableMetric!
   chargeModel: ChargeModelEnum!
   createdAt: ISO8601DateTime!
-  frequency: ChargeFrequency!
   id: ID!
   proRata: Boolean!
   updatedAt: ISO8601DateTime!
   vatRate: Float
 }
 
-enum ChargeFrequency {
-  one_time
-  recurring
-}
-
 input ChargeInput {
   amountCents: Int!
   amountCurrency: CurrencyEnum!
   billableMetricId: ID!
   chargeModel: ChargeModelEnum!
-  frequency: ChargeFrequency!
   id: ID
   proRata: Boolean!
   vatRate: Float

diff --git a/schema.json b/schema.json
@@ -572,24 +572,6 @@
 
               ]
             },
-            {
-              "name": "frequency",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "ChargeFrequency",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null,
-              "args": [
-
-              ]
-            },
             {
               "name": "id",
               "description": null,
@@ -662,29 +644,6 @@
           "inputFields": null,
           "enumValues": null
         },
-        {
-          "kind": "ENUM",
-          "name": "ChargeFrequency",
-          "description": null,
-          "interfaces": null,
-          "possibleTypes": null,
-          "fields": null,
-          "inputFields": null,
-          "enumValues": [
-            {
-              "name": "one_time",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "recurring",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ]
-        },
         {
           "kind": "INPUT_OBJECT",
           "name": "ChargeInput",
@@ -753,22 +712,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "frequency",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "ChargeFrequency",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "chargeModel",
               "description": null,

diff --git a/spec/factories/charge_factory.rb b/spec/factories/charge_factory.rb
@@ -9,13 +9,5 @@
 
     pro_rata { false }
     charge_model { 'standard' }
-
-    factory :one_time_charge do
-      frequency { :one_time }
-    end
-
-    factory :recurring_charge do
-      frequency { :recurring }
-    end
   end
 end
diff --git a/spec/graphql/mutations/plans/create_spec.rb b/spec/graphql/mutations/plans/create_spec.rb
@@ -44,15 +44,13 @@
               billableMetricId: billable_metrics.first.id,
               amountCents: 100,
               amountCurrency: 'USD',
-              frequency: 'recurring',
               proRata: false,
               chargeModel: 'standard',
             },
             {
               billableMetricId: billable_metrics.last.id,
               amountCents: 300,
               amountCurrency: 'EUR',
-              frequency: 'one_time',
               proRata: true,
               vatRate: 10.5,
               chargeModel: 'standard',

diff --git a/spec/graphql/mutations/plans/update_spec.rb b/spec/graphql/mutations/plans/update_spec.rb
@@ -45,15 +45,13 @@
               billableMetricId: billable_metrics.first.id,
               amountCents: 100,
               amountCurrency: 'USD',
-              frequency: 'recurring',
               proRata: false,
               chargeModel: 'standard',
             },
             {
               billableMetricId: billable_metrics.last.id,
               amountCents: 300,
               amountCurrency: 'EUR',
-              frequency: 'one_time',
               proRata: true,
               vatRate: 10.5,
               chargeModel: 'standard',

diff --git a/spec/services/billable_metrics_service_spec.rb b/spec/services/billable_metrics_service_spec.rb
@@ -122,7 +122,7 @@
       let(:subscription) { create(:subscription) }
 
       before do
-        create(:one_time_charge, plan: subscription.plan, billable_metric: billable_metric)
+        create(:charge, plan: subscription.plan, billable_metric: billable_metric)
       end
 
       it 'returns an error' do

diff --git a/spec/services/charges/charge_models/standard_service_spec.rb b/spec/services/charges/charge_models/standard_service_spec.rb
@@ -7,7 +7,7 @@
 
   let(:charge) do
     create(
-      :one_time_charge,
+      :charge,
       amount_cents: 500,
       charge_model: 'standard',
     )

diff --git a/spec/services/fees/charge_service_spec.rb b/spec/services/fees/charge_service_spec.rb
@@ -12,7 +12,7 @@
   let(:billable_metric) { create(:billable_metric, aggregation_type: 'count_agg') }
   let(:charge) do
     create(
-      :one_time_charge,
+      :charge,
       plan: subscription.plan,
       charge_model: 'standard',
       billable_metric: billable_metric,

diff --git a/spec/services/invoices/create_service_spec.rb b/spec/services/invoices/create_service_spec.rb
@@ -20,7 +20,7 @@
     let(:billable_metric) { create(:billable_metric, aggregation_type: 'count_agg') }
 
     before do
-      create(:one_time_charge, plan: subscription.plan, charge_model: 'standard')
+      create(:charge, plan: subscription.plan, charge_model: 'standard')
     end
 
     context 'when billed monthly' do

diff --git a/spec/services/plans_service_spec.rb b/spec/services/plans_service_spec.rb
@@ -26,15 +26,13 @@
             billable_metric_id: billable_metrics.first.id,
             amount_cents: 100,
             amount_currency: 'USD',
-            frequency: 'recurring',
             pro_rata: false,
             charge_model: 'standard',
           },
           {
             billable_metric_id: billable_metrics.last.id,
             amount_cents: 300,
             amount_currency: 'EUR',
-            frequency: 'one_time',
             pro_rata: true,
             vat_rate: 10.5,
             charge_model: 'standard',
@@ -96,15 +94,13 @@
             billable_metric_id: billable_metrics.first.id,
             amount_cents: 100,
             amount_currency: 'USD',
-            frequency: 'recurring',
             pro_rata: false,
             charge_model: 'standard',
           },
           {
             billable_metric_id: billable_metrics.last.id,
             amount_cents: 300,
             amount_currency: 'EUR',
-            frequency: 'one_time',
             pro_rata: true,
             vat_rate: 10.5,
             charge_model: 'standard',
@@ -153,7 +149,6 @@
           billable_metric_id: billable_metrics.first.id,
           amount_cents: 300,
           amount_currency: 'USD',
-          frequency: 'recurring',
           pro_rata: false,
           charge_model: 'standard',
         )
@@ -174,15 +169,13 @@
               billable_metric_id: billable_metrics.first.id,
               amount_cents: 100,
               amount_currency: 'USD',
-              frequency: 'recurring',
               pro_rata: false,
               charge_model: 'standard',
             },
             {
               billable_metric_id: billable_metrics.last.id,
               amount_cents: 300,
               amount_currency: 'EUR',
-              frequency: 'one_time',
               pro_rata: true,
               vat_rate: 10.5,
               charge_model: 'standard',
@@ -205,7 +198,6 @@
           billable_metric_id: billable_metrics.first.id,
           amount_cents: 300,
           amount_currency: 'USD',
-          frequency: 'recurring',
           pro_rata: false,
           charge_model: 'standard',
         )