From 5f012bd3c04d66a25e646e1fd3f2c705f841d8a4 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Thu, 3 Oct 2024 09:18:14 +0100 Subject: [PATCH 1/4] Updating get_meta to handle 3-col info on filters and indicators and updating tests correspondingly --- NAMESPACE | 1 - R/get_meta.R | 19 ++-------------- man/parse_meta_indicator_columns.Rd | 21 ------------------ tests/testthat/seed_tests.R | 17 ++++++++++++++ tests/testthat/test-get_meta.R | 2 +- .../testthat/testdata/example_meta_parsed.rds | Bin 3845 -> 3170 bytes .../testdata/example_meta_unparsed.rds | Bin 4448 -> 3788 bytes .../example_publication_catalogue.rds | Bin 497 -> 432 bytes .../testdata/example_publication_datasets.rds | Bin 678 -> 736 bytes 9 files changed, 20 insertions(+), 40 deletions(-) delete mode 100644 man/parse_meta_indicator_columns.Rd diff --git a/NAMESPACE b/NAMESPACE index 8db4dd6..4306f15 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -14,7 +14,6 @@ export(parse_api_dataset) export(parse_filter_in) export(parse_meta_filter_columns) export(parse_meta_filter_item_ids) -export(parse_meta_indicator_columns) export(parse_meta_location_ids) export(parse_meta_time_periods) export(query_dataset) diff --git a/R/get_meta.R b/R/get_meta.R index 6174ce9..abd960d 100644 --- a/R/get_meta.R +++ b/R/get_meta.R @@ -145,7 +145,8 @@ parse_meta_location_ids <- function(api_meta_locations) { #' parse_meta_filter_columns() parse_meta_filter_columns <- function(api_meta_filters) { data.frame( - col_name = api_meta_filters$id, + col_id = api_meta_filters$id, + col_name = api_meta_filters$column, label = api_meta_filters$label ) } @@ -192,19 +193,3 @@ parse_meta_filter_item_ids <- function(api_meta_filters) { return(filter_items) } -#' Parse API meta to give the indicator columns -#' -#' @param api_meta_indicators Indicator information provided by the API output -#' -#' @return data frame containing indicator column names and labels -#' @export -#' -#' @examples -#' get_meta_response(example_id())$indicators |> -#' parse_meta_indicator_columns() -parse_meta_indicator_columns <- function(api_meta_indicators) { - data.frame( - col_name = api_meta_indicators$id, - label = api_meta_indicators$label - ) -} diff --git a/man/parse_meta_indicator_columns.Rd b/man/parse_meta_indicator_columns.Rd deleted file mode 100644 index 4812a96..0000000 --- a/man/parse_meta_indicator_columns.Rd +++ /dev/null @@ -1,21 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/get_meta.R -\name{parse_meta_indicator_columns} -\alias{parse_meta_indicator_columns} -\title{Parse API meta to give the indicator columns} -\usage{ -parse_meta_indicator_columns(api_meta_indicators) -} -\arguments{ -\item{api_meta_indicators}{Indicator information provided by the API output} -} -\value{ -data frame containing indicator column names and labels -} -\description{ -Parse API meta to give the indicator columns -} -\examples{ -get_meta_response(example_id())$indicators |> - parse_meta_indicator_columns() -} diff --git a/tests/testthat/seed_tests.R b/tests/testthat/seed_tests.R index 2cccde2..0f40d5c 100644 --- a/tests/testthat/seed_tests.R +++ b/tests/testthat/seed_tests.R @@ -16,8 +16,12 @@ # Refresh all test data seed_tests <- function() { + message("Updating publication list") seed_get_publications() + message("Updating data catalogue list") seed_get_data_catalogue() + message("Updating example meta data") + seed_get_meta() } # Refresh the publication list @@ -35,3 +39,16 @@ seed_get_data_catalogue <- function() { file = "tests/testthat/testdata/example_publication_datasets.rds" ) } + +# Refresh the data sets list from the standard example publication +seed_get_meta <- function() { + saveRDS( + eesyapi::get_meta_response(eesyapi::example_id()), + file = "tests/testthat/testdata/example_meta_unparsed.rds" + ) + saveRDS( + eesyapi::get_meta(eesyapi::example_id()), + file = "tests/testthat/testdata/example_meta_parsed.rds" + ) +} + diff --git a/tests/testthat/test-get_meta.R b/tests/testthat/test-get_meta.R index 0211fd5..5c4ea8f 100644 --- a/tests/testthat/test-get_meta.R +++ b/tests/testthat/test-get_meta.R @@ -66,7 +66,7 @@ test_that("Filter item ids parsing works as expected", { test_that("Indicator ids parsing works as expected", { expect_equal( readRDS("testdata/example_meta_unparsed.rds")$indicators |> - parse_meta_indicator_columns(), + parse_meta_filter_columns(), readRDS("testdata/example_meta_parsed.rds")$indicators ) }) diff --git a/tests/testthat/testdata/example_meta_parsed.rds b/tests/testthat/testdata/example_meta_parsed.rds index 06385e0a1cecf80aa1375766c2eb03c9cf6dab32..1c40f7c60609996d76c47eadb1292e00870fa51e 100644 GIT binary patch literal 3170 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 IeTg&x00!a_?*IS* literal 3845 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 HJ3;^eWx0I? diff --git a/tests/testthat/testdata/example_meta_unparsed.rds b/tests/testthat/testdata/example_meta_unparsed.rds index fd3571fe9398658952913266cc59f0ec168898cd..1675282b7fa1b5ca76f6d0c7c72568e825b622a0 100644 GIT binary patch literal 3788 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 a|0_>rT}|aYq4=%B`uztqA1!+e0{{S$mDvOU literal 497 zcmVxv!sjlgjbHEl zO8tB4zaKTX(pkwtJ1&5g5`)r)0ut6Jt++6VMXex)YAhXK#1XKja6lPGL5sBHrg182 z5hJBm)&aNExm-8kl(j)?g*3>TB5JK5)G^xtC%gg13ItLU9JE5qqA`dZa9=FP(e+mK z#%0T^@0nF&w0?hi{UdAI&h={LvU}CFzSyq&Y;?moYu;Y%bk~~DO6J_Bz1(!%;KtC> z_P21e@fl~cu^l^ih@zfRKy6ysM=`@aL=<>Ifqj%sunn!xD0{gX1tQAs2?bt5`LfJ5 zo$@0Y*O_&zwdb`D*$ZE|S2m5}E{tt%OY5)Kb&SM3mxU4a*Fs&HQ zMTs#ki_ZvE2>m1EH4+u!6)kdEP)ZB@AEB&qQ87_ro?}{aT#(m=$e$=HMk`Y0m`U#( zt&{ZF3y1Adad!Dx{4vBc4=YY$cdZKo!NV#=CpqWy@%cXcoPOFi45Mq9=7!PjiC3fd z;rti|!uP2D5YL`?I)-U%3Hv;7P#oIGf+4jmh@+tggNQ^hvT021z;Rt~xQ6u{*MUPa zbYK`nLl{sG6J&>uGq$z-Pc8KB4TvzuAZ7^#abAF<(c8vTQZ7+DCpiHbPH71oErB7e z$!W>8*w&~TC#;;(Xx-7$-PBfe?EzA+*1*!Dz(%$UEd-H$j)Fr69lGJbvV9wcFAzFJ z=&x~xvD@VBe*MwdwweuHd=v+k@46AR$MG1t4)P%;ZVY2$S%DY2z86>u>qXeZLF7RX zyBNBmMD!fp)b^%cS)a*kqy4@5zG@}rMhe-{gzVc0 z`3Fc{R8!p1U>#!l2bKn@iEYd^Xs_hBP*<}{GpScc;eIPocYdpgId5%m{(pRpWxl4| z`Jw0+oB&+$XpjRZRN>K+WFsBmo?6gY9v;cW5=EASQr5Yf&Kmkc{Ml-&S+FL?Z zGnOcSsQbYs<5Q4l6o^5T<^}!3_WQR9%7(uRyd2Sjh+6Q3{(JVvqjgHHN~_xMA4MrE zn`m24sa;*AeE&kk1WdK+OdF8*dCqZiM$0PUstB_l%<7OiOX;Yob|LMA=92=?ri`4> z3%U@XFP8DT64?waix|N?SGC}@;0dZfkY{uzhR&LS@Q z^SF# zNf{9o=ui(q)6`kyS^D%Al$xYg*^#0R;~A^ku#!Q2=kJ1rvndMTp=kJ>c)NdEwd z4}7u?X&T#@x1haBvC^()7jnZ_$Kw7xJKQU(e#$LBCUzT=LuayT`Jul$)`9T(dD4?f!8I;C|$j zqR8A+U|D5vwb7~T8JN(hm1=d9-vbl8sB=qu{~SsVxoTCueb3#jT$*?OJk4`pjtatgWzSqN+18$&TJ*=!>D30%Rd&AxV1 zO(kY4WG*CUs<5>^%-*cA(z|o_&5kRnR?YUSdOBsL9rGi-|EjkA>}0I@^?o*dK3Ge? M0skrNFW3eE03SP2jQ{`u From c7d2375485532624a9afff38b8f57d85f5307739 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Thu, 3 Oct 2024 09:24:50 +0100 Subject: [PATCH 2/4] Styling code --- R/get_meta.R | 1 - tests/testthat/seed_tests.R | 1 - 2 files changed, 2 deletions(-) diff --git a/R/get_meta.R b/R/get_meta.R index abd960d..6647554 100644 --- a/R/get_meta.R +++ b/R/get_meta.R @@ -192,4 +192,3 @@ parse_meta_filter_item_ids <- function(api_meta_filters) { } return(filter_items) } - diff --git a/tests/testthat/seed_tests.R b/tests/testthat/seed_tests.R index 0f40d5c..9c11d19 100644 --- a/tests/testthat/seed_tests.R +++ b/tests/testthat/seed_tests.R @@ -51,4 +51,3 @@ seed_get_meta <- function() { file = "tests/testthat/testdata/example_meta_parsed.rds" ) } - From da14d757d47a62690bd2c816a6391406fcb36376 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Thu, 3 Oct 2024 09:31:38 +0100 Subject: [PATCH 3/4] Version update --- DESCRIPTION | 2 +- NEWS.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index e86998e..52263ef 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: eesyapi Title: EES-y API -Version: 0.2.0 +Version: 0.2.1 Authors@R: c( person("Rich", "Bielby", , "richard.bielby@education.gov.uk", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index 2b3cc52..dd75304 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# eesyapi 0.2.1 + +* Updated `get_meta()` to work with new API meta output (addition of id alongside col_name and label) +* Removed redundant function: `parse_meta_filter_columns()` +* Hex logo added for documentation + # eesyapi 0.2.0 * Creating publication querying functions: From d88150e34b51dbeba57625a875cd7c6d9cbab327 Mon Sep 17 00:00:00 2001 From: Rich Bielby Date: Thu, 3 Oct 2024 11:55:54 +0100 Subject: [PATCH 4/4] Updated filter_items produced by get_meta to list col_id correctly --- R/get_meta.R | 8 ++++---- .../testthat/testdata/example_meta_parsed.rds | Bin 3170 -> 3170 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/get_meta.R b/R/get_meta.R index 6647554..d365087 100644 --- a/R/get_meta.R +++ b/R/get_meta.R @@ -164,13 +164,13 @@ parse_meta_filter_columns <- function(api_meta_filters) { parse_meta_filter_item_ids <- function(api_meta_filters) { nfilters <- length(api_meta_filters$id) filter_items <- data.frame( - col_name = NA, + col_id = NA, item_id = NA, item_label = NA, isAggregate = NA ) filter_items <- filter_items |> - dplyr::filter(!is.na(filter_items$col_name)) + dplyr::filter(!is.na(filter_items$col_id)) for (i in 1:nfilters) { filter_items_i <- as.data.frame( api_meta_filters$options[i] @@ -179,7 +179,7 @@ parse_meta_filter_item_ids <- function(api_meta_filters) { item_id = "id", item_label = "label" ) |> - dplyr::mutate(col_name = api_meta_filters$id[i]) + dplyr::mutate(col_id = api_meta_filters$id[i]) if (!("isAggregate" %in% names(filter_items_i))) { filter_items_i <- filter_items_i |> dplyr::mutate(isAggregate = NA) @@ -187,7 +187,7 @@ parse_meta_filter_item_ids <- function(api_meta_filters) { filter_items <- filter_items |> rbind( filter_items_i |> - dplyr::select("col_name", "item_label", "item_id", default_item = "isAggregate") + dplyr::select("col_id", "item_label", "item_id", default_item = "isAggregate") ) } return(filter_items) diff --git a/tests/testthat/testdata/example_meta_parsed.rds b/tests/testthat/testdata/example_meta_parsed.rds index 1c40f7c60609996d76c47eadb1292e00870fa51e..11d49b983a667cc2b55b4f9ee2c3196d9f853302 100644 GIT binary patch delta 296 zcmV+@0oVTG7~&YPL<@h)hkG+6%d_;!#J4t@n6Ve#B=FA!`JcavQXBmEIrN3&$EZQ; zy}O)2ks#+DYIZc-gR{tKO`t#egPw56^euYGh}-@*ELA z2P9X13&;GiYzqhIX70t|O}dzIK8XFBtR(o`k^Dq)-z~mNhUR~b{r!G2zmom`fJ!ne z4qf_qE-3iZar#aod0#epb}}>Kk1#RW(+ueIr8?`qFe{$B+=aG`XK&T1V-@;XbkA*EWCazuKIKB{27mkKVJrPe uhrb1w(C1G?Zm1wxvCq-BD>NxZhHcX4QkO2qB>A5nKm7|d5g=ZNGynh!F`R_} delta 296 zcmV+@0oVTG7~&YPL<@hC1H75ig=79;wuJ+9Gxy@~CSA-}AH@DmRuugGNPeQY?-t)BL-T*e{(e81U&;Q5KqZ+K zhc10U7Zm*IIDIRTyfK?RJDC~rN0^xGX$JHOQ=Ro*m=(`m?m}C}v-j%Mu?l@K^63NI zf7t$OP>>JKUrrHy778MBihjNJ?@v{ivMBuz`p!Qxy5}}7vVw|SpK>8}gTMdtu$6wM u!`}l;=o2U+H`E}k*yrfm6`GVH!#3%YsY@4QlKfwfpZ*0hjF^3iGynk2h?SlI