Removes the helper function from server files (#1105)

Co-authored-by: Aman Singh <saintsoldierx@gmail.com>
KhalisFoundation · Jun 10, 2020 · c0a5a67 · c0a5a67
1 parent 99c89fa
commit c0a5a67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/server/utils/shabads/create-shabad-description.js b/server/utils/shabads/create-shabad-description.js
@@ -1,9 +1,4 @@
-import {
-  translationMap,
-  getWriter,
-  getSource,
-  getUnicodeVerse
-} from '../../../src/js/util/api/shabad';
+import { SOURCES } from '@sttm/banidb';
 
 /**
  *
@@ -13,10 +8,10 @@ import {
 export const createShabadDescription = (shabad, shabadInfo) => {
 
   if (!shabad) return '';
-  const shabadWriter = getWriter(shabad).english;
-  const shabadSource = shabadInfo ? getSource(shabadInfo) : '';
-  const shabadMeaning = translationMap.english(shabad);
-  const shabadUnicode = getUnicodeVerse(shabad);
+  const shabadWriter = shabad.writer ? shabad.writer.english : '';
+  const shabadSource = shabadInfo ? SOURCES[shabadInfo.source.sourceId] : '';
+  const shabadMeaning = shabad.translation.en.bdb || '';
+  const shabadUnicode = shabad.verse.unicode || '';
 
   return `${shabadMeaning} ${shabadUnicode} shabad ${shabadSource && `from ${shabadSource}`} ${shabadWriter && ` written by ${shabadWriter}`}`;
 }
diff --git a/server/utils/shabads/create-shabad-title.js b/server/utils/shabads/create-shabad-title.js
@@ -1,15 +1,10 @@
-import {
-  transliterationMap,
-  getUnicodeVerse
-} from '../../../src/js/util/api/shabad';
-
 /**
  *
  * @param {object} shabad - The shabad obj
  **/
 export const createShabadTitle = (shabad) => {
   if (!shabad) return '';
-  const shabadInEnglish = transliterationMap.english(shabad);
-  const shabadUnicode = getUnicodeVerse(shabad);
+  const shabadInEnglish = shabad.translation.en.bdb || '';
+  const shabadUnicode = shabad.verse.unicode || '';
   return `Shabad ${shabadInEnglish}. ${shabadUnicode}`
 }