resolve pid, qid equivalence from session

Author: antaldaniel

R/copy_wikidata_item.R

@@ -90,6 +90,8 @@ copy_wikidata_item <- function(
   equivalence_property <- resolve_from_session("wikibase_api_url", equivalence_property, wikibase_session)
   classification_property <- resolve_from_session("wikibase_api_url", classification_property, wikibase_session)
   csrf <- resolve_from_session("csrf", csrf, wikibase_session)
+  qid_equivalence_property <- resolve_from_session("qid_equivalence_property", qid_equivalence_property, wikibase_session)
+
 
   validate_copy_entity_args(
     language = language,

R/copy_wikidata_property.R

@@ -93,6 +93,7 @@ copy_wikidata_property <- function(
   wikibase_api_url <- resolve_from_session("wikibase_api_url", wikibase_api_url, wikibase_session)
   classification_property <- resolve_from_session("classification_property", classification_property, wikibase_session)
   equivalence_property <- resolve_from_session("equivalence_property", equivalence_property, wikibase_session)
+  pid_equivalence_property <- resolve_from_session("pid_equivalence_property", pid_equivalence_property, wikibase_session)
 
   csrf <- resolve_from_session("csrf", csrf, wikibase_session)
 

R/create_property.R

@@ -20,7 +20,7 @@
 #' @param datatype A single character string defining the datatype of this
 #'   property, for example, \code{"string"}, \code{"wikibase-item"},
 #'   \code{"quantity"}, \code{"commonsMedia"}, \code{"url"}, \code{"external-id"},
-#'   \code{"globe-coordinate"}.
+#'   \code{"globe-coordinate"}, \code{"time"}, \code{"monolingualtext"}.
 #' @param equivalence_property An optional PID of a property already defined in
 #'   the same Wikibase instance that records the equivalence of this new
 #'   property with a property defined elsewhere, for example, on Wikidata or
@@ -105,7 +105,11 @@ create_property <- function(label,
   log_file_name <- resolve_from_session("log_file_name", log_file_name, wikibase_session)
   wikibase_api_url <- resolve_from_session("wikibase_api_url", wikibase_api_url, wikibase_session)
   equivalence_property <- resolve_from_session("wikibase_api_url", equivalence_property, wikibase_session)
-   csrf <- resolve_from_session("csrf", csrf, wikibase_session)
+  csrf <- resolve_from_session("csrf", csrf, wikibase_session)
+
+  if(!is_valid_wikibase_datatype(datatype)) {
+    stop ("create_property(..., datatype): ", datatype, " is not a valid Wikibase property type.")
+  }
 
   validate_create_entity_args(
     label = label,
@@ -114,10 +118,15 @@ create_property <- function(label,
     wikibase_api_url = wikibase_api_url,
     equivalence_property = equivalence_property,
     equivalence_id = equivalence_id,
+    classification_property = NA_character_, # not used in this function
+    classification_id = NA_character_, # not used in this function
     csrf = csrf,
     data_curator = data_curator,
     validated_action = "create_property()"
   )
+
+
+
   # Save the time of running the code
   action_time <- Sys.time()
   action_timestamp <- action_timestamp_create()

man/create_property.Rd

@@ -1,37 +1,5 @@
-test_that("multiplication works", {
-  expect_equal(2 * 2, 4)
+test_that("create_item() validates inputs", {
+  expect_error(create_item(label=123, description="test"),
+               regexp = "\\'label\\' must be a non-empty character string")
 })
-library(keyring)
-jekyll_anna <- "Reprexba jekyll@MesterannaBot"
-jekyll_daniel <- "Reprexba jekyll@AntaldanielBot"
-agya_wikibase_api_url <- "https://reprexbase.eu/jekyll/api.php" # temporary
-my_csrf <- get_csrf(
-  jekyll_daniel,
-  password = key_get(
-    service = agya_wikibase_api_url,
-    username = jekyll_daniel,
-  ),
-  agya_wikibase_api_url
-)
 
-
-agya_wikibase_session <- list(
-  csrf = my_csrf,
-  wikibase_api_url = agya_wikibase_api_url,
-  language = c("en", "sk", "hu", "de", "fr", "es", "ro"),
-  data_curator = person("Daniel", "Antal"),
-  pid_equivalence_property = "P2",
-  qid_equivalence_property = "P35",
-  log_path = here("not_included")
-)
-
-digital_record_class <- create_item(
-  label = "digital record",
-  description = "a subclass of the record, a record in the collection of the Andrássy Gyula Foundation.",
-  language = "en",
-  classification_property = "P137", # subclass of
-  classification_id = "Q584", # record
-  wikibase_api_url = agya_wikibase_api_url,
-  csrf = agya_wikibase_session$csrf,
-  wikibase_session = agya_wikibase_session
-)

tests/testthat/test-create_item.R

@@ -1,3 +1,5 @@
-test_that("multiplication works", {
-  expect_equal(2 * 2, 4)
+test_that("create_property() validates inputs", {
+  expect_error(create_property(label="test", description="test",
+                           datatype = "chicken"),
+               regexp = "is not a valid Wikibase property type")
 })