Merge pull request #466 from BIBSYSDEV/NP-48273-mapping-ffi-stuff

Np 48273 mapping ffi stuff
BIBSYSDEV · Jan 10, 2025 · b94daa8 · b94daa8
2 parents 7901c82 + f2f0d2b
commit b94daa8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/brage-migration-common/src/main/java/no/sikt/nva/brage/migration/common/model/BrageType.java b/brage-migration-common/src/main/java/no/sikt/nva/brage/migration/common/model/BrageType.java
@@ -61,7 +61,10 @@ public enum BrageType {
     LITERARY_ARTS("Literary arts"),
     POPULAR_SCIENCE_MONOGRAPH("Popular science monograph"),
     EDITORIAL("Editorial"),
-    FILM("Film");
+    FILM("Film"),
+    VITEN("Viten"),
+    FAGARTIKKEL("Fagartikkel"),
+    EKSTERNNOTAT("Eksternnotat");
 
     private static final String RAPPORT = "Rapport";
     private static final String BOOK_CHAPTER = "Book chapter";

diff --git a/brage-migration-common/src/main/java/no/sikt/nva/brage/migration/common/model/NvaType.java b/brage-migration-common/src/main/java/no/sikt/nva/brage/migration/common/model/NvaType.java
@@ -41,6 +41,7 @@ public enum NvaType {
     EXHIBITION_CATALOGUE("Exhibition catalogue"),
     LITERARY_ARTS("Literary arts"),
     POPULAR_SCIENCE_MONOGRAPH("Popular science monograph"),
+    POPULAR_SCIENCE_ARTICLE("Popular science article"),
     EDITORIAL("Editorial"),
     CRISTIN_RECORD("CristinRecord");
 

diff --git a/src/main/java/no/sikt/nva/scrapers/TypeMapper.java b/src/main/java/no/sikt/nva/scrapers/TypeMapper.java
@@ -40,13 +40,15 @@ public final class TypeMapper {
         entry(Set.of(BrageType.JOURNAL_ARTICLE), NvaType.JOURNAL_ARTICLE),
         entry(Set.of(BrageType.ARTICLE), NvaType.JOURNAL_ARTICLE),
         entry(Set.of(BrageType.JOURNAL_ISSUE), NvaType.JOURNAL_ISSUE),
+        entry(Set.of(BrageType.VITEN), NvaType.JOURNAL_ISSUE),
         entry(Set.of(BrageType.PROFESSIONAL_ARTICLE), NvaType.PROFESSIONAL_ARTICLE),
         entry(Set.of(BrageType.DATASET), NvaType.DATASET),
         entry(Set.of(BrageType.DATA_SET), NvaType.DATASET),
         entry(Set.of(BrageType.OTHERS), NvaType.REPORT),
         entry(Set.of(BrageType.OTHER), NvaType.REPORT),
         entry(Set.of(BrageType.REPORT), NvaType.REPORT),
         entry(Set.of(BrageType.NOTES), NvaType.REPORT),
+        entry(Set.of(BrageType.EKSTERNNOTAT), NvaType.REPORT),
         entry(Set.of(BrageType.POSTER), NvaType.CONFERENCE_POSTER),
         entry(Set.of(BrageType.NON_FICTION_CHAPTER), NvaType.CHAPTER),
         entry(Set.of(BrageType.PRESENTATION), NvaType.LECTURE),
@@ -86,6 +88,7 @@ public final class TypeMapper {
         entry(Set.of(BrageType.LITERARY_ARTS), NvaType.LITERARY_ARTS),
         entry(Set.of(BrageType.EDITORIAL), NvaType.EDITORIAL),
         entry(Set.of(BrageType.POPULAR_SCIENCE_MONOGRAPH), NvaType.POPULAR_SCIENCE_MONOGRAPH),
+        entry(Set.of(BrageType.FAGARTIKKEL), NvaType.POPULAR_SCIENCE_ARTICLE),
         entry(Set.of(BrageType.FILM), NvaType.FILM));
 
     public static String convertBrageTypeToNvaType(Set<String> inputTypes) {

diff --git a/src/test/java/no/sikt/nva/scrapers/TypeMapperTest.java b/src/test/java/no/sikt/nva/scrapers/TypeMapperTest.java
@@ -78,4 +78,25 @@ void shouldMapOriginalNvaTypeAndUnsupportedTypeToNvaType() {
         var actualType = TypeMapper.convertBrageTypeToNvaType(Set.of("Article", "Journal article"));
         assertThat(actualType, is(equalTo(expectedNvaType)));
     }
+
+    @Test
+    void shouldMapVitenAsJournalIssue() {
+        var expectedNvaType = NvaType.JOURNAL_ISSUE.getValue();
+        var actualType = TypeMapper.convertBrageTypeToNvaType(Set.of("Viten"));
+        assertThat(actualType, is(equalTo(expectedNvaType)));
+    }
+
+    @Test
+    void shouldMapFagartikkelAsPopularScienceArticle() {
+        var expectedNvaType = NvaType.POPULAR_SCIENCE_ARTICLE.getValue();
+        var actualType = TypeMapper.convertBrageTypeToNvaType(Set.of("Fagartikkel"));
+        assertThat(actualType, is(equalTo(expectedNvaType)));
+    }
+
+    @Test
+    void shouldMapEksernnotatAsReport() {
+        var expectedNvaType = NvaType.REPORT.getValue();
+        var actualType = TypeMapper.convertBrageTypeToNvaType(Set.of("Eksternnotat"));
+        assertThat(actualType, is(equalTo(expectedNvaType)));
+    }
 }