@churchsoln/dbms 1.0.64 → 1.0.66

package/constants/index.js

@@ -117,6 +117,11 @@ const INVOICE_STATUS = {
 // An asset account, but not cash: excluded wherever "posting asset" means a bank/cash account.
 const ACCOUNTS_RECEIVABLE_CODE = "1100";
 
+const BANK_RECONCILIATION_STATUS = {
+    IN_PROGRESS: "InProgress",
+    COMPLETED: "Completed",
+};
+
 const ACCOUNTING_ACCOUNT_TYPES = {
     ASSET: { name: "Asset", normalBalance: NORMAL_BALANCE.DEBIT },
     LIABILITY: { name: "Liability", normalBalance: NORMAL_BALANCE.CREDIT },
@@ -294,4 +299,5 @@ module.exports = {
     ACCOUNTS_PAYABLE_CODE,
     INVOICE_STATUS,
     ACCOUNTS_RECEIVABLE_CODE,
+    BANK_RECONCILIATION_STATUS,
 };

package/migrations/church/20261026170653-create-bankReconciliation.js

@@ -0,0 +1,47 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .createTable(
+                "BankReconciliation",
+                {
+                    id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+                    chartOfAccountId: { type: DataTypes.INTEGER, allowNull: false },
+                    statementDate: { type: DataTypes.DATEONLY, allowNull: false },
+                    statementEndingBalance: { type: DataTypes.DECIMAL(12, 2), allowNull: false },
+                    beginningBalance: { type: DataTypes.DECIMAL(12, 2), allowNull: false },
+                    clearedBalance: { type: DataTypes.DECIMAL(12, 2), allowNull: true },
+                    difference: { type: DataTypes.DECIMAL(12, 2), allowNull: true },
+                    status: { type: DataTypes.STRING, allowNull: false },
+                    startedAt: { type: DataTypes.DATE, allowNull: false },
+                    completedAt: { type: DataTypes.DATE, allowNull: true },
+                    createdBy: { type: DataTypes.INTEGER, allowNull: true },
+                    createdAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                    updatedAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                },
+                { timestamps: false }
+            )
+            .then(() =>
+                queryInterface.addConstraint("BankReconciliation", {
+                    fields: ["chartOfAccountId"],
+                    type: "foreign key",
+                    name: "BankReconciliation_ChartOfAccountId_Fkey",
+                    references: {
+                        table: "ChartOfAccounts",
+                        field: "id",
+                    },
+                    onDelete: "restrict",
+                    onUpdate: "cascade",
+                })
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.dropTable("BankReconciliation");
+    },
+};

package/migrations/church/20261026170654-update-journalEntryLine-add-reconciliation.js

@@ -0,0 +1,35 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .addColumn("JournalEntryLine", "cleared", {
+                type: DataTypes.BOOLEAN,
+                allowNull: false,
+                defaultValue: false,
+            })
+            .then(() =>
+                queryInterface.addColumn("JournalEntryLine", "bankReconciliationId", {
+                    type: DataTypes.INTEGER,
+                    allowNull: true,
+                })
+            )
+            .then(() =>
+                queryInterface.addConstraint("JournalEntryLine", {
+                    fields: ["bankReconciliationId"],
+                    type: "foreign key",
+                    name: "JournalEntryLine_BankReconciliationId_Fkey",
+                    references: {
+                        table: "BankReconciliation",
+                        field: "id",
+                    },
+                    onDelete: "set null",
+                    onUpdate: "cascade",
+                })
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.removeConstraint("JournalEntryLine", "JournalEntryLine_BankReconciliationId_Fkey");
+        await queryInterface.removeColumn("JournalEntryLine", "bankReconciliationId");
+        await queryInterface.removeColumn("JournalEntryLine", "cleared");
+    },
+};

package/migrations/church/20261028170655-update-billLine-add-fundAccountId.js

@@ -0,0 +1,27 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .addColumn("BillLine", "fundAccountId", {
+                type: DataTypes.INTEGER,
+                allowNull: true,
+            })
+            .then(() =>
+                queryInterface.addConstraint("BillLine", {
+                    fields: ["fundAccountId"],
+                    type: "foreign key",
+                    name: "BillLine_FundAccountId_Fkey",
+                    references: {
+                        table: "ChartOfAccounts",
+                        field: "id",
+                    },
+                    onDelete: "restrict",
+                    onUpdate: "cascade",
+                })
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.removeConstraint("BillLine", "BillLine_FundAccountId_Fkey");
+        await queryInterface.removeColumn("BillLine", "fundAccountId");
+    },
+};

package/migrations/church/20261028170656-update-invoiceLine-add-fundAccountId.js

@@ -0,0 +1,27 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .addColumn("InvoiceLine", "fundAccountId", {
+                type: DataTypes.INTEGER,
+                allowNull: true,
+            })
+            .then(() =>
+                queryInterface.addConstraint("InvoiceLine", {
+                    fields: ["fundAccountId"],
+                    type: "foreign key",
+                    name: "InvoiceLine_FundAccountId_Fkey",
+                    references: {
+                        table: "ChartOfAccounts",
+                        field: "id",
+                    },
+                    onDelete: "restrict",
+                    onUpdate: "cascade",
+                })
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.removeConstraint("InvoiceLine", "InvoiceLine_FundAccountId_Fkey");
+        await queryInterface.removeColumn("InvoiceLine", "fundAccountId");
+    },
+};

package/migrations/church/20261028170657-update-journalEntryLine-add-fundAccountId.js

@@ -0,0 +1,27 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .addColumn("JournalEntryLine", "fundAccountId", {
+                type: DataTypes.INTEGER,
+                allowNull: true,
+            })
+            .then(() =>
+                queryInterface.addConstraint("JournalEntryLine", {
+                    fields: ["fundAccountId"],
+                    type: "foreign key",
+                    name: "JournalEntryLine_FundAccountId_Fkey",
+                    references: {
+                        table: "ChartOfAccounts",
+                        field: "id",
+                    },
+                    onDelete: "restrict",
+                    onUpdate: "cascade",
+                })
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.removeConstraint("JournalEntryLine", "JournalEntryLine_FundAccountId_Fkey");
+        await queryInterface.removeColumn("JournalEntryLine", "fundAccountId");
+    },
+};

package/migrations/church/20261028170658-update-journalEntryLine-add-className.js

@@ -0,0 +1,12 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface.addColumn("JournalEntryLine", "className", {
+            type: DataTypes.STRING,
+            allowNull: true,
+        });
+    },
+    down: async (queryInterface) => {
+        await queryInterface.removeColumn("JournalEntryLine", "className");
+    },
+};

package/migrations/church/20261028170659-update-invoiceLine-add-className.js

@@ -0,0 +1,12 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface.addColumn("InvoiceLine", "className", {
+            type: DataTypes.STRING,
+            allowNull: true,
+        });
+    },
+    down: async (queryInterface) => {
+        await queryInterface.removeColumn("InvoiceLine", "className");
+    },
+};

package/migrations/church/20261029170660-create-budget.js

@@ -0,0 +1,60 @@
+"use strict";
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .createTable(
+                "Budget",
+                {
+                    id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+                    fiscalYearId: { type: DataTypes.INTEGER, allowNull: false },
+                    chartOfAccountId: { type: DataTypes.INTEGER, allowNull: false },
+                    amount: { type: DataTypes.DECIMAL(18, 2), allowNull: false },
+                    createdAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                    updatedAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                },
+                { timestamps: false }
+            )
+            .then(() =>
+                queryInterface.addConstraint("Budget", {
+                    fields: ["fiscalYearId"],
+                    type: "foreign key",
+                    name: "Budget_FiscalYearId_Fkey",
+                    references: {
+                        table: "FiscalYears",
+                        field: "id",
+                    },
+                    onDelete: "restrict",
+                    onUpdate: "cascade",
+                })
+            )
+            .then(() =>
+                queryInterface.addConstraint("Budget", {
+                    fields: ["chartOfAccountId"],
+                    type: "foreign key",
+                    name: "Budget_ChartOfAccountId_Fkey",
+                    references: {
+                        table: "ChartOfAccounts",
+                        field: "id",
+                    },
+                    onDelete: "restrict",
+                    onUpdate: "cascade",
+                })
+            )
+            .then(() =>
+                queryInterface.addConstraint("Budget", {
+                    fields: ["fiscalYearId", "chartOfAccountId"],
+                    type: "unique",
+                    name: "Budget_FiscalYearId_ChartOfAccountId_Unique",
+                })
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.dropTable("Budget");
+    },
+};

package/models/church/bankReconciliation.js

@@ -0,0 +1,48 @@
+const { BANK_RECONCILIATION_STATUS } = require("../../constants");
+
+module.exports = (sequelize, DataTypes) => {
+    const bankReconciliation = sequelize.define(
+        "BankReconciliation",
+        {
+            id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+            chartOfAccountId: { type: DataTypes.INTEGER, allowNull: false },
+            statementDate: { type: DataTypes.DATEONLY, allowNull: false },
+            statementEndingBalance: { type: DataTypes.DECIMAL(12, 2), allowNull: false },
+            beginningBalance: { type: DataTypes.DECIMAL(12, 2), allowNull: false },
+            clearedBalance: { type: DataTypes.DECIMAL(12, 2), allowNull: true },
+            difference: { type: DataTypes.DECIMAL(12, 2), allowNull: true },
+            status: { type: DataTypes.STRING, defaultValue: BANK_RECONCILIATION_STATUS.IN_PROGRESS },
+            startedAt: { type: DataTypes.DATE },
+            completedAt: { type: DataTypes.DATE, allowNull: true },
+            createdBy: { type: DataTypes.INTEGER, allowNull: true },
+            createdAt: { type: DataTypes.DATE },
+            updatedAt: { type: DataTypes.DATE },
+        },
+        { freezeTableName: true, timestamps: false }
+    );
+    bankReconciliation.associate = function (models) {
+        bankReconciliation.belongsTo(models.chartOfAccounts, {
+            foreignKey: "chartOfAccountId",
+            as: "chartOfAccount",
+        });
+        bankReconciliation.hasMany(models.journalEntryLine, {
+            foreignKey: "bankReconciliationId",
+            as: "clearedLines",
+        });
+    };
+    bankReconciliation.selectedFields = [
+        "id",
+        "chartOfAccountId",
+        "statementDate",
+        "statementEndingBalance",
+        "beginningBalance",
+        "clearedBalance",
+        "difference",
+        "status",
+        "startedAt",
+        "completedAt",
+        "createdBy",
+        "createdAt",
+    ];
+    return bankReconciliation;
+};

package/models/church/billLine.js

@@ -7,6 +7,7 @@ module.exports = (sequelize, DataTypes) => {
             chartOfAccountId: { type: DataTypes.INTEGER, allowNull: true },
             description: { type: DataTypes.TEXT, allowNull: true },
             className: { type: DataTypes.STRING, allowNull: true },
+            fundAccountId: { type: DataTypes.INTEGER, allowNull: true },
             amount: { type: DataTypes.DECIMAL(12, 2), defaultValue: 0 },
             taxRate: { type: DataTypes.DECIMAL(6, 4), defaultValue: 0 },
             taxLabel: { type: DataTypes.STRING, allowNull: true },
@@ -28,6 +29,10 @@ module.exports = (sequelize, DataTypes) => {
             foreignKey: "chartOfAccountId",
             as: "chartOfAccount",
         });
+        billLine.belongsTo(models.chartOfAccounts, {
+            foreignKey: "fundAccountId",
+            as: "fundAccount",
+        });
     };
     billLine.selectedFields = [
         "id",
@@ -35,6 +40,7 @@ module.exports = (sequelize, DataTypes) => {
         "chartOfAccountId",
         "description",
         "className",
+        "fundAccountId",
         "amount",
         "taxRate",
         "taxLabel",

package/models/church/budget.js

@@ -0,0 +1,33 @@
+module.exports = (sequelize, DataTypes) => {
+    const budget = sequelize.define(
+        "Budget",
+        {
+            id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+            fiscalYearId: { type: DataTypes.INTEGER, allowNull: false },
+            chartOfAccountId: { type: DataTypes.INTEGER, allowNull: false },
+            amount: { type: DataTypes.DECIMAL(18, 2), allowNull: false },
+            createdAt: { type: DataTypes.DATE },
+            updatedAt: { type: DataTypes.DATE },
+        },
+        { freezeTableName: true, timestamps: false }
+    );
+    budget.associate = function (models) {
+        budget.belongsTo(models.fiscalYears, {
+            foreignKey: "fiscalYearId",
+            as: "fiscalYear",
+        });
+        budget.belongsTo(models.chartOfAccounts, {
+            foreignKey: "chartOfAccountId",
+            as: "chartOfAccount",
+        });
+    };
+    budget.selectedFields = [
+        "id",
+        "fiscalYearId",
+        "chartOfAccountId",
+        "amount",
+        "createdAt",
+        "updatedAt",
+    ];
+    return budget;
+};

package/models/church/invoiceLine.js

@@ -6,6 +6,8 @@ module.exports = (sequelize, DataTypes) => {
             invoiceId: { type: DataTypes.INTEGER, allowNull: false },
             chartOfAccountId: { type: DataTypes.INTEGER, allowNull: true },
             description: { type: DataTypes.TEXT, allowNull: true },
+            fundAccountId: { type: DataTypes.INTEGER, allowNull: true },
+            className: { type: DataTypes.STRING, allowNull: true },
             quantity: { type: DataTypes.DECIMAL(12, 2), defaultValue: 1 },
             rate: { type: DataTypes.DECIMAL(12, 2), defaultValue: 0 },
             amount: { type: DataTypes.DECIMAL(12, 2), defaultValue: 0 },
@@ -24,12 +26,18 @@ module.exports = (sequelize, DataTypes) => {
             foreignKey: "chartOfAccountId",
             as: "chartOfAccount",
         });
+        invoiceLine.belongsTo(models.chartOfAccounts, {
+            foreignKey: "fundAccountId",
+            as: "fundAccount",
+        });
     };
     invoiceLine.selectedFields = [
         "id",
         "invoiceId",
         "chartOfAccountId",
         "description",
+        "fundAccountId",
+        "className",
         "quantity",
         "rate",
         "amount",

package/models/church/journalEntryLine.js

@@ -8,6 +8,16 @@ module.exports = (sequelize, DataTypes) => {
             debit: { type: DataTypes.DECIMAL(10, 2), defaultValue: 0 },
             credit: { type: DataTypes.DECIMAL(10, 2), defaultValue: 0 },
             memo: { type: DataTypes.TEXT, allowNull: true },
+            // Bank reconciliation: cleared is toggled while a reconciliation is in progress;
+            // bankReconciliationId is stamped once that reconciliation is completed, locking the line in.
+            cleared: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: false },
+            bankReconciliationId: { type: DataTypes.INTEGER, allowNull: true },
+            // Which fund (an Equity account, same convention as Fund Balance Report) this income or
+            // expense line belongs to. Null means unassigned; irrelevant for non-Income/Expense lines.
+            fundAccountId: { type: DataTypes.INTEGER, allowNull: true },
+            // Ministry/department tag, same free-text values as BillLine.className; copied from the
+            // triggering BillLine/InvoiceLine, or set directly for a manual entry.
+            className: { type: DataTypes.STRING, allowNull: true },
             createdAt: { type: DataTypes.DATE },
             updatedAt: { type: DataTypes.DATE },
         },
@@ -22,6 +32,14 @@ module.exports = (sequelize, DataTypes) => {
             foreignKey: "chartOfAccountId",
             as: "chartOfAccount",
         });
+        journalEntryLine.belongsTo(models.bankReconciliation, {
+            foreignKey: "bankReconciliationId",
+            as: "bankReconciliation",
+        });
+        journalEntryLine.belongsTo(models.chartOfAccounts, {
+            foreignKey: "fundAccountId",
+            as: "fundAccount",
+        });
     };
     journalEntryLine.selectedFields = [
         "id",
@@ -30,6 +48,10 @@ module.exports = (sequelize, DataTypes) => {
         "debit",
         "credit",
         "memo",
+        "cleared",
+        "bankReconciliationId",
+        "fundAccountId",
+        "className",
         "createdAt",
         "updatedAt",
     ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@churchsoln/dbms",
-    "version": "1.0.64",
+    "version": "1.0.66",
     "main": "index.js",
     "scripts": {
         "prestart": "node db-setup.js",