fix: weight unit convert

andrew-bierman · Sep 29, 2024 · cebc8e1 · cebc8e1
1 parent 8f9d1cf
commit cebc8e1
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 19 deletions.
diff --git a/packages/app/modules/item/components/AddItem.tsx b/packages/app/modules/item/components/AddItem.tsx
@@ -58,14 +58,10 @@ export const AddItem = ({
   const { editPackItem } = useEditPackItem(isItemPage);
 
   const handleSubmit = (data: Item) => {
-    const convertedData = {
-      ...data,
-      weight: convertWeighToSmallestUnit(data.unit as ItemUnit, data.weight),
-    };
     if (isEdit) {
-      editPackItem(convertedData as any);
+      editPackItem(data as any);
     } else {
-      addPackItem(convertedData);
+      addPackItem(data);
     }
     if (closeModalHandler) closeModalHandler();
   };

diff --git a/packages/app/modules/item/components/ImportForm.tsx b/packages/app/modules/item/components/ImportForm.tsx
@@ -149,7 +149,7 @@ export const ImportForm: FC<ImportFormProps> = ({
         }}
       >
         <CascadedDropdownComponent
-          value={selectedType}
+          value={selectedType.value}
           data={[
             ...(currentpage !== 'items'
               ? csvOption
@@ -166,4 +166,4 @@ export const ImportForm: FC<ImportFormProps> = ({
       </RButton>
     </View>
   );
-};
+};
diff --git a/packages/app/modules/item/screens/ItemDetailsScreen.tsx b/packages/app/modules/item/screens/ItemDetailsScreen.tsx
@@ -9,6 +9,8 @@ import useResponsive from 'app/hooks/useResponsive';
 import { CustomCard } from 'app/components/card';
 import LargeCard from 'app/components/card/LargeCard';
 import { FeedPreview } from 'app/modules/feed';
+import { convertWeight } from 'app/utils/convertWeight';
+import { SMALLEST_ITEM_UNIT } from '../constants';
 
 export function ItemDetailsScreen() {
   const { limit, handleLimitChange, page, handlePageChange } = usePagination();
@@ -36,7 +38,12 @@ export function ItemDetailsScreen() {
                     <RStack>
                       <RText>Category: {item?.category?.name || '-'}</RText>
                       <RText>
-                        Weight: {item?.weight}
+                        Weight:{' '}
+                        {convertWeight(
+                          Number(item?.weight),
+                          SMALLEST_ITEM_UNIT,
+                          item?.unit as any,
+                        )}
                         {item?.unit}
                       </RText>
                       <RText>Quantity: {item?.quantity}</RText>

diff --git a/packages/app/modules/item/screens/ItemsScreen.tsx b/packages/app/modules/item/screens/ItemsScreen.tsx
@@ -98,9 +98,11 @@ export function ItemsScreen() {
             <BaseModal title="Add a global Item" trigger="Add Item">
               <AddItemGlobal />
             </BaseModal>
-            { role === 'admin' && <BaseModal title="Import global Item" trigger="Import Item">
-              <ImportItemGlobal />
-            </BaseModal>}
+            {role === 'admin' && (
+              <BaseModal title="Import global Item" trigger="Import Item">
+                <ImportItemGlobal />
+              </BaseModal>
+            )}
           </View>
         </RStack>
         {!isError && data?.items && Array.isArray(data.items) && (

diff --git a/packages/ui/src/Bento/elements/tables/PaginatedSortedTable.tsx b/packages/ui/src/Bento/elements/tables/PaginatedSortedTable.tsx
@@ -8,10 +8,12 @@ import {
   getPaginationRowModel,
 } from '@tanstack/react-table';
 import { useMedia } from 'tamagui';
+import { convertWeight } from 'app/utils/convertWeight';
 import { Text, View, Button, getTokenValue } from 'tamagui';
 import { Table } from './common/tableParts';
 import { Pressable } from 'react-native';
 import { useRouter } from '@packrat/crosspath';
+import { SMALLEST_ITEM_UNIT } from 'app/modules/item/constants';
 
 const ITEMS_PER_PAGE = 10;
 
@@ -66,7 +68,12 @@ export function PaginatedSortedTable({
       footer: (info) => info.column.id,
     }),
     columnHelper.accessor('weight', {
-      cell: (info) => info.getValue(),
+      cell: (info) =>
+        convertWeight(
+          info.getValue(),
+          SMALLEST_ITEM_UNIT,
+          info.row.original.unit as any,
+        ),
       header: () => 'Weight',
       footer: (info) => info.column.id,
     }),

diff --git a/server/src/services/item/addItemGlobalService.ts b/server/src/services/item/addItemGlobalService.ts
@@ -4,6 +4,7 @@ import { Item } from '../../drizzle/methods/Item';
 import { ItemCategory } from '../../drizzle/methods/itemcategory';
 import { ItemCategory as categories } from '../../utils/itemCategory';
 import { VectorClient } from '../../vector/client';
+import { convertWeight, SMALLEST_WEIGHT_UNIT } from 'src/utils/convertWeight';
 // import { prisma } from '../../prisma';
 
 /**
@@ -37,7 +38,7 @@ export const addItemGlobalService = async (
   }
   const newItem = await itemClass.create({
     name,
-    weight,
+    weight: convertWeight(Number(weight), unit as any, SMALLEST_WEIGHT_UNIT),
     quantity,
     unit,
     categoryId: category.id,

diff --git a/server/src/services/item/addItemService.ts b/server/src/services/item/addItemService.ts
@@ -5,6 +5,7 @@ import { ItemOwners } from '../../drizzle/methods/ItemOwners';
 import { ItemCategory as categories } from '../../utils/itemCategory';
 import { type InsertItemCategory } from '../../db/schema';
 import { VectorClient } from '../../vector/client';
+import { convertWeight, SMALLEST_WEIGHT_UNIT } from 'src/utils/convertWeight';
 import { type ExecutionContext } from 'hono';
 
 /**
@@ -42,7 +43,7 @@ export const addItemService = async (
   const item = await itemClass.create(
     {
       name,
-      weight,
+      weight: convertWeight(Number(weight), unit as any, SMALLEST_WEIGHT_UNIT),
       quantity,
       unit,
       // packs: [packId],

diff --git a/server/src/services/item/bulkAddGlobalItemService.ts b/server/src/services/item/bulkAddGlobalItemService.ts
@@ -3,6 +3,7 @@ import { type InsertItemCategory } from '../../db/schema';
 import { ItemCategory } from '../../drizzle/methods/itemcategory';
 import { DbClient } from 'src/db/client';
 import { item as ItemTable } from '../../db/schema';
+import { convertWeight, SMALLEST_WEIGHT_UNIT } from 'src/utils/convertWeight';
 
 export const bulkAddItemsGlobalService = async (
   items: Array<{
@@ -35,7 +36,7 @@ export const bulkAddItemsGlobalService = async (
 
     const newItem = {
       name,
-      weight,
+      weight: convertWeight(Number(weight), unit as any, SMALLEST_WEIGHT_UNIT),
       quantity,
       unit,
       categoryId: category.id,

diff --git a/server/src/services/item/editItemService.ts b/server/src/services/item/editItemService.ts
@@ -6,6 +6,7 @@ import { Item } from '../../drizzle/methods/Item';
 import { ItemCategory } from '../../drizzle/methods/itemcategory';
 import { ItemCategory as categories } from '../../utils/itemCategory';
 import { VectorClient } from '../../vector/client';
+import { convertWeight, SMALLEST_WEIGHT_UNIT } from 'src/utils/convertWeight';
 
 /**
  * Edit an item in the service.
@@ -55,12 +56,16 @@ export const editItemService = async (
       });
     }
   }
-
+  const itemUnit = unit || item.unit;
   // const item = await itemClass.findItem({ id });
   const newItem = await itemClass.update(id, {
     name: name || item.name,
-    weight: weight || item.weight,
-    unit: unit || item.unit,
+    weight: convertWeight(
+      Number(weight || item.weight),
+      itemUnit as any,
+      SMALLEST_WEIGHT_UNIT,
+    ),
+    unit: itemUnit,
     quantity: quantity || item.quantity,
     categoryId: category.id || item.categoryId,
   });

diff --git a/server/src/utils/convertWeight.ts b/server/src/utils/convertWeight.ts
@@ -1,4 +1,5 @@
 type WeightUnit = 'g' | 'kg' | 'oz' | 'lb' | 'lbs';
+export const SMALLEST_WEIGHT_UNIT = 'g';
 
 const units: Record<WeightUnit, number> = {
   g: 1,