Merge pull request #89 from TKOaly/weight-removal

Remove weight column from the database
TKOaly · Mar 6, 2024 · 7a7e356 · 7a7e356
2 parents ee3d117 + 8be1864
commit 7a7e356
Show file tree

Hide file tree

Showing 11 changed files with 903 additions and 1,854 deletions.
diff --git a/openapi.yaml b/openapi.yaml
@@ -49,7 +49,6 @@ components:
         - barcode
         - name
         - category
-        - weight
         - sellPrice
         - stock
       properties: 
@@ -63,10 +62,6 @@ components:
           description: Human readable and user facing name of the product.
         category: 
           '$ref': '#/components/schemas/Category'
-        weight: 
-          type: integer
-          example: 370
-          description: Weight of the product in grams.
         sellPrice: 
           type: integer
           example: 310
@@ -1355,7 +1350,6 @@ paths:
                 - barcode
                 - name
                 - categoryId
-                - weight
                 - buyPrice
                 - sellPrice
                 - stock
@@ -1373,10 +1367,6 @@ paths:
                   type: integer
                   example: 10
                   minimum: 0
-                weight: 
-                  type: integer
-                  example: 350
-                  minimum: 0
                 buyPrice: 
                   type: integer
                   example: 210
@@ -1466,10 +1456,6 @@ paths:
                   type: integer
                   example: 10
                   minimum: 0
-                weight: 
-                  type: integer
-                  example: 350
-                  minimum: 0
                 buyPrice: 
                   type: integer
                   example: 210

diff --git a/src/db/boxStore.js b/src/db/boxStore.js
@@ -13,7 +13,6 @@ const rowToBox = (row) => {
                     categoryId: row.pgrpid,
                     description: row.pgrpdescr
                 },
-                weight: row.weight,
                 buyPrice: row.buyprice,
                 sellPrice: row.sellprice,
                 stock: row.count
@@ -39,7 +38,6 @@ module.exports.getBoxes = async () => {
             'RVITEM.descr',
             'RVITEM.pgrpid',
             'PRODGROUP.descr as pgrpdescr',
-            'RVITEM.weight',
             'PRICE.buyprice',
             'PRICE.sellprice',
             'PRICE.count'
@@ -63,7 +61,6 @@ module.exports.findByBoxBarcode = async (boxBarcode) => {
             'RVITEM.descr',
             'RVITEM.pgrpid',
             'PRODGROUP.descr as pgrpdescr',
-            'RVITEM.weight',
             'PRICE.buyprice',
             'PRICE.sellprice',
             'PRICE.count'
@@ -100,7 +97,6 @@ module.exports.insertBox = async (boxData) => {
                 'RVITEM.descr',
                 'RVITEM.pgrpid',
                 'PRODGROUP.descr as pgrpdescr',
-                'RVITEM.weight',
                 'PRICE.buyprice',
                 'PRICE.sellprice',
                 'PRICE.count'
@@ -119,7 +115,6 @@ module.exports.insertBox = async (boxData) => {
                     categoryId: productRow.pgrpid,
                     description: productRow.pgrpdescr
                 },
-                weight: productRow.weight,
                 buyPrice: productRow.buyprice,
                 sellPrice: productRow.sellprice,
                 stock: productRow.count
@@ -152,7 +147,6 @@ module.exports.updateBox = async (boxBarcode, boxData) => {
                 'RVITEM.descr',
                 'RVITEM.pgrpid',
                 'PRODGROUP.descr as pgrpdescr',
-                'RVITEM.weight',
                 'PRICE.buyprice',
                 'PRICE.sellprice',
                 'PRICE.count'
@@ -178,7 +172,6 @@ module.exports.deleteBox = async (boxBarcode) => {
                 'RVITEM.descr',
                 'RVITEM.pgrpid',
                 'PRODGROUP.descr as pgrpdescr',
-                'RVITEM.weight',
                 'PRICE.buyprice',
                 'PRICE.sellprice',
                 'PRICE.count'

diff --git a/src/db/historyStore.js b/src/db/historyStore.js
@@ -27,7 +27,6 @@ const rowToProduct = (row) => {
             categoryId: row.pgrpid,
             description: row.pgrpdescr
         },
-        weight: row.weight,
         buyPrice: row.buyprice,
         sellPrice: row.sellprice,
         stock: row.stock
@@ -60,7 +59,6 @@ const createPurchaseHistoryQuery = () =>
             'RVITEM.descr',
             'RVITEM.pgrpid',
             'PRODGROUP.descr as pgrpdescr',
-            'RVITEM.weight',
             'PRICE.barcode',
             'PRICE.sellprice',
             'PRICE.buyprice',

diff --git a/src/db/migrations/20180217113920_prodgroup_rvitem.js b/src/db/migrations/20180217113920_prodgroup_rvitem.js
@@ -29,11 +29,6 @@ exports.up = async (knex) => {
                 .string('descr', 64)
                 .notNullable()
                 .comment('Textual product description (name)');
-            table
-                .integer('weight')
-                .unsigned()
-                .notNullable()
-                .comment('Product weight');
         });
     }
 };

diff --git a/src/db/productStore.js b/src/db/productStore.js
@@ -10,7 +10,6 @@ const rowToProduct = (row) => {
                 categoryId: row.pgrpid,
                 description: row.pgrpdescr
             },
-            weight: row.weight,
             buyPrice: row.buyprice,
             sellPrice: row.sellprice,
             stock: row.count
@@ -31,7 +30,6 @@ module.exports.searchProducts = async (query) => {
             'RVITEM.descr',
             'RVITEM.pgrpid',
             'PRODGROUP.descr as pgrpdescr',
-            'RVITEM.weight',
             'PRICE.barcode',
             'PRICE.buyprice',
             'PRICE.sellprice',
@@ -53,7 +51,6 @@ module.exports.getProducts = async () => {
             'RVITEM.descr',
             'RVITEM.pgrpid',
             'PRODGROUP.descr as pgrpdescr',
-            'RVITEM.weight',
             'PRICE.barcode',
             'PRICE.buyprice',
             'PRICE.sellprice',
@@ -75,7 +72,6 @@ module.exports.findByBarcode = async (barcode) => {
             'RVITEM.descr',
             'RVITEM.pgrpid',
             'PRODGROUP.descr as pgrpdescr',
-            'RVITEM.weight',
             'PRICE.barcode',
             'PRICE.buyprice',
             'PRICE.sellprice',
@@ -101,8 +97,7 @@ module.exports.insertProduct = async (productData, userId) => {
             .transacting(trx)
             .insert({
                 pgrpid: productData.categoryId,
-                descr: productData.name,
-                weight: productData.weight
+                descr: productData.name
             })
             .returning(['itemid']);
 
@@ -132,7 +127,6 @@ module.exports.insertProduct = async (productData, userId) => {
                 categoryId: productData.categoryId,
                 description: categoryRow.descr
             },
-            weight: productData.weight,
             buyPrice: productData.buyPrice,
             sellPrice: productData.sellPrice,
             stock: productData.stock
@@ -144,12 +138,11 @@ module.exports.insertProduct = async (productData, userId) => {
  * Updates a product's information
  */
 module.exports.updateProduct = async (barcode, productData, userId) => {
-    /* productData may have fields { name, categoryId, weight, buyPrice, sellPrice, stock } */
+    /* productData may have fields { name, categoryId, buyPrice, sellPrice, stock } */
     return await knex.transaction(async (trx) => {
         const rvitemFields = deleteUndefinedFields({
             pgrpid: productData.categoryId,
-            descr: productData.name,
-            weight: productData.weight
+            descr: productData.name
         });
         if (Object.keys(rvitemFields).length > 0) {
             const priceRow = await knex('PRICE')
@@ -210,7 +203,6 @@ module.exports.updateProduct = async (barcode, productData, userId) => {
                 'RVITEM.descr',
                 'RVITEM.pgrpid',
                 'PRODGROUP.descr as pgrpdescr',
-                'RVITEM.weight',
                 'PRICE.barcode',
                 'PRICE.buyprice',
                 'PRICE.sellprice',
@@ -305,7 +297,6 @@ module.exports.deleteProduct = async (barcode) => {
                 'RVITEM.descr',
                 'RVITEM.pgrpid',
                 'PRODGROUP.descr as pgrpdescr',
-                'RVITEM.weight',
                 'PRICE.barcode',
                 'PRICE.buyprice',
                 'PRICE.sellprice',