From bfa73aa6a9ce0b25115f986b68e18bc08d07b3f5 Mon Sep 17 00:00:00 2001
From: Gowtham Rao <rao@ohdsi.org>
Date: Mon, 30 Sep 2024 07:02:18 -0400
Subject: [PATCH] optimized

---
 R/GetMappedSourceConcepts.R        | 2 +-
 R/GetMappedStandardConcepts.R      | 2 +-
 R/ResolveConceptSetExpression.R    | 7 ++++---
 man/resolveConceptSetExpression.Rd | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/R/GetMappedSourceConcepts.R b/R/GetMappedSourceConcepts.R
index 4664b70..b8cedb0 100644
--- a/R/GetMappedSourceConcepts.R
+++ b/R/GetMappedSourceConcepts.R
@@ -44,7 +44,7 @@ getMappedSourceConcepts <-
     }
 
     tempTableName <- loadTempConceptTable(
-      conceptIds = conceptIds,
+      conceptIds = conceptIds |> unique() |> sort(),
       connection = connection,
       tempEmulationSchema = tempEmulationSchema
     )
diff --git a/R/GetMappedStandardConcepts.R b/R/GetMappedStandardConcepts.R
index 190a845..26a1c70 100644
--- a/R/GetMappedStandardConcepts.R
+++ b/R/GetMappedStandardConcepts.R
@@ -44,7 +44,7 @@ getMappedStandardConcepts <-
     }
 
     tempTableName <- loadTempConceptTable(
-      conceptIds = conceptIds,
+      conceptIds = conceptIds |> unique() |> sort(),
       tempEmulationSchema = tempEmulationSchema,
       connection = connection
     )
diff --git a/R/ResolveConceptSetExpression.R b/R/ResolveConceptSetExpression.R
index ec1b19b..5c20b51 100644
--- a/R/ResolveConceptSetExpression.R
+++ b/R/ResolveConceptSetExpression.R
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-#' Given a concept set expression, get the resolved concepts
+#' Given a concept set expression, get the resolved concept ids.
 #'
 #' @template Connection
 #'
@@ -26,7 +26,7 @@
 #' @template TempEmulationSchema
 #'
 #' @return
-#' Returns a tibble data frame.
+#' Returns a tibble data frame of distinct sorted concept ids.
 #'
 #' @export
 resolveConceptSetExpression <- function(conceptSetExpression,
@@ -49,8 +49,9 @@ resolveConceptSetExpression <- function(conceptSetExpression,
       snakeCaseToCamelCase = TRUE,
       tempEmulationSchema = tempEmulationSchema
     ) |>
+    dplyr::distinct() |> 
     dplyr::arrange(conceptId) |> 
-    dplyr::tibble()
+    dplyr::pull()
   
   return(resolvedConceptIds)
 }
diff --git a/man/resolveConceptSetExpression.Rd b/man/resolveConceptSetExpression.Rd
index f87ce73..5b278ae 100644
--- a/man/resolveConceptSetExpression.Rd
+++ b/man/resolveConceptSetExpression.Rd
@@ -2,7 +2,7 @@
 % Please edit documentation in R/ResolveConceptSetExpression.R
 \name{resolveConceptSetExpression}
 \alias{resolveConceptSetExpression}
-\title{Given a concept set expression, get the resolved concepts}
+\title{Given a concept set expression, get the resolved concept ids.}
 \usage{
 resolveConceptSetExpression(
   conceptSetExpression,
@@ -32,8 +32,8 @@ tables, provide a schema with write privileges where temp tables can be created.
 \item{vocabularyDatabaseSchema}{The schema name of containing the vocabulary tables.}
 }
 \value{
-Returns a tibble data frame.
+Returns a tibble data frame of distinct sorted concept ids.
 }
 \description{
-Given a concept set expression, get the resolved concepts
+Given a concept set expression, get the resolved concept ids.
 }