Fallback to give out name if nb/nn doesn't exist

This happens when a class doesn't have grep codes
vtfk · Mar 25, 2022 · 94eecfe · 94eecfe
1 parent b3ca593
commit 94eecfe
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 13 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -62,5 +62,9 @@ module.exports = {
     if (!obj) return false
     const regex = new RegExp(text, 'i')
     return regex.test(JSON.stringify(obj))
+  },
+  classIdentifier: (lang, name) => {
+    if (lang) return lang
+    return name
   }
 }
diff --git a/templates/minelev/varsel/fag-nb.md b/templates/minelev/varsel/fag-nb.md
@@ -24,7 +24,7 @@ info:
 Dette omfatter følgende fag:
 
 {{#each content.classes}}
- - {{this.nb}}
+ - {{ classIdentifier this.nb this.name }}
 {{/each}}
 
 Varselet gjelder {{ lowercase content.period.nb }} skoleåret {{ content.year }}.

diff --git a/templates/minelev/varsel/fag-nn.md b/templates/minelev/varsel/fag-nn.md
@@ -24,7 +24,7 @@ info:
 Dette omfattar følgjande fag:
 
 {{#each content.classes}}
- - {{this.nn}}
+ - {{ classIdentifier this.nn this.name }}
 {{/each}}
 
 Varselet gjeld {{ lowercase content.period.nn }} skoleåret {{ content.year }}.

diff --git a/tests/data/varsel-fag.json b/tests/data/varsel-fag.json
@@ -36,15 +36,14 @@
       },
       "classes": [
         {
-          "id": "TESVS:TEST/201NOR1208",
+          "id": "01234567",
+          "name": "TEST/201NOR1208",
           "nb": "Norsk hovedmål, skriftlig",
           "nn": "Norsk hovudmål, skriftleg",
           "en": "Norwegian as 1st lang, written"
         }, {
-          "id": "TESVS:TEST/201NOR1209",
-          "nb": "Norsk hovedmål, muntlig",
-          "nn": "Norsk hovudmål, muntlig",
-          "en": "Norwegian as 1st lang, plural"
+          "id": "76543210",
+          "name": "TEST/201NOR1209"
         }
       ],
       "reasons": [

diff --git a/tests/data/varsel-orden.json b/tests/data/varsel-orden.json
@@ -36,15 +36,14 @@
       },
       "classes": [
         {
-          "id": "TESVS:TEST/201NOR1208",
+          "id": "01234567",
+          "name": "TEST/201NOR1208",
           "nb": "Norsk hovedmål, skriftlig",
           "nn": "Norsk hovudmål, skriftleg",
           "en": "Norwegian as 1st lang, written"
         }, {
-          "id": "TESVS:TEST/201NOR1209",
-          "nb": "Norsk hovedmål, muntlig",
-          "nn": "Norsk hovudmål, muntlig",
-          "en": "Norwegian as 1st lang, plural"
+          "id": "76543210",
+          "name": "TEST/201NOR1209"
         }
       ],
       "reasons": [

diff --git a/tests/lib/helpers.test.js b/tests/lib/helpers.test.js
@@ -1,4 +1,4 @@
-const { isoDate, prettyDate, lowercase, join, uppercase, variable, eq, ne, lt, gt, lte, gte, and, or, multiple, replace, capitalize, uppercaseFirst, objectContains } = require('../../lib/helpers')
+const { isoDate, prettyDate, lowercase, join, uppercase, variable, eq, ne, lt, gt, lte, gte, and, or, multiple, replace, capitalize, uppercaseFirst, objectContains, classIdentifier } = require('../../lib/helpers')
 
 describe('Test helper - logic', () => {
   const options = {}
@@ -220,3 +220,26 @@ describe('Test helper - objectContains', () => {
     expect(objectContains(obj, 'heihei')).toBe(false)
   })
 })
+
+describe('Test helper - classIdentifier', () => {
+  it('returns "nb" from class object when it exists', () => {
+    const obj = {
+      id: '01234567',
+      name: 'TEST/201NOR1208',
+      nb: 'Norsk hovedmål, skriftlig',
+      nn: 'Norsk hovudmål, skriftleg',
+      en: 'Norwegian as 1st lang, written'
+    }
+    const identifier = classIdentifier(obj.nb, obj.name)
+    expect(identifier).toBe(obj.nb)
+  })
+
+  it('returns "name" from class object when "nb" doesnt exist', () => {
+    const obj = {
+      id: '76543210',
+      name: 'TEST/201NOR1209'
+    }
+    const identifier = classIdentifier(obj.nb, obj.name)
+    expect(identifier).toBe(obj.name)
+  })
+})