Fixed bug in expense contribution calculation.

pkg/controller/fixtures/simple.yaml

@@ -0,0 +1,21 @@
+- model: Login
+  rows:
+    - _id: doug
+      email: doug.dimmadome@testing.monetr.app
+      password_hash: ""
+      first_name: Doug
+      last_name: Dimmadome
+      is_enabled: true
+      is_email_verified: true
+      is_phone_verified: false
+- model: Account
+  rows:
+    - _id: doug
+      timezone: America/Chicago
+- model: User
+  rows:
+    - _id: doug
+      account_id: "{{ $.Account.doug.account_id }}"
+      login_id: "{{ $.Login.doug.login_id }}"
+
+

pkg/models/spending.go

@@ -109,17 +109,10 @@ func (e *Spending) CalculateNextContribution(
 		e.IsBehind = false
 	}
 
-	// If the next time we would contribute to this expense is not behind and has more than one contribution to meet its
-	// target then we need to calculate a partial contribution.
-	numberOfContributions := 0
-	if nextContributionDate.Before(nextDueDate) {
-		numberOfContributions++
-	}
-
 	// TODO Handle expenses that recur more frequently than they are funded.
 	nowInTimezone := time.Now().In(timezone)
-	nextContributionRule.DTStart(nowInTimezone)
-	numberOfContributions = len(nextContributionRule.Between(nowInTimezone, nextDueDate, false))
+	nextContributionRule.DTStart(nextContributionDate)
+	numberOfContributions := len(nextContributionRule.Between(nowInTimezone, nextDueDate, false))
 
 	totalNeeded := e.TargetAmount - progressAmount
 	perContribution := totalNeeded / int64(numberOfContributions)