feat(ORCID): [AOU-2084] update mapping between AoU document types and ORCID Work types

AoU-Admin/src/main/java/ch/unige/aou/service/metadata/exports/OrcidWorkAdapter.java

@@ -379,6 +379,10 @@ public class OrcidWorkAdapter {
           work.setType("review");
           return;
         }
+        if (AouConstants.DEPOSIT_SUB_SUBTYPE_BILLET_DE_BLOG_NAME.equals(subSubtype)) {
+          work.setType("blog-post");
+          return;
+        }
       }
 
       String subtype = metadataExtractor.getSubtype(depositDoc);
@@ -388,13 +392,12 @@ public class OrcidWorkAdapter {
         case AouConstants.DEPOSIT_SUBTYPE_ARTICLE_PROFESSIONNEL_NAME -> workType = "magazine-article";
         case AouConstants.DEPOSIT_SUBTYPE_AUTRE_ARTICLE_NAME -> workType = "newspaper-article";
         case AouConstants.DEPOSIT_SUBTYPE_NUMERO_DE_REVUE_NAME -> workType = "journal-issue";
-        case AouConstants.DEPOSIT_SUBTYPE_LIVRE_NAME -> workType = "book";
-        case AouConstants.DEPOSIT_SUBTYPE_OUVRAGE_COLLECTIF_NAME,
-                AouConstants.DEPOSIT_SUBTYPE_ACTES_DE_CONFERENCE_NAME -> workType = "edited-book";
-        case AouConstants.DEPOSIT_SUBTYPE_CHAPITRE_DE_LIVRE_NAME,
-                AouConstants.DEPOSIT_SUBTYPE_CHAPITRE_D_ACTES_NAME -> workType = "book-chapter";
+        case AouConstants.DEPOSIT_SUBTYPE_LIVRE_NAME, AouConstants.DEPOSIT_SUBTYPE_OUVRAGE_COLLECTIF_NAME -> workType = "book";
+        case AouConstants.DEPOSIT_SUBTYPE_ACTES_DE_CONFERENCE_NAME -> workType = "conference-proceedings";
+        case AouConstants.DEPOSIT_SUBTYPE_CHAPITRE_DE_LIVRE_NAME -> workType = "book-chapter";
+        case AouConstants.DEPOSIT_SUBTYPE_CHAPITRE_D_ACTES_NAME -> workType = "conference-paper";
         case AouConstants.DEPOSIT_SUBTYPE_CONTRIBUTION_DICTIONNAIRE_ENCYCLOPEDIE_NAME -> workType = "encyclopedia-entry";
-        case AouConstants.DEPOSIT_SUBTYPE_PRESENTATION_INTERVENTION_NAME -> workType = "lecture-speech";
+        case AouConstants.DEPOSIT_SUBTYPE_PRESENTATION_INTERVENTION_NAME -> workType = "conference-presentation";
         case AouConstants.DEPOSIT_SUBTYPE_POSTER_NAME -> workType = "conference-poster";
         case AouConstants.DEPOSIT_SUBTYPE_THESE_NAME,
                 AouConstants.DEPOSIT_SUBTYPE_THESE_DOCTORAL_PROFESSIONAL_NAME,

AoU-Admin/src/main/java/ch/unige/aou/service/metadata/imports/OrcidImportService.java

@@ -260,8 +260,8 @@ public class OrcidImportService extends MetadataImportService {
         return AouConstants.DEPOSIT_SUB_SUBTYPE_COMPTE_RENDU_LIVRE_NAME;
       case "review":
         return AouConstants.DEPOSIT_SUB_SUBTYPE_COMMENTAIRE_NAME;
-      case "supervised-student-publication":
-        return AouConstants.DEPOSIT_SUB_SUBTYPE_ARTICLE_NAME;
+      case "blog-post":
+        return AouConstants.DEPOSIT_SUB_SUBTYPE_BILLET_DE_BLOG_NAME;
       default:
         return null;
     }
@@ -269,21 +269,27 @@ public class OrcidImportService extends MetadataImportService {
 
   private String getSubType(Work work) {
     switch (work.getType()) {
-      case "journal-article", "magazine-article", "book-review", "review", "supervised-student-publication":
+      case "journal-article", "book-review", "review", "clinical-study":
         return AouConstants.DEPOSIT_SUBTYPE_ARTICLE_SCIENTIFIQUE_NAME;
+      case "magazine-article", "blog-post":
+        return AouConstants.DEPOSIT_SUBTYPE_ARTICLE_PROFESSIONNEL_NAME;
       case "newspaper-article", "newsletter-article":
         return AouConstants.DEPOSIT_SUBTYPE_AUTRE_ARTICLE_NAME;
       case "journal-issue":
         return AouConstants.DEPOSIT_SUBTYPE_NUMERO_DE_REVUE_NAME;
-      case "book", "manual":
+      case "book", "manual", "learning-object":
         return AouConstants.DEPOSIT_SUBTYPE_LIVRE_NAME;
       case "edited-book":
         return AouConstants.DEPOSIT_SUBTYPE_OUVRAGE_COLLECTIF_NAME;
       case "book-chapter":
         return AouConstants.DEPOSIT_SUBTYPE_CHAPITRE_DE_LIVRE_NAME;
+      case "conference-paper":
+        return AouConstants.DEPOSIT_SUBTYPE_CHAPITRE_D_ACTES_NAME;
       case "encyclopedia-entry", "dictionary-entry":
         return AouConstants.DEPOSIT_SUBTYPE_CONTRIBUTION_DICTIONNAIRE_ENCYCLOPEDIE_NAME;
-      case "lecture-speech", "conference-abstract":
+      case "conference-proceedings":
+        return AouConstants.DEPOSIT_SUBTYPE_ACTES_DE_CONFERENCE_NAME;
+      case "lecture-speech", "conference-abstract", "conference-presentation", "conference-output":
         return AouConstants.DEPOSIT_SUBTYPE_PRESENTATION_INTERVENTION_NAME;
       case "conference-poster":
         return AouConstants.DEPOSIT_SUBTYPE_POSTER_NAME;
@@ -293,7 +299,7 @@ public class OrcidImportService extends MetadataImportService {
         return AouConstants.DEPOSIT_SUBTYPE_RAPPORT_DE_RECHERCHE_NAME;
       case "working-paper":
         return AouConstants.DEPOSIT_SUBTYPE_WORKING_PAPER_NAME;
-      case "preprint":
+      case "preprint", "supervised-student-publication":
       default:
         return AouConstants.DEPOSIT_SUBTYPE_PREPRINT_NAME;
     }
@@ -301,17 +307,17 @@ public class OrcidImportService extends MetadataImportService {
 
   private String getType(Work work) {
     switch (work.getType()) {
-      case "journal-article", "magazine-article", "newspaper-article", "book-review", "review", "newsletter-article", "supervised-student-publication":
+      case "journal-article", "magazine-article", "newspaper-article", "book-review", "review", "newsletter-article", "clinical-study", "blog-post":
         return AouConstants.DEPOSIT_TYPE_ARTICLE_NAME;
       case "journal-issue":
         return AouConstants.DEPOSIT_TYPE_JOURNAL_NAME;
-      case "book", "edited-book", "book-chapter", "encyclopedia-entry", "manual", "dictionary-entry":
+      case "book", "edited-book", "book-chapter", "encyclopedia-entry", "manual", "dictionary-entry", "learning-object":
         return AouConstants.DEPOSIT_TYPE_LIVRE_NAME;
-      case "lecture-speech", "conference-poster", "conference-abstract":
+      case "lecture-speech", "conference-poster", "conference-abstract", "conference-paper", "conference-proceedings", "conference-presentation", "conference-output":
         return AouConstants.DEPOSIT_TYPE_CONFERENCE_NAME;
       case "dissertation-thesis":
         return AouConstants.DEPOSIT_TYPE_DIPLOME_NAME;
-      case "report", "working-paper", "preprint":
+      case "report", "working-paper", "preprint", "supervised-student-publication":
       default:
         return AouConstants.DEPOSIT_TYPE_RAPPORT_NAME;
     }