Merge pull request #125 from bedatadriven/fix-124

Fix #124: Correct handling of imports with serial numbers

DESCRIPTION

@@ -2,8 +2,8 @@ Package: activityinfo
 Type: Package
 Title: R interface to ActivityInfo.org, an information management software for
     humanitarian and development operations
-Version: 4.36
-Date: 2023-05-25
+Version: 4.36.1
+Date: 2023-07-01
 Authors@R: c(
     person("Alex", "Bertram", email = "[email protected]", 
            role = c("aut", "cre")),

NEWS.md

@@ -1,3 +1,6 @@
+## [4.36.1]
+- Fix for `importRecords()` when the form has a serial number (#124)
+
 ## [4.36]
 - API tokens are now stored per root URL of the server. The token will need to be added again using activityInfoToken(token). The location of the token file has changed from "~/.activityinfo.credentials" to "~/.activityinfo.server.credentials" to avoid accidentally overwriting and losing the old tokens. (#101)
 - Column name de-duplication in getRecords() (#118)

R/import.R

@@ -295,6 +295,9 @@ matchRecordIdsByKey <- function(schema, data, fieldIds, fieldValues) {
   keys <- which(fieldIds %in% keyFieldIds)
 
   provided <- as.data.frame(fieldValues[keys])
+  if(ncol(provided) != length(keyFieldIds)) {
+    stop("One or more key fields are missing")
+  }
   names(provided) <- sprintf("k%d", seq_along(keyFieldIds))
 
   # Check that our input does not include duplicates according to the key
@@ -316,7 +319,7 @@ matchRecordIdsByKey <- function(schema, data, fieldIds, fieldValues) {
 
 findKeyFieldIds <- function(schema) {
   fieldIds <- sapply(schema$elements, function(e) e$id)
-  keys <- sapply(schema$elements, function(e) identical(e$key, TRUE))
+  keys <- sapply(schema$elements, function(e) identical(e$key, TRUE) && e$type != "serial")
 
   return(fieldIds[keys])
 }