add: tax deductible boolean to funds (#70)

* add: tax deductible boolean to funds

* filter out tax deductible funds for summaries

Author: Himali-Malvawala

src/models/Fund.ts

@@ -2,6 +2,7 @@ export class Fund {
     public id?: string;
     public churchId?: string;
     public name?: string;
+    public taxDeductible?: boolean;
     public productId?: string;
     public amount?: number;
 }

src/repositories/DonationRepository.ts

@@ -56,7 +56,7 @@ export class DonationRepository {
         const sql = "SELECT d.*, f.id as fundId, f.name as fundName, fd.amount as fundAmount"
             + " FROM donations d"
             + " INNER JOIN fundDonations fd on fd.donationId = d.id"
-            + " INNER JOIN funds f on f.id = fd.fundId"
+            + " INNER JOIN funds f on f.id = fd.fundId AND f.taxDeductible = 1"
             + " WHERE d.churchId = ? AND d.personId = ?"
             + " ORDER BY d.donationDate DESC";
         return DB.query(sql, [churchId, personId]);
@@ -69,7 +69,7 @@ export class DonationRepository {
         const sql = "SELECT STR_TO_DATE(concat(year(d.donationDate), ' ', week(d.donationDate, 0), ' Sunday'), '%X %V %W') AS week, SUM(fd.amount) as totalAmount, f.name as fundName"
             + " FROM donations d"
             + " INNER JOIN fundDonations fd on fd.donationId = d.id"
-            + " INNER JOIN funds f on f.id = fd.fundId"
+            + " INNER JOIN funds f on f.id = fd.fundId AND f.taxDeductible = 1"
             + " WHERE d.churchId=?"
             + " AND d.donationDate BETWEEN ? AND ?"
             + " GROUP BY year(d.donationDate), week(d.donationDate, 0), f.name"
@@ -81,7 +81,7 @@ export class DonationRepository {
         const sql = "SELECT d.personId, d.amount as donationAmount, fd.fundId, fd.amount as fundAmount, f.name as fundName"
             + " FROM donations d"
             + " INNER JOIN fundDonations fd on fd.donationId = d.id"
-            + " INNER JOIN funds f on f.id = fd.fundId"
+            + " INNER JOIN funds f on f.id = fd.fundId AND f.taxDeductible = 1"
             + " WHERE d.churchId=?"
             + " AND d.donationDate BETWEEN ? AND ?";
         return DB.query(sql, [churchId, DateHelper.toMysqlDate(startDate), DateHelper.toMysqlDate(endDate)]);

src/repositories/FundRepository.ts

@@ -22,15 +22,15 @@ export class FundRepository {
 
     private async create(fund: Fund) {
         fund.id = UniqueIdHelper.shortId();
-        const sql = "INSERT INTO funds (id, churchId, name, productId, removed) VALUES (?, ?, ?, ?, 0);";
-        const params = [fund.id, fund.churchId, fund.name, fund.productId];
+        const sql = "INSERT INTO funds (id, churchId, name, taxDeductible, productId, removed) VALUES (?, ?, ?, ?, ?, 0);";
+        const params = [fund.id, fund.churchId, fund.name, fund.taxDeductible, fund.productId];
         await DB.query(sql, params);
         return fund;
     }
 
     private async update(fund: Fund) {
-        const sql = "UPDATE funds SET name=?, productId=? WHERE id=? and churchId=?";
-        const params = [fund.name, fund.productId, fund.id, fund.churchId];
+        const sql = "UPDATE funds SET name=?, taxDeductible=?, productId=? WHERE id=? and churchId=?";
+        const params = [fund.name, fund.taxDeductible, fund.productId, fund.id, fund.churchId];
         await DB.query(sql, params);
         return fund;
     }
@@ -48,7 +48,7 @@ export class FundRepository {
     }
 
     public convertToModel(churchId: string, data: any) {
-        const result: Fund = { id: data.id, name: data.name, churchId: data.churchId, productId: data.productId };
+        const result: Fund = { id: data.id, name: data.name, churchId: data.churchId, productId: data.productId, taxDeductible: data.taxDeductible };
         return result;
     }
 

tools/dbScripts/funds.mysql

@@ -4,6 +4,7 @@ CREATE TABLE `funds` (
   `id` char(11) NOT NULL,
   `churchId` char(11) DEFAULT NULL,
   `name` varchar(50) DEFAULT NULL,
+  `taxDeductible` bit(1) DEFAULT NULL,
   `productId` varchar(50) DEFAULT Null,
   `removed` bit(1) DEFAULT NULL,
   PRIMARY KEY (`id`)