fix/merge conflicts

Author: DanSmaR

app/models/subscription.rb

@@ -1,13 +1,14 @@
 class Subscription < ApplicationRecord
+  SUBSCRIPTION_AMOUNT = 19.90
   belongs_to :user
   has_many :billings, dependent: :destroy
 
   enum status: { inactive: 0, active: 10 }
 
-  after_update :enqueue_billing_job, if: :active? && :saved_change_to_status?
+  after_update :create_billing, if: :active? && :saved_change_to_status?
 
   def active!
-    self.start_date = Time.zone.now
+    self.start_date = Time.zone.now.to_date
     super
   end
 
@@ -18,8 +19,15 @@ def inactive!
 
   private
 
-  def enqueue_billing_job
-    billing_date = start_date.to_datetime + 1.month
-    BillingJob.set(wait_until: billing_date).perform_later(self)
+  def create_billing
+    return if start_date.nil?
+
+    billing_date = if start_date.day < 29
+                     start_date + 1.month
+                   else
+                     start_date.next_month.beginning_of_month + 1.month
+                   end
+
+    billings.create(billing_date:, amount: SUBSCRIPTION_AMOUNT)
   end
 end

spec/factories/billings.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :billing do
-    amount { "9.99" }
+    amount { 19.901 }
     subscription { nil }
-    billing_date { "2024-02-14" }
+    billing_date { '2024-02-14' }
   end
 end

spec/jobs/premium_user_receives_monthly_billing_spec.rb

@@ -10,8 +10,6 @@
 
       perform_enqueued_jobs
 
-      debugger
-
       expect(Billing.count).to eq 1
     end
   end

spec/models/billing_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
 RSpec.describe Billing, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  # pending "add some examples to (or delete) #{__FILE__}"
 end

spec/models/subscription_spec.rb

@@ -3,7 +3,8 @@
 RSpec.describe Subscription, type: :model do
   describe '#active!' do
     it 'atualiza data de início automaticamente' do
-      subscription = create(:subscription, status: :inactive, start_date: nil)
+      user = create(:user, :free)
+      subscription = user.subscription
 
       subscription.active!
 
@@ -14,7 +15,8 @@
 
   describe '#active!' do
     it 'atualiza data de início automaticamente' do
-      subscription = create(:subscription, status: :active, start_date: Time.zone.now)
+      user = create(:user, :free)
+      subscription = user.subscription
 
       subscription.inactive!