Goals: Second speed improvement

packages/loot-core/src/server/budget/goaltemplates.ts

@@ -6,6 +6,7 @@ import {
 import { amountToInteger, integerToAmount } from '../../shared/util';
 import * as db from '../db';
 import { getRuleForSchedule, getNextDate } from '../schedules/app';
+import { batchMessages } from '../sync';
 
 import { setBudget, setZero, getSheetValue } from './actions';
 import { parse } from './goal-template.pegjs';
@@ -33,8 +34,20 @@ function checkScheduleTemplates(template) {
   }
   return { lowPriority, errorNotice };
 }
+async function setGoalBudget({ month, templateBudget }) {
+  await batchMessages(async () => {
+    templateBudget.forEach(element => {
+      setBudget({
+        category: element.category,
+        month,
+        amount: element.amount,
+      });
+    });
+  });
+}
 
 async function processTemplate(month, force) {
+  let templateBudget = [];
   let num_applied = 0;
   let errors = [];
   let category_templates = await getCategoryTemplates();
@@ -65,7 +78,7 @@ async function processTemplate(month, force) {
       }
     }
   }
-  setZero({ month });
+  await setZero({ month });
   // find all remainder templates, place them after all other templates
   let remainder_found;
   let remainder_priority = lowestPriority + 1;
@@ -88,6 +101,7 @@ async function processTemplate(month, force) {
 
   let sheetName = monthUtils.sheetForMonth(month);
   let available_start = await getSheetValue(sheetName, `to-budget`);
+  let available_remaining = available_start;
   for (let priority = 0; priority <= lowestPriority; priority++) {
     // setup scaling for remainder
     let remainder_scale = 1;
@@ -148,15 +162,16 @@ async function processTemplate(month, force) {
                 priority,
                 remainder_scale,
                 available_start,
+                available_remaining,
                 force,
               );
             if (to_budget != null) {
               num_applied++;
-              await setBudget({
+              templateBudget.push({
                 category: category.id,
-                month,
                 amount: to_budget,
               });
+              available_remaining -= to_budget;
             }
             if (applyErrors != null) {
               errors = errors.concat(
@@ -167,7 +182,9 @@ async function processTemplate(month, force) {
         }
       }
     }
+    await setGoalBudget({ month, templateBudget });
   }
+
   if (!force) {
     //if overwrite is not preferred, set cell to original value
     for (let l = 0; l < originalCategoryBalance.length; l++) {
@@ -251,6 +268,7 @@ async function applyCategoryTemplate(
   priority,
   remainder_scale,
   available_start,
+  budgetAvailable,
   force,
 ) {
   let current_month = `${month}-01`;
@@ -325,7 +343,6 @@ async function applyCategoryTemplate(
   let budgeted = await getSheetValue(sheetName, `budget-${category.id}`);
   let spent = await getSheetValue(sheetName, `sum-amount-${category.id}`);
   let balance = await getSheetValue(sheetName, `leftover-${category.id}`);
-  let budgetAvailable = await getSheetValue(sheetName, `to-budget`);
   let to_budget = budgeted;
   let limit;
   let hold;

upcoming-release-notes/1347.md

@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [shall0pass]
+---
+
+Goals: Yet another speed improvement on the calculation of templates and filling cells