Skip to content

Version 4.39 #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamiewhths merged 11 commits into from
Apr 4, 2025
Merged

Version 4.39 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
71765a4
handle missing parent billing accounts
Mar 13, 2025
261e957
fix typo
Mar 13, 2025
496a9e5
add special handling for **empty** billing account addons as datafram…
Mar 13, 2025
1096f83
Merge pull request #150 from bedatadriven/handle-billing-account-parents
akbertram Mar 13, 2025
f20d4d7
wrap addons list in another list for robust transform to dataframe
Mar 13, 2025
a42afc6
Merge branch 'version-4.39' into handle-empty-billing-account-addons
akbertram Mar 13, 2025
8dd9f76
Merge pull request #151 from bedatadriven/handle-empty-billing-accoun…
akbertram Mar 13, 2025
72facb6
add missing addons list wrapper
Mar 13, 2025
bcebfac
Merge pull request #152 from bedatadriven/billing-account-addons-list
jamiewhths Mar 13, 2025
1457e9e
Rename to `parentBillingAccountId`
Mar 13, 2025
44b8019
update release number and date
Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.38
Date: 2024-12-17
Version: 4.39
Date: 2025-04-02
Authors@R: c(
person("Alex", "Bertram", email = "alex@bedatadriven.com",
role = c("aut", "cre")),
Expand Down
23 changes: 18 additions & 5 deletions R/billingInfo.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ getBillingAccount <- function(billingAccountId, asDataFrame = TRUE) {

billingInfo <- getResource(paste0("/billingAccounts/", billingAccountId), task = "Getting billing account info")
billingInfo$id <- as.character(billingInfo$id)
billingInfo$addons <- list(billingInfo$addons)
if (is.null(billingInfo$parentBillingAccountId)) {
billingInfo$parentBillingAccountId <- NA
} else {
billingInfo$parentBillingAccountId <- as.character(billingInfo$parentBillingAccountId)
}

if (asDataFrame == TRUE) {
billingInfo <- tibble::as_tibble(billingInfo)
return(billingInfo)
Expand Down Expand Up @@ -131,13 +138,19 @@ getDatabaseBillingAccount <- function(databaseId, asDataFrame = TRUE) {
if(missing(databaseId)) stop("A databaseId must be provided")
stopifnot("A single databaseId must be provided" = (length(databaseId)==1))

databaseOwner <- getResource(paste0("/databases/", databaseId, "/billingAccount"), task = "Getting database owner")
databaseOwner$id <- as.character(databaseOwner$id)

billingInfo <- getResource(paste0("/databases/", databaseId, "/billingAccount"), task = "Getting database billing account")
billingInfo$id <- as.character(billingInfo$id)
billingInfo$addons <- list(billingInfo$addons)
if (is.null(billingInfo$parentBillingAccountId)) {
billingInfo$parentBillingAccountId <- NA
} else {
billingInfo$parentBillingAccountId <- as.character(billingInfo$parentBillingAccountId)
}

if (asDataFrame) {
databaseOwner <- as_tibble(databaseOwner)
billingInfo <- as_tibble(billingInfo)
}
return(databaseOwner)
return(billingInfo)
}


Expand Down