fix row numbering of response values (closes #112)

cloudyr · Mar 12, 2016 · 28697c4 · 28697c4
1 parent e52435b
commit 28697c4
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 17 deletions.
diff --git a/R/GetBonuses.R b/R/GetBonuses.R
@@ -61,7 +61,7 @@ function(assignment = NULL,
                 if (verbose) {
                     message(runningtotal, " Bonuses Retrieved")
                 }
-                return(do.call('rbind',Bonuses))
+                return(setRownames(do.call('rbind',Bonuses)))
             } else {
                 if (verbose) {
                     message(runningtotal, " Bonuses Retrieved")

diff --git a/R/GetHITsForQualificationType.R b/R/GetHITsForQualificationType.R
@@ -83,6 +83,6 @@ function (qual, response.group = NULL, return.all = TRUE, pagenumber = 1,
     if (verbose) {
         message(request$total, " HITs Retrieved")
     }
-    return(list(HITs = request$HITs,
-                QualificationRequirements = request$QualificationRequirements))
+    return(list(HITs = setRownames(request$HITs),
+                QualificationRequirements = setRownames(request$QualificationRequirements)))
 }
diff --git a/R/GetQualificationRequests.R b/R/GetQualificationRequests.R
@@ -77,7 +77,7 @@ function (qual = NULL, return.all = TRUE, pagenumber = "1", pagesize = "10",
         message(request$total, " Requests Retrieved")
     }
     if (request$total > 0) {
-        return(request$QualificationRequests)
+        return(setRownames(request$QualificationRequests))
     } else {
         return(emptydf(0, 5, c("QualificationRequestId", "QualificationTypeId", "SubjectId", "SubmitTime", "Answer")))
     }

diff --git a/R/GetQualifications.R b/R/GetQualifications.R
@@ -63,7 +63,7 @@ function (qual, status = NULL, return.all = TRUE, pagenumber = 1,
         message(request$total, " Qualifications Retrieved")
     }
     if (request$total > 0) {
-        return(request$Qualifications)
+        return(setRownames(request$Qualifications))
     } else {
         return(emptydf(0, 5, c("QualificationTypeId", "WorkerId", "GrantTime", "Value", "Status")))
     }

diff --git a/R/SearchHITs.R b/R/SearchHITs.R
@@ -124,14 +124,14 @@ function (response.group = NULL, return.all = TRUE, pagenumber = "1",
             }
         }
         if(return.hit.dataframe==TRUE){
-            return.list <- list(HITs = request$HITs,
-                                QualificationRequirements = request$QualificationRequirements)
+            return.list <- list(HITs = setRownames(request$HITs),
+                                QualificationRequirements = setRownames(request$QualificationRequirements))
         } else {
-            return.list <- list(QualificationRequirements = request$QualificationRequirements)
+            return.list <- list(QualificationRequirements = setRownames(request$QualificationRequirements))
         }
     } else {
         if (return.hit.dataframe == TRUE) {
-            return.list <- list(HITs = request$HITs)        
+            return.list <- list(HITs = setRownames(request$HITs))
         } else {
             return.list <- NULL
         }

diff --git a/R/SearchQualificationTypes.R b/R/SearchQualificationTypes.R
@@ -88,5 +88,5 @@ function (query = NULL, only.mine = TRUE, only.requestable = FALSE,
     } else if (!request$valid[1] & verbose) {
         warning("Invalid Request")
     }
-    return(request$quals)
+    return(setRownames(request$quals))
 }
diff --git a/R/asdataframe.R b/R/asdataframe.R
@@ -107,7 +107,8 @@ as.data.frame.Assignments <- function(xml.parsed, return.assignment.xml = FALSE)
                             "OtherSelectionField","UploadedFileKey","UploadedFileSizeInBytes"))
     names(values) <- gsub("Combined.Answers.","",names(values),fixed=TRUE)
     assignments <- merge(assignments,values,by="AssignmentId",all=TRUE)
-    return(list(assignments = assignments, answers = answers))
+    return(list(assignments = setRownames(assignments), 
+                answers = answers))
 }
 
 
@@ -194,7 +195,7 @@ as.data.frame.QualificationTypes <- function(xml.parsed) {
                                 "QualificationTypeStatus", "AutoGranted", "AutoGrantedValue", "IsRequestable",
                                 "RetryDelayInSeconds", "TestDurationInSeconds", "Test", "AnswerKey")))
     } else {
-        return(do.call(rbind.data.frame, out))
+        return(setRownames(do.call(rbind.data.frame, out)))
     }
 }
 
@@ -212,7 +213,7 @@ as.data.frame.QualificationRequests <- function(xml.parsed){
     if (!length(out)) {
         return(emptydf(0, 5, c("QualificationRequestId","QualificationTypeId","SubjectId","SubmitTime","Answer")))
     } else {
-        return(do.call("rbind.data.frame", out))
+        return(setRownames(do.call("rbind.data.frame", out)))
     }
 }
 
@@ -413,8 +414,7 @@ as.data.frame.QuestionFormAnswers <- function(xml.parsed) {
         }
         return(out)
     }
-    values <- do.call(rbind,lapply(answers,FUN=convertxml))
-    return(values)
+    return(setRownames(do.call(rbind,lapply(answers,FUN=convertxml))))
 }
 
 
@@ -555,7 +555,7 @@ as.data.frame.BonusPayments <- function(xml.parsed){
     if (!length(out)) {
         return(emptydf(0, 7, c("AssignmentId","WorkerId","Amount","CurrencyCode","FormattedPrice","Reason","GrantTime")))
     } else {
-        return(do.call(rbind.data.frame,out))
+        return(setRownames(do.call(rbind.data.frame,out)))
     }
 }
 
@@ -570,7 +570,7 @@ as.data.frame.WorkerBlock <- function(xml.parsed) {
     if (!length(out)) {
         return(emptydf(0, 2, c("WorkerId", "Reason")))
     } else {
-        return(do.call(rbind.data.frame,out))
+        return(setRownames(do.call(rbind.data.frame,out)))
     }
 }
 
diff --git a/R/setRownames.R b/R/setRownames.R
@@ -0,0 +1,7 @@
+setRownames <- function(dat) {
+    if (nrow(dat) > 0) {
+        return(`row.names<-`(dat, 1:nrow(dat)))
+    } else {
+        return(dat)
+    }
+}
diff --git a/tests/testthat/tests.R b/tests/testthat/tests.R
@@ -2,6 +2,14 @@ context("Sandbox Tests")
 
 test_that("Account Balance Check", {
     expect_true(as.numeric(AccountBalance()$balance) == 10000)
+    expect_true(is.numeric(SufficientFunds()$Total))
+})
+
+test_that("RequesterReport", {
+    expect_true(is.data.frame(RequesterReport()))
+})
+test_that("RequesterReport", {
+    expect_true(is.data.frame(WorkerReport("A1RO9UJNWXMU65")))
 })
 
 r <- RegisterHITType(title = "Example HITType",
@@ -50,6 +58,10 @@ test_that("ChangeHITType", {
     expect_true(nrow(ch) == 1)
 })
 
+test_that("SearchHITs", {
+    expect_true(is.data.frame(SearchHITs()$HITs))
+})
+
 test_that("GetAssignments", {
     a <- GetAssignments(hit = h$HITId, sandbox = TRUE)
     expect_true(nrow(a) == 0)
@@ -82,3 +94,7 @@ test_that("DisposeQualificationType", {
     dis <- DisposeQualificationType(q1$QualificationTypeId, sandbox = TRUE)
     expect_true(nrow(dis) == 1)
 })
+
+test_that("SearchQualificationTypes", {
+    expect_true(is.data.frame(SearchQualificationTypes()))
+})