wip: paid subscriptions system and articles #467

DioFun · 2024-07-04T17:28:26Z

Le but est d'avoir un suivi et des correctifs aux fur et à mesure pour le moment quant au système d'abonnement payant.
Développement de la gestion des articles et abonnements payants.
La gestion des remboursements sera effectuée dans une autre PR

links to #455

Co-authored-by: DioFun <DioFun@users.noreply.github.com> Co-authored-by: Nymous <thomas.gaudin@centraliens-lille.org>

todo: fix tests

…le table

codecov · 2024-07-05T09:26:02Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (01e1374) to head (1a799a5).
Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##            master      #467    +/-   ##
==========================================
  Coverage   100.00%   100.00%            
==========================================
  Files           26        48    +22     
  Lines          337       663   +326     
  Branches        35        66    +31     
==========================================
+ Hits           337       663   +326

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…commit

nymous

Same, just posting what I wrote for now (also you pushed after I started to review so some comments might be outdated ^^')

nymous · 2024-07-14T13:35:01Z

app/controllers/admin/articles_controller.rb

+    def destroy
+      @article = Article.find(params[:id])
+      authorize! :destroy, @article
+      @article.soft_delete unless @article.destroy


Maybe add a comment to explain why we do this.
Alternative way to write it, not really convinced by it but at least it reads from left to right (and there isn't a side-effect in the conditional):

Suggested change

@article.soft_delete unless @article.destroy

@article.destroy or @article.soft_delete

This comment still stands

nymous · 2024-07-14T13:36:51Z

app/controllers/admin/dashboard_controller.rb

+module Admin
+  class DashboardController < ApplicationController
+    def index
+      authorize! :manage, :all


Is this a temporary permission and we will check more granularly, or is the admin dashboard only intended for superadmins?

That is temporary permission for now

Maybe add a todo if it's temporary

Suggested change

authorize! :manage, :all

authorize! :manage, :all # TODO: use finer grained permissions

nymous · 2024-07-14T13:38:20Z

app/controllers/admin/payment_methods_controller.rb

+    def destroy
+      @payment_method = PaymentMethod.find(params[:id])
+      authorize! :destroy, @payment_method
+      @payment_method.soft_delete unless @payment_method.destroy


Same thing here, maybe comment, maybe write it differently

Suggested change

@payment_method.soft_delete unless @payment_method.destroy

@payment_method.destroy or @payment_method.soft_delete

Bump comment

nymous · 2024-07-14T13:39:01Z

app/controllers/admin/subscription_offers_controller.rb

+    def destroy
+      @subscription_offer = SubscriptionOffer.find(params[:id])
+      authorize! :destroy, @subscription_offer
+      @subscription_offer.soft_delete unless @subscription_offer.destroy


Same, comment or

Suggested change

@subscription_offer.soft_delete unless @subscription_offer.destroy

@subscription_offer.destroy or @subscription_offer.soft_delete

Bump comment

app/views/sales/new.html.erb

nymous · 2024-07-14T14:16:31Z

app/controllers/sales_controller.rb

+    params.require(:sale).permit(:duration, :payment_method_id, articles_sales_attributes: [:article_id, :quantity])
+  end
+
+  def reformated_params


The params methods could probably do with some comments and vertical space to separate blocks ^^'

nymous · 2024-07-14T14:17:18Z

app/controllers/sales_controller.rb

+  # rubocop:disable Metrics/AbcSize
+  def create
+    @sale = @owner.sales_as_client.new(reformated_params)
+    @sale.update_total_price


Ooooh, it's dangerous to have to think to do this before saving, can this be moved to a before_save or something?

Has been moved but not sure if it's enough

nymous · 2024-07-14T14:19:57Z

app/models/article.rb

+  validates :name, presence: true, allow_blank: false
+  validates :price, presence: true, allow_blank: false,
+                    numericality: { greater_than_or_equal_to: 0, only_integer: true, message: 'Must be a positive
+                     number. Maximum 2 numbers after comma' }


Not sure the error message is up-to-date with the fact that we store it as cents.

In the UI, the user will be ask to enter a decimal number and then it'll be multiply by 100

app/models/sale.rb

app/controllers/sales_controller.rb

…d payment_method

…t deletion tests

…ash generation for sale

… is negative

Letiste · 2024-08-10T11:49:31Z

app/controllers/sales_controller.rb

+    unless @sale.generate(duration: params[:sale][:duration], seller: current_user)
+      return redirect_to :new_user_sale, user: @user, status: :unprocessable_entity
+    end
+    return redirect_to :new_user_sale, user: @user, status: :unprocessable_entity if @sale.empty?


what happens if we try to call generate on an empty sale? Before generating it, should we check if the sale isn't empty?

Letiste · 2024-08-10T11:50:13Z

app/javascript/controllers/sales_controller.js

+    // newArticle.getElementById("sale_article_id_new").id = `sale_article_id_${this.nextId}`
+    // newArticle.getElementById("sale_quantity_new").id = `sale_quantity_${this.nextId}`


can this be removed?

app/models/articles_sale.rb

Letiste · 2024-08-10T12:00:13Z

app/models/sale.rb

+  def compute_total_price
+    total = 0
+    articles_sales.each do |rec|
+      total += rec.quantity * Article.find(rec.article_id).price
+    end
+    sales_subscription_offers.each do |rec|
+      total += rec.quantity * SubscriptionOffer.find(rec.subscription_offer.id).price
+    end
+    total
+  end


We don't care about that at our scale because we are talking about one or two articles, but I think here we would make a request to the database per article/subscription. That can be a problem once you get to dozens of articles.
We don't need to change anything for our case though, it's simpler like that

Letiste · 2024-08-10T12:05:07Z

app/models/sale.rb

+  def generate_sales_subscription_offers(duration)
+    subscription_offers = SubscriptionOffer.order(duration: :desc)
+    if subscription_offers.empty?
+      errors.add(:base, 'There are no subscription offers registered!')
+      return false
+    end
+    subscription_offers.each do |offer|
+      break if duration.zero?
+
+      quantity = duration / offer.duration
+      if quantity.positive?
+        sales_subscription_offers.new(subscription_offer_id: offer.id, quantity: quantity)
+        duration -= quantity * offer.duration
+      end
+    end
+    return true if duration.zero?
+
+    errors.add(:base, 'Subscription offers are not exhaustive!')
+    false
+  end


I'm a bit lost trying to understand what this function is doing. What does the duration parameter represent? Why do we leave the loop once the duration is zero? Why do we return false when there is an error, should we instead throw if it's unexpected?

This function aims to generate the subiscription_offer for a given duration, duration is the number of months the subscription last. Example : an adherent want to pay for 13 months and we have two different offer 12 months is 50€ and 1 month is 5€ then it will create a sales_subscription_offers of 12 months and of 1 months. So we leave the loop when reach 0 because we do not need to continue as we already split the sale into the different offers we have. Lastly, we return false, because it's quite obscure the error process and the throw in my case i'd like just to send a message to the user not crash the website.

app/models/setting.rb

Letiste · 2024-08-10T12:08:01Z

app/models/subscription.rb

+  # validate :cannot_change_after_cancelled, on: :update

-  def cancel!
-    self.cancelled_at = Time.current
-    save!
+  def user
+    sale.client
  end

-  private
+  # def cancel!
+  #   self.cancelled_at = Time.current
+  #   save!
+  # end

-  def cannot_change_after_cancelled
-    return if cancelled_at_was.nil?
+  # private

-    errors.add(:cancelled_at, 'Subscription has already been cancelled')
-  end
+  # def cannot_change_after_cancelled
+  #   return if cancelled_at_was.nil?
+  #
+  #   errors.add(:cancelled_at, 'Subscription has already been cancelled')
+  # end


Can we delete the comments if it's not used?

I just commented it out for now because we would surely use it again when we'll make the refund module.

nymous · 2024-09-29T14:49:04Z

app/assets/fonts/DejaVuSans-Bold.ttf

We will need to add the font license if we use it (available in the font archive), probably as a app/assets/fronts/dejavu-license.txt.

nymous · 2024-09-29T15:05:14Z

app/controllers/admin/articles_controller.rb

+    def destroy
+      @article = Article.find(params[:id])
+      authorize! :destroy, @article
+      @article.soft_delete unless @article.destroy


This comment still stands

nymous · 2024-09-29T15:09:38Z

app/controllers/admin/dashboard_controller.rb

+module Admin
+  class DashboardController < ApplicationController
+    def index
+      authorize! :manage, :all


Maybe add a todo if it's temporary

Suggested change

authorize! :manage, :all

authorize! :manage, :all # TODO: use finer grained permissions

nymous · 2024-09-29T15:48:37Z

app/controllers/admin/payment_methods_controller.rb

+    def destroy
+      @payment_method = PaymentMethod.find(params[:id])
+      authorize! :destroy, @payment_method
+      @payment_method.soft_delete unless @payment_method.destroy


Bump comment

nymous · 2024-09-29T15:48:45Z

app/controllers/admin/subscription_offers_controller.rb

+    def destroy
+      @subscription_offer = SubscriptionOffer.find(params[:id])
+      authorize! :destroy, @subscription_offer
+      @subscription_offer.soft_delete unless @subscription_offer.destroy


Bump comment

nymous · 2024-11-02T15:43:03Z

test/models/sale_test.rb

With all the validation logic that I moved to the Sale model, this test will probably need more cases:

test if sale is empty

test if sale has duplicate articles

nymous · 2024-11-02T15:43:53Z

test/models/subscription_offer_test.rb

+    assert_not_predicate @subscription_offer, :valid?
+  end
+
+  test 'price should be positive' do


Also test for strictly positive? (a subscription offer that costs 0 is weird)

nymous · 2024-11-02T15:47:56Z

test/models/subscription_offer_test.rb

+  end
+
+  test 'duration should be positive' do
+    @subscription_offer.duration = -5


Same here, test for strictly positive as well

nymous · 2024-11-02T15:48:55Z

test/models/subscription_offer_test.rb

+  test 'offer should be destroyed if no sales' do
+    @subscription_offer.sales.destroy_all
+    @subscription_offer.refunds.destroy_all
+    assert_difference 'SubscriptionOffer.unscoped.count', -1 do
+      @subscription_offer.destroy
+    end
+  end
+
+  test 'offer should be destroyable' do
+    @subscription_offer.sales.destroy_all
+    @subscription_offer.refunds.destroy_all
+    assert_predicate @subscription_offer, :destroy
+  end


Again, should this be merged?

Suggested change

test 'offer should be destroyed if no sales' do

@subscription_offer.sales.destroy_all

@subscription_offer.refunds.destroy_all

assert_difference 'SubscriptionOffer.unscoped.count', -1 do

@subscription_offer.destroy

end

end

test 'offer should be destroyable' do

@subscription_offer.sales.destroy_all

@subscription_offer.refunds.destroy_all

assert_predicate @subscription_offer, :destroy

end

test 'offer should be destroyed if no sales' do

@subscription_offer.sales.destroy_all

@subscription_offer.refunds.destroy_all

assert_difference 'SubscriptionOffer.unscoped.count', -1 do

assert_predicate @subscription_offer, :destroy

end

end

nymous · 2024-11-02T16:41:18Z

test/services/invoice_pdf_generator_test.rb

Wow very nice tests on a hard-to-test feature!

nymous · 2024-11-02T16:53:08Z

Just to show you what the errors look like in the reworked sale form:

The duplicate articles are shown in red

DioFun and others added 7 commits June 20, 2024 19:00

wip: begin of migration creation

01e20d1

feat: creating migration (work in progress)

5a8e0df

Co-authored-by: DioFun <DioFun@users.noreply.github.com> Co-authored-by: Nymous <thomas.gaudin@centraliens-lille.org>

fix: relations that wasn't well defined, fixtures fix

f76fb69

todo: fix tests

Remove user_id from subscription and get subscriptions through the sa…

fda8cd9

…le table

fix: through association was define after a call to it

9f884e5

Add subscriptions modules routes

472b9a8

fix rubocop problems

c82f46e

nymous marked this pull request as draft July 4, 2024 18:11

DioFun added 5 commits July 4, 2024 21:29

feat: creation and deletion of articles

8956ebc

ref: change soft_delete! to soft_delete

09e8c50

Deletion of subscriptions controller

a27935a

comment unusefull tests & try to fix those that did not passed

97ffc49

Comment outdated tests, fix existing that should pass

adbc98c

DioFun and others added 9 commits July 5, 2024 11:29

fix: add locals

ffbccc5

fix: add locals

6681798

test: add some test and fix problems related

ca250bd

test: add more tests

66907ce

fix: let rails issue errors when trying to destroy a dependant article

b64f9ec

feat: manage subscription offers with tests impleted

0e731a6

fix: mistake

6d236ec

wip: sales implementation

6ba8bd1

wip: dynamically add articles to a sale using StimulusJS

85f996d

DioFun self-assigned this Jul 5, 2024

D0gmaDev and others added 2 commits July 7, 2024 17:41

wip: generate invoice pdf with hexapdf

4d14f17

wip: add subscription to sale

518d6c6

DioFun requested a review from nymous July 8, 2024 22:38

DioFun added 2 commits July 9, 2024 00:40

fix(test): update fixtures regarding the column renaming of the last …

152a8b5

…commit

feat(paymentMethods): add, remove payment methods

2d9083e

nymous reviewed Jul 16, 2024

View reviewed changes

DioFun added 4 commits July 16, 2024 11:26

refactor(sales): add default_scope for article, subscription_offer an…

d2391e9

…d payment_method

fix(tests): fix tests broke by last commit & advised change in review

e112313

fix(saleView): add min on duration field

4e2e840

test: add a test for soft deletion & check deleted_at not nil for sof…

fee752c

…t deletion tests

DioFun mentioned this pull request Jul 18, 2024

Todo list #435

Open

23 tasks

DioFun and others added 18 commits July 19, 2024 07:27

fix(sales): fix sales reation

06ad62e

refactor(invoiceSaleCreation): change name and place of the invoice h…

12e32fd

…ash generation for sale

feat(subscriptions): create subscription on sale creation

6cae8a0

fix(invoices): multiple pages pdf

012f6bd

fix(setting): rename last_invoice_id key to next_invoice_id

5b1bff1

refactor(sales): improve readability

8a5a714

test: write some invoice tests

6d3196f

test(invoices): write generator service tests

74232b0

test(articles_sales): create test for articles_sale model

ef231da

fix(sales): ensure duration is positive

a85b030

test(sales): start sales_controller tests

d7bbf2c

test(sales_controller): test if sales is not processable and duration…

604b731

… is negative

test(sales_controller): create test for invalid payment_method

470c527

fix(subscription): comment out cancel method

1768f59

test(sale): add test for sale model

e5b05ec

fix(subscription): comment out unuseful methods

8894741

fix(sale): generate_sales_subscription_offers now returns true

720c7d2

test(sale): test if subscription offers are not exhaustive

1a799a5

DioFun marked this pull request as ready for review August 3, 2024 09:36

DioFun requested review from nymous and Letiste August 3, 2024 09:37

Letiste reviewed Aug 10, 2024

View reviewed changes

nymous requested changes Nov 2, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wip: paid subscriptions system and articles #467

wip: paid subscriptions system and articles #467

DioFun commented Jul 4, 2024 •

edited

Loading

codecov bot commented Jul 5, 2024 •

edited

Loading

nymous left a comment

nymous Jul 14, 2024

nymous Sep 29, 2024

nymous Jul 14, 2024

DioFun Jul 16, 2024

nymous Sep 29, 2024

nymous Jul 14, 2024

nymous Sep 29, 2024

nymous Jul 14, 2024

nymous Sep 29, 2024

nymous Jul 14, 2024

nymous Jul 14, 2024

DioFun Jul 16, 2024

nymous Jul 14, 2024

DioFun Jul 16, 2024

Letiste Aug 10, 2024

Letiste Aug 10, 2024

Letiste Aug 10, 2024

Letiste Aug 10, 2024

DioFun Aug 12, 2024

Letiste Aug 10, 2024

DioFun Aug 12, 2024

nymous Sep 29, 2024

nymous Sep 29, 2024

nymous Sep 29, 2024

nymous Sep 29, 2024

nymous Sep 29, 2024

nymous Nov 2, 2024

nymous Nov 2, 2024

nymous Nov 2, 2024

nymous Nov 2, 2024

nymous Nov 2, 2024

nymous commented Nov 2, 2024

	@article.soft_delete unless @article.destroy
	@article.destroy or @article.soft_delete

	authorize! :manage, :all
	authorize! :manage, :all # TODO: use finer grained permissions

	@payment_method.soft_delete unless @payment_method.destroy
	@payment_method.destroy or @payment_method.soft_delete

	@subscription_offer.soft_delete unless @subscription_offer.destroy
	@subscription_offer.destroy or @subscription_offer.soft_delete

		// newArticle.getElementById("sale_article_id_new").id = `sale_article_id_${this.nextId}`
		// newArticle.getElementById("sale_quantity_new").id = `sale_quantity_${this.nextId}`

wip: paid subscriptions system and articles #467

Are you sure you want to change the base?

wip: paid subscriptions system and articles #467

Conversation

DioFun commented Jul 4, 2024 • edited Loading

codecov bot commented Jul 5, 2024 • edited Loading

Codecov Report

nymous left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nymous commented Nov 2, 2024

DioFun commented Jul 4, 2024 •

edited

Loading

codecov bot commented Jul 5, 2024 •

edited

Loading