From 14791d3d7df9bffd04c5aef457e4464263704783 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 13 May 2024 17:07:33 +0200 Subject: [PATCH 1/5] Update function to accept currencies argument --- R/check_missing_currency.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R/check_missing_currency.R b/R/check_missing_currency.R index 550f1b1..69c5ed6 100644 --- a/R/check_missing_currency.R +++ b/R/check_missing_currency.R @@ -1,4 +1,7 @@ -check_missing_currency <- function(portfolio_total) { +check_missing_currency <- function( + portfolio_total, + currencies + ) { # Currency blank or not in our currency data frame portfolio_total %>% mutate(has_currency = case_when( From 915f1dea3adda1a3d1a9ee165a5fae7451c51932 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 13 May 2024 17:09:23 +0200 Subject: [PATCH 2/5] Update calling function --- R/add_portfolio_flags.R | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/R/add_portfolio_flags.R b/R/add_portfolio_flags.R index e194232..9677669 100644 --- a/R/add_portfolio_flags.R +++ b/R/add_portfolio_flags.R @@ -5,16 +5,21 @@ #' financial data. #' #' @param portfolio A data frame containing a portfolio +#' @param currencies A data frame containing a currencies and their exchange +#' rates. #' #' @return A data frame of the portfolio with the flags columns added #' #' @export -add_portfolio_flags <- function(portfolio) { +add_portfolio_flags <- function( + portfolio, + currencies +) { ### FLAGS/Exclusions portfolio <- check_isin_format(portfolio) - portfolio <- check_missing_currency(portfolio) + portfolio <- check_missing_currency(portfolio, currencies) portfolio <- check_valid_input_value(portfolio) portfolio <- check_financial_data(portfolio) From ff12e3d1dc9a0e1b70eb5179c628fc12c5a595c2 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Mon, 13 May 2024 17:11:41 +0200 Subject: [PATCH 3/5] render docs and version bump --- DESCRIPTION | 2 +- man/add_portfolio_flags.Rd | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index bd51a33..7e3d29a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: pacta.portfolio.audit Title: Functions for Calculating Audit Statistics for PACTA on Capital Transition Monitor -Version: 0.0.1.9000 +Version: 0.0.1.9001 Authors@R: c(person(given = "CJ", family = "Yetman", diff --git a/man/add_portfolio_flags.Rd b/man/add_portfolio_flags.Rd index 67cee0b..a47681f 100644 --- a/man/add_portfolio_flags.Rd +++ b/man/add_portfolio_flags.Rd @@ -4,10 +4,13 @@ \alias{add_portfolio_flags} \title{Adds flags columns to a portfolio data frame} \usage{ -add_portfolio_flags(portfolio) +add_portfolio_flags(portfolio, currencies) } \arguments{ \item{portfolio}{A data frame containing a portfolio} + +\item{currencies}{A data frame containing a currencies and their exchange +rates.} } \value{ A data frame of the portfolio with the flags columns added From 17e056ac2aa75ce848664f6961765eacada6df60 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Thu, 16 May 2024 11:23:25 +0200 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: CJ Yetman --- DESCRIPTION | 2 +- R/add_portfolio_flags.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7e3d29a..bd51a33 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: pacta.portfolio.audit Title: Functions for Calculating Audit Statistics for PACTA on Capital Transition Monitor -Version: 0.0.1.9001 +Version: 0.0.1.9000 Authors@R: c(person(given = "CJ", family = "Yetman", diff --git a/R/add_portfolio_flags.R b/R/add_portfolio_flags.R index 9677669..29e5e86 100644 --- a/R/add_portfolio_flags.R +++ b/R/add_portfolio_flags.R @@ -5,7 +5,7 @@ #' financial data. #' #' @param portfolio A data frame containing a portfolio -#' @param currencies A data frame containing a currencies and their exchange +#' @param currencies A data frame containing ISO 4217 currency codes and their exchange #' rates. #' #' @return A data frame of the portfolio with the flags columns added From fd70adb9daa231a1163dac485156699c7138b232 Mon Sep 17 00:00:00 2001 From: Alex Axthelm Date: Thu, 16 May 2024 12:05:57 +0200 Subject: [PATCH 5/5] render docs --- man/add_portfolio_flags.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/add_portfolio_flags.Rd b/man/add_portfolio_flags.Rd index a47681f..2118518 100644 --- a/man/add_portfolio_flags.Rd +++ b/man/add_portfolio_flags.Rd @@ -9,7 +9,7 @@ add_portfolio_flags(portfolio, currencies) \arguments{ \item{portfolio}{A data frame containing a portfolio} -\item{currencies}{A data frame containing a currencies and their exchange +\item{currencies}{A data frame containing ISO 4217 currency codes and their exchange rates.} } \value{