diff --git a/src/database/schemas/management/taxrecord.schema.js b/src/database/schemas/finance/taxrecord.schema.js similarity index 100% rename from src/database/schemas/management/taxrecord.schema.js rename to src/database/schemas/finance/taxrecord.schema.js diff --git a/src/database/schemas/models.js b/src/database/schemas/models.js index 8069e09..44b07a0 100644 --- a/src/database/schemas/models.js +++ b/src/database/schemas/models.js @@ -36,7 +36,7 @@ import { fileModel } from './management/file.schema.js'; import { courierServiceModel } from './management/courierservice.schema.js'; import { courierModel } from './management/courier.schema.js'; import { taxRateModel } from './management/taxrate.schema.js'; -import { taxRecordModel } from './management/taxrecord.schema.js'; +import { taxRecordModel } from './finance/taxrecord.schema.js'; import { shipmentModel } from './inventory/shipment.schema.js'; import { invoiceModel } from './finance/invoice.schema.js'; import { clientModel } from './sales/client.schema.js'; diff --git a/src/routes/management/taxrecords.js b/src/routes/finance/taxrecords.js similarity index 97% rename from src/routes/management/taxrecords.js rename to src/routes/finance/taxrecords.js index 0838679..2b54afc 100644 --- a/src/routes/management/taxrecords.js +++ b/src/routes/finance/taxrecords.js @@ -12,7 +12,7 @@ import { listTaxRecordsByPropertiesRouteHandler, getTaxRecordStatsRouteHandler, getTaxRecordHistoryRouteHandler, -} from '../../services/management/taxrecords.js'; +} from '../../services/finance/taxrecords.js'; // list of tax records router.get('/', isAuthenticated, (req, res) => { diff --git a/src/routes/index.js b/src/routes/index.js index 27abad8..5c26e89 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -36,7 +36,7 @@ import documentJobsRoutes from './management/documentjobs.js'; import courierRoutes from './management/courier.js'; import courierServiceRoutes from './management/courierservice.js'; import taxRateRoutes from './management/taxrates.js'; -import taxRecordRoutes from './management/taxrecords.js'; +import taxRecordRoutes from './finance/taxrecords.js'; import invoiceRoutes from './finance/invoices.js'; import paymentRoutes from './finance/payments.js'; import clientRoutes from './sales/clients.js'; diff --git a/src/services/management/__tests__/taxrecords.test.js b/src/services/finance/__tests__/taxrecords.test.js similarity index 94% rename from src/services/management/__tests__/taxrecords.test.js rename to src/services/finance/__tests__/taxrecords.test.js index 01bb738..95acab7 100644 --- a/src/services/management/__tests__/taxrecords.test.js +++ b/src/services/finance/__tests__/taxrecords.test.js @@ -11,7 +11,7 @@ jest.unstable_mockModule('../../../database/database.js', () => ({ getModelHistory: jest.fn(), })); -jest.unstable_mockModule('../../../database/schemas/management/taxrecord.schema.js', () => ({ +jest.unstable_mockModule('../../../database/schemas/finance/taxrecord.schema.js', () => ({ taxRecordModel: { modelName: 'TaxRecord' }, })); @@ -37,7 +37,7 @@ const { const { listObjects, getObject, editObject, newObject } = await import( '../../../database/database.js' ); -const { taxRecordModel } = await import('../../../database/schemas/management/taxrecord.schema.js'); +const { taxRecordModel } = await import('../../../database/schemas/finance/taxrecord.schema.js'); describe('Tax Record Service Route Handlers', () => { let req, res; diff --git a/src/services/management/taxrecords.js b/src/services/finance/taxrecords.js similarity index 98% rename from src/services/management/taxrecords.js rename to src/services/finance/taxrecords.js index ee2bcb6..c317858 100644 --- a/src/services/management/taxrecords.js +++ b/src/services/finance/taxrecords.js @@ -1,5 +1,5 @@ import config from '../../config.js'; -import { taxRecordModel } from '../../database/schemas/management/taxrecord.schema.js'; +import { taxRecordModel } from '../../database/schemas/finance/taxrecord.schema.js'; import log4js from 'log4js'; import mongoose from 'mongoose'; import {