refactor(notice):move helper functions to utils file

thematters · Jul 20, 2024 · 6d397aa · 6d397aa
1 parent 66a0030
commit 6d397aa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/lib/__test__/notificationService.test.ts b/lib/__test__/notificationService.test.ts
@@ -3,6 +3,7 @@ import type { NotificationType } from '../notification/types'
 
 import { NOTICE_TYPE, OFFICIAL_NOTICE_EXTEND_TYPE } from '../notification/enums'
 import { NotificationService } from '../notification'
+import { mergeDataWith } from '../notification/utils'
 import { getKnexClient } from '../utils/db'
 
 let knex: Knex
@@ -19,9 +20,12 @@ beforeAll(async () => {
   notificationService = new NotificationService({ knex, knexRO: knex })
 })
 
-/**
- * Notification Service
- */
+// utils
+test('mergeDataWith', () => {
+  expect(mergeDataWith({ a: [1, 2] }, { a: [2, 3] })).toEqual({ a: [1, 2, 3] })
+})
+
+// service
 describe('user notify setting', () => {
   const defaultNoifySetting: Record<NotificationType, boolean> = {
     // user

diff --git a/lib/notification/index.ts b/lib/notification/index.ts
@@ -15,7 +15,7 @@ import type {
 import type { Language, User } from '../types'
 
 import uniqBy from 'lodash.uniqby'
-import { isEqual, mergeWith, uniq } from 'lodash'
+import { isEqual } from 'lodash'
 
 import { DAY } from '../constants/index.js'
 import { v4 } from 'uuid'
@@ -28,16 +28,7 @@ import {
 } from './enums.js'
 
 import trans, { findTranslation } from './translations.js'
-import { loadLatestArticleVersion } from './utils.js'
-
-const mergeDataCustomizer = (objValue: any, srcValue: any) => {
-  if (Array.isArray(objValue)) {
-    return uniq(objValue.concat(srcValue))
-  }
-}
-
-const mergeDataWith = (objValue: any, srcValue: any) =>
-  mergeWith(objValue, srcValue, mergeDataCustomizer)
+import { loadLatestArticleVersion, mergeDataWith } from './utils.js'
 
 export class NotificationService {
   private knex: Knex

diff --git a/lib/notification/utils.ts b/lib/notification/utils.ts
@@ -1,6 +1,17 @@
 import type { Language } from '../types'
 import type { Knex } from 'knex'
 
+import { mergeWith, uniq } from 'lodash'
+
+const mergeDataCustomizer = (objValue: any, srcValue: any) => {
+  if (Array.isArray(objValue)) {
+    return uniq(objValue.concat(srcValue))
+  }
+}
+
+export const mergeDataWith = (objValue: any, srcValue: any) =>
+  mergeWith(objValue, srcValue, mergeDataCustomizer)
+
 export const loadLatestArticleVersion = async (articleId: string, knex: Knex) =>
   knex('article_version_newest').where('articleId', articleId).first()