Skip to content

Commit 922423f

Browse files
Fix network_id mismatch
In case of `network[["name"]] = Name_with_Some_Upper_Case`, the network was uploaded in DB like this `network[["name"]] <- tolower(network[["name"]])`. But when `POST_interaction()`tried to get FK for the network, it could not match because the ` network[["name"]]` inside the function still had upper case.
1 parent 85a0020 commit 922423f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

R/POST_interaction.R

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@
3939

4040
# Create and inject interactions table ##
4141
POST_interaction <- function(inter_df, inter, enviro = NA, attr = NULL, users, network){
42-
42+
# inter_df <- FW_name[[1]];interx <- inter[[1]];enviro<-NA;users <- users;network <- network[[1]];attr <- attr_inter
4343
# Put attribute in lowercase
4444
attr[["name"]] <- tolower(attr[["name"]])
4545
if(attr[["unit"]] != "NA") attr[["unit"]] <- tolower(attr[["unit"]])
4646

47-
47+
# Put network name in lowercase to match network[["name"]] already in DB
48+
network[["name"]] <- tolower(network[["name"]])
49+
4850
# Retrive foreign keys
4951
## node_from & node_to
5052
inter_df[, "node_from"] <- NA
@@ -61,9 +63,9 @@ POST_interaction <- function(inter_df, inter, enviro = NA, attr = NULL, users, n
6163
inter_df[, "attr_id"] <- GET_fkey("attribute", c("name", "unit"), c(tolower(attr[["name"]]), attr[["unit"]]))
6264
}
6365

64-
if (length(content(httr::GET(url = gsub(" ", "%20", paste0(server, mangal.env$base, "/environment?name=", enviro[["name"]], "&date=", enviro[["date"]], "&value=", enviro[["value"]])), config = mangal.env$headers))) != 0){
65-
inter_df[, "environment_id"] <- GET_fkey("environment", c("name", "date", "value"), c(enviro[["name"]], enviro[["date"]], enviro[["value"]]))
66-
}
66+
# if (length(content(httr::GET(url = gsub(" ", "%20", paste0(server, mangal.env$base, "/environment?name=", enviro[["name"]], "&date=", enviro[["date"]], "&value=", enviro[["value"]])), config = mangal.env$headers))) != 0){
67+
# inter_df[, "environment_id"] <- GET_fkey("environment", c("name", "date", "value"), c(enviro[["name"]], enviro[["date"]], enviro[["value"]]))
68+
# }
6769

6870
if (length(content(httr::GET(url = gsub(" ", "%20", paste0(server, mangal.env$base, "/network?name=", network[["name"]], "&date=", network[["date"]])), config = mangal.env$headers))) != 0){
6971
inter_df[, "network_id"] <- GET_fkey("network", c("name", "date"), c(network[["name"]], network[["date"]]))

0 commit comments

Comments
 (0)