The BDE offers 80 € to each new member that registers to the Société générale

apps/treasury/models.py

@@ -291,11 +291,11 @@ class SogeCredit(models.Model):
 
     @property
     def valid(self):
-        return self.credit_transaction is not None
+        return self.credit_transaction.valid
 
     @property
     def amount(self):
-        return sum(transaction.total for transaction in self.transactions.all())
+        return sum(transaction.total for transaction in self.transactions.all()) + 8000
 
     def invalidate(self):
         """
@@ -304,11 +304,7 @@ class SogeCredit(models.Model):
         """
         if self.valid:
             self.credit_transaction.valid = False
-            self.credit_transaction._force_save = True
             self.credit_transaction.save()
-            self.credit_transaction._force_delete = True
-            self.credit_transaction.delete()
-        self.credit_transaction = None
         for transaction in self.transactions.all():
             transaction.valid = False
             transaction._force_save = True
@@ -321,17 +317,10 @@ class SogeCredit(models.Model):
 
         # First invalidate all transaction and delete the credit if already did (and force mode)
         self.invalidate()
-        self.credit_transaction = SpecialTransaction.objects.create(
-            source=NoteSpecial.objects.get(special_type="Virement bancaire"),
-            destination=self.user.note,
-            quantity=1,
-            amount=self.amount,
-            reason="Crédit société générale",
-            last_name=self.user.last_name,
-            first_name=self.user.first_name,
-            bank="Société générale",
-            created_at=self.transactions.order_by("-created_at").first().created_at,
-        )
+        # Refresh credit amount
+        self.save()
+        self.credit_transaction.valid = True
+        self.credit_transaction.save()
         self.save()
 
         for transaction in self.transactions.all():
@@ -340,6 +329,25 @@ class SogeCredit(models.Model):
             transaction.created_at = timezone.now()
             transaction.save()
 
+    def save(self, *args, **kwargs):
+        if not self.credit_transaction:
+            self.credit_transaction = SpecialTransaction.objects.create(
+                source=NoteSpecial.objects.get(special_type="Virement bancaire"),
+                destination=self.user.note,
+                quantity=1,
+                amount=0,
+                reason="Crédit société générale",
+                last_name=self.user.last_name,
+                first_name=self.user.first_name,
+                bank="Société générale",
+                valid=False,
+            )
+        elif not self.valid:
+            self.credit_transaction.amount = self.amount
+            self.credit_transaction._force_save = True
+            self.credit_transaction.save()
+        super().save(*args, **kwargs)
+
     def delete(self, **kwargs):
         """
         Deleting a SogeCredit is equivalent to say that the Société générale didn't pay.
@@ -358,6 +366,9 @@ class SogeCredit(models.Model):
             transaction.valid = True
             transaction.created_at = timezone.now()
             transaction.save()
+        self.credit_transaction.valid = False
+        self.credit_transaction.reason += " (invalide)"
+        self.credit_transaction.save()
         super().delete(**kwargs)
 
     class Meta:

apps/treasury/templates/treasury/sogecredit_list.html

@@ -30,7 +30,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
         <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
         <div class="form-check">
             <label for="invalid_only" class="form-check-label">
-                <input id="invalid_only" name="invalid_only" type="checkbox" class="checkboxinput form-check-input">
+                <input id="invalid_only" name="invalid_only" type="checkbox" class="checkboxinput form-check-input" checked>
                 {% trans "Filter with unvalidated credits only" %}
             </label>
         </div>

apps/treasury/tests/test_treasury.py

@@ -353,7 +353,6 @@ class TestSogeCredits(TestCase):
         soge_credit.refresh_from_db()
         self.assertTrue(soge_credit.valid)
         self.user.note.refresh_from_db()
-        self.assertEqual(self.user.note.balance, 0)
         self.assertEqual(
             Transaction.objects.filter(Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
         self.assertTrue(self.user.profile.soge)
@@ -391,7 +390,7 @@ class TestSogeCredits(TestCase):
         self.user.note.refresh_from_db()
         self.assertEqual(self.user.note.balance, 0)
         self.assertEqual(
-            Transaction.objects.filter(Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
+            Transaction.objects.filter(Q(source=self.user.note) | Q(destination=self.user.note)).count(), 4)
         self.assertFalse(self.user.profile.soge)
 
     def test_invoice_api(self):

apps/treasury/views.py

@@ -425,11 +425,8 @@ class SogeCreditListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableVi
                     | Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
                 )
 
-        if "valid" in self.request.GET:
-            q = Q(credit_transaction=None)
-            if not self.request.GET["valid"]:
-                q = ~q
-            qs = qs.filter(q)
+        if "valid" not in self.request.GET or not self.request.GET["valid"]:
+            qs = qs.filter(credit_transaction__valid=False)
 
         return qs[:20]