identified 55-4 issue

Author: hagan

R/methods.R

@@ -37,9 +37,6 @@ S7::method(create_calendar,ti) <- function(x){
   # before building the scaffold.
 
 
-
-
-
   summary_dbi <- x@datum@data |>
     dplyr::ungroup() |>
     make_db_tbl() |>
@@ -83,17 +80,19 @@ S7::method(create_calendar,ti) <- function(x){
   # Create a single-column table of all possible dates in the range.
 
   master_dates <- seq_date_sql(
-    start_date = start_date,
-    end_date   = x@datum@max_date,
-    time_unit  = x@time_unit@value,
-    .con        = dbplyr::remote_con(x@datum@data)
+    start_date    = start_date,
+    end_date      = x@datum@max_date,
+    calendar_type = x@datum@calendar_type,
+    time_unit     = x@time_unit@value,
+    .con          = dbplyr::remote_con(x@datum@data)
   )
 
   # 5. Build the Scaffolding ------------------------------------------------
   # If groups exist, expand the calendar. We use an inner join to the bounds
   # to constrain the cross-join to only the "Active Life" of each group.
 
   if (x@datum@group_indicator) {
+
     calendar_dbi <- master_dates |>
       dplyr::cross_join(
         active_bounds |> dplyr::distinct(!!!x@datum@group_quo)

R/time_intelligence_fn.R

@@ -176,11 +176,13 @@ yoy_fn <- function(x){
 
 
 
-  full_dbi <- create_full_dbi(x) |>
-    dplyr::select(-c(year))
+  full_dbi <- create_full_dbi(x)
+    # dplyr::select(-c(year))
 
   # create lag
-  lag_dbi <- full_dbi |>
+  lag_dbi <-
+    full_dbi |>
+    dplyr::select(-c(year)) |>
     dbplyr::window_order(date,!!!x@datum@group_quo) |>
     dplyr::mutate(
       date_lag=dplyr::lead(date,n = !!x@fn@lag_n)
@@ -192,18 +194,16 @@ yoy_fn <- function(x){
     dplyr::select(-c(date,!!x@value@value_quo,missing_date_indicator))
 
   # bring tables together
-  out_dbi <-   dplyr::left_join(
+  out_dbi <-
+    dplyr::left_join(
     full_dbi
     ,lag_dbi
     ,by=dplyr::join_by(date==date_lag,!!!x@datum@group_quo)
   ) |>
-    dplyr::mutate(
-      year=lubridate::year(date)
-      ,.after=date
-    ) |>
     dplyr::relocate(date,year) |>
     dplyr::relocate(dplyr::any_of("missing_date_indicator"),.after=dplyr::last_col())
 
+
   return(out_dbi)
 
 }
@@ -429,11 +429,11 @@ qoq_fn <- function(x){
   # create calendar
   # full_dbi <-  fpaR::create_calendar(x)
 
-  full_dbi <- create_full_dbi(x) |>
-    dplyr::select(-c(year,quarter))
+  full_dbi <- create_full_dbi(x)
 
   # create lag
   lag_dbi <- full_dbi |>
+    dplyr::select(-c(year,quarter)) |>
     dbplyr::window_order(date,!!!x@datum@group_quo) |>
     dplyr::mutate(
       date_lag=dplyr::lead(date,n = !!x@fn@lag_n)
@@ -448,10 +448,6 @@ qoq_fn <- function(x){
     ,lag_dbi
     ,by=dplyr::join_by(date==date_lag,!!!x@datum@group_quo)
   ) |>
-    dplyr::mutate(
-      year=lubridate::year(date)
-      ,quarter=lubridate::quarter(date)
-    ) |>
     dplyr::relocate(date,year,quarter) |>
     dplyr::relocate(dplyr::any_of("missing_date_indicator"),.after=dplyr::last_col())
 
@@ -680,14 +676,12 @@ mom_fn <- function(x){
 
   # full_dbi <-  create_calendar(x)
 
-  full_dbi <- create_full_dbi(x) |>
-    dplyr::select(
-      -c(year,month)
-    )
+  full_dbi <- create_full_dbi(x)
 
 
   # create lag
   lag_dbi <- full_dbi |>
+    dplyr::select(-c(year,month)) |>
     dbplyr::window_order(date,!!!x@datum@group_quo) |>
     dplyr::mutate(
       date_lag=dplyr::lead(date,n = !!x@fn@lag_n)
@@ -706,11 +700,6 @@ mom_fn <- function(x){
     ,lag_dbi
     ,by=dplyr::join_by(date==date_lag,!!!x@datum@group_quo)
   ) |>
-    dplyr::mutate(
-      year=lubridate::year(date)
-      ,month=lubridate::month(date)
-      ,.after=date
-    ) |>
     dplyr::relocate(date,year,month) |>
     dplyr::relocate(dplyr::any_of("missing_date_indicator"),.after=dplyr::last_col())
 
@@ -952,12 +941,10 @@ wow_fn <- function(x){
 
 
 
-  full_dbi <- create_full_dbi(x) |>
-    dplyr::select(
-      -c(year,month,week)
-    )
+  full_dbi <- create_full_dbi(x)
 
   lag_dbi <- full_dbi|>
+    dplyr::select(-c(year,month,week)) |>
     dbplyr::window_order(date) |>
     dplyr::mutate(
       date_lag=dplyr::lead(date,n = !!x@fn@lag_n)
@@ -973,11 +960,6 @@ wow_fn <- function(x){
     ,lag_dbi
     ,by=dplyr::join_by(date==date_lag,!!!x@datum@group_quo)
   ) |>
-    dplyr::mutate(
-      year=lubridate::year(date)
-      ,month=lubridate::month(date)
-      ,week=dplyr::sql("DATE_PART('week',date)")
-    ) |>
     dplyr::relocate(date,year,month,week) |>
     dplyr::relocate(dplyr::any_of("missing_date_indicator"),.after=dplyr::last_col())
 

R/utils-misc.R

@@ -587,6 +587,9 @@ create_non_standard_month <- function(.data,pattern){
 complete_non_standard_calendar <- function(.data,x){
 
 
+  # .data <- create_calendar(x)
+    # complete_non_standard_calendar(x=x)
+
   #test inputs
   # pattern <- "544"
 
@@ -639,7 +642,8 @@ complete_non_standard_calendar <- function(.data,x){
     )
 
 
-  out <- out |>
+  out <-
+    out |>
     dplyr::select(dplyr::any_of(new_cols))
 
   return(out)
@@ -723,14 +727,16 @@ create_full_dbi <- function(x){
 
     full_dbi <-
       create_calendar(x) |>
-      complete_standard_calendar(x=x)
+
+    complete_standard_calendar(x=x)
 
   }
 
   if(x@datum@calendar_type!="standard"){
 
-    full_dbi <-  create_calendar(x) |>
-      complete_non_standard_calendar(x=x)
+    full_dbi <-  create_calendar(x)
+
+
   }
 
   return(full_dbi)