From 2ff98b96576a41aeba21815244149d46be9fc416 Mon Sep 17 00:00:00 2001
From: jreps <jreps@its.jnj.com>
Date: Thu, 20 Jun 2024 12:31:31 -0400
Subject: [PATCH] Update estimation-sccs-results-full.R

---
 R/estimation-sccs-results-full.R | 55 +++++++++++++-------------------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/R/estimation-sccs-results-full.R b/R/estimation-sccs-results-full.R
index c71cbfb2..f337ef5e 100644
--- a/R/estimation-sccs-results-full.R
+++ b/R/estimation-sccs-results-full.R
@@ -508,8 +508,8 @@ estimationGetSccsModel <- function(
 
   WHERE scr.database_id = '@database_id'
   AND scr.analysis_id = @analysis_id
-  AND  sc.era_id = @exposure_id
-  AND scr.rr IS NOT NULL
+  --AND  sc.era_id = @exposure_id
+  --AND scr.rr IS NOT NULL
   AND scr.exposures_outcome_set_id = @exposures_outcome_set_id
   "
   
@@ -729,42 +729,33 @@ estimationGetSccsControlEstimates <- function(
 ) {
   
   sql <- "
-  SELECT ci_95_lb, ci_95_ub, log_rr, se_log_rr, calibrated_ci_95_lb, calibrated_ci_95_ub, calibrated_log_rr,
-  calibrated_se_log_rr, exposures_outcome_set_id
-  FROM 
-  (select * from @schema.@sccs_table_prefixresult 
-  WHERE database_id = '@database_id'
-  AND analysis_id = @analysis_id
-  AND covariate_id = @covariate_id
-  ) sr
-  ;
-  "
-  res <- connectionHandler$queryDb(
-    sql,
-    schema = resultDatabaseSettings$schema,
-    sccs_table_prefix = resultDatabaseSettings$sccsTablePrefix,
-    database_id = databaseId,
-    covariate_id = covariateId,
-    analysis_id = analysisId,
-    era_id = eraId,
-    snakeCaseToCamelCase = TRUE
-  )
+  SELECT r.ci_95_lb, r.ci_95_ub, r.log_rr, r.se_log_rr, 
+  r.calibrated_ci_95_lb, r.calibrated_ci_95_ub, r.calibrated_log_rr,
+  r.calibrated_se_log_rr, r.exposures_outcome_set_id,
+  e.true_effect_size, c.exposures_outcome_set_id 
   
-  sql <- "
-  select e.true_effect_size, c.exposures_outcome_set_id 
-   from 
+  FROM 
+  @schema.@sccs_table_prefixresult r
+  INNER JOIN
    @schema.@sccs_table_prefixexposure e
+   on r.exposures_outcome_set_id = e.exposures_outcome_set_id
+   
    INNER JOIN 
    @schema.@sccs_table_prefixcovariate c
    on e.era_id = c.era_id 
    and e.exposures_outcome_set_id = c.exposures_outcome_set_id
+   and c.database_id = r.database_id
+   and c.analysis_id = r.analysis_id
+   and c.covariate_id = r.covariate_id
+   
    WHERE e.era_id = @era_id
-   and c.database_id = '@database_id'
-   AND c.analysis_id = @analysis_id
-   AND c.covariate_id = @covariate_id
+   AND r.database_id = '@database_id'
+   AND r.analysis_id = @analysis_id
+   AND r.covariate_id = @covariate_id
+   AND e.true_effect_size is not NULL
   ;
   "
-  res2 <- connectionHandler$queryDb(
+  res <- connectionHandler$queryDb(
     sql,
     schema = resultDatabaseSettings$schema,
     sccs_table_prefix = resultDatabaseSettings$sccsTablePrefix,
@@ -774,10 +765,8 @@ estimationGetSccsControlEstimates <- function(
     era_id = eraId,
     snakeCaseToCamelCase = TRUE
   )
-  # only keep the positive or negative controls (trueEffectSize 1 or >1)
-  res2 <- res2[!is.na(res2$trueEffectSize),]
   
-  allres <- merge(res, res2, by = 'exposuresOutcomeSetId')
+  #allres <- merge(res, res2, by = 'exposuresOutcomeSetId')
   
-  return(allres)
+  return(res)
 }