Merge pull request #3138 from goratt12/3135-fix-sort-by-comment

fix(research): fix sort by comments
ONEARMY · Jan 3, 2024 · 7e57be2 · 7e57be2
2 parents 157684f + c541a67
commit 7e57be2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/utils/helpers.test.ts b/src/utils/helpers.test.ts
@@ -208,7 +208,7 @@ describe('src/utils/helpers', () => {
   describe('calculateTotalComments Function', () => {
     it('should return 0 when item has no updates', () => {
       const item = { item: {} } as any
-      expect(calculateTotalComments(item)).toBe('0')
+      expect(calculateTotalComments(item)).toBe(0)
     })
 
     it('should return 0 when updates have no comments', () => {
@@ -221,7 +221,7 @@ describe('src/utils/helpers', () => {
           }),
         ),
       } as IResearch.ItemDB | IItem
-      expect(calculateTotalComments(item)).toBe('0')
+      expect(calculateTotalComments(item)).toBe(0)
     })
 
     it('should return the correct amount of comments', () => {
@@ -234,7 +234,7 @@ describe('src/utils/helpers', () => {
           }),
         ),
       } as IResearch.ItemDB | IItem
-      expect(calculateTotalComments(item)).toBe('9')
+      expect(calculateTotalComments(item)).toBe(9)
     })
 
     it('should ignore deleted and draft updates', () => {
@@ -260,7 +260,7 @@ describe('src/utils/helpers', () => {
             }),
           ]),
       } as IResearch.ItemDB | IItem
-      expect(calculateTotalComments(item)).toBe('4')
+      expect(calculateTotalComments(item)).toBe(4)
     })
   })
 

diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
@@ -167,7 +167,9 @@ export const isAllowedToPin = (pin: IMapPin, user?: IUser) => {
   }
 }
 
-export const calculateTotalComments = (item: IResearch.ItemDB | IItem) => {
+export const calculateTotalComments = (
+  item: IResearch.ItemDB | IItem,
+): number => {
   if (item.updates) {
     const commentOnUpdates = item.updates.reduce((totalComments, update) => {
       const updateCommentsLength =
@@ -177,9 +179,9 @@ export const calculateTotalComments = (item: IResearch.ItemDB | IItem) => {
       return totalComments + updateCommentsLength
     }, 0)
 
-    return commentOnUpdates ? String(commentOnUpdates) : '0'
+    return commentOnUpdates ? commentOnUpdates : 0
   } else {
-    return '0'
+    return 0
   }
 }