Updated A LOT

server/services/reports.js

@@ -1,15 +1,11 @@
 const PDFDocument = require('pdfkit');
-const { all, one, parseJson } = require('../db');
+const { all, one } = require('../db');
 const { annualSchedule, money, monthlyFromAnnual } = require('../depreciation');
 const { assetExportRows, assetFromRow } = require('./assets');
-
-function activeRuleSet() {
-  const row = one('SELECT * FROM tax_rule_sets WHERE active = 1 ORDER BY effective_date DESC, id DESC LIMIT 1');
-  return row ? parseJson(row.rules_json, {}) : {};
-}
+const { ruleSetForBook } = require('./ruleSets');
 
 function depreciationReport(year, bookType) {
-  const rules = activeRuleSet();
+  const rules = ruleSetForBook(bookType);
   const rows = all(`
     SELECT a.*, b.book_type, b.active, b.cost, b.depreciation_method, b.convention, b.useful_life_months AS book_life,
       b.section_179_amount, b.bonus_percent, b.business_use_percent AS book_business_use_percent,
@@ -59,7 +55,7 @@ function depreciationReport(year, bookType) {
 }
 
 function monthlyDepreciationReport(year, bookType) {
-  const rules = activeRuleSet();
+  const rules = ruleSetForBook(bookType);
   const assets = all('SELECT * FROM assets ORDER BY asset_id').map(assetFromRow);
   const rows = assets.flatMap((asset) => {
     const book = one('SELECT * FROM asset_books WHERE asset_id = ? AND book_type = ? AND active = 1', [asset.id, bookType]);
@@ -100,7 +96,6 @@ function writeDepreciationPdf(res, year, book) {
 }
 
 module.exports = {
-  activeRuleSet,
   depreciationReport,
   monthlyDepreciationReport,
   writeDepreciationPdf