From b590890bd3f04f517446520e02453414b8ace3f5 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Tue, 1 Sep 2026 17:35:20 +0100
Subject: [PATCH] Enhance Database Models with Additional Cost and Pricing
 Fields

- Added 'additionalCost' and 'additionalCostWithTax' fields to CourierService model.
- Introduced 'connection.port' field in DocumentPrinter model.
- Updated Filament model with 'density' and 'emptySpoolWeight' fields.
- Enhanced Part, PartSku, Product, and ProductSku models by adding 'cost', 'costWithTax', 'price', 'margin', and 'priceWithTax' fields for improved pricing structure.
---
 src/database/models/CourierService.js  | 5 +++++
 src/database/models/DocumentPrinter.js | 2 ++
 src/database/models/Filament.js        | 6 ++++++
 src/database/models/Part.js            | 6 ++++++
 src/database/models/PartSku.js         | 4 ++++
 src/database/models/Product.js         | 6 ++++++
 src/database/models/ProductSku.js      | 4 ++++
 7 files changed, 33 insertions(+)

diff --git a/src/database/models/CourierService.js b/src/database/models/CourierService.js
index fc540ee4..6dec0b56 100644
--- a/src/database/models/CourierService.js
+++ b/src/database/models/CourierService.js
@@ -131,6 +131,8 @@ export const CourierService = {
     'deliveryTime',
     'cost',
     'costWithTax',
+    'additionalCost',
+    'additionalCostWithTax',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -140,8 +142,11 @@ export const CourierService = {
     'courier',
     'active',
     'tracked',
+    'deliveryTime',
     'cost',
     'costWithTax',
+    'additionalCost',
+    'additionalCostWithTax',
     'estimatedDeliveryTime',
     'createdAt',
     '_id',
diff --git a/src/database/models/DocumentPrinter.js b/src/database/models/DocumentPrinter.js
index 75452176..28e059a4 100644
--- a/src/database/models/DocumentPrinter.js
+++ b/src/database/models/DocumentPrinter.js
@@ -103,6 +103,7 @@ export const DocumentPrinter = {
     'active',
     'isGlobal',
     'state',
+    'connection.port',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -111,6 +112,7 @@ export const DocumentPrinter = {
     'name',
     'documentSize',
     'connectedAt',
+    'connection.port',
     'updatedAt',
     'state',
     'createdAt'
diff --git a/src/database/models/Filament.js b/src/database/models/Filament.js
index 99960bcd..4060eb75 100644
--- a/src/database/models/Filament.js
+++ b/src/database/models/Filament.js
@@ -135,7 +135,10 @@ export const Filament = {
     'material',
     'diameter',
     'name',
+    'density',
+    'emptySpoolWeight',
     'cost',
+    'costWithTax',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -145,6 +148,9 @@ export const Filament = {
     'createdAt',
     'vendor',
     'material',
+    'diameter',
+    'density',
+    'emptySpoolWeight',
     'cost',
     'costWithTax',
     'updatedAt'
diff --git a/src/database/models/Part.js b/src/database/models/Part.js
index 4c23b468..66c6f72a 100644
--- a/src/database/models/Part.js
+++ b/src/database/models/Part.js
@@ -113,6 +113,11 @@ export const Part = {
     'product._id',
     '_id',
     'name',
+    'cost',
+    'costWithTax',
+    'price',
+    'margin',
+    'priceWithTax',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -123,6 +128,7 @@ export const Part = {
     'cost',
     'costWithTax',
     'price',
+    'margin',
     'priceWithTax',
     'createdAt',
     'updatedAt',
diff --git a/src/database/models/PartSku.js b/src/database/models/PartSku.js
index fab141ea..d2933aa4 100644
--- a/src/database/models/PartSku.js
+++ b/src/database/models/PartSku.js
@@ -124,7 +124,10 @@ export const PartSku = {
     'part',
     'name',
     'cost',
+    'costWithTax',
     'price',
+    'priceWithTax',
+    'margin',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -137,6 +140,7 @@ export const PartSku = {
     'costWithTax',
     'price',
     'priceWithTax',
+    'margin',
     'createdAt',
     'updatedAt'
   ],
diff --git a/src/database/models/Product.js b/src/database/models/Product.js
index c182d968..471624f5 100644
--- a/src/database/models/Product.js
+++ b/src/database/models/Product.js
@@ -118,6 +118,11 @@ export const Product = {
     'name',
     'globalPrice',
     'productCategory',
+    'cost',
+    'costWithTax',
+    'price',
+    'margin',
+    'priceWithTax',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -131,6 +136,7 @@ export const Product = {
     'cost',
     'costWithTax',
     'price',
+    'margin',
     'priceWithTax',
     'updatedAt'
   ],
diff --git a/src/database/models/ProductSku.js b/src/database/models/ProductSku.js
index bd9807e6..c97bd458 100644
--- a/src/database/models/ProductSku.js
+++ b/src/database/models/ProductSku.js
@@ -124,7 +124,10 @@ export const ProductSku = {
     'product',
     'name',
     'cost',
+    'costWithTax',
     'price',
+    'priceWithTax',
+    'margin',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -137,6 +140,7 @@ export const ProductSku = {
     'costWithTax',
     'price',
     'priceWithTax',
+    'margin',
     'createdAt',
     'updatedAt'
   ],