WIP Process payments for expired invoices

app/controllers/contributions/donations_controller.rb

@@ -84,21 +84,26 @@ class Contributions::DonationsController < ApplicationController
       @donation.paid_at = DateTime.now
       @donation.payment_status = "settled"
       @donation.save!
-      flash_message = { success: "Thank you!" }
+      msg = { success: "Thank you!" }
     when "Processing"
       unless @donation.processing?
         @donation.payment_status = "processing"
         @donation.save!
-        flash_message = { success: "Thank you! We will send you an email when the payment is confirmed." }
+        msg = { success: "Thank you! We will send you an email when the payment is confirmed." }
         BtcpayCheckDonationJob.set(wait: 20.seconds).perform_later(@donation)
       end
     when "Expired"
-      flash_message = { warning: "The payment request for this donation has expired" }
+      if invoice["additionalStatus"] &&
+         invoice["additionalStatus"] == "PaidLate"
+        # TODO introduce state machine
+        mark_as_paid(donation)
+      end
+      msg = { warning: "The payment request for this donation has expired" }
     else
-      flash_message = { warning: "Could not determine status of payment" }
+      msg = { warning: "Could not determine status of payment" }
     end
 
-    redirect_to contributions_donations_url, flash: flash_message
+    redirect_to contributions_donations_url, flash: msg
   end
 
   private

app/jobs/btcpay_check_donation_job.rb

@@ -9,20 +9,29 @@ class BtcpayCheckDonationJob < ApplicationJob
     )
 
     case invoice["status"]
-    when "Settled"
-      donation.paid_at = DateTime.now
-      donation.payment_status = "settled"
-      donation.save!
-
-      NotificationMailer.with(user: donation.user)
-                        .bitcoin_donation_confirmed
-                        .deliver_later
     when "Processing"
       re_enqueue_job(donation)
+    when "Settled"
+      mark_as_paid(donation)
+    when "Expired"
+      if invoice["additionalStatus"] &&
+         invoice["additionalStatus"] == "PaidLate"
+        mark_as_paid(donation)
+      end
     end
   end
 
   def re_enqueue_job(donation)
     self.class.set(wait: 20.seconds).perform_later(donation)
   end
+
+  def mark_as_paid(donation)
+    donation.paid_at = DateTime.now
+    donation.payment_status = "settled"
+    donation.save!
+
+    NotificationMailer.with(user: donation.user)
+                      .bitcoin_donation_confirmed
+                      .deliver_later
+  end
 end

app/jobs/create_ldap_user_job.rb

@@ -4,7 +4,7 @@ class CreateLdapUserJob < ApplicationJob
   def perform(username:, domain:, email:, hashed_pw:, confirmed: false)
     dn = "cn=#{username},ou=#{domain},cn=users,dc=kosmos,dc=org"
     attr = {
-      objectclass: ["top", "account", "person", "inetOrgPerson", "extensibleObject"],
+      objectclass: ["top", "account", "person", "extensibleObject"],
       cn: username,
       sn: username,
       uid: username,

db/seeds.rb

@@ -7,7 +7,7 @@ Sidekiq::Testing.inline! do
 
   puts "Create user: admin"
 
-  UserManager::CreateAccount.call(account: {
+  CreateAccount.call(account: {
     username: "admin", domain: "kosmos.org", email: "admin@example.com",
     password: "admin is admin", confirmed: true
   })
@@ -20,7 +20,7 @@ Sidekiq::Testing.inline! do
     email = Faker::Internet.unique.email
     next if username.length < 3
 
-    UserManager::CreateAccount.call(account: {
+    CreateAccount.call(account: {
       username: username, domain: "kosmos.org", email: email,
       password: "user is user", confirmed: true
     })

spec/jobs/create_ldap_user_job_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe CreateLdapUserJob, type: :job do
     expect(ldap_client_mock).to have_received(:add).with(
       dn: "cn=halfinney,ou=kosmos.org,cn=users,dc=kosmos,dc=org",
       attributes: {
-        objectclass: ["top", "account", "person", "inetOrgPerson", "extensibleObject"],
+        objectclass: ["top", "account", "person", "extensibleObject"],
         cn: "halfinney",
         sn: "halfinney",
         uid: "halfinney",
@@ -51,7 +51,7 @@ RSpec.describe CreateLdapUserJob, type: :job do
     expect(ldap_client_mock).to have_received(:add).with(
       dn: "cn=halfinney,ou=kosmos.org,cn=users,dc=kosmos,dc=org",
       attributes: {
-        objectclass: ["top", "account", "person", "inetOrgPerson", "extensibleObject"],
+        objectclass: ["top", "account", "person", "extensibleObject"],
         cn: "halfinney",
         sn: "halfinney",
         uid: "halfinney",