Handle ordered factor when multiple choice question uses recoded vari…

…able names (#343)

* If variableNames are non-null, use them for factor levels, otherwise use the choiceText.

* Reformat this bit of code

* Update NEWS

---------

Co-authored-by: Julia Silge <julia.silge@gmail.com>

NEWS.md

@@ -1,5 +1,7 @@
 # qualtRics (development version)
 
+- Fixed bug when a survey question has *both* recoded values and variable naming thanks to @Haunfelder (#343)
+
 # qualtRics 3.2.0
 
 - Changed how multiple choice questions are mapped to an R factor with the `convert` argument to `fetch_survey()`, to now excluding `NA` as a factor level (#315)

R/utils.R

@@ -358,10 +358,18 @@ wrapper_mc <- function(data, question_meta) {
   meta <- tibble::enframe(question_meta$choices)
 
   # Level names
-  ln <- dplyr::pull(dplyr::mutate(meta,
-                                  meta_levels = purrr::map_chr(value,
-                                                               "choiceText")),
-                    meta_levels)
+ln <-
+  dplyr::pull(
+    dplyr::mutate(meta,
+      meta_levels = ifelse(
+        purrr::map(value, function(x) is.null(x$variableName)),
+        purrr::map_chr(value, "choiceText"),
+        purrr::map_chr(value, "variableName")
+      )
+    ),
+    meta_levels
+  )
+
   ln <- remove_html(ln)
 
   # Convert